From 9467e4cb8aea317f730575f327837be649d350a4 Mon Sep 17 00:00:00 2001
From: Rachel Lambda Samuelsson <depsterr@protonmail.com>
Date: Tue, 4 Jun 2024 00:26:34 +0200
Subject: [PATCH] 24.05

---
 computational/configuration.nix |  2 +-
 flake.lock                      | 16 ++++++++--------
 flake.nix                       |  4 ++--
 home/rachel.nix                 | 17 ++---------------
 lambda/configuration.nix        |  2 +-
 shared/desktop.nix              | 16 ++++++++--------
 6 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/computational/configuration.nix b/computational/configuration.nix
index a38cf80..5fdc5c3 100644
--- a/computational/configuration.nix
+++ b/computational/configuration.nix
@@ -48,5 +48,5 @@
   networking.hostName = "computational";
   networking.networkmanager.enable = true;
 
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 }
diff --git a/flake.lock b/flake.lock
index 042f799..f59034d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -100,32 +100,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1712386041,
-        "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=",
+        "lastModified": 1716736833,
+        "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff",
+        "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712588820,
-        "narHash": "sha256-y31s5idk3jMJMAVE4Ud9AdI7HT3CgTAeMTJ0StqKN7Y=",
+        "lastModified": 1717144377,
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
         "owner": "NixOs",
         "repo": "nixpkgs",
-        "rev": "d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
         "type": "github"
       },
       "original": {
         "owner": "NixOs",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 39e8afe..8d670f4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,9 +3,9 @@
   description = "My various NixOs configurations";
 
   inputs = {
-    nixpkgs.url = "github:NixOs/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOs/nixpkgs/nixos-24.05";
     nixpkgs-unstable.url = "github:NixOs/nixpkgs/nixos-unstable";
-    home-manager.url = "github:nix-community/home-manager/release-23.11";
+    home-manager.url = "github:nix-community/home-manager/release-24.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     agda.url = "github:agda/agda/v2.6.4.1";
     agda.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/home/rachel.nix b/home/rachel.nix
index 483d49c..d3c3a63 100644
--- a/home/rachel.nix
+++ b/home/rachel.nix
@@ -7,7 +7,6 @@ let username = "rachel";
       export PATH="${hpkgs.haskell-language-server}/bin:$PATH"
       exec ${hpkgs.haskell-language-server}/bin/haskell-language-server-wrapper "$@"
     '';
-    rzk = hpkgs.rzk;
 in
 {
   home = {
@@ -81,7 +80,6 @@ in
       idris2
       prismlauncher
       vimv
-      rzk
       whalebird
       lean4
       slippi-netplay
@@ -90,7 +88,7 @@ in
       unstable.renoise
       git-crypt
     ];
-    stateVersion = "23.11";
+    stateVersion = "24.05";
   };
   
   xdg.userDirs = {
@@ -273,17 +271,6 @@ in
             vim.diagnostic.enable(args.buf)
           end
         })
-
-        vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, {
-          pattern = { "*.rzk" },
-          callback = function(arg)
-	    vim.lsp.start({
-              name = 'rzk-lsp',
-              cmd = { "${rzk}/bin/rzk", "lsp" },
-              root_dir = vim.fs.dirname(vim.fs.find('rzk.yaml', { upward = true })[1]),
-            })
-          end
-        })
       '';
       extraConfig = ''
         set rnu nu
@@ -526,7 +513,7 @@ in
   services = {
     gpg-agent = {
       enable = true;
-      pinentryFlavor = "qt";
+      pinentryPackage = pkgs.pinentry-qt;
     };
   };
 }
diff --git a/lambda/configuration.nix b/lambda/configuration.nix
index 85ccd6d..d00779e 100644
--- a/lambda/configuration.nix
+++ b/lambda/configuration.nix
@@ -61,5 +61,5 @@
     wifi.macAddress = "random";
   };
 
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 }
diff --git a/shared/desktop.nix b/shared/desktop.nix
index cb50d3f..8ed8751 100644
--- a/shared/desktop.nix
+++ b/shared/desktop.nix
@@ -60,6 +60,14 @@
   ];
 
   # [DESKTOP / XORG / WAYLAND]
+  services.libinput = {
+    enable = true;
+    touchpad = {
+      naturalScrolling = true;
+      accelProfile = "flat" ;
+      tapping = false;
+    };
+  };
   services.xserver = {
     enable = true;
     desktopManager.plasma5.enable = true;
@@ -78,14 +86,6 @@
         symbolsFile = ../shared/fox.xkb;
       };
     };
-    libinput = {
-      enable = true;
-      touchpad = {
-        naturalScrolling = true;
-        accelProfile = "flat" ;
-        tapping = false;
-      };
-    };
   };
 
   # [TTY]