From c16bdf2280fd25f3861289acf2046d2fac559793 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Wed, 25 Dec 2024 02:03:17 -0500 Subject: [PATCH] Generalize more boot whatever --- hosts/envy/boot/default.nix | 7 +-- hosts/envy/users/jimbo/default.nix | 4 +- hosts/tower/boot/default.nix | 1 - modules/home/wms/sway/hotkeys/README.md | 83 ------------------------- modules/system/devices/boot/default.nix | 9 ++- 5 files changed, 10 insertions(+), 94 deletions(-) delete mode 100644 modules/home/wms/sway/hotkeys/README.md diff --git a/hosts/envy/boot/default.nix b/hosts/envy/boot/default.nix index 8edd6ac..50d146f 100644 --- a/hosts/envy/boot/default.nix +++ b/hosts/envy/boot/default.nix @@ -1,7 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: { - boot = { - kernelPackages = pkgs.unstable.linuxPackages_latest; - blacklistedKernelModules = [ "pcspkr" ]; - }; + boot.kernelPackages = pkgs.linuxPackages_latest; } diff --git a/hosts/envy/users/jimbo/default.nix b/hosts/envy/users/jimbo/default.nix index e39c27e..d93c068 100644 --- a/hosts/envy/users/jimbo/default.nix +++ b/hosts/envy/users/jimbo/default.nix @@ -1,6 +1,6 @@ -{ ... }: +{ lib, ... }: { home-manager.users.jimbo = { - home.stateVersion = "24.11"; + home.stateVersion = lib.mkForce "24.11"; }; } diff --git a/hosts/tower/boot/default.nix b/hosts/tower/boot/default.nix index 1251240..b8f4fbc 100644 --- a/hosts/tower/boot/default.nix +++ b/hosts/tower/boot/default.nix @@ -18,7 +18,6 @@ in { # Must be Zen for IOMMU isolation kernelPackages = pkgs.unstable.linuxPackages_zen; kernelParams = commonKernelParams ++ [ "vfio-pci.ids=10de:1f82,10de:10fa" ]; - blacklistedKernelModules = [ "pcspkr" ]; # Enable cross-compilation binfmt.emulatedSystems = [ "aarch64-linux" ]; diff --git a/modules/home/wms/sway/hotkeys/README.md b/modules/home/wms/sway/hotkeys/README.md deleted file mode 100644 index 80fb47f..0000000 --- a/modules/home/wms/sway/hotkeys/README.md +++ /dev/null @@ -1,83 +0,0 @@ -# Sway Superdow Manager Hotkeys - -## Application Launchers -| Key Combination | Action | -|----------------------------|----------------------------------------| -| Super + F1 | Launch **LibreWolf** (Jim profile) | -| Super + F2 | Launch **LibreWolf** (Alt profile) | -| Super + F3 | Launch **LibreWolf** (Misc profile) | -| Super + F4 | Launch **Virt-Manager** | -| Super + F5 | Launch **Looking Glass** | - -## Superdow Management -| Key Combination | Action | -|----------------------------|----------------------------------------| -| Super + Arrows | Focus in the specified direction | -| Super + Shift + Arrows | Move window in the specified direction | -| Super + Shift + Space | Toggle window floating | -| Super + Space | Switch focus between floating/tiled | -| Super + Shift + 1-9 | Move window to a workspace and focus | -| Super + 1-9 | Switch to specified workspace | -| Super + 0 | Pin window and toggle border | -| Super + F | Toggle fullscreen | -| Super + Shift + R | Reload configuration | -| Super + Q | Close the current window | - -## Layout Management -| Key Combination | Action | -|----------------------------|----------------------------------------| -| Super + W | Toggle split layout | -| Super + E | Toggle tabbed/stacking layout | -| Super + H/V | Split window horizontally/vertically | -| Super + A/D | Focus parent/child container | - -## Volume and Media Controls -| Key Combination | Action | -|----------------------------|----------------------------------------| -| Alt + J | Lower system volume | -| Alt + K | Raise system volume | -| Alt + M | Mute/unmute audio | -| Super + Backslash | Toggle media playback | -| Alt + Shift + H | Skip to the next track | -| Alt + Shift + L | Go to the previous track | - -## Screenshot and Brightness Controls -| Key Combination | Action | -|----------------------------|----------------------------------------| -| Alt + F | Take a screenshot | -| Alt + Shift + F | Screenshot of the current screen | -| Alt + Ctrl + F | Screenshot of the current window | -| Super + = | Brightness up | -| Super + - | Brightness down | - -## Scratchpads -| Key Combination | Action | -|----------------------------|----------------------------------------| -| Super + Shift + Backslash | Open **Btop** (monitoring) | -| Super + Shift + M | Open **Music** scratchpad | -| Super + Shift + V | Open **Sound Settings** scratchpad | - -## Special Sway Tools -| Key Combination | Action | -|----------------------------|----------------------------------------| -| Super + Escape | **Kill** selected window | -| Super + Ctrl + X | **Inspect** window properties | - -## Miscellaneous -| Key Combination | Action | -|----------------------------|----------------------------------------| -| Super + Return | Open **Foot terminal** | -| Super + S | Open **Rofi** (run commands) | -| Super + C | Open **Clipman** (clipboard manager) | -| Super + X | Open **Power Menu** | -| Super + B | Toggle **Waybar** | -| Super + Ctrl + S | Open **Rofi Scratchpads** | -| Super + Ctrl + X | Open **Rofi Power Menu** | - -## Workspaces -| Key Combination | Action | -|----------------------------|----------------------------------------| -| Super + 1-9 | Switch to workspace | -| Super + Shift + 1-9 | Move window to workspace and focus | -| Alt + F1-F9 | Switch to alternate workspace | -| Alt + Shift + F1-F9 | Move window to alt workspace and focus | diff --git a/modules/system/devices/boot/default.nix b/modules/system/devices/boot/default.nix index 2c2533f..46a4d3b 100644 --- a/modules/system/devices/boot/default.nix +++ b/modules/system/devices/boot/default.nix @@ -6,8 +6,11 @@ ./systemd ]; - boot.kernel.sysctl = { - "vm.max_map_count" = 2147483642; - "kernel.sysrq" = 1; + boot = { + blacklistedKernelModules = [ "pcspkr" ]; + kernel.sysctl = { + "vm.max_map_count" = 2147483642; + "kernel.sysrq" = 1; + }; }; }