flake.nix

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

machines/macbook/default.nix

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

machines/thinkpad/default.nix

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

machines/vm-aarch64/default.nix

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

modules/desktop/default.nix

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

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, ${pkgs.darkman}/bin/darkman toggle" # D (code:40)
+      "$mod, code:40, exec, 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,4 +1,3 @@
-{ pkgs, ... }:
 let
   theme = import ../theme;
 in
@@ -16,10 +15,7 @@ in
 
     settings = {
 
-      exec-once = [
-        "uwsm finalize"
-        "swaylock || hyprctl dispatch exit"
-      ];
+      exec-once = [ "swaylock || hyprctl dispatch exit" ];
 
       misc.disable_hyprland_logo = true;
 
@@ -65,16 +61,14 @@ in
 
   services.darkman = {
     lightModeScripts.hyprland-light = ''
-      while read -r line; do export "$line"; done < <(${pkgs.systemd}/bin/systemctl --user show-environment)
-      ${pkgs.hyprland}/bin/hyprctl keyword misc:background_color 0x${theme.bg.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}
+      hyprctl keyword misc:background_color 0x${theme.bg.light}
+      hyprctl keyword general:col.active_border 0xFF${theme.primary.light}
+      hyprctl keyword general:col.inactive_border 0xFF${theme.secondary.light}
     '';
     darkModeScripts.hyprland-dark = ''
-      while read -r line; do export "$line"; done < <(${pkgs.systemd}/bin/systemctl --user show-environment)
-      ${pkgs.hyprland}/bin/hyprctl keyword misc:background_color 0x${theme.bg.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}
+      hyprctl keyword misc:background_color 0x${theme.bg.dark}
+      hyprctl keyword general:col.active_border 0xFF${theme.primary.dark}
+      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 = "${pkgs.uwsm}/bin/uwsm start hyprland-uwsm.desktop";
+        command = "hyprland > /dev/null 2>&1";
         user = "larstvei";
       };
       default_session = initial_session;
@@ -23,15 +23,7 @@
     extraPortals = [
       pkgs.xdg-desktop-portal-hyprland
       pkgs.xdg-desktop-portal-gtk
-      pkgs.darkman
     ];
-
-    config.hyprland = {
-      default = [
-        "hyprland"
-        "gtk"
-      ];
-      "org.freedesktop.impl.portal.Settings" = [ "darkman" ];
-    };
+    config.hyprland."org.freedesktop.impl.portal.Settings" = "darkman";
   };
 }