🧹 Refactor, moved monitornames to common.nix, removed waypaper reload

README.md

@@ -12,7 +12,7 @@ My NixOS configurations with dotfiles for my desktop
 | Shell  | Fish       |
 | Prompt | Starship   |
 | Theme  | Catppuccin |
-| GPU    | NVidia     |
+| GPU    | Nvidia     |
 | Panel  | Hyprpanel  |
 | Runner | Rofi       |
 | Fetch  | Fastfetch  |

common.nix

@@ -20,6 +20,10 @@ rec {
     options = "grp:alt_shift_toggle"; # Toggle using ALT + SHIFT
   };
 
+  # Empty matches all
+  monitor1 = "DP-1";
+  monitor2 = "DP-3";
+
   username = "martin";
 
   # This value determines the NixOS release from which the default

configuration.nix

@@ -53,7 +53,7 @@ in
     vdhcoapp
     fortune
     cowsay
-    inputs.zen-browser.packages."${system}".default # beta
+    inputs.zen-browser.packages.${system}.default # beta
     onlyoffice-desktopeditors
   ];
 

flake.nix

@@ -37,6 +37,7 @@
     }:
     let
       system = "x86_64-linux";
+      hostname = "nixos";
       inherit (self) outputs;
       common = import ./common.nix;
     in
@@ -46,7 +47,7 @@
       # Adds the nix fmt command to format nix files
       formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
 
-      nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
+      nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem {
         system = system;
         specialArgs = { inherit outputs inputs; }; # Pass args to modules
         modules = [

home-manager/development/git.nix

@@ -5,6 +5,7 @@
     userEmail = "git@martials.no";
 
     aliases = {
+      amend = "commit --amend";
       cm = "commit";
       s = "status";
     };

home-manager/hyprland/hypridle/default.nix

@@ -34,4 +34,5 @@ in
       ];
     };
   };
+  wayland.windowManager.hyprland.settings.exec-once = [ "hypridle" ];
 }

home-manager/hyprland/hyprpaper.nix

@@ -1,6 +1,8 @@
 # Wallpapers
 { pkgs, ... }:
-
+let
+  common = import ../../common.nix;
+in
 {
   home.packages = with pkgs; [
     hyprpaper
@@ -25,8 +27,8 @@
         ];
 
         wallpaper = [
-          "DP-1,${monitor1}"
-          "DP-3,${monitor2}"
+          "${common.monitor1},${monitor1}"
+          "${common.monitor2},${monitor2}"
         ];
       };
   };

home-manager/hyprland/settings.nix

@@ -1,23 +1,21 @@
 { lib, ... }:
 let
   common = import ../../common.nix;
-  app = common.default;
   theme = import ../../theme.nix;
+  app = common.default;
 in
 {
   wayland.windowManager.hyprland.settings = {
     monitor = [
-      "DP-1, 3440x1440@175, 0x0, 1"
-      "DP-3, 3840x2160@60, 3440x0, 1.5, transform, 1"
+      "${common.monitor1}, 3440x1440@175, 0x0, 1"
+      "${common.monitor2}, 3840x2160@60, 3440x0, 1.5, transform, 1"
     ];
 
     # Autostart
     exec-once = [
       app.browser
       app.terminal
-      "hypridle"
       "systemctl --user start hyprpolkitagent"
-      "waypaper --restore"
     ];
 
     env = [