flake.lock

@@ -573,16 +573,16 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1727439651,
-        "narHash": "sha256-cMfDBWlWjCy+B6W68xJg5CIC4zghOi6KG1QXnflT6uY=",
-        "owner": "yannham",
+        "lastModified": 1722083110,
+        "narHash": "sha256-ABBKwqQmCdHaKgz0OQ45flWU+IiicJdDV0xwtDd8gtw=",
+        "owner": "NixOS",
         "repo": "nix",
-        "rev": "27b2fc43d4059cb9ad7cf75f492ea8cf9d41f697",
+        "rev": "9f1e73ed372eb679aea2d4989ba01fe85f1e1569",
         "type": "github"
       },
       "original": {
-        "owner": "yannham",
-        "ref": "27b2fc43d4059cb9ad7cf75f492ea8cf9d41f697",
+        "owner": "NixOS",
+        "ref": "9f1e73ed372eb679aea2d4989ba01fe85f1e1569",
         "repo": "nix",
         "type": "github"
       }

flake.nix

@@ -22,13 +22,9 @@
     #nix itself
     nix = {
       type = "github";
-      #owner = "NixOS";
-      #repo = "nix";
-      #ref = "08deebddf26be28e5367983fdece18c484bbe410";
-
-      owner = "yannham";
+      owner = "NixOS";
       repo = "nix";
-      ref = "27b2fc43d4059cb9ad7cf75f492ea8cf9d41f697";
+      ref = "9f1e73ed372eb679aea2d4989ba01fe85f1e1569";
       inputs.nixpkgs.follows = "stable";
     };
     nixos-generators = {

hosts/gerg-desktop/boot.nix

@@ -95,16 +95,12 @@ in
 
     kernelPackages = pkgs.linuxPackagesFor (
       let
-        version = "6.10.11";
-        src = pkgs.fetchurl {
-          url = "mirror://kernel/linux/kernel/v${builtins.head (lib.splitVersion version)}.x/linux-${version}.tar.xz";
-          hash = "sha256-+02gRvjBhRWfRTfe2IejCsxp2RxVWg/3+rxFIPWaMJY=";
-        };
+        inherit (config.boot.zfs.package.latestCompatibleLinuxPackages) kernel;
       in
       (pkgs.linuxManualConfig {
-        inherit src;
+        inherit (kernel) src;
         inherit (config.boot) kernelPatches;
-        version = "${version}-gerg";
+        version = "${kernel.version}-gerg";
         config = {
           CONFIG_RUST = "y";
           CONFIG_MODULES = "y";

hosts/gerg-desktop/main.nix

@@ -98,6 +98,7 @@
         vesktop
         gh
         nixfmt-rfc-style
+        tmux
         super-slicer-latest # 3D printer slicer
         # QMK configuration
         #via

hosts/gerg-desktop/zfs.nix

@@ -6,8 +6,6 @@
 {
   #link some stuff
   systemd.tmpfiles.rules = [
-
-    "L+ /etc/zfs/zpool.cache - - - - /persist/zfs/zpool.cache"
     "L+ /etc/secureboot - - - - /persist/secureboot"
     "L+ /etc/ssh/ssh_host_ed25519_key  - - - - /persist/ssh/ssh_host_ed25519_key"
     "L+ /etc/ssh/ssh_host_ed25519_key.pub  - - - - /persist/ssh/ssh_host_ed25519_key.pub"

lib/default.nix

@@ -237,7 +237,6 @@ rec {
             let
               defaultArgs =
                 pkgs
-                // pkgs.xorg
                 // (
                   let
                     inputs' = constructInputs' pkgs.stdenv.system inputs;

modules/DE/dwm.nix

@@ -11,8 +11,6 @@
   config = lib.mkIf config.local.DE.dwm.enable {
     systemd.user.services = {
       sxhkd = {
-        wantedBy = [ "graphical-session.target" ];
-        partOf = [ "graphical-session.target" ];
         serviceConfig = {
           ExecStart = "${lib.getExe pkgs.sxhkd} -c /etc/sxhkd/sxhkdrc";
           Restart = "always";
@@ -22,25 +20,27 @@
       };
 
       picom = {
-        wantedBy = [ "graphical-session.target" ];
-        partOf = [ "graphical-session.target" ];
         serviceConfig = {
-          ExecStart = "${lib.getExe pkgs.picom} --backend egl";
+          ExecStart = "${lib.getExe pkgs.picom} --backend glx";
           Restart = "always";
           RestartSec = 2;
           ExecReload = "pkill -usr1 -x $MAINPID";
         };
       };
     };
-    services = {
-      gvfs.enable = true;
-      displayManager.defaultSession = "none+dwm";
-      xserver = {
+
+    services.gvfs.enable = true;
+
+    services.displayManager.defaultSession = "none+dwm";
+
+    services.xserver = {
       enable = true;
       displayManager = {
         sessionCommands = ''
           feh --bg-center "${self'.packages.images}/recursion.png"
           numlockx
+          systemctl --user start sxhkd
+          systemctl --user start picom
         '';
       };
       windowManager.session = [
@@ -66,10 +66,25 @@
         }
       ];
     };
-    };
     environment = {
       systemPackages = builtins.attrValues {
-        inherit (suckless.packages) dmenu dwm st;
+        inherit (suckless.packages) dmenu dwm;
+        st =
+          let
+            st = pkgs.writeShellScript "st" ''
+              ARGS="''${@:1}"
+              exec ${lib.getExe suckless.packages.st} "''${ARGS:-tmux}"
+            '';
+          in
+          pkgs.symlinkJoin {
+            name = "st";
+            paths = [ suckless.packages.st ];
+            nativeBuildInputs = [ pkgs.makeBinaryWrapper ];
+            postBuild = ''
+              unlink "$out/bin/st"
+              ln -s "${st}" "$out/bin/st"
+            '';
+          };
         inherit (pkgs)
           maim
           playerctl

modules/nix.nix

@@ -26,11 +26,7 @@
     #
     # Use nix directly from master
     #
-    package = nix.packages.default.overrideAttrs (old: {
-      meta = old.meta // {
-        mainProgram = "nix";
-      };
-    });
+    package = nix.packages.default;
     #
     # Other nix settings
     #