fixes, config passes nix flake check .

desktops/hyprland/default.nix

@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ./home.nix
     ./system.nix
   ];
 }

desktops/hyprland/system.nix

@@ -2,7 +2,7 @@
 
 {
   programs.hyprland.enable = true;
-  services.displayManager.sddm.enable = true;
+  services.displayManager.sddm.wayland.enable = true;
 
   xdg.portal = {
     enable = true;

desktops/plasma/default.nix

@@ -2,7 +2,7 @@
 
 {
   services.desktopManager.plasma6.enable = true;
-  services.displayManager.sddm.enable = true;
+  services.displayManager.sddm.wayland.enable = true;
 
   xdg.portal.enable = true;
   xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];

home/default.nix

@@ -4,6 +4,7 @@
   imports = [
     ./programs/bash.nix
     ./programs/git.nix
+    ../desktops/hyprland/home.nix
   ];
 
   home.username = "river";

home/programs/eza.nix

@@ -3,6 +3,6 @@
 {
   programs.eza = {
     enable = true;
-    withIcons = true;
+    icons = "auto";
   };
 }

home/programs/git.nix

@@ -3,6 +3,13 @@
 {
   programs.git = {
     enable = true;
-    withDelta = true;
+  };
+  programs.delta = {
+    enable = true;
+    options = {
+      features = "decorations interactive";
+      navigate = true;
+      hyperlinks = true;
+    };
   };
 }

hosts/laptop/configuration.nix

@@ -16,23 +16,34 @@
   ];
 
   boot = {
+    zfs.forceImportRoot = false;
     supportedFilesystems = [ "zfs" ];
-    loader = {
-      initrd = {
-        systemd.enable = true;
 
-        luks.devices."cryptroot" = {
+    initrd = {
-          device = "/dev/disk/by-partlabel/luks";
+      luks.devices."cryptroot" = {
-          allowDiscards = true;
+        device = "/dev/disk/by-partlabel/luks";
-        };
+        allowDiscards = true;
-
-        initrd.availableKernelModules = [
-          "tpm_tis"
-          "tpm_crb"
-        ];
       };
-      efi.canTouchEfiVariables = true;
+
+      availableKernelModules = [
+        "tpm_tis"
+        "tpm_crb"
+      ];
     };
+
+    loader = {
+      efi = {
+        canTouchEfiVariables = true;
+        efiSysMountPoint = "/boot"; # Adjust if your EFI partition is mounted elsewhere (e.g., /boot/efi)
+      };
+      grub = {
+        enable = true;
+        device = "nodev"; # "nodev" is required for EFI installs
+        efiSupport = true;
+        useOSProber = true; # Set to true if you are dual-booting with Windows/other distros
+      };
+    };
+
     kernelModules = [
       "tpm_tis"
       "tpm_crb"

hosts/laptop/disko.nix

@@ -1,71 +1,68 @@
 { disk, ... }:
 
 {
-  disko.devices.disk.main = {
+  disko.devices = {
-    type = "disk";
+    disk.main = {
-    device = disk;
+      type = "disk";
-    content = {
+      device = disk;
-      type = "gpt";
+      content = {
-
+        type = "gpt";
-      partitions = {
+        partitions = {
-        ESP = {
+          ESP = {
-          size = "1G";
+            size = "1G";
-          type = "EF00";
+            type = "EF00";
-
-          content = {
-            type = "filesystem";
-            format = "vfat";
-            mountpoint = "/boot";
-          };
-        };
-
-        luks = {
-          size = "100%";
-
-          content = {
-            type = "luks";
-            name = "cryptroot";
-
-            # important: allow TPM-based unlocking
-            settings = {
-              allowDiscards = true;
-            };
-
-            # this is key for TPM workflows
-            initrdUnlock = true;
 
             content = {
-              type = "zfs";
+              type = "filesystem";
-              pool = "rpool";
+              format = "vfat";
+              mountpoint = "/boot";
+            };
+          };
+
+          luks = {
+            size = "100%";
+            content = {
+              type = "luks";
+              name = "cryptroot";
+              # important: allow TPM-based unlocking
+              settings = {
+                allowDiscards = true;
+              };
+
+              # this is key for TPM workflows
+              initrdUnlock = true;
+              content = {
+                type = "zfs";
+                pool = "rpool";
+              };
             };
           };
         };
       };
     };
-  };
 
-  zpool.rpool = {
+    # Moved inside disko.devices
-    type = "zpool";
+    zpool.rpool = {
-
+      type = "zpool";
-    rootFsOptions = {
+      rootFsOptions = {
-      compression = "zstd";
+        compression = "zstd";
-      "com.sun:auto-snapshot" = "true";
+        "com.sun:auto-snapshot" = "true";
-    };
-
-    datasets = {
-      root = {
-        type = "zfs_fs";
-        mountpoint = "/";
       };
+      datasets = {
+        root = {
+          type = "zfs_fs";
+          mountpoint = "/";
+        };
 
-      nix = {
+        nix = {
-        type = "zfs_fs";
+          type = "zfs_fs";
-        mountpoint = "/nix";
+          mountpoint = "/nix";
-      };
+        };
 
-      home = {
+        home = {
-        type = "zfs_fs";
+          type = "zfs_fs";
-        mountpoint = "/home";
+          mountpoint = "/home";
+        };
       };
     };
   };

modules/networking/core/default.nix

@@ -12,16 +12,18 @@
 
   services.resolved = {
     enable = true;
-    dnssec = "true";
+
-    domains = [ "~." ];
+    settings.Resolve = {
-    fallbackDns = [
+      dnssec = "true";
-      "192.168.1.193" # Pi-hole
+      DNSOverTLS = "true";
-      "1.1.1.1" # Cloudflare
+      domains = [ "~." ];
-      "1.0.0.1" # Cloudflare (Secondary)
+      fallbackDns = [
-    ];
+        "192.168.1.193" # Pi-hole
-    extraConfig = ''
+        "1.1.1.1" # Cloudflare
-      DNSOverTLS=yes
+        "1.0.0.1" # Cloudflare (Secondary)
-    '';
+      ];
+    };
+
   };
 
   networking.nftables.enable = true;

modules/networking/tailscale.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ config, ... }:
 
 {
   services.tailscale.enable = true;

modules/virtualization/qemu.nix

@@ -6,7 +6,6 @@
   virtualisation.libvirtd = {
     enable = true;
     qemu = {
-      ovmf.enable = true;
       swtpm.enable = true;
     };
   };