From 0b0d6fc8ab5e825b7f4249c8e584a88b5157a36f Mon Sep 17 00:00:00 2001
From: Evan Reichard <evan@reichard.io>
Date: Wed, 9 Apr 2025 09:19:39 -0400
Subject: [PATCH] shortcuts

---
 .../graphical/browsers/firefox/default.nix    |  7 +--
 .../graphical/ghostty/config/ghostty.conf     | 43 ++++++++++---------
 .../wms/hyprland/config/hyprland.conf         | 15 ++++---
 modules/nixos/system/boot/default.nix         |  4 +-
 4 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/modules/home/programs/graphical/browsers/firefox/default.nix b/modules/home/programs/graphical/browsers/firefox/default.nix
index 365be75..4fe57d4 100644
--- a/modules/home/programs/graphical/browsers/firefox/default.nix
+++ b/modules/home/programs/graphical/browsers/firefox/default.nix
@@ -47,12 +47,6 @@ in
             install_url = "https://gitflic.ru/project/magnolia1234/bpc_uploads/blob/raw?file=bypass_paywalls_clean-latest.xpi";
             installation_mode = "force_installed";
           };
-
-          # Ctrl+Number Tabs
-          "{84601290-bec9-494a-b11c-1baa897a9683}" = {
-            install_url = "https://addons.mozilla.org/firefox/downloads/latest/ctrl-number-to-switch-tabs/latest.xpi";
-            installation_mode = "force_installed";
-          };
         };
         Preferences = { };
       } "Policies to apply to firefox";
@@ -94,6 +88,7 @@ in
               "browser.shell.checkDefaultBrowser" = false;
               "general.smoothScroll.msdPhysics.enabled" = true;
               "intl.accept_languages" = "en-US,en";
+              "ui.key.accelKey" = "224";
 
               # "devtools.chrome.enabled" = true;
               # "xpinstall.signatures.required" = false;
diff --git a/modules/home/programs/graphical/ghostty/config/ghostty.conf b/modules/home/programs/graphical/ghostty/config/ghostty.conf
index f5eb20f..f755411 100755
--- a/modules/home/programs/graphical/ghostty/config/ghostty.conf
+++ b/modules/home/programs/graphical/ghostty/config/ghostty.conf
@@ -5,30 +5,33 @@ font-family = "MesloLGM Nerd Font Mono"
 confirm-close-surface = true
 
 # Keybindings - Tabs & Splits
-keybind = ctrl+t=new_tab
-keybind = ctrl+w=close_surface
-keybind = ctrl+d=new_split:right
-keybind = ctrl+shift+d=new_split:down
-keybind = ctrl+enter=toggle_split_zoom
+keybind = cmd+t=new_tab
+keybind = cmd+w=close_surface
+keybind = cmd+d=new_split:right
+keybind = cmd+shift+d=new_split:down
+keybind = cmd+shift+enter=toggle_split_zoom
 
 # Keybindings - Navigation - Splits
-keybind = ctrl+left=goto_split:left
-keybind = ctrl+right=goto_split:right
-keybind = ctrl+up=goto_split:up
-keybind = ctrl+down=goto_split:down
-keybind = ctrl+]=goto_split:next
-keybind = ctrl+[=goto_split:previous
+keybind = cmd+left=goto_split:left
+keybind = cmd+right=goto_split:right
+keybind = cmd+up=goto_split:up
+keybind = cmd+down=goto_split:down
+keybind = cmd+]=goto_split:next
+keybind = cmd+[=goto_split:previous
 
 # Keybindings - Navigation - Tabs
-keybind = ctrl+1=goto_tab:1
-keybind = ctrl+2=goto_tab:2
-keybind = ctrl+3=goto_tab:3
-keybind = ctrl+4=goto_tab:4
-keybind = ctrl+5=goto_tab:5
-keybind = ctrl+6=goto_tab:6
-keybind = ctrl+7=goto_tab:7
-keybind = ctrl+8=goto_tab:8
-keybind = ctrl+9=goto_tab:9
+keybind = cmd+1=goto_tab:1
+keybind = cmd+2=goto_tab:2
+keybind = cmd+3=goto_tab:3
+keybind = cmd+4=goto_tab:4
+keybind = cmd+5=goto_tab:5
+keybind = cmd+6=goto_tab:6
+keybind = cmd+7=goto_tab:7
+keybind = cmd+8=goto_tab:8
+keybind = cmd+9=goto_tab:9
+
+keybind = performable:cmd+c=copy_to_clipboard
+keybind = performable:cmd+v=paste_from_clipboard
 
 # Melange Dark - Adapted From: https://github.com/savq/melange-nvim/blob/master/term/kitty/melange_dark.conf
 palette = 0=#34302C
diff --git a/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf b/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf
index a9ac984..9cb9c1d 100755
--- a/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf
+++ b/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf
@@ -192,20 +192,21 @@ gestures {
 ### KEYBINDINGS ###
 ###################
 
-# See https://wiki.hyprland.org/Configuring/Keywords/
-$mainMod = SUPER # Sets "Windows" key as main modifier
+# Super Bindings (macOS Transition)
+bind = SUPER_SHIFT, 1, exec, hyprshot -m output
+bind = SUPER_SHIFT, 2, exec, hyprshot -m window
+bind = SUPER_SHIFT, 3, exec, hyprshot -m region
+bind = SUPER, Q, killactive,
+bind = SUPER, SPACE, exec, $menu
 
-bind = $mainMod_ALT, 1, exec, hyprshot -m output
-bind = $mainMod_ALT, 2, exec, hyprshot -m window
-bind = $mainMod_ALT, 3, exec, hyprshot -m region
+# See https://wiki.hyprland.org/Configuring/Keywords/
+$mainMod = ALT # Sets "Windows" key as main modifier
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
 bind = $mainMod, RETURN, exec, $terminal
-bind = $mainMod, W, killactive,
 bind = $mainMod, M, exit,
 bind = $mainMod, E, exec, $fileManager
 bind = $mainMod, V, togglefloating,
-bind = $mainMod, SPACE, exec, $menu
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod, J, togglesplit, # dwindle
 
diff --git a/modules/nixos/system/boot/default.nix b/modules/nixos/system/boot/default.nix
index cfe2b95..dfdf9ae 100644
--- a/modules/nixos/system/boot/default.nix
+++ b/modules/nixos/system/boot/default.nix
@@ -1,6 +1,6 @@
 { config, lib, namespace, ... }:
 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkDefault;
 
   cfg = config.${namespace}.system.boot;
 in
@@ -39,7 +39,7 @@ in
           editor = false;
         };
 
-        timeout = 1;
+        timeout = mkDefault 1;
       };
 
       initrd = mkIf cfg.xenGuest {