commit 2f02bcaf4f570a1f5f496611c977b318646c110b
author PineaFan <pineafan@clicks.codes> Sat Apr 20 21:21:44 2024 +0100
committer Samuel Shuert <coded@clicks.codes> Sat Apr 20 22:55:15 2024 +0000
tree 2f6050a3ea56fffd324185a19c8ff47d0ba49744
parent b48715003a004735fed757e2860c30f628851dd1

Add new options to chimera for hyprland

Change-Id: I415c6777bf27c87fe6cd8484e2e89f9ca50600bf
Reviewed-on: https://git.clicks.codes/c/Chimera/NixFiles/+/650
Tested-by: Samuel Shuert <coded@clicks.codes>
Reviewed-by: Samuel Shuert <coded@clicks.codes>

modules/home/hyprland/default.nix

diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix
index 4aa178d..3e4a424 100644
--- a/modules/home/hyprland/default.nix
+++ b/modules/home/hyprland/default.nix
@@ -32,6 +32,33 @@
       };
     };
 
+    input.keybinds = {
+      alternativeSearch.enable = lib.mkEnableOption "Use alt + space or SUPER + D to open search";
+      extraBinds = let
+        binds = lib.types.submodule {
+          options = {
+            meta = lib.mkOption {
+              type = lib.types.nullOr lib.types.str;
+              description = "Additional modifier keys space seperated";
+              default = null;
+            };
+            key = lib.mkOption {
+              type = lib.types.str;
+              description = "Final key";
+            };
+            function = lib.mkOption {
+              type = lib.types.str;
+              description = "Hyprland bind function";
+            };
+          };
+        };
+      in lib.mkOption {
+        type = lib.types.listOf binds;
+        description = "Extra keybinds to add";
+        default = [ ];
+      };
+    };
+
     nvidia.enable = lib.mkEnableOption "Enable NVIDIA support";
 
     hyprland = {
@@ -41,6 +68,18 @@
         description = "List of default monitors to set";
         default = [ ];
       };
+      window = {
+        rounding = lib.mkOption {
+          type = lib.types.int;
+          description = "How round the windows should be";
+          default = 7;
+        };
+        blur = lib.mkOption {
+          type = lib.types.int;
+          description = "How blurred the wallpaper under innactive windows should be";
+          default = 8;
+        };
+      };
     };
   };
 
@@ -87,6 +126,7 @@
           mod = "SUPER";
           terminal = "${pkgs.kitty}/bin/kitty";
           menu = (if config.chimera.runner.anyrun.enable then "${inputs.anyrun.packages.${system}.anyrun}/bin/anyrun" else "");
+          screenshot = "${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -d)\" - | ${pkgs.wl-clipboard}/bin/wl-copy";
         in
         {
           misc = {
@@ -109,8 +149,9 @@
           };
 
           decoration = {
-            rounding = 7;
+            rounding = config.chimera.hyprland.window.rounding;
             drop_shadow = false;
+            blur.size = config.chimera.hyprland.window.blur;
           };
 
           input = {
@@ -153,8 +194,11 @@
               "${mod}, right, movefocus, r"
               "${mod}, left, movefocus, l"
               "${mod}, L, exec, ${lock}"
+              "${mod}, R, exec, ${screenshot}"
+              ", Print, exec, ${screenshot}"
             ]
             ++ (if config.chimera.runner.enable then [ "${mod}, D, exec, ${menu}" ] else [])
+            ++ (if lib.and config.chimera.input.keybinds.alternativeSearch.enable config.chimera.runner.enable then [ "ALT, SPACE, exec, ${menu}" ] else [])
             ++ (builtins.concatLists (
               builtins.genList
                 (
@@ -172,7 +216,8 @@
                   ]
                 )
                 10
-            ));
+            ))
+            ++ (builtins.map (item: "SUPER_${item.meta}, ${item.key}, ${item.function}") config.chimera.input.keybinds.extraBinds);
 
           bindm = [
             "${mod}, mouse:272, movewindow"
@@ -185,7 +230,7 @@
             "GBM_BACKEND,nvidia-drm"
             "__GLX_VENDOR_LIBRARY_NAME,nvidia"
             "WLR_NO_HARDWARE_CURSORS,1"
-          ]
+          ];
         };
     };
   };

modules/home/hyprpaper/default.nix

diff --git a/modules/home/hyprpaper/default.nix b/modules/home/hyprpaper/default.nix
index 2f4eabf..86bd9fc 100644
--- a/modules/home/hyprpaper/default.nix
+++ b/modules/home/hyprpaper/default.nix
@@ -22,7 +22,7 @@
 
         wallpaper=,${config.chimera.theme.wallpaper}
 
-        splash = ${builtins.toString config.chimera.hyprland.hyprpaper.splash.enable}
+        splash = ${if config.chimera.hyprland.hyprpaper.splash.enable then "true" else "false"}
         splash_offset = ${builtins.toString config.chimera.hyprland.hyprpaper.splash.offset}
 
         ipc = off