From 28f90bdb63f824917c9aaff22e23a32f0aae1be4 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Fri, 7 Jun 2024 10:28:58 +0200
Subject: flake: upgrade NixOS 23.11 -> 24.05

---
 common/commandline.nix         | 11 ++++++-----
 flake.lock                     | 16 ++++++++--------
 flake.nix                      | 12 ++++++------
 templates/desktop/flake.nix    |  8 ++++----
 usecases/desktop/graphical.nix |  2 +-
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/common/commandline.nix b/common/commandline.nix
index 7a490c0..c779fdd 100644
--- a/common/commandline.nix
+++ b/common/commandline.nix
@@ -4,10 +4,11 @@ inputs: {
   lib,
   ...
 }:
-with inputs.self.lib.theme; let
-  dominantEscapeCode = fgEscapeCode config.theme.colors.dominant;
-  bgDominantEscapeCode = bgEscapeCode config.theme.colors.dominant;
-  backgroundEscapeCode = fgEscapeCode config.theme.colors.background;
+let
+  inherit (inputs.self.lib) theme;
+  dominantEscapeCode = theme.fgEscapeCode config.theme.colors.dominant;
+  bgDominantEscapeCode = theme.bgEscapeCode config.theme.colors.dominant;
+  backgroundEscapeCode = theme.fgEscapeCode config.theme.colors.background;
 in {
   imports = [
     (import ./commandline/dircolors.nix inputs)
@@ -131,7 +132,7 @@ in {
 
     programs.eza = {
       enable = true;
-      enableAliases = true;
+      enableZshIntegration = true;
     };
 
     home.sessionVariables = {
diff --git a/flake.lock b/flake.lock
index e1f5603..44d685d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -180,16 +180,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1716729592,
-        "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=",
+        "lastModified": 1717527182,
+        "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6",
+        "rev": "845a5c4c073f74105022533907703441e0464bc3",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -254,16 +254,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716633019,
-        "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=",
+        "lastModified": 1717555607,
+        "narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e",
+        "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105",
         "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 9ae5f3a..62e79b1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,11 +2,11 @@
   description = "My 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";
     flake-utils.url = "github:numtide/flake-utils";
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     rycee-nur = {
@@ -42,8 +42,8 @@
       test = { config, ... }: {
         imports = [ self.nixosModules.default ];
 
-        home-manager.users.minijackson.home.stateVersion = "22.11";
-        home-manager.users.root.home.stateVersion = "22.11";
+        home-manager.users.minijackson.home.stateVersion = "24.05";
+        home-manager.users.root.home.stateVersion = "24.05";
 
         users.users.minijackson.initialHashedPassword = "";
         users.users.root.initialHashedPassword = "";
@@ -264,8 +264,8 @@
                 isoImage.makeEfiBootable = true;
                 isoImage.makeUsbBootable = true;
 
-                home-manager.users.minijackson.home.stateVersion = "22.11";
-                home-manager.users.root.home.stateVersion = "22.11";
+                home-manager.users.minijackson.home.stateVersion = "24.05";
+                home-manager.users.root.home.stateVersion = "24.05";
 
                 users.users.minijackson.initialHashedPassword = "";
                 users.users.root.initialHashedPassword = "";
diff --git a/templates/desktop/flake.nix b/templates/desktop/flake.nix
index 5295304..12f0898 100644
--- a/templates/desktop/flake.nix
+++ b/templates/desktop/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "Flake for the myHostname host";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.05";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
   inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
   inputs.nixos-config-reborn = {
     url = "git+https://git.huh.gdn/NixOS/nixos-config-reborn";
@@ -35,10 +35,10 @@
         ./tinc.nix
 
         ({ ... }: {
-          home-manager.users.minijackson.home.stateVersion = "21.05";
-          home-manager.users.root.home.stateVersion = "21.05";
+          home-manager.users.minijackson.home.stateVersion = "24.05";
+          home-manager.users.root.home.stateVersion = "24.05";
 
-          system.stateVersion = "21.05";
+          system.stateVersion = "24.05";
         })
       ];
     };
diff --git a/usecases/desktop/graphical.nix b/usecases/desktop/graphical.nix
index dc70802..bab45ea 100644
--- a/usecases/desktop/graphical.nix
+++ b/usecases/desktop/graphical.nix
@@ -100,7 +100,7 @@ inputs: {
     };
   };
 
-  programs.gnupg.agent.pinentryFlavor = "gnome3";
+  programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3;
 
   # For KDEConnect
   networking.firewall.allowedTCPPortRanges = [
-- 
cgit v1.2.3