From: Julien Moutinho <julm+julm-nix@sourcephile.fr>
Date: Tue, 28 May 2024 18:19:42 +0000 (+0200)
Subject: nix: update to nixos-24.05
X-Git-Url: https://git.sourcephile.fr/julm/julm-nix.git/commitdiff_plain

nix: update to nixos-24.05
---

diff --git a/flake.lock b/flake.lock
index 00ed24c..6351a05 100644
--- a/flake.lock
+++ b/flake.lock
@@ -164,16 +164,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1715381426,
-        "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
+        "lastModified": 1716736833,
+        "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
+        "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -202,16 +202,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712310679,
-        "narHash": "sha256-XgC/a/giEeNkhme/AV1ToipoZ/IVm1MV2ntiK4Tm+pw=",
+        "lastModified": 1716793392,
+        "narHash": "sha256-ex3nO87EEQhshXd19QSVW5UIXL0pbPuew4q8TdEJQBY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "72da83d9515b43550436891f538ff41d68eecc7f",
+        "rev": "67a8b308bae9c26be660ccceff3e53a65e01afe1",
         "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 cb196cb..7d04d2f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,10 +14,10 @@
     doom-emacs.flake = false;
     doom-emacs.url = "github:hlissner/doom-emacs";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager.url = "github:nix-community/home-manager/release-23.11";
+    home-manager.url = "github:nix-community/home-manager/release-24.05";
     nix-formatter-pack.inputs.nixpkgs.follows = "nixpkgs";
     nix-formatter-pack.url = "github:Gerschtli/nix-formatter-pack";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     git-hooks.inputs.nixpkgs.follows = "nixpkgs";
     git-hooks.inputs.nixpkgs-stable.follows = "nixpkgs";
     git-hooks.url = "github:cachix/git-hooks.nix";
diff --git a/home-manager/profiles/gnupg.nix b/home-manager/profiles/gnupg.nix
index 9d333c1..18f6662 100644
--- a/home-manager/profiles/gnupg.nix
+++ b/home-manager/profiles/gnupg.nix
@@ -9,8 +9,7 @@
     enable = true;
     enableSshSupport = true;
     enableExtraSocket = true;
