fix: hyprland keys

homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix

@@ -31,12 +31,12 @@ in
       graphical = {
         wms.hyprland = {
           enable = true;
-          monitors = [
+          mainMod = "ALT";
-            ",highres,auto,2" # Optional - 1.68
+          monitors = [ ",highres,auto,2" ]; # Alternatively - 1.68
-          ];
         };
         ghostty = enabled;
         ghidra = enabled;
+        gimp = enabled;
         browsers.firefox = {
           enable = true;
           gpuAcceleration = true;

modules/home/programs/graphical/gimp/default.nix

@@ -1,4 +1,9 @@
-{ pkgs, lib, config, namespace, ... }:
+{ pkgs
+, lib
+, config
+, namespace
+, ...
+}:
 let
   inherit (lib) mkIf mkEnableOption;
 
@@ -11,7 +16,9 @@ in
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
+      darktable
       gimp-with-plugins
+      gthumb
     ];
   };
 }

modules/home/programs/graphical/wms/hyprland/config/hyprland.conf

@@ -44,7 +44,6 @@ decoration {
 }
 
 # https://wiki.hyprland.org/Configuring/Variables/#animations
-#https://wiki.hyprland.org/Configuring/Animations/
 animations {
     enabled = yes, please :)
 

modules/home/programs/graphical/wms/hyprland/default.nix

@@ -1,4 +1,9 @@
-{ lib, pkgs, config, namespace, ... }:
+{ lib
+, pkgs
+, config
+, namespace
+, ...
+}:
 let
   inherit (lib) types mkIf;
   inherit (lib.${namespace}) mkOpt enabled;
@@ -8,10 +13,9 @@ in
 {
   options.${namespace}.programs.graphical.wms.hyprland = {
     enable = lib.mkEnableOption "Hyprland";
-    mainMod = mkOpt types.str "SUPER" "Hyprland main modifier key";
+    mainMod = mkOpt types.str "SUPER" "main modifier key";
-    monitors = mkOpt (with types; listOf str) [
+    menuMod = mkOpt types.str "SUPER" "menu modifier key (i.e. menuMod + space)";
-      ", preferred, auto, 1"
+    monitors = mkOpt (with types; listOf str) [ ", preferred, auto, 1" ] "monitor configuration";
-    ] "Hyprland monitor configuration";
   };
 
   config = mkIf cfg.enable {
@@ -22,19 +26,20 @@ in
       extraConfig = builtins.readFile ./config/hyprland.conf;
       settings = {
         "$mainMod" = cfg.mainMod;
+        "$menuMod" = cfg.menuMod;
         "$terminal" = "ghostty";
         "$menu" = "wofi --show drun";
 
         monitor = cfg.monitors;
 
         bind = [
-          # Super Bindings (macOS Transition)
+          # Menu Mod Bindings (macOS Transition - Spotlight & Screenshots)
-          "ALT_SHIFT, 1, exec, hyprshot -m output"
+          "$menuMod, SPACE, exec, $menu"
-          "ALT_SHIFT, 2, exec, hyprshot -m window"
+          "$menuMod SHIFT, 1, exec, hyprshot -m output"
-          "ALT_SHIFT, 3, exec, hyprshot -m region"
+          "$menuMod SHIFT, 2, exec, hyprshot -m window"
+          "$menuMod SHIFT, 3, exec, hyprshot -m region"
 
           # Primary Bindings
-          "$mainMod, SPACE, exec, $menu"
           "$mainMod, RETURN, exec, $terminal"
           "$mainMod, Q, killactive"
           "$mainMod, M, exit"
@@ -91,8 +96,8 @@ in
           ",XF86MonBrightnessDown, exec, brightnessctl s 10%-"
 
           # macOS Keyboard Brightness
-          "ALT, XF86MonBrightnessUp, exec, brightnessctl -d kbd_backlight s 10%+"
+          "$menuMod, XF86MonBrightnessUp, exec, brightnessctl -d kbd_backlight s 10%+"
-          "ALT, XF86MonBrightnessDown, exec, brightnessctl -d kbd_backlight s 10%-"
+          "$menuMod, XF86MonBrightnessDown, exec, brightnessctl -d kbd_backlight s 10%-"
         ];
         bindl = [
           # Player Controls
@@ -107,7 +112,8 @@ in
     programs.waybar = {
       enable = true;
       style = builtins.readFile ./config/waybar-style.css;
-      settings = [{
+      settings = [
+        {
           layer = "top";
           position = "top";
           mod = "dock";
@@ -130,7 +136,9 @@ in
             "battery"
             "clock"
           ];
-        "hyprland/window" = { format = "{}"; };
+          "hyprland/window" = {
+            format = "{}";
+          };
           "wlr/workspaces" = {
             on-scroll-up = "hyprctl dispatch workspace e+1";
             on-scroll-down = "hyprctl dispatch workspace e-1";
@@ -240,7 +248,11 @@ in
               phone = "";
               portable = "";
               car = "";
-            default = [ "" "" "" ];
+              default = [
+                ""
+                ""
+                ""
+              ];
             };
           };
           "pulseaudio#microphone" = {
@@ -253,7 +265,8 @@ in
             on-scroll-down = "pamixer --default-source -d 5";
             scroll-step = 5;
           };
-      }];
+        }
+      ];
     };
 
     home.packages = with pkgs; [

systems/aarch64-linux/lin-va-mbp-personal/default.nix

@@ -40,10 +40,7 @@ in
 
     services = {
       avahi = enabled;
-      printing = {
+      printing = enabled;
-        enable = true;
-        drivers = [ pkgs.gutenprint ];
-      };
       tailscale = enabled;
       ydotool = enabled;
     };