Refactor a bit

This makes things a bit more robust against moving around files.

flake.nix

@@ -27,44 +27,60 @@
 
   outputs =
     {
+      self,
       darwin,
       nixpkgs,
       home-manager,
       nix-rosetta-builder,
       ...
     }@inputs:
+    let
+      sharedArgs = { inherit inputs self; };
+    in
     {
-      darwinConfigurations = {
+      nixosModules = {
-        larstvei-macbookpro = darwin.lib.darwinSystem {
+        base = ./modules/base;
-          system = "aarch64-darwin";
+        nixos = ./modules/nixos;
+        graphical = ./modules/nixos/graphical;
+      };
 
-          specialArgs = { inherit inputs; };
+      homeModules = {
+        full = ./modules/home/full;
+        desktop = ./modules/desktop;
+        minimal = ./modules/home/minimal;
+      };
 
-          modules = [
+      darwinModules = {
-            home-manager.darwinModules.default
+        base = ./modules/darwin;
-            ./machines/macbook
+      };
-            nix-rosetta-builder.darwinModules.default
+
-            { nix-rosetta-builder.onDemand = true; }
+      darwinConfigurations.larstvei-macbookpro = darwin.lib.darwinSystem {
-          ];
+        system = "aarch64-darwin";
+        specialArgs = sharedArgs;
+        modules = [
+          home-manager.darwinModules.default
+          ./machines/macbook
+          nix-rosetta-builder.darwinModules.default
+          { nix-rosetta-builder.onDemand = true; }
+        ];
+      };
+
+      nixosConfigurations =
+        let
+          mkLinux =
+            system: path:
+            nixpkgs.lib.nixosSystem {
+              system = system;
+              specialArgs = sharedArgs;
+              modules = [
+                home-manager.nixosModules.default
+                path
+              ];
+            };
+        in
+        {
+          thinkpad = mkLinux "x86_64-linux" ./machines/thinkpad;
+          vm-aarch64 = mkLinux "aarch64-linux" ./machines/vm-aarch64;
         };
-      };
-
-      nixosConfigurations.thinkpad = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
-        modules = [
-          home-manager.nixosModules.default
-          ./machines/thinkpad
-        ];
-      };
-
-      nixosConfigurations.vm-aarch64 = nixpkgs.lib.nixosSystem {
-        system = "aarch64-linux";
-        specialArgs = { inherit inputs; };
-        modules = [
-          home-manager.nixosModules.default
-          ./machines/vm-aarch64
-        ];
-      };
     };
 }

machines/macbook/default.nix

@@ -1,8 +1,13 @@
-{ pkgs, inputs, ... }:
+{
+  self,
+  pkgs,
+  inputs,
+  ...
+}:
 {
   imports = [
-    ../../modules/base
+    self.nixosModules.base
-    ../../modules/darwin
+    self.darwinModules.base
   ];
 
   system.primaryUser = "larstvei";
@@ -18,6 +23,6 @@
     useGlobalPkgs = true;
     useUserPackages = true;
     extraSpecialArgs = { inherit inputs; };
-    users.larstvei.imports = [ ../../modules/home/full ];
+    users.larstvei.imports = [ self.homeModules.full ];
   };
 }

machines/thinkpad/default.nix

