hosts/nixos-desktop/default.nix

@@ -29,6 +29,8 @@
     services.wallpaper.enable = true;
   };
 
+  virtualisation.containers.cdi.dynamic.nvidia.enable = true;
+
   home-manager.users.moritz.home.packages = with pkgs; [
     anki
     stable.calibre # NOTE: breaks often in unstable
@@ -36,14 +38,10 @@
 
   hardware = {
     keyboard.qmk.enable = true;
-    nvidia = {
-      modesetting.enable = true;
-      open = true;
-    };
-    nvidia-container-toolkit.enable = true;
-    graphics = {
+    nvidia.modesetting.enable = true;
+    opengl = {
       enable = true;
-      enable32Bit = true;
+      driSupport32Bit = true;
     };
 
     # sensors
@@ -52,6 +50,9 @@
   };
 
   boot = {
+    # KERNEL
+    kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; # NOTE: use latest zfs compatible kernel
+
     # BOOT
     supportedFilesystems = [ "zfs" "btrfs" "ntfs" ];
     loader = {

hosts/nixos-desktop/disko.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   # needed for zfs pool
@@ -83,27 +83,9 @@
     };
   };
   # rollback to blank
-  boot.initrd.systemd.services.rollback = {
-    description = "Rollback ZFS datasets to a pristine state";
-    wantedBy = [
-      "initrd.target"
-    ];
-    after = [
-      "zfs-import-zroot.service"
-    ];
-    before = [
-      "sysroot.mount"
-    ];
-    path = with pkgs; [
-      zfs
-    ];
-    unitConfig.DefaultDependencies = "no";
-    serviceConfig.Type = "oneshot";
-    script = ''
+  boot.initrd.postDeviceCommands = lib.mkAfter ''
     zfs rollback -r zroot/encrypted/root@blank && echo "rollback complete"
   '';
-  };
-  boot.initrd.systemd.enable = true;
   fileSystems."/persist".neededForBoot = true;
   # HACK: to fix issue of agenix running before impermanence
   age.identityPaths = [

modules/profiles/base.nix

@@ -241,16 +241,15 @@ in
     which-nix
 
     # utils
-    (viu.override { withSixel = true; })
     bat
     cht-sh
     f
     fd
     gi
-    lazygit
     parallel
     ripgrep
     vim
+    (viu.override { withSixel = true; })
     wget
   ];
 

modules/programs/nvim/new_plugins/lazygit.nix

@@ -1,14 +0,0 @@
-_:
-
-{
-  home-manager.users.moritz.programs.nixvim = {
-    keymaps = [
-      { key = "<leader>g"; action = "<cmd>LazyGit<cr>"; options.desc = "Lazygit"; }
-    ];
-
-    plugins.lazygit = {
-      enable = true;
-      settings = { };
-    };
-  };
-}