From 754b655ad4c6a2c5a52a2bef6472eaded43d0e6a Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Mon, 3 Apr 2023 20:45:54 +0200
Subject: [PATCH] kernel update arrived

---
 flake.lock                              | 12 ++++++------
 pkgs/x32edit/default.nix                |  5 +++--
 users/rouven/modules/neovim/default.nix |  2 +-
 users/rouven/modules/packages.nix       |  4 ++--
 users/rouven/modules/zsh/default.nix    |  1 +
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1ef3453..235b3a7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -140,11 +140,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1680439377,
-        "narHash": "sha256-hF/cjhEWQR3g70RnI61GQ10Wrp8h6dDtWmkoI0LZ4PE=",
+        "lastModified": 1680537665,
+        "narHash": "sha256-o0VPjm64/CSTWf59Skw++1ExNDst+pnqX0u9KqhV8cw=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "b1426cad28f250a2269012da904901e0edcef114",
+        "rev": "0a099ca2ab8e4b5da01189202740bbc4bbe81f5b",
         "type": "github"
       },
       "original": {
@@ -334,11 +334,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1680213900,
-        "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
+        "lastModified": 1680398059,
+        "narHash": "sha256-qtbKRe+pWuf5nNINdiCgn6EwOIQZxj0Ig/wybBpFNkQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
+        "rev": "7c656856e9eb863c4d21c83e2601dd77f95f6941",
         "type": "github"
       },
       "original": {
diff --git a/pkgs/x32edit/default.nix b/pkgs/x32edit/default.nix
index 9627464..526c24b 100644
--- a/pkgs/x32edit/default.nix
+++ b/pkgs/x32edit/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, lib, libX11, libXext, alsa-lib, freetype, ... }:
+{ stdenv, fetchurl, lib, libX11, libXext, alsa-lib, freetype, curlWithGnuTls, ... }:
 stdenv.mkDerivation rec {
   pname = "X32-Edit";
-  # 4.3 has some extra dependencies, TODO fix later
+  #version = "4.3";
   version = "4.1";
 
   src = fetchurl {
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
     let
       # we prepare our library path in the let clause to avoid it become part of the input of mkDerivation
       libPath = lib.makeLibraryPath [
+        #curlWithGnuTls # libcurl-gnutls.so.4
         libX11 # libX11.so.6
         libXext # libXext.so.6
         alsa-lib # libasound.so.2
diff --git a/users/rouven/modules/neovim/default.nix b/users/rouven/modules/neovim/default.nix
index 28214a2..c467064 100644
--- a/users/rouven/modules/neovim/default.nix
+++ b/users/rouven/modules/neovim/default.nix
@@ -141,7 +141,7 @@
           tree-sitter-go
           tree-sitter-haskell
           tree-sitter-html
-          tree-sitter-java
+          #tree-sitter-java # this is broken too lmao
           tree-sitter-javascript
           tree-sitter-json
           tree-sitter-latex
diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index 348ab23..53331b5 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -22,7 +22,7 @@
 
     # sound
     pavucontrol
-    (pkgs.callPackage ../../../pkgs/x32edit {})
+    (pkgs.callPackage ../../../pkgs/x32edit { })
 
     # bluetooth
     blueman
@@ -53,7 +53,7 @@
     virt-manager
     ventoy-bin
 
-    trash-cli # better rm 
+    trash-cli # better rm
     ripgrep # better grep
     exa # ls but with icons
     bat # better less
diff --git a/users/rouven/modules/zsh/default.nix b/users/rouven/modules/zsh/default.nix
index b097bdb..162a574 100644
--- a/users/rouven/modules/zsh/default.nix
+++ b/users/rouven/modules/zsh/default.nix
@@ -11,6 +11,7 @@
       "switch" = "sudo nixos-rebuild switch && cat ${../../../../images/another-cat-2.sixel}";
       "update" = "cd /etc/nixos && nix flake update && cat ${../../../../images/another-cat.sixel}";
       "garbage" = "sudo nix-collect-garbage -d && cat ${../../../../images/cat-garbage.sixel}";
+      q = "exit";
     };
     history = {
       size = 10000;