@@ -1,15 +1,16 @@
+{ self, ... }:
 {
   imports = [
     ./keyboard
     ./hardware
-    ../../modules/base
+    self.nixosModules.base
-    ../../modules/nixos
+    self.nixosModules.nixos
-    ../../modules/nixos/graphical
+    self.nixosModules.graphical
   ];
 
   home-manager.users.larstvei.imports = [
-    ../../modules/home/full
+    self.homeModules.full
-    ../../modules/desktop
+    self.homeModules.desktop
   ];
 
   services.gnome.gnome-keyring.enable = true;

machines/vm-aarch64/default.nix

@@ -1,14 +1,13 @@
+{ self, ... }:
 {
   imports = [
     ./hardware
-    ../../modules/base
+    self.nixosModules.base
-    ../../modules/nixos
+    self.nixosModules.nixos
-    # ../../modules/nixos-graphical
   ];
 
   home-manager.users.larstvei.imports = [
-    ../../modules/home/minimal
+    self.homeModules.minimal
-    # ../../modules/desktop
   ];
 
   networking.hostName = "larstvei-vm";

modules/desktop/default.nix

@@ -47,6 +47,10 @@
 
   services.darkman = {
     enable = true;
-    settings.portal = true;
+    settings = {
+      portal = true;
+      lat = 59.9;
+      lng = 10.7;
+    };
   };
 }

modules/desktop/hypr/bindings/default.nix

@@ -61,7 +61,7 @@ in
       "$mod, code:28, exec, kitty" # T (code:28)
       "$mod, code:26, exec, emacs" # E (code:26)
       "$mod, code:56, exec, zen-beta" # B (code:56)
-      "$mod, code:40, exec, darkman toggle" # D (code:40)
+      "$mod, code:40, exec, ${pkgs.darkman}/bin/darkman toggle" # D (code:40)
       "$mod, code:65, exec, ${nanostatus}/bin/nanostatus-toggle" # Space (code:65)
       "$mod SHIFT, code:58, exec, ${toggle-mirror-display}/bin/toggle-mirror-display" # M (code:58) + Shift
 

modules/desktop/hypr/default.nix

@@ -1,3 +1,4 @@
+{ pkgs, ... }:
 let
   theme = import ../theme;
 in
@@ -15,7 +16,10 @@ in
 
     settings = {
 
-      exec-once = [ "swaylock || hyprctl dispatch exit" ];
+      exec-once = [
+        "uwsm finalize"
+        "swaylock || hyprctl dispatch exit"
+      ];
 
       misc.disable_hyprland_logo = true;
 
@@ -61,14 +65,16 @@ in
 
   services.darkman = {
     lightModeScripts.hyprland-light = ''
-      hyprctl keyword misc:background_color 0x${theme.bg.light}
+      while read -r line; do export "$line"; done < <(${pkgs.systemd}/bin/systemctl --user show-environment)
-      hyprctl keyword general:col.active_border 0xFF${theme.primary.light}
+      ${pkgs.hyprland}/bin/hyprctl keyword misc:background_color 0x${theme.bg.light}
-      hyprctl keyword general:col.inactive_border 0xFF${theme.secondary.light}
+      ${pkgs.hyprland}/bin/hyprctl keyword general:col.active_border 0xFF${theme.primary.light}
+      ${pkgs.hyprland}/bin/hyprctl keyword general:col.inactive_border 0xFF${theme.secondary.light}
     '';
     darkModeScripts.hyprland-dark = ''
-      hyprctl keyword misc:background_color 0x${theme.bg.dark}
+      while read -r line; do export "$line"; done < <(${pkgs.systemd}/bin/systemctl --user show-environment)
-      hyprctl keyword general:col.active_border 0xFF${theme.primary.dark}
+      ${pkgs.hyprland}/bin/hyprctl keyword misc:background_color 0x${theme.bg.dark}
-      hyprctl keyword general:col.inactive_border 0xFF${theme.secondary.dark}
+      ${pkgs.hyprland}/bin/hyprctl keyword general:col.active_border 0xFF${theme.primary.dark}
+      ${pkgs.hyprland}/bin/hyprctl keyword general:col.inactive_border 0xFF${theme.secondary.dark}
     '';
   };
 }

modules/nixos/graphical/default.nix

@@ -4,7 +4,7 @@
     enable = true;
     settings = rec {
       initial_session = {
-        command = "hyprland > /dev/null 2>&1";
+        command = "${pkgs.uwsm}/bin/uwsm start hyprland-uwsm.desktop";
         user = "larstvei";
       };
       default_session = initial_session;
@@ -23,7 +23,15 @@
     extraPortals = [
       pkgs.xdg-desktop-portal-hyprland
       pkgs.xdg-desktop-portal-gtk
+      pkgs.darkman
     ];
-    config.hyprland."org.freedesktop.impl.portal.Settings" = "darkman";
+
+    config.hyprland = {
+      default = [
+        "hyprland"
+        "gtk"
+      ];
+      "org.freedesktop.impl.portal.Settings" = [ "darkman" ];
+    };
   };
 }