Merge branch 'master' of git.mvl.sh:vleeuwenmenno/dotfiles

config/home-manager/packages/workstation/packages.nix

@@ -21,6 +21,7 @@
     kitty-themes # Kitty terminal themes
     pavucontrol # PulseAudio volume control
     qrencode # qr code generator
+    grimblast # Screenshot tool
 
     ## Chat Apps
     telegram-desktop

config/hyprland.conf

@@ -169,7 +169,7 @@ input {
     kb_rules =
     
     # 0 = no, 1 = yes, 2 = on click
-    follow_mouse = 2 
+    follow_mouse = 1
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 
     touchpad {
@@ -195,20 +195,25 @@ device {
 ###################
 
 # See https://wiki.hyprland.org/Configuring/Keywords/
-$mainMod = SUPER # Sets "Windows" key as main modifier
+$mainMod = SUPER
+$superMod = SUPER
+$shiftMod = SHIFT
+$altMod = ALT
+$ctrlMod = CTRL
+$spaceMod = SPACE
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = CTRL ALT, T, exec, $terminal
+bind = $ctrlMod $altMod, T, exec, $terminal
-bind = CTRL ALT, SPACE, exec, 1password --quick-access
+bind = $ctrlMod $altMod, SPACE, exec, 1password --quick-access
 bind = $mainMod, L, exec, hyprlock
 bind = $mainMod, C, killactive,
 bind = $mainMod, M, exit,
 bind = $mainMod, E, exec, $fileManager
 bind = $mainMod, V, togglefloating,
-bind = CTRL, SPACE, exec, ulauncher-toggle
+bind = $ctrlMod, SPACE, exec, ulauncher-toggle
 bind = $mainMod, R, exec, $menu
-bind = $mainMod, P, pseudo, # dwindle
+bind = $mainMod, J, togglesplit, dwindle
-bind = $mainMod, J, togglesplit, # dwindle
+bind = $altMod $shiftMod, 4, exec, grimblast --cursor copy area
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, left, movefocus, l
@@ -228,21 +233,21 @@ bind = $mainMod, 8, workspace, 8
 bind = $mainMod, 9, workspace, 9
 bind = $mainMod, 0, workspace, 10
 
-# Move active window to a workspace with mainMod + SHIFT + [0-9]
+# Move active window to a workspace with mainMod + $shiftMod + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod $shiftMod, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod $shiftMod, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod $shiftMod, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod $shiftMod, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod $shiftMod, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod $shiftMod, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod $shiftMod, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod $shiftMod, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod $shiftMod, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
+bind = $mainMod $shiftMod, 0, movetoworkspace, 10
 
 # Example special workspace (scratchpad)
 bind = $mainMod, S, togglespecialworkspace, magic
-bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+bind = $mainMod $shiftMod, S, movetoworkspace, special:magic
 
 # Scroll through existing workspaces with mainMod + scroll
 bind = $mainMod, mouse_down, workspace, e+1
@@ -273,11 +278,8 @@ bindl = , XF86AudioPrev, exec, playerctl previous
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
 # See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
 
-# Example windowrule v1
+# Keep Ulauncher and 1Password focused since they both use a sort of quick-access window
-# windowrule = float, ^(kitty)$
+windowrule = stayfocused,^(Ulauncher)$
-
-# Example windowrule v2
-# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
 
 # Ignore maximize requests from apps. You'll probably like this.
 windowrulev2 = suppressevent maximize, class:.*

config/nixos/flake.lock

@@ -145,11 +145,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1734907157,
+        "lastModified": 1734988658,
-        "narHash": "sha256-sF3Wot4jIemoSo0YigdHyoR5JMaXgKja+mPJGoXXk/k=",
+        "narHash": "sha256-SSPQCHeqMRsR6rhONWFAHDMtQ5NEKnU8G2BktlDwIoY=",
         "owner": "hyprwm",
         "repo": "hyprland",
-        "rev": "5f7ad767dbf0bac9ddd6bf6c825fb9ed7921308a",
+        "rev": "2e2e2e2cad97eb017ab02f8a67b751e0abe3bb72",
         "type": "github"
       },
       "original": {

secrets/ssh_config/prod.conf.gpg

@@ -1,12 +1,9 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMIMu3XXOPLCIP/0sCgAXbVifGOa6+M7lEAY9APajBS8fSDPQfRNhHQRSam
+jA0ECQMIzH98wOyu8vL/0sAdAdNq59gT7UxaXaNy/ezeziTtcyJm3JFFzC3hFPCd
-f1eJm4XfWw/mlnz0IFaf69wGjrd5qiGaPHwtQlZzapaxSgNZquWXSqAH2x6I9gGa
+OYrDYiJgDqjDXNVEyPR24ffXSk+WbfSQEqEd9KCaSiFueP8d+IMMzHtHsgMrx+sT
-yS7eay1vjr/bkTOgzWJBLksrUTcfU3UmxW41/ORVnSD8UfqSOg9j+RLYadAQhian
+v4G88/gsQpBbxVUs6yktCVmchlsbgshflajhigfHqbSSUp/DramW4ueKRSUEixty
-11vn2G+1AlmTFgY9zbOflbw+pU83x0t2DX7cTHDO5A/BWQ3ZXEhId8t9PHaobZ9e
+IoUvTEJqE7VWMC2QBaPtpn6tBqNtQyQZtzQFMdjH4xXa4eQZkIgZo4YZt1rXxUkK
-M/I0k0kEr5UjeXuQwP1Bwiqd47lEOjlSbgu/MJ+ptbWoxyemmlYLGZbeoCuqEdPS
+eTUZjRCRRDyiJSlh6dK+R++eUh2NcN97f/ThPUPxhKTLAml1obfqcW2JFc+xp9Y=
-V2NgeYauLblQ9z1SQpB5POr9x1csXviIj4AMU6+0eNjDfnK4trtNjjiryYybvJtz
+=+WWh
-mzmsvltZRN/oTBHwNiDo6nqHo2DETDT1VpUMrodjdX92OsCcRxCfe9PC7ULnfh9n
-4/jQ/75dJYpWYZIWbC3nG5D76xz8TSTjGbgywvkN4rdnjQ==
-=JAg8
 -----END PGP MESSAGE-----