* move custom kernel to separate file (it dont work on Swordsmachine (it's nvidia (i hate nvidia)))

* add hypridle, hyprlock (primitive config), swaybg

common/boot.nix

@@ -1,12 +1,6 @@
 { inputs, config, pkgs, ... }:
 
 {
-  imports = [
-    inputs.chaotic.nixosModules.nyx-cache
-    inputs.chaotic.nixosModules.nyx-overlay
-    inputs.chaotic.nixosModules.nyx-registry
-  ];
-
   boot = {
     loader = {
       systemd-boot = {
@@ -16,8 +10,6 @@
       };
       efi.canTouchEfiVariables = true;
     };
-
-    kernelPackages = pkgs.linuxPackages_cachyos;
   };
 
   services.scx = {

common/kernel.nix

@@ -0,0 +1,11 @@
+{ inputs, config, pkgs, ... }:
+
+{
+  imports = [
+    inputs.chaotic.nixosModules.nyx-cache
+    inputs.chaotic.nixosModules.nyx-overlay
+    inputs.chaotic.nixosModules.nyx-registry
+  ];
+
+  boot.kernelPackages = pkgs.linuxPackages_cachyos;
+}

hosts/Earthmover/default.nix

@@ -8,6 +8,8 @@
     ../../common/desktop
     ../../modules/common
     ../../modules/nixos
+    
+    ../../common/kernel.nix
   ];
 
   home-manager.users.wo2w = {

hosts/Swordsmachine/default.nix

@@ -8,7 +8,8 @@
     ../../common/desktop
     ../../modules/common
     ../../modules/nixos
-    ../../modules/nixos/niri.nix
+    
+    ../../modules/common/niri.nix
 
     inputs.nixos-hardware.nixosModules.dell-xps-15-9570-nvidia
   ];

modules/common/niri.nix

@@ -10,20 +10,23 @@
   };
 
   environment.systemPackages = with pkgs; [
-    mako
+    mako # notif daemon, may replace
-    xwayland-satellite
+    swaybg # wayland compositor wallpaper program
-    (flameshot.override { enableWlrSupport = true; })
+    xwayland-satellite # necessary for xwayland on niri
+    (flameshot.override { enableWlrSupport = true; }) # screenshot program
   ];
 
-  home-manager.users.wo2w.programs = {
+  home-manager.users.wo2w = {
+    programs = {
       niri = {
         settings = {
           binds = {
             # custom binds
             "Mod+Space".action.spawn = [ "rofi" "-show" "drun" ];
-          "Print".action.spawn = [ "sh" "-c" "QT_QPA_PLATFORM=xcb" "flameshot" "screen" ];
+            "Print".action.spawn = [ "sh" "-c" "QT_QPA_PLATFORM=xcb" "DISPLAY=:0" "flameshot" "screen" ];
-          "Shift+Print".action.spawn = [ "sh" "-c" "QT_QPA_PLATFORM=xcb" "flameshot" "gui" ];
+            "Shift+Print".action.spawn = [ "sh" "-c" "QT_QPA_PLATFORM=xcb" "DISPLAY=:0" "flameshot" "gui" ];
-          "Mod+Print".action.spawn = [ "sh" "-c" "QT_CPA_PLATFORM=xcb" "flameshot" "full" ];
+            "Mod+Print".action.spawn = [ "sh" "-c" "QT_QPA_PLATFORM=xcb" "DISPLAY=:0" "flameshot" "full" ];
+            
 
             # default binds
 
@@ -251,7 +254,7 @@
           };
 
           spawn-at-startup = [
-          { command = [ "" ]; }
+            { command = [ "xwayland-satellite" ]; }
           ];
 
           window-rules = [
@@ -291,7 +294,46 @@
       hyprlock = {
         enable = true;
         settings = {
+          # stop hm complaining about the default config conflicting with custom config (bug?)
+          background = {
+            path = "/home/wo2w/Pictures/uni1.jpg";
+            blur_passes = 3;
+            color = "rgb(1a1b26)";
+          };
 
+          label = {
+            text = "$DESC";
+          };
+
+          input-field = {
+            size = "200, 50";
+            position = "0, -80";
+          };
+        };
+      };
+    };
+
+    services = {
+      hypridle = {
+        enable = true;
+        settings = {
+          general = {
+            lock_cmd = "hyprlock";
+            before_sleep_cmd = "hyprlock";
+            after_sleep_cmd = "hyprlock";
+          };
+
+          listener = [
+            {
+              timeout = 300;
+              on-timeout = "hyprlock";
+            }
+            {
+              timeout = 900;
+              on-timeout = "systemctl sleep";
+            }
+          ];
+        };
       };
     };
   };