From 28daa28c6b9dd10041f0be0b68b4ff4814c5f079 Mon Sep 17 00:00:00 2001 From: GarandPLG Date: Tue, 6 Jan 2026 21:46:12 +0100 Subject: [PATCH] Replace $modifier with SUPER and update defaults --- flake.lock | 30 ++-- hosts/Garand-Desktop/system-modules.nix | 13 +- hosts/Garand-Laptop/system-modules.nix | 3 +- hosts/default/system-modules.nix | 3 +- modules/core/packages/packages.nix | 1 + modules/core/packages/programs.nix | 5 - modules/core/thunar.nix | 2 +- modules/home/hyprland/binds.nix | 182 ++++++++++++------------ modules/home/hyprland/hyprland.nix | 1 - modules/home/scripts/keybinds.nix | 6 +- 10 files changed, 122 insertions(+), 124 deletions(-) diff --git a/flake.lock b/flake.lock index bb2ea8f..12fcfcd 100644 --- a/flake.lock +++ b/flake.lock @@ -165,11 +165,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1766846533, - "narHash": "sha256-D7XoHk5/daZt3E0K6uCueVxpDYp+cIoCctoTsz5mjfk=", + "lastModified": 1767672212, + "narHash": "sha256-CGQgo92QKzCnRUF2wjEPsaIoKajVU5EyK1aDaMwo1xg=", "owner": "rycee", "repo": "nur-expressions", - "rev": "e55ad9427895bc94e55b2cb6474ca46773816885", + "rev": "461ec70d76363e9f76588afe59e02fbbc69da80e", "type": "gitlab" }, "original": { @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1766963849, - "narHash": "sha256-9a1PTYJByzRUurF8Vb5kNXcO5HEBj9uGQMS7JoLUGTI=", + "lastModified": 1767702900, + "narHash": "sha256-xMzHmNytl7JgFRov2jHf2GYsLVp/sAfYO0JvbZt0uDo=", "owner": "nix-community", "repo": "home-manager", - "rev": "87785ddbc70fbd379cf3ee0d1ebd778957172248", + "rev": "38e187fd2f9efac197e03be0c25f3ee215974144", "type": "github" }, "original": { @@ -442,11 +442,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "lastModified": 1767640445, + "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5", "type": "github" }, "original": { @@ -612,11 +612,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1766603026, - "narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=", + "lastModified": 1767652667, + "narHash": "sha256-zsgfockkvK0JrSvzVAb8JeUq3SDdITu6ViUf7yeIpi4=", "owner": "danth", "repo": "stylix", - "rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430", + "rev": "a4406d9799d002c41296c72378a1094a8fc9aa1b", "type": "github" }, "original": { @@ -748,11 +748,11 @@ ] }, "locked": { - "lastModified": 1767440749, - "narHash": "sha256-HMPTjLM3vg5iLX/2ssqFIhAjoRLQJ6PHNqjzuyjj+No=", + "lastModified": 1767530064, + "narHash": "sha256-1VLviyl0Y7UGrAXk+tv6DoWGxTmQ+QC2nh5zjRsrWf8=", "owner": "lassulus", "repo": "wrappers", - "rev": "c10d90a8907b57a8c57c232562820a1352fa98d7", + "rev": "c72dce567038c07660a9fca576d6e95e2243c34a", "type": "github" }, "original": { diff --git a/hosts/Garand-Desktop/system-modules.nix b/hosts/Garand-Desktop/system-modules.nix index 14d59ba..186a04f 100644 --- a/hosts/Garand-Desktop/system-modules.nix +++ b/hosts/Garand-Desktop/system-modules.nix @@ -12,6 +12,11 @@ _: { }; }; + /* + Networking + */ + tailscale.enable = true; # Tailscale: secure network for remote access + /* Gaming */ @@ -19,11 +24,6 @@ _: { gamescope.enable = false; # Gamescope: micro‑compositor for games steam.enable = true; # Steam: platform for buying and playing games - /* - Networking - */ - tailscale.enable = false; # Tailscale: secure network for remote access - packages = { /* Container & Packaging @@ -78,8 +78,9 @@ _: { Utilities / Misc */ eddieAirVPN.enable = true; # Eddie AirVPN: VPN client - galculator.enable = true; # Galculator: simple calculator + galculator.enable = false; # Galculator: simple calculator gedit.enable = false; # Gedit: GNOME text editor winboat.enable = false; # Winboat: Windows remote desktop via RDP + adb.enable = false; # ADB: Android SDK platform tools }; } diff --git a/hosts/Garand-Laptop/system-modules.nix b/hosts/Garand-Laptop/system-modules.nix index 84ba81b..3a73197 100644 --- a/hosts/Garand-Laptop/system-modules.nix +++ b/hosts/Garand-Laptop/system-modules.nix @@ -78,8 +78,9 @@ _: { Utilities / Misc */ eddieAirVPN.enable = true; # Eddie AirVPN: VPN client - galculator.enable = true; # Galculator: simple calculator + galculator.enable = false; # Galculator: simple calculator gedit.enable = false; # Gedit: GNOME text editor winboat.enable = false; # Winboat: Windows remote desktop via RDP + adb.enable = false; # ADB: Android SDK platform tools }; } diff --git a/hosts/default/system-modules.nix b/hosts/default/system-modules.nix index 84ba81b..3a73197 100644 --- a/hosts/default/system-modules.nix +++ b/hosts/default/system-modules.nix @@ -78,8 +78,9 @@ _: { Utilities / Misc */ eddieAirVPN.enable = true; # Eddie AirVPN: VPN client - galculator.enable = true; # Galculator: simple calculator + galculator.enable = false; # Galculator: simple calculator gedit.enable = false; # Gedit: GNOME text editor winboat.enable = false; # Winboat: Windows remote desktop via RDP + adb.enable = false; # ADB: Android SDK platform tools }; } diff --git a/modules/core/packages/packages.nix b/modules/core/packages/packages.nix index 442b48d..b51045c 100644 --- a/modules/core/packages/packages.nix +++ b/modules/core/packages/packages.nix @@ -46,6 +46,7 @@ pixieditor = pixieditor; bottles = bottles; heroic = heroic; + adb = android-tools; }; in { imports = builtins.attrValues (builtins.mapAttrs mkPackage packages); diff --git a/modules/core/packages/programs.nix b/modules/core/packages/programs.nix index 27bca66..f8a5698 100644 --- a/modules/core/packages/programs.nix +++ b/modules/core/packages/programs.nix @@ -1,7 +1,3 @@ -# { -# pkgs -# ... -# } _: { programs = { nano.enable = true; @@ -13,7 +9,6 @@ _: { seahorse.enable = true; fuse.userAllowOther = true; mtr.enable = true; - adb.enable = true; hyprlock.enable = true; gnupg.agent = { enable = true; diff --git a/modules/core/thunar.nix b/modules/core/thunar.nix index c90b8b8..6539ce2 100644 --- a/modules/core/thunar.nix +++ b/modules/core/thunar.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { programs.thunar = { enable = true; - plugins = with pkgs.xfce; [ + plugins = with pkgs; [ thunar-archive-plugin thunar-volman ]; diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index f9f1271..949269e 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -11,129 +11,129 @@ in { # ============================================================================= # APLIKACJE - GŁÓWNE # ============================================================================= - "$modifier, A, exec, anki" - "$modifier, B, exec, bitwarden" - "$modifier, C, exec, chromium" - "$modifier, D, exec, vesktop" - "$modifier, G, exec, affinity-v3" - "$modifier, I, exec, iotas" - "$modifier, J, exec, Jan" - "$modifier, L, exec, logseq" - "$modifier, M, exec, plexamp" - "$modifier, N, exec, dex ${desktopEntriesPath}/garandcloud.desktop" - "$modifier, O, exec, obs" - "$modifier, P, exec, plex-desktop" - "$modifier, Return, exec, ${terminal}" - "$modifier, S, exec, steam" - "$modifier, T, exec, thunar" - "$modifier, V, exec, codium" - "$modifier, W, exec, ${browser}" - "$modifier, Z, exec, zeditor" + "SUPER, A, exec, anki" + "SUPER, B, exec, bitwarden" + "SUPER, C, exec, chromium" + "SUPER, D, exec, vesktop" + "SUPER, G, exec, affinity-v3" + "SUPER, I, exec, iotas" + "SUPER, J, exec, Jan" + "SUPER, L, exec, logseq" + "SUPER, M, exec, plexamp" + "SUPER, N, exec, dex ${desktopEntriesPath}/garandcloud.desktop" + "SUPER, O, exec, obs" + "SUPER, P, exec, plex-desktop" + "SUPER, Return, exec, ${terminal}" + "SUPER, S, exec, steam" + "SUPER, T, exec, thunar" + "SUPER, V, exec, codium" + "SUPER, W, exec, ${browser}" + "SUPER, Z, exec, zeditor" # ============================================================================= # APLIKACJE - Z SHIFT # ============================================================================= - "$modifier SHIFT, B, exec, blueman-manager" - "$modifier SHIFT, C, exec, dex ${desktopEntriesPath}/claude.desktop" - "$modifier SHIFT, G, exec, dex ${desktopEntriesPath}/chatgpt.desktop" - "$modifier SHIFT, M, exec, dex ${desktopEntriesPath}/messenger.desktop" - "$modifier SHIFT, N, exec, nextcloud" - "$modifier SHIFT, O, exec, onlyoffice-desktopeditors" - "$modifier SHIFT, Return, exec, rofi-launcher" - "$modifier SHIFT, T, exec, tutanota-desktop" - "$modifier SHIFT, W, exec, web-search" + "SUPER SHIFT, B, exec, blueman-manager" + "SUPER SHIFT, C, exec, dex ${desktopEntriesPath}/claude.desktop" + "SUPER SHIFT, G, exec, dex ${desktopEntriesPath}/chatgpt.desktop" + "SUPER SHIFT, M, exec, dex ${desktopEntriesPath}/messenger.desktop" + "SUPER SHIFT, N, exec, nextcloud" + "SUPER SHIFT, O, exec, onlyoffice-desktopeditors" + "SUPER SHIFT, Return, exec, rofi-launcher" + "SUPER SHIFT, T, exec, tutanota-desktop" + "SUPER SHIFT, W, exec, web-search" # ============================================================================= # APLIKACJE - Z ALT # ============================================================================= - "$modifier ALT, G, exec, dex ${desktopEntriesPath}/glance.desktop" - "$modifier ALT, M, exec, dex ${desktopEntriesPath}/mastodon.desktop" - "$modifier ALT, S, exec, slack" - "$modifier ALT, T, exec, gedit" + "SUPER ALT, G, exec, dex ${desktopEntriesPath}/glance.desktop" + "SUPER ALT, M, exec, dex ${desktopEntriesPath}/mastodon.desktop" + "SUPER ALT, S, exec, slack" + "SUPER ALT, T, exec, gedit" # ============================================================================= # APLIKACJE - Z CONTROL # ============================================================================= - "$modifier CONTROL, G, exec, gimp" - "$modifier CONTROL, M, exec, mattermost-desktop" - "$modifier CONTROL, S, exec, signal-desktop" + "SUPER CONTROL, G, exec, gimp" + "SUPER CONTROL, M, exec, mattermost-desktop" + "SUPER CONTROL, S, exec, signal-desktop" # ============================================================================= # NARZĘDZIA SYSTEMOWE # ============================================================================= - "$modifier, E, exec, emopicker9000" - "$modifier, K, exec, galculator" - "$modifier ALT, W, exec, wallsetter" - "$modifier CONTROL, P, exec, hyprpicker -a" - "$modifier SHIFT, K, exec, list-keybinds" - "$modifier SHIFT, P, exec, pavucontrol" - "$modifier SHIFT, S, exec, screenshootin" + "SUPER, E, exec, emopicker9000" + "SUPER, K, exec, galculator" + "SUPER ALT, W, exec, wallsetter" + "SUPER CONTROL, P, exec, hyprpicker -a" + "SUPER SHIFT, K, exec, list-keybinds" + "SUPER SHIFT, P, exec, pavucontrol" + "SUPER SHIFT, S, exec, screenshootin" # ============================================================================= # ZARZĄDZANIE OKNAMI # ============================================================================= - "$modifier, Escape, exec, hyprlock" - "$modifier, F, fullscreen," - "$modifier, Q, killactive," - "$modifier CONTROL, Escape, exec, wlogout" - "$modifier SHIFT, Escape, exit," - "$modifier SHIFT, I, togglesplit," + "SUPER, Escape, exec, hyprlock" + "SUPER, F, fullscreen," + "SUPER, Q, killactive," + "SUPER CONTROL, Escape, exec, wlogout" + "SUPER SHIFT, Escape, exit," + "SUPER SHIFT, I, togglesplit," # ============================================================================= # FOKUS OKIEN # ============================================================================= - "$modifier, down, movefocus, d" - "$modifier, left, movefocus, l" - "$modifier, right, movefocus, r" - "$modifier, up, movefocus, u" + "SUPER, down, movefocus, d" + "SUPER, left, movefocus, l" + "SUPER, right, movefocus, r" + "SUPER, up, movefocus, u" # ============================================================================= # PRZEMIESZCZANIE OKIEN # ============================================================================= - "$modifier SHIFT, down, movewindow, d" - "$modifier SHIFT, left, movewindow, l" - "$modifier SHIFT, right, movewindow, r" - "$modifier SHIFT, up, movewindow, u" + "SUPER SHIFT, down, movewindow, d" + "SUPER SHIFT, left, movewindow, l" + "SUPER SHIFT, right, movewindow, r" + "SUPER SHIFT, up, movewindow, u" # ============================================================================= # ZAMIANA OKIEN # ============================================================================= - "$modifier ALT, down, swapwindow, d" - "$modifier ALT, left, swapwindow, l" - "$modifier ALT, right, swapwindow, r" - "$modifier ALT, up, swapwindow, u" + "SUPER ALT, down, swapwindow, d" + "SUPER ALT, left, swapwindow, l" + "SUPER ALT, right, swapwindow, r" + "SUPER ALT, up, swapwindow, u" # ============================================================================= # WORKSPACES - PRZEŁĄCZANIE # ============================================================================= - "$modifier, 0, workspace, 10" - "$modifier, 1, workspace, 1" - "$modifier, 2, workspace, 2" - "$modifier, 3, workspace, 3" - "$modifier, 4, workspace, 4" - "$modifier, 5, workspace, 5" - "$modifier, 6, workspace, 6" - "$modifier, 7, workspace, 7" - "$modifier, 8, workspace, 8" - "$modifier, 9, workspace, 9" - "$modifier CONTROL, left, workspace, e-1" - "$modifier CONTROL, right, workspace, e+1" - "$modifier, mouse_down, workspace, e+1" - "$modifier, mouse_up, workspace, e-1" + "SUPER, 0, workspace, 10" + "SUPER, 1, workspace, 1" + "SUPER, 2, workspace, 2" + "SUPER, 3, workspace, 3" + "SUPER, 4, workspace, 4" + "SUPER, 5, workspace, 5" + "SUPER, 6, workspace, 6" + "SUPER, 7, workspace, 7" + "SUPER, 8, workspace, 8" + "SUPER, 9, workspace, 9" + "SUPER CONTROL, left, workspace, e-1" + "SUPER CONTROL, right, workspace, e+1" + "SUPER, mouse_down, workspace, e+1" + "SUPER, mouse_up, workspace, e-1" # ============================================================================= # WORKSPACES - PRZENOSZENIE OKIEN # ============================================================================= - "$modifier SHIFT, 0, movetoworkspace, 10" - "$modifier SHIFT, 1, movetoworkspace, 1" - "$modifier SHIFT, 2, movetoworkspace, 2" - "$modifier SHIFT, 3, movetoworkspace, 3" - "$modifier SHIFT, 4, movetoworkspace, 4" - "$modifier SHIFT, 5, movetoworkspace, 5" - "$modifier SHIFT, 6, movetoworkspace, 6" - "$modifier SHIFT, 7, movetoworkspace, 7" - "$modifier SHIFT, 8, movetoworkspace, 8" - "$modifier SHIFT, 9, movetoworkspace, 9" + "SUPER SHIFT, 0, movetoworkspace, 10" + "SUPER SHIFT, 1, movetoworkspace, 1" + "SUPER SHIFT, 2, movetoworkspace, 2" + "SUPER SHIFT, 3, movetoworkspace, 3" + "SUPER SHIFT, 4, movetoworkspace, 4" + "SUPER SHIFT, 5, movetoworkspace, 5" + "SUPER SHIFT, 6, movetoworkspace, 6" + "SUPER SHIFT, 7, movetoworkspace, 7" + "SUPER SHIFT, 8, movetoworkspace, 8" + "SUPER SHIFT, 9, movetoworkspace, 9" # ============================================================================= # MEDIA I KONTROLKI SYSTEMOWE @@ -151,19 +151,19 @@ in { # ============================================================================= # NIEUŻYWANE KEYBINDY # ============================================================================= - # "$modifier SHIFT, N, exec, swaync-client -rs" - # "$modifier, P, pseudo," - # "$modifier SHIFT,F, togglefloating," - # "$modifier ALT,F, workspaceopt, allfloat" - # "$modifier SHIFT, SPACE, movetoworkspace, special" - # "$modifier, SPACE, togglespecialworkspace" + # "SUPER SHIFT, N, exec, swaync-client -rs" + # "SUPER, P, pseudo," + # "SUPER SHIFT,F, togglefloating," + # "SUPER ALT,F, workspaceopt, allfloat" + # "SUPER SHIFT, SPACE, movetoworkspace, special" + # "SUPER, SPACE, togglespecialworkspace" # "ALT,Tab,cyclenext" # "ALT,Tab,bringactivetotop" ]; bindm = [ - "$modifier, mouse:272, movewindow" - "$modifier, mouse:273, resizewindow" + "SUPER, mouse:272, movewindow" + "SUPER, mouse:273, resizewindow" ]; }; } diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 384bfc5..dbac00a 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -60,7 +60,6 @@ in { }; general = { - "$modifier" = "SUPER"; layout = "dwindle"; gaps_in = 6; gaps_out = 8; diff --git a/modules/home/scripts/keybinds.nix b/modules/home/scripts/keybinds.nix index dec1ae2..8f61f1b 100644 --- a/modules/home/scripts/keybinds.nix +++ b/modules/home/scripts/keybinds.nix @@ -14,13 +14,13 @@ in msg=' = Windows/Super/CAPS LOCK (Enter nie wykonuje skrótu)' keybinds=$(cat ~/.config/hypr/hyprland.conf | grep -E '^bind') - # replace $modifier with SUPER and clean up paths - display_keybinds=$(echo "$keybinds" | sed 's/\$modifier//g' | sed 's|${desktopEntriesPath}/||g') + # replace SUPER with SUPER and clean up paths + display_keybinds=$(echo "$keybinds" | sed 's/\SUPER//g' | sed 's|${desktopEntriesPath}/||g') # remove "bind=" and "bindm=" prefixes display_keybinds=$(echo "$display_keybinds" | sed 's/^bind=//' | sed 's/^bindm=/🖱️/') - # add + before CONTROL, SHIFT, ALT when they appear after removed $modifier + # add + before CONTROL, SHIFT, ALT when they appear after removed SUPER display_keybinds=$(echo "$display_keybinds" | sed 's/ CONTROL/ + CONTROL/g' | sed 's/ SHIFT/ + SHIFT/g' | sed 's/ ALT/ + ALT/g') # replace commas: first comma -> " +", second comma -> " =", remaining commas -> " ->"