-    pinentryFlavor = lib.mkDefault (if nixosConfig.services.xserver.enable then "gtk2" else "curses");
-    #pinentryPackage = lib.mkDefault (if nixosConfig.services.xserver.enable then pkgs.pinentry-gtk2 else pkgs.pinentry-curses);
+    pinentryPackage = lib.mkDefault (if nixosConfig.services.xserver.enable then pkgs.pinentry-gtk2 else pkgs.pinentry-curses);
   };
   programs.gpg.enable = true;
   programs.gpg.settings = {
diff --git a/home-manager/profiles/sharing.nix b/home-manager/profiles/sharing.nix
index 1a6b86e..a01468b 100644
--- a/home-manager/profiles/sharing.nix
+++ b/home-manager/profiles/sharing.nix
@@ -3,7 +3,7 @@
   home.packages = [
     pkgs.croc
     pkgs.sshfs
-    pkgs.stig
+    #pkgs.stig
     #pkgs.transmission-gtk
   ] ++ lib.optionals nixosConfig.services.xserver.enable [
     pkgs.amule
diff --git a/homes/julm/hosts/losurdo.nix b/homes/julm/hosts/losurdo.nix
index fa7385d..458e05a 100644
--- a/homes/julm/hosts/losurdo.nix
+++ b/homes/julm/hosts/losurdo.nix
@@ -19,12 +19,11 @@
     ../../../home-manager/profiles/firefox.nix
     ../../../home-manager/profiles/xmonad.nix
   ];
-  services.gpg-agent.pinentryFlavor = lib.mkForce "curses";
-  #services.gpg-agent.pinentryPackage = lib.mkForce pkgs.pinentry-curses;
+  services.gpg-agent.pinentryPackage = lib.mkForce pkgs.pinentry-curses;
   home.packages = [
     pkgs.evince
     pkgs.wine
-    pkgs.stig
+    #pkgs.stig
     #pkgs.blender
     #pkgs.freecad
     #pkgs.mastodon-archive
diff --git a/homes/julm/hosts/oignon.nix b/homes/julm/hosts/oignon.nix
index 7231166..0df03f5 100644
--- a/homes/julm/hosts/oignon.nix
+++ b/homes/julm/hosts/oignon.nix
@@ -56,7 +56,7 @@
     pkgs.neverball
     pkgs.tuxpaint
     pkgs.xsane
-    pkgs.stig
+    #pkgs.stig
     pkgs.gthumb
     pkgs.thunderbird
     #pkgs.chromium
diff --git a/hosts/aubergine/networking.nix b/hosts/aubergine/networking.nix
index 2f3eec7..e1d6955 100644
--- a/hosts/aubergine/networking.nix
+++ b/hosts/aubergine/networking.nix
@@ -40,7 +40,7 @@ with (import networking/names-and-numbers.nix);
   services.avahi = {
     enable = true;
     openFirewall = true;
-    nssmdns = true;
+    nssmdns4 = true;
     publish = {
       enable = true;
       addresses = true;
diff --git a/hosts/courge.nix b/hosts/courge.nix
index 41aec60..d42f87c 100644
--- a/hosts/courge.nix
+++ b/hosts/courge.nix
@@ -65,12 +65,13 @@
     desktopManager = {
       gnome.enable = true;
     };
-    displayManager = {
-      defaultSession = "gnome";
-      gdm.enable = true;
-      autoLogin = {
-        user = config.users.users.mo.name;
-      };
+  };
+
+  services.displayManager = {
+    defaultSession = "gnome";
+    gdm.enable = true;
+    autoLogin = {
+      user = config.users.users.mo.name;
     };
   };
 
diff --git a/hosts/oignon.nix b/hosts/oignon.nix
index 46d3666..69acc14 100644
--- a/hosts/oignon.nix
+++ b/hosts/oignon.nix
@@ -219,14 +219,15 @@
         }
       ];
     };
-    displayManager = {
-      defaultSession = "home-manager";
-      #defaultSession = "none+xmonad";
-      #defaultSession = "mate";
-      #defaultSession = "cinnamon";
-      autoLogin = {
-        user = config.users.users.julm.name;
-      };
+  };
+
+  services.displayManager = {
+    defaultSession = "home-manager";
+    #defaultSession = "none+xmonad";
+    #defaultSession = "mate";
+    #defaultSession = "cinnamon";
+    autoLogin = {
+      user = config.users.users.julm.name;
     };
   };
 
diff --git a/hosts/patate.nix b/hosts/patate.nix
index b5ee3b3..e479098 100644
--- a/hosts/patate.nix
+++ b/hosts/patate.nix
@@ -60,11 +60,12 @@
       xfce.enable = true;
       xterm.enable = false;
     };
-    displayManager = {
-      defaultSession = "mate";
-      autoLogin = {
-        user = config.users.users.sevy.name;
-      };
+  };
+
+  services.displayManager = {
+    defaultSession = "mate";
+    autoLogin = {
+      user = config.users.users.sevy.name;
     };
   };
 
diff --git a/nixos/profiles/graphical.nix b/nixos/profiles/graphical.nix
index 3243979..e23fac7 100644
--- a/nixos/profiles/graphical.nix
+++ b/nixos/profiles/graphical.nix
@@ -25,9 +25,9 @@ with lib;
   services.gvfs.enable = mkDefault true;
   services.avahi.enable = mkDefault true;
 
+  services.libinput.enable = mkDefault true;
   services.xserver = {
     enable = mkDefault true;
-    libinput.enable = mkDefault true;
     exportConfiguration = mkDefault true; # link /usr/share/X11/ properly
     desktopManager = {
       session = [
@@ -42,7 +42,10 @@ with lib;
       ];
       xterm.enable = mkDefault false;
     };
-    displayManager.autoLogin.enable = mkDefault true;
+  };
+
+  services.displayManager = {
+    autoLogin.enable = mkDefault true;
   };
 
   services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
diff --git a/nixos/profiles/lang-fr.nix b/nixos/profiles/lang-fr.nix
index 546f61c..2c9b98f 100644
--- a/nixos/profiles/lang-fr.nix
+++ b/nixos/profiles/lang-fr.nix
@@ -8,8 +8,10 @@
   console.font = "Lat2-Terminus16";
   console.keyMap = lib.mkDefault "fr";
   services.xserver = {
-    layout = lib.mkDefault "fr";
-    xkbOptions = "eurosign:e, compose:menu, grp:alt_space_toggle";
+    xkb = {
+      layout = lib.mkDefault "fr";
+      options = "eurosign:e, compose:menu, grp:alt_space_toggle";
+    };
     libinput.enable = config.services.xserver.enable;
   };
 }
