GarandPLG/garandos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace $modifier with SUPER and update defaults

Browse Source
This commit is contained in:
GarandPLG
2026-01-06 21:46:12 +01:00
parent b8a7ead4be
commit 28daa28c6b
10 changed files with 122 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
flake.lock generated
View File

@@ -165,11 +165,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1766846533, "lastModified": 1767672212,
"narHash": "sha256-D7XoHk5/daZt3E0K6uCueVxpDYp+cIoCctoTsz5mjfk=", "narHash": "sha256-CGQgo92QKzCnRUF2wjEPsaIoKajVU5EyK1aDaMwo1xg=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "e55ad9427895bc94e55b2cb6474ca46773816885", "rev": "461ec70d76363e9f76588afe59e02fbbc69da80e",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -369,11 +369,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766963849, "lastModified": 1767702900,
"narHash": "sha256-9a1PTYJByzRUurF8Vb5kNXcO5HEBj9uGQMS7JoLUGTI=", "narHash": "sha256-xMzHmNytl7JgFRov2jHf2GYsLVp/sAfYO0JvbZt0uDo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "87785ddbc70fbd379cf3ee0d1ebd778957172248", "rev": "38e187fd2f9efac197e03be0c25f3ee215974144",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -442,11 +442,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1766902085, "lastModified": 1767640445,
"narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -612,11 +612,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1766603026, "lastModified": 1767652667,
"narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=", "narHash": "sha256-zsgfockkvK0JrSvzVAb8JeUq3SDdITu6ViUf7yeIpi4=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430", "rev": "a4406d9799d002c41296c72378a1094a8fc9aa1b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -748,11 +748,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767440749, "lastModified": 1767530064,
"narHash": "sha256-HMPTjLM3vg5iLX/2ssqFIhAjoRLQJ6PHNqjzuyjj+No=", "narHash": "sha256-1VLviyl0Y7UGrAXk+tv6DoWGxTmQ+QC2nh5zjRsrWf8=",
"owner": "lassulus", "owner": "lassulus",
"repo": "wrappers", "repo": "wrappers",
"rev": "c10d90a8907b57a8c57c232562820a1352fa98d7", "rev": "c72dce567038c07660a9fca576d6e95e2243c34a",
"type": "github" "type": "github"
}, },
"original": { "original": {

13
hosts/Garand-Desktop/system-modules.nix
View File

@@ -12,6 +12,11 @@ _: {
}; };
}; };
/*
Networking
*/
tailscale.enable = true; # Tailscale: secure network for remote access
/* /*
Gaming Gaming
*/ */
@@ -19,11 +24,6 @@ _: {
gamescope.enable = false; # Gamescope: micro‑compositor for games gamescope.enable = false; # Gamescope: micro‑compositor for games
steam.enable = true; # Steam: platform for buying and playing games steam.enable = true; # Steam: platform for buying and playing games
/*
Networking
*/
tailscale.enable = false; # Tailscale: secure network for remote access
packages = { packages = {
/* /*
Container & Packaging Container & Packaging
@@ -78,8 +78,9 @@ _: {
Utilities / Misc Utilities / Misc
*/ */
eddieAirVPN.enable = true; # Eddie AirVPN: VPN client 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 gedit.enable = false; # Gedit: GNOME text editor
winboat.enable = false; # Winboat: Windows remote desktop via RDP winboat.enable = false; # Winboat: Windows remote desktop via RDP
adb.enable = false; # ADB: Android SDK platform tools
}; };
} }

3
hosts/Garand-Laptop/system-modules.nix
View File

@@ -78,8 +78,9 @@ _: {
Utilities / Misc Utilities / Misc
*/ */
eddieAirVPN.enable = true; # Eddie AirVPN: VPN client 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 gedit.enable = false; # Gedit: GNOME text editor
winboat.enable = false; # Winboat: Windows remote desktop via RDP winboat.enable = false; # Winboat: Windows remote desktop via RDP
adb.enable = false; # ADB: Android SDK platform tools
}; };
} }

