Merge branch 'main' of git.peprolinbot.com:peprolinbot/nixos-config

hosts/frues-pc/default.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  username,
+  ...
+}: {
   imports = [
     ./hardware-configuration.nix
     ./../../modules/core
@@ -26,4 +30,9 @@
     capSysAdmin = true;
     openFirewall = true;
   };
+
+  home-manager.users.${username}.wayland.windowManager.hyprland.settings.monitor = [
+    "HDMI-A-1, 1920x1080@75, 0x0, 1"
+    "DP-1, 2560x1440@165, 1920x0, 1.333333"
+  ];
 }

modules/home/hyprland/config.nix

@@ -293,18 +293,18 @@
         "noblur,class:^(xwaylandvideobridge)$"
       ];
 
+      monitor = [
+        ",preferred,auto,1"
+      ];
+
+      xwayland = {
+        force_zero_scaling = true;
+      };
+
       gestures = {
         workspace_swipe = true;
         workspace_swipe_direction_lock = false;
       };
     };
-
-    extraConfig = "
-      monitor=,preferred,auto,1
-
-      xwayland {
-        force_zero_scaling = true
-      }
-    ";
   };
 }

modules/home/hyprland/hypridle.nix

@@ -25,19 +25,14 @@
           on-timeout = ckb-next --profile "Off"       # turn off keyboard backlight.
           on-resume = ckb-next --profile "Personal"   # turn on keyboard backlight.
         }
-
-        listener {
-          timeout = 330                               # 5.5min
-          on-timeout = ddcmonitorctl off              # screen off when timeout has passed
-          on-resume = ddcmonitorctl on                # screen on when activity is detected after timeout has fired.
-        }
       ''
-      else ''
+      else null
-        listener {
+    )
-          timeout = 330                               # 5.5min
+    + ''
-          on-timeout = hyprctl dispatch dpms off    # screen off when timeout has passed
+      listener {
-          on-resume = hyprctl dispatch dpms on       # screen on when activity is detected after timeout has fired.
+        timeout = 330                               # 5.5min
-        }
+        on-timeout = hyprctl dispatch dpms off    # screen off when timeout has passed
-      ''
+        on-resume = hyprctl dispatch dpms on       # screen on when activity is detected after timeout has fired.
-    );
+      }
+    '';
 }

modules/home/packages.nix

@@ -39,6 +39,7 @@
       orca-slicer
       swappy
       # tdf # cli pdf viewer
+      speedcrunch
       thunderbird
       todo # cli todo list
       toipe # typing test in the terminal