From 32cc39c4002eb91b45e3b5d69795746c24ceb0fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Thu, 24 Oct 2024 11:47:19 +0200
Subject: [PATCH 1/3] feat: add lazygit

---
 modules/profiles/base.nix                     |  3 ++-
 modules/programs/nvim/new_plugins/lazygit.nix | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 modules/programs/nvim/new_plugins/lazygit.nix

diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index 7586fad..ca8a8b4 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -241,15 +241,16 @@ in
     which-nix
 
     # utils
+    (viu.override { withSixel = true; })
     bat
     cht-sh
     f
     fd
     gi
+    lazygit
     parallel
     ripgrep
     vim
-    (viu.override { withSixel = true; })
     wget
   ];
 
diff --git a/modules/programs/nvim/new_plugins/lazygit.nix b/modules/programs/nvim/new_plugins/lazygit.nix
new file mode 100644
index 0000000..9cb3060
--- /dev/null
+++ b/modules/programs/nvim/new_plugins/lazygit.nix
@@ -0,0 +1,14 @@
+_:
+
+{
+  home-manager.users.moritz.programs.nixvim = {
+    keymaps = [
+      { key = "<leader>g"; action = "<cmd>LazyGit<cr>"; options.desc = "Lazygit"; }
+    ];
+
+    plugins.lazygit = {
+      enable = true;
+      settings = { };
+    };
+  };
+}

From 4d2577e8eb3946e7ac34e33390dfc4d7e0262473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Thu, 24 Oct 2024 11:48:53 +0200
Subject: [PATCH 2/3] refactor: fix renamed options

---
 hosts/nixos-desktop/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix
index bed3eca..84d74d2 100644
--- a/hosts/nixos-desktop/default.nix
+++ b/hosts/nixos-desktop/default.nix
@@ -29,8 +29,6 @@
     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
@@ -38,10 +36,14 @@
 
   hardware = {
     keyboard.qmk.enable = true;
-    nvidia.modesetting.enable = true;
-    opengl = {
+    nvidia = {
+      modesetting.enable = true;
+      open = true;
+    };
+    nvidia-container-toolkit.enable = true;
+    graphics = {
       enable = true;
-      driSupport32Bit = true;
+      enable32Bit = true;
     };
 
     # sensors
@@ -50,9 +52,6 @@
   };
 
   boot = {
-    # KERNEL
-    kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; # NOTE: use latest zfs compatible kernel
-
     # BOOT
     supportedFilesystems = [ "zfs" "btrfs" "ntfs" ];
     loader = {

From 14007ca4f8099344fa12db3a96d417434f0e3731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Thu, 24 Oct 2024 11:49:05 +0200
Subject: [PATCH 3/3] fix: boot issues

---
 hosts/nixos-desktop/disko.nix | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/hosts/nixos-desktop/disko.nix b/hosts/nixos-desktop/disko.nix
index d373c43..43d1242 100644
--- a/hosts/nixos-desktop/disko.nix
+++ b/hosts/nixos-desktop/disko.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, pkgs, ... }:
 
 {
   # needed for zfs pool
@@ -83,9 +83,27 @@
     };
   };
   # rollback to blank
-  boot.initrd.postDeviceCommands = lib.mkAfter ''
-    zfs rollback -r zroot/encrypted/root@blank && echo "rollback complete"
-  '';
+  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 = ''
+      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 = [