3
hosts/default/system-modules.nix
View File

@@ -78,8 +78,9 @@ _: {
Utilities / Misc Utilities / Misc
*/ */
eddieAirVPN.enable = true; # Eddie AirVPN: VPN client 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 gedit.enable = false; # Gedit: GNOME text editor
winboat.enable = false; # Winboat: Windows remote desktop via RDP winboat.enable = false; # Winboat: Windows remote desktop via RDP
adb.enable = false; # ADB: Android SDK platform tools
}; };
} }

1
modules/core/packages/packages.nix
View File

@@ -46,6 +46,7 @@
pixieditor = pixieditor; pixieditor = pixieditor;
bottles = bottles; bottles = bottles;
heroic = heroic; heroic = heroic;
adb = android-tools;
}; };
in { in {
imports = builtins.attrValues (builtins.mapAttrs mkPackage packages); imports = builtins.attrValues (builtins.mapAttrs mkPackage packages);

5
modules/core/packages/programs.nix
View File

@@ -1,7 +1,3 @@
# {
# pkgs
# ...
# }
_: { _: {
programs = { programs = {
nano.enable = true; nano.enable = true;
@@ -13,7 +9,6 @@ _: {
seahorse.enable = true; seahorse.enable = true;
fuse.userAllowOther = true; fuse.userAllowOther = true;
mtr.enable = true; mtr.enable = true;
adb.enable = true;
hyprlock.enable = true; hyprlock.enable = true;
gnupg.agent = { gnupg.agent = {
enable = true; enable = true;

2
modules/core/thunar.nix
View File

@@ -1,7 +1,7 @@
{pkgs, ...}: { {pkgs, ...}: {
programs.thunar = { programs.thunar = {
enable = true; enable = true;
plugins = with pkgs.xfce; [ plugins = with pkgs; [
thunar-archive-plugin thunar-archive-plugin
thunar-volman thunar-volman
]; ];

182
modules/home/hyprland/binds.nix
View File

@@ -11,129 +11,129 @@ in {
# ============================================================================= # =============================================================================
# APLIKACJE - GŁÓWNE # APLIKACJE - GŁÓWNE
# ============================================================================= # =============================================================================
"$modifier, A, exec, anki" "SUPER, A, exec, anki"
"$modifier, B, exec, bitwarden" "SUPER, B, exec, bitwarden"
"$modifier, C, exec, chromium" "SUPER, C, exec, chromium"
"$modifier, D, exec, vesktop" "SUPER, D, exec, vesktop"
"$modifier, G, exec, affinity-v3" "SUPER, G, exec, affinity-v3"
"$modifier, I, exec, iotas" "SUPER, I, exec, iotas"
"$modifier, J, exec, Jan" "SUPER, J, exec, Jan"
"$modifier, L, exec, logseq" "SUPER, L, exec, logseq"
"$modifier, M, exec, plexamp" "SUPER, M, exec, plexamp"
"$modifier, N, exec, dex ${desktopEntriesPath}/garandcloud.desktop" "SUPER, N, exec, dex ${desktopEntriesPath}/garandcloud.desktop"
"$modifier, O, exec, obs" "SUPER, O, exec, obs"
"$modifier, P, exec, plex-desktop" "SUPER, P, exec, plex-desktop"
"$modifier, Return, exec, ${terminal}" "SUPER, Return, exec, ${terminal}"
"$modifier, S, exec, steam" "SUPER, S, exec, steam"
"$modifier, T, exec, thunar" "SUPER, T, exec, thunar"
"$modifier, V, exec, codium" "SUPER, V, exec, codium"
"$modifier, W, exec, ${browser}" "SUPER, W, exec, ${browser}"
"$modifier, Z, exec, zeditor" "SUPER, Z, exec, zeditor"
# ============================================================================= # =============================================================================
# APLIKACJE - Z SHIFT # APLIKACJE - Z SHIFT
# ============================================================================= # =============================================================================
"$modifier SHIFT, B, exec, blueman-manager" "SUPER SHIFT, B, exec, blueman-manager"
"$modifier SHIFT, C, exec, dex ${desktopEntriesPath}/claude.desktop" "SUPER SHIFT, C, exec, dex ${desktopEntriesPath}/claude.desktop"
"$modifier SHIFT, G, exec, dex ${desktopEntriesPath}/chatgpt.desktop" "SUPER SHIFT, G, exec, dex ${desktopEntriesPath}/chatgpt.desktop"
"$modifier SHIFT, M, exec, dex ${desktopEntriesPath}/messenger.desktop" "SUPER SHIFT, M, exec, dex ${desktopEntriesPath}/messenger.desktop"
"$modifier SHIFT, N, exec, nextcloud" "SUPER SHIFT, N, exec, nextcloud"
"$modifier SHIFT, O, exec, onlyoffice-desktopeditors" "SUPER SHIFT, O, exec, onlyoffice-desktopeditors"
"$modifier SHIFT, Return, exec, rofi-launcher" "SUPER SHIFT, Return, exec, rofi-launcher"
"$modifier SHIFT, T, exec, tutanota-desktop" "SUPER SHIFT, T, exec, tutanota-desktop"
"$modifier SHIFT, W, exec, web-search" "SUPER SHIFT, W, exec, web-search"
# ============================================================================= # =============================================================================
# APLIKACJE - Z ALT # APLIKACJE - Z ALT
# ============================================================================= # =============================================================================
"$modifier ALT, G, exec, dex ${desktopEntriesPath}/glance.desktop" "SUPER ALT, G, exec, dex ${desktopEntriesPath}/glance.desktop"
"$modifier ALT, M, exec, dex ${desktopEntriesPath}/mastodon.desktop" "SUPER ALT, M, exec, dex ${desktopEntriesPath}/mastodon.desktop"
"$modifier ALT, S, exec, slack" "SUPER ALT, S, exec, slack"
"$modifier ALT, T, exec, gedit" "SUPER ALT, T, exec, gedit"
# ============================================================================= # =============================================================================
# APLIKACJE - Z CONTROL # APLIKACJE - Z CONTROL
# ============================================================================= # =============================================================================
"$modifier CONTROL, G, exec, gimp" "SUPER CONTROL, G, exec, gimp"
"$modifier CONTROL, M, exec, mattermost-desktop" "SUPER CONTROL, M, exec, mattermost-desktop"
"$modifier CONTROL, S, exec, signal-desktop" "SUPER CONTROL, S, exec, signal-desktop"
# ============================================================================= # =============================================================================
# NARZĘDZIA SYSTEMOWE # NARZĘDZIA SYSTEMOWE
# ============================================================================= # =============================================================================
"$modifier, E, exec, emopicker9000" "SUPER, E, exec, emopicker9000"
"$modifier, K, exec, galculator" "SUPER, K, exec, galculator"
"$modifier ALT, W, exec, wallsetter" "SUPER ALT, W, exec, wallsetter"
"$modifier CONTROL, P, exec, hyprpicker -a" "SUPER CONTROL, P, exec, hyprpicker -a"
"$modifier SHIFT, K, exec, list-keybinds" "SUPER SHIFT, K, exec, list-keybinds"
"$modifier SHIFT, P, exec, pavucontrol" "SUPER SHIFT, P, exec, pavucontrol"
"$modifier SHIFT, S, exec, screenshootin" "SUPER SHIFT, S, exec, screenshootin"
# ============================================================================= # =============================================================================
# ZARZĄDZANIE OKNAMI # ZARZĄDZANIE OKNAMI
# ============================================================================= # =============================================================================
"$modifier, Escape, exec, hyprlock" "SUPER, Escape, exec, hyprlock"
"$modifier, F, fullscreen," "SUPER, F, fullscreen,"
"$modifier, Q, killactive," "SUPER, Q, killactive,"
"$modifier CONTROL, Escape, exec, wlogout" "SUPER CONTROL, Escape, exec, wlogout"
"$modifier SHIFT, Escape, exit," "SUPER SHIFT, Escape, exit,"
"$modifier SHIFT, I, togglesplit," "SUPER SHIFT, I, togglesplit,"
# ============================================================================= # =============================================================================
# FOKUS OKIEN # FOKUS OKIEN
# ============================================================================= # =============================================================================
"$modifier, down, movefocus, d" "SUPER, down, movefocus, d"
"$modifier, left, movefocus, l" "SUPER, left, movefocus, l"
"$modifier, right, movefocus, r" "SUPER, right, movefocus, r"
"$modifier, up, movefocus, u" "SUPER, up, movefocus, u"
# ============================================================================= # =============================================================================
# PRZEMIESZCZANIE OKIEN # PRZEMIESZCZANIE OKIEN
# ============================================================================= # =============================================================================
"$modifier SHIFT, down, movewindow, d" "SUPER SHIFT, down, movewindow, d"
"$modifier SHIFT, left, movewindow, l" "SUPER SHIFT, left, movewindow, l"
"$modifier SHIFT, right, movewindow, r" "SUPER SHIFT, right, movewindow, r"
"$modifier SHIFT, up, movewindow, u" "SUPER SHIFT, up, movewindow, u"
# ============================================================================= # =============================================================================
# ZAMIANA OKIEN # ZAMIANA OKIEN
# ============================================================================= # =============================================================================
"$modifier ALT, down, swapwindow, d" "SUPER ALT, down, swapwindow, d"
"$modifier ALT, left, swapwindow, l" "SUPER ALT, left, swapwindow, l"
"$modifier ALT, right, swapwindow, r" "SUPER ALT, right, swapwindow, r"
"$modifier ALT, up, swapwindow, u" "SUPER ALT, up, swapwindow, u"
# ============================================================================= # =============================================================================
# WORKSPACES - PRZEŁĄCZANIE # WORKSPACES - PRZEŁĄCZANIE
# ============================================================================= # =============================================================================
"$modifier, 0, workspace, 10" "SUPER, 0, workspace, 10"
"$modifier, 1, workspace, 1" "SUPER, 1, workspace, 1"
"$modifier, 2, workspace, 2" "SUPER, 2, workspace, 2"
"$modifier, 3, workspace, 3" "SUPER, 3, workspace, 3"
"$modifier, 4, workspace, 4" "SUPER, 4, workspace, 4"
"$modifier, 5, workspace, 5" "SUPER, 5, workspace, 5"
"$modifier, 6, workspace, 6" "SUPER, 6, workspace, 6"
"$modifier, 7, workspace, 7" "SUPER, 7, workspace, 7"
"$modifier, 8, workspace, 8" "SUPER, 8, workspace, 8"
"$modifier, 9, workspace, 9" "SUPER, 9, workspace, 9"
"$modifier CONTROL, left, workspace, e-1" "SUPER CONTROL, left, workspace, e-1"
"$modifier CONTROL, right, workspace, e+1" "SUPER CONTROL, right, workspace, e+1"
"$modifier, mouse_down, workspace, e+1" "SUPER, mouse_down, workspace, e+1"
"$modifier, mouse_up, workspace, e-1" "SUPER, mouse_up, workspace, e-1"
# ============================================================================= # =============================================================================
# WORKSPACES - PRZENOSZENIE OKIEN # WORKSPACES - PRZENOSZENIE OKIEN
# ============================================================================= # =============================================================================
"$modifier SHIFT, 0, movetoworkspace, 10" "SUPER SHIFT, 0, movetoworkspace, 10"
"$modifier SHIFT, 1, movetoworkspace, 1" "SUPER SHIFT, 1, movetoworkspace, 1"
"$modifier SHIFT, 2, movetoworkspace, 2" "SUPER SHIFT, 2, movetoworkspace, 2"
"$modifier SHIFT, 3, movetoworkspace, 3" "SUPER SHIFT, 3, movetoworkspace, 3"
"$modifier SHIFT, 4, movetoworkspace, 4" "SUPER SHIFT, 4, movetoworkspace, 4"
"$modifier SHIFT, 5, movetoworkspace, 5" "SUPER SHIFT, 5, movetoworkspace, 5"
"$modifier SHIFT, 6, movetoworkspace, 6" "SUPER SHIFT, 6, movetoworkspace, 6"
"$modifier SHIFT, 7, movetoworkspace, 7" "SUPER SHIFT, 7, movetoworkspace, 7"
"$modifier SHIFT, 8, movetoworkspace, 8" "SUPER SHIFT, 8, movetoworkspace, 8"
"$modifier SHIFT, 9, movetoworkspace, 9" "SUPER SHIFT, 9, movetoworkspace, 9"
# ============================================================================= # =============================================================================
# MEDIA I KONTROLKI SYSTEMOWE # MEDIA I KONTROLKI SYSTEMOWE
@@ -151,19 +151,19 @@ in {
# ============================================================================= # =============================================================================
# NIEUŻYWANE KEYBINDY # NIEUŻYWANE KEYBINDY
# ============================================================================= # =============================================================================
# "$modifier SHIFT, N, exec, swaync-client -rs" # "SUPER SHIFT, N, exec, swaync-client -rs"
# "$modifier, P, pseudo," # "SUPER, P, pseudo,"
# "$modifier SHIFT,F, togglefloating," # "SUPER SHIFT,F, togglefloating,"
# "$modifier ALT,F, workspaceopt, allfloat" # "SUPER ALT,F, workspaceopt, allfloat"
# "$modifier SHIFT, SPACE, movetoworkspace, special" # "SUPER SHIFT, SPACE, movetoworkspace, special"
# "$modifier, SPACE, togglespecialworkspace" # "SUPER, SPACE, togglespecialworkspace"
# "ALT,Tab,cyclenext" # "ALT,Tab,cyclenext"
# "ALT,Tab,bringactivetotop" # "ALT,Tab,bringactivetotop"
]; ];
bindm = [ bindm = [
"$modifier, mouse:272, movewindow" "SUPER, mouse:272, movewindow"
"$modifier, mouse:273, resizewindow" "SUPER, mouse:273, resizewindow"
]; ];
}; };
} }

1
modules/home/hyprland/hyprland.nix
View File

@@ -60,7 +60,6 @@ in {
}; };
general = { general = {
"$modifier" = "SUPER";
layout = "dwindle"; layout = "dwindle";
gaps_in = 6; gaps_in = 6;
gaps_out = 8; gaps_out = 8;

6
modules/home/scripts/keybinds.nix
View File

@@ -14,13 +14,13 @@ in
msg=' = Windows/Super/CAPS LOCK (Enter nie wykonuje skrótu)' msg=' = Windows/Super/CAPS LOCK (Enter nie wykonuje skrótu)'
keybinds=$(cat ~/.config/hypr/hyprland.conf | grep -E '^bind') keybinds=$(cat ~/.config/hypr/hyprland.conf | grep -E '^bind')
# replace $modifier with SUPER and clean up paths # replace SUPER with SUPER and clean up paths
display_keybinds=$(echo "$keybinds" | sed 's/\$modifier//g' | sed 's|${desktopEntriesPath}/||g') display_keybinds=$(echo "$keybinds" | sed 's/\SUPER//g' | sed 's|${desktopEntriesPath}/||g')
# remove "bind=" and "bindm=" prefixes # remove "bind=" and "bindm=" prefixes
display_keybinds=$(echo "$display_keybinds" | sed 's/^bind=//' | sed 's/^bindm=/🖱️/') 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') 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 -> " ->" # replace commas: first comma -> " +", second comma -> " =", remaining commas -> " ->"