diff --git a/nixos/profiles/networking/remote.nix b/nixos/profiles/networking/remote.nix
index 4b73cc7..b0f6b36 100644
--- a/nixos/profiles/networking/remote.nix
+++ b/nixos/profiles/networking/remote.nix
@@ -13,8 +13,7 @@ with lib;
   # sets this up as soon as the initrd.
   boot.kernelParams = [ "panic=10" ];
 
-  programs.gnupg.agent.pinentryFlavor = "curses";
-  #programs.gnupg.agent.pinentryPackage = pkgs.pinentry-curses;
+  programs.gnupg.agent.pinentryPackage = pkgs.pinentry-curses;
 
   systemd = {
     # Always try to start all the units (default.target)
diff --git a/nixos/profiles/system.nix b/nixos/profiles/system.nix
index 9e8242e..9b16ed1 100644
--- a/nixos/profiles/system.nix
+++ b/nixos/profiles/system.nix
@@ -28,8 +28,7 @@ with lib;
       ../../home-manager/options.nix
       ../../home-manager/profiles/essential.nix
     ];
-    services.gpg-agent.pinentryFlavor = "curses";
-    #services.gpg-agent.pinentryPackage = pkgs.pinentry-curses;
+    services.gpg-agent.pinentryPackage = pkgs.pinentry-curses;
   };
   nix = {
     settings.auto-optimise-store = mkDefault true;
@@ -70,7 +69,7 @@ with lib;
     enable = mkDefault true;
     enableRootSlice = mkDefault true;
     enableSystemSlice = mkDefault true;
-    enableUserServices = mkDefault true;
+    enableUserSlices = mkDefault true;
   };
   systemd.services.openssh = {
     serviceConfig = {
diff --git a/nixos/profiles/zfs.nix b/nixos/profiles/zfs.nix
index 168744c..17b41b0 100644
--- a/nixos/profiles/zfs.nix
+++ b/nixos/profiles/zfs.nix
@@ -28,7 +28,7 @@
   boot.zfs.forceImportRoot = true;
   boot.zfs.requestEncryptionCredentials = lib.mkDefault [ "${hostName}/root" ];
 
-  boot.zfs.enableUnstable = false;
+  #boot.zfs.package = pkgs.zfs_unstable;
 
   # Enables periodic scrubbing of ZFS pools.
   services.zfs.autoScrub.enable = true;
diff --git a/nixpkgs/patches.nix b/nixpkgs/patches.nix
index 544774e..576d0a3 100644
--- a/nixpkgs/patches.nix
+++ b/nixpkgs/patches.nix
@@ -2,22 +2,7 @@
   {
     meta.description = "openvpn";
     url = "https://github.com/NixOS/nixpkgs/pull/109643.diff";
-    sha256 = "sha256-RWEVclcCLgb+Xna2G6BmtjEltH8IOE8diN+CnPhcJ+E=";
-  }
-  {
-    meta.description = "stig";
-    url = "https://github.com/NixOS/nixpkgs/pull/276014.diff";
-    sha256 = "sha256-SUftUE++06TqRmK88VxQKiI9NaJs7XtC8I97ScQHF/Y=";
-  }
-  {
-    meta.description = "dnscrypt-proxy2";
-    url = "https://github.com/NixOS/nixpkgs/pull/304810.diff";
-    sha256 = "sha256-YGQZibCIKz7YYS1bw2QNtHbJPWWV6nZqWwddWsAFK5Q=";
-  }
-  {
-    meta.description = "kernel-hardening-checker";
-    url = "https://github.com/NixOS/nixpkgs/pull/287537.diff";
-    sha256 = "sha256-0Dos8UlxTQXhdMoKoMFDUMsI5PlgHzCsXsvFSvAvW5Q=";
+    sha256 = "sha256-mfSsvQagvR+9ykppFs4CYG6RLJJRcklZ61D/tZ4OErY=";
   }
   /*
     {