From b0074a081a4ea107d5fa42f231026a5bc47fcc03 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@jimbosfiles.com>
Date: Sat, 19 Oct 2024 19:59:55 -0400
Subject: [PATCH] Add initial support for grub

---
 modules/home/sway/default.nix                    |  1 -
 modules/home/sway/hardware/default.nix           |  2 +-
 modules/home/sway/hotkeys/default.nix            | 11 +++--------
 modules/home/sway/rules/default.nix              |  2 +-
 modules/home/sway/theme/default.nix              |  2 +-
 modules/system/accounts/users/jimbo/default.nix  |  1 -
 modules/system/devices/boot/grub/efi/default.nix |  9 +++++++++
 modules/system/services/pc/keyd/default.nix      |  1 +
 8 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 modules/system/devices/boot/grub/efi/default.nix

diff --git a/modules/home/sway/default.nix b/modules/home/sway/default.nix
index 9d34f57..80f8412 100644
--- a/modules/home/sway/default.nix
+++ b/modules/home/sway/default.nix
@@ -12,7 +12,6 @@
     ./swaylock
   ];
 
-  # Enable Sway and write some scripts
   wayland.windowManager.sway = {
     enable = true;
     package = null;
diff --git a/modules/home/sway/hardware/default.nix b/modules/home/sway/hardware/default.nix
index a70a3d0..21b793c 100644
--- a/modules/home/sway/hardware/default.nix
+++ b/modules/home/sway/hardware/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, ... }:
 {
   wayland.windowManager.sway = {
     config = {
diff --git a/modules/home/sway/hotkeys/default.nix b/modules/home/sway/hotkeys/default.nix
index b11dfa2..6675234 100644
--- a/modules/home/sway/hotkeys/default.nix
+++ b/modules/home/sway/hotkeys/default.nix
@@ -127,8 +127,8 @@
         "${primeMod}+Ctrl+Return" = ''exec foot ssh ${config.ips.server}'';
 
         # Display Brightness and Keyboard Brightness
-        "${secMod}+equal" = ''exec light -A 5'';
-        "${secMod}+minus" = ''exec light -U 5'';
+        "${primeMod}+equal" = ''exec light -A 5'';
+        "${primeMod}+minus" = ''exec light -U 5'';
         "XF86KbdBrightnessUp" = ''exec light -s sysfs/leds/smc::kbd_backlight -A 5'';
         "XF86KbdBrightnessDown" = ''exec light -s sysfs/leds/smc::kbd_backlight -U 5'';
 
@@ -233,13 +233,8 @@
         "${primeMod}+${secMod}+Left" = ''resize shrink width ${resizeAmount} px or 5 ppt'';
         "${primeMod}+${secMod}+Right" = ''resize grow width ${resizeAmount} px or 5 ppt'';
 
-        # Adjust gap size
-        "${primeMod}+Shift+equal" = ''gaps inner current set 5'';
-        "${primeMod}+equal" = ''gaps inner current plus 5'';
-        "${primeMod}+minus" = ''gaps inner current minus 5'';
-
         # Scratchpads
-        "Ctrl+Shift+Escape" = ''[app_id="gotop"] scratchpad show, move position center, resize set 1216 888'';
+        "Ctrl+Shift+Delete" = ''[app_id="gotop"] scratchpad show, move position center, resize set 1216 888'';
         "${primeMod}+Shift+m" = ''[app_id="music"] scratchpad show, move position center, resize set 1006 657'';
         "${primeMod}+Shift+v" = ''[app_id="sound"] scratchpad show, move position center, resize set 1000 800'';
         "${primeMod}+Shift+Backslash" = ''[app_id="com.github.wwmm.easyeffects"] scratchpad show, move position center, resize set 1000 800'';
diff --git a/modules/home/sway/rules/default.nix b/modules/home/sway/rules/default.nix
index 3f31641..ff080f6 100644
--- a/modules/home/sway/rules/default.nix
+++ b/modules/home/sway/rules/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, ... }:
 {
   wayland.windowManager.sway = {
     config = {
diff --git a/modules/home/sway/theme/default.nix b/modules/home/sway/theme/default.nix
index eb7e09d..403497c 100644
--- a/modules/home/sway/theme/default.nix
+++ b/modules/home/sway/theme/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 {
   wayland.windowManager.sway = {
     enable = true;
diff --git a/modules/system/accounts/users/jimbo/default.nix b/modules/system/accounts/users/jimbo/default.nix
index e468f9d..527dec5 100644
--- a/modules/system/accounts/users/jimbo/default.nix
+++ b/modules/system/accounts/users/jimbo/default.nix
@@ -12,7 +12,6 @@
         (builtins.readFile ../../../../../hosts/lacros/id_ed25519.pub)
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 pixel9"
       ];
-
       extraGroups = [
         "wheel"
         "audio"
diff --git a/modules/system/devices/boot/grub/efi/default.nix b/modules/system/devices/boot/grub/efi/default.nix
new file mode 100644
index 0000000..65a1f36
--- /dev/null
+++ b/modules/system/devices/boot/grub/efi/default.nix
@@ -0,0 +1,9 @@
+{ ... }:
+{
+  boot.loader.grub = {
+    enable = true;
+    efiSupport = true;
+    efiInstallAsRemovable = true;
+    device = "nodev";
+  };
+}
diff --git a/modules/system/services/pc/keyd/default.nix b/modules/system/services/pc/keyd/default.nix
index 761afc8..a7f23b0 100644
--- a/modules/system/services/pc/keyd/default.nix
+++ b/modules/system/services/pc/keyd/default.nix
@@ -8,6 +8,7 @@
         capslock = "overload(control, esc)";
         esc = "capslock";
         control = "f14";
+	scrolllock = "esc";
       };
     };
   };