hosts/artemis: fix upgrade

hosts/artemis/hardware-configuration.nix

@@ -68,8 +68,9 @@ in
       "amdgpu.sched_hw_submission=4"
       "audit=0"
     ];
-    kernelPackages = pkgs.linuxPackages_6_17;
+    kernelPackages = pkgs.linuxPackages_6_18;
     supportedFilesystems = [ "ntfs" ];
+    zfs.package = pkgs.zfs_2_4;
   };
 
   hardware = {

modules/nixos/impermanence.nix

@@ -6,15 +6,8 @@
 }:
 let
   inherit (lib)
-    attrNames
-    flip
-    isAttrs
-    mapAttrs
     mkIf
-    mkMerge
-    mkOption
     optionals
-    types
     ;
 in
 {
@@ -88,60 +81,4 @@ in
   };
 
   users.mutableUsers = !config.environment.persistence."/persist".enable;
-
-  # For each user that has a home-manager config, merge the locally defined
-  # persistence options that we defined above.
-  imports =
-    let
-      mkUserFiles = map (
-        x: { parentDirectory.mode = "700"; } // (if isAttrs x then x else { file = x; })
-      );
-      mkUserDirs = map (x: { mode = "700"; } // (if isAttrs x then x else { directory = x; }));
-    in
-    [
-      {
-        environment.persistence = mkMerge (
-          flip map (attrNames config.home-manager.users) (
-            user:
-            let
-              hmUserCfg = config.home-manager.users.${user};
-            in
-            flip mapAttrs hmUserCfg.home.persistence (
-              _: sourceCfg: {
-                users.${user} = {
-                  files = mkUserFiles sourceCfg.files;
-                  directories = mkUserDirs sourceCfg.directories;
-                };
-              }
-            )
-          )
-        );
-      }
-    ];
-
-  home-manager.sharedModules = [
-    {
-      options.home.persistence = mkOption {
-        description = "Additional persistence config for the given source path";
-        default = { };
-        type = types.attrsOf (
-          types.submodule {
-            options = {
-              files = mkOption {
-                description = "Additional files to persist via NixOS impermanence.";
-                type = types.listOf (types.either types.attrs types.str);
-                default = [ ];
-              };
-
-              directories = mkOption {
-                description = "Additional directories to persist via NixOS impermanence.";
-                type = types.listOf (types.either types.attrs types.str);
-                default = [ ];
-              };
-            };
-          }
-        );
-      };
-    }
-  ];
 }

users/guest/default.nix

@@ -160,7 +160,7 @@ in
       enable = true;
       settings = {
         default_session = {
-          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --sessions ${desktops}/share/xsessions:${desktops}/share/wayland-sessions";
+          command = "${pkgs.tuigreet}/bin/tuigreet --time --sessions ${desktops}/share/xsessions:${desktops}/share/wayland-sessions";
         };
       };
     };

users/jordan/common/optional/graphical/niri.nix

@@ -196,9 +196,9 @@ in
 
         "Mod+y".action = toggle-column-tabbed-display;
 
-        "Print".action = screenshot;
+        # "Print".action = screenshot;
-        "Ctrl+Print".action = screenshot-screen { };
+        # "Ctrl+Print".action = screenshot-screen { };
-        "Alt+Print".action = screenshot-window;
+        # "Alt+Print".action = screenshot-window;
 
         "Mod+Escape" = {
           action = toggle-keyboard-shortcuts-inhibit;