Zamiana systemd-boot na GRUB z własnym motywem

- Wyłączono `systemd-boot`, włączono `grub` z obsługą EFI.
- Dodano własny motyw GRUB z grafiką `jablon.png` i plikiem `theme.txt`.
- Motyw zawiera spersonalizowane kolory, czcionki i układ menu GRUB-a.
- Dodano dodatkowy wpis menu GRUB-a zatytułowany „Mój system”.
- Motyw kompilowany jest jako niestandardowe źródło w `pkgs.stdenv.mkDerivation`.

.vscode/bookmarks.code-snippets

@@ -0,0 +1,83 @@
+{
+	// Place your zaneyos workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and 
+	// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope 
+	// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is 
+	// used to trigger the snippet and the body will be expanded and inserted. Possible variables are: 
+	// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. 
+	// Placeholders with the same ids are connected.
+	// Example:
+	// "Print to console": {
+	// 	"scope": "javascript,typescript",
+	// 	"prefix": "log",
+	// 	"body": [
+	// 		"console.log('$1');",
+	// 		"$2"
+	// 	],
+	// 	"description": "Log output to console"
+	// }
+	"bm-link": {
+		"scope": "nix",
+		"prefix": "bm-link",
+		"body": [
+      "{",
+      "  name = \"\";",
+      "  tags = [];",
+      "  keyword = \"@\";",
+      "  url = \"\";",
+      "}"
+		],
+		"description": "Home-manager Bookmark link"
+	},
+	"bm-folder": {
+		"scope": "nix",
+		"prefix": "bm-folder",
+		"body": [
+      "{",
+      "  name = \"\";",
+      "  toolbar = true;",
+      "  bookmarks = [];",
+      "}"
+		],
+		"description": "Home-manager Bookmark folder"
+	},
+	"search-engine": {
+		"scope": "nix",
+		"prefix": "search-engine",
+		"description": "Home-manager Search engine",
+		"body": [
+      "\"\" = {",
+			"  definedAliases = [];",
+			"  icon = \"\";",
+			"  urls = [",
+			"    {",
+			"      template = \"\";",
+			"      params = [",
+			"        {",
+			"          name = \"\";",
+			"          value = \"{searchTerms}\";",
+			"        }",
+			"      ];",
+			"    }",
+			"  ];",
+			"};"
+		]
+	},
+	"nix-config": {
+		"scope": "nix",
+		"prefix": "nix-config",
+		"description": "Config do pliku .nix",
+		"body": [
+			"{pkgs, ...}: {}"
+		]
+	},
+	"nix-config=nixpkgs": {
+		"scope": "nix",
+		"prefix": "nix-config-nixpkgs",
+		"description": "Config do pliku .nix z nixpkgs",
+		"body": [
+			"{pkgs, ... }: {",
+			"  environment.systemPackages = with pkgs; [];",
+			"}",
+		]
+	}
+}

.vscode/settings.json

@@ -18,5 +18,10 @@
   },
   "editor.formatOnPaste": true,
   "editor.formatOnSave": true,
-  "editor.defaultFormatter": "jnoortheen.nix-ide"
+  "[nix]": {
+    "editor.defaultFormatter": "jnoortheen.nix-ide",
+  },
+  "[json]": {
+    "editor.defaultFormatter": "vscode.json-language-features"
+  }
 }

config/garand-grub-theme/theme.txt

@@ -0,0 +1,33 @@
+# GRUB2 gfxmenu theme
+desktop-image: "jablon.png"
+title-text: ""
+terminal-left: "0"
+terminal-top: "0"
+terminal-width: "100%"
+terminal-height: "100%"
+terminal-border: "0"
+
++ boot_menu {
+  left = 15%
+  top = 30%
+  width = 70%
+  height = 40%
+  item_font = "DejaVu Sans Regular 12"
+  item_color = "#cccccc"
+  selected_item_color = "#ffffff"
+  icon_width = 32
+  icon_height = 32
+  item_height = 24
+  item_spacing = 12
+  selected_item_pixmap_style = "select_*.png"
+}
+
++ label {
+  top = 82%
+  left = 15%
+  width = 70%
+  align = "center"
+  text = "Użyj strzałek do wyboru pozycji menu i Enter aby potwierdzić."
+  color = "#ffffff"
+  font = "DejaVu Sans Bold 10"
+}

config/hyprland.nix

@@ -67,13 +67,14 @@ in
               sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
               accel_profile = flat
             }
-            windowrule = noborder,^(wofi)$
-            windowrule = center,^(wofi)$
-            windowrule = center,^(steam)$
-            windowrule = float, nm-connection-editor|blueman-manager
-            windowrule = float, swayimg|vlc|Viewnior|pavucontrol
-            windowrule = float, nwg-look|qt5ct|mpv
-            windowrule = float, zoom
+            windowrulev2 = noborder, class:^(wofi)$
+            windowrulev2 = center, class:^(wofi)$
+            windowrulev2 = center, class:^(steam)$
+            windowrulev2 = float, class:^(nm-connection-editor|blueman-manager)$
+            windowrulev2 = float, class:^(swayimg|vlc|Viewnior|pavucontrol)$
+            windowrulev2 = float, class:^(nwg-look|qt5ct|mpv)$
+            windowrulev2 = float, class:^(zoom)$
+            windowrulev2 = float, class:^(galculator)$
             windowrulev2 = stayfocused, title:^()$,class:^(steam)$
             windowrulev2 = minsize 1 1, title:^()$,class:^(steam)$
             windowrulev2 = opacity 1 0.7, class:^(librewolf)$
@@ -85,6 +86,15 @@ in
             windowrulev2 = opacity 0.9 0.7, class:^(chrome-ppepjbbmpdbanediafpgploonglppmlk-Default)$
             windowrulev2 = opacity 0.9 0.7, class:^(tutanota-desktop)$
             windowrulev2 = opacity 0.9 0.7, class:^(discord)$
+            windowrulev2 = opacity 0.9 0.7, class:^(ONLYOFFICE)$
+            windowrulev2 = opacity 0.9 0.7, class:^(net.lutris.Lutris)$
+            windowrulev2 = opacity 0.9 0.7, class:^(chrome-nibpilkookahlimkjopijpmhgllidlok-Default)$
+            windowrulev2 = opacity 0.9 0.7, class:^(Anki)$
+            windowrulev2 = opacity 0.9 0.7, class:^(galculator)$
+            windowrulev2 = opacity 0.9 0.7, class:^(chrome-mcpclnpikkcgnjfknenfalelmlaccfcj-Default)$
+            windowrulev2 = opacity 0.9 0.7, class:^(chrome-dbipeoijaciefjfbfdkpfncmlbfinpge-Default)$
+            windowrulev2 = opacity 0.9 0.7, class:^(Bitwarden)$
+            windowrulev2 = opacity 0.9 0.7, class:^(chrome-akpamiohjfcnimfljfndmaldlcfphjmp-Default)$
             gestures {
               workspace_swipe = true
               workspace_swipe_fingers = 3
@@ -132,31 +142,18 @@ in
               pseudotile = true
               preserve_split = true
             }
-            bind = ${modifier},Return,exec,${terminal}
-            bind = ${modifier}SHIFT,Return,exec,rofi-launcher
-            bind = ${modifier}SHIFT,W,exec,web-search
-            bind = ${modifier},V,exec,codium
-            bind = ${modifier}ALT,W,exec,wallsetter
-            bind = ${modifier}SHIFT,N,exec,swaync-client -rs
-            bind = ${modifier},W,exec,${browser}
-            bind = ${modifier},E,exec,emopicker9000
-            bind = ${modifier},S,exec,screenshootin
-            bind = ${modifier}SHIFT,S,exec,slack
-            bind = ${modifier},D,exec,discord
-            bind = ${modifier},O,exec,obs
-            bind = ${modifier},C,exec,hyprpicker -a
-            bind = ${modifier},G,exec,gimp
-            bind = ${modifier}SHIFT,G,exec,godot4
-            bind = ${modifier},T,exec,thunar
-            bind = ${modifier}SHIFT,T,exec,tutanota-desktop
-            bind = ${modifier},M,exec,plexamp
-            bind = ${modifier}SHIFT,M,exec,chrome-bbdeiblfgdokhlblpgeaokenkfknecgl-Default
             bind = ${modifier},Q,killactive,
+            bind = ${modifier},Escape,exit,
             bind = ${modifier},P,pseudo,
             bind = ${modifier}SHIFT,I,togglesplit,
             bind = ${modifier},F,fullscreen,
             bind = ${modifier}SHIFT,F,togglefloating,
-            bind = ${modifier}SHIFT,C,exit,
+            bind = ALT,Tab,cyclenext
+            bind = ALT,Tab,bringactivetotop
+            bind = ${modifier},left,movefocus,l
+            bind = ${modifier},right,movefocus,r
+            bind = ${modifier},up,movefocus,u
+            bind = ${modifier},down,movefocus,d
             bind = ${modifier}SHIFT,left,movewindow,l
             bind = ${modifier}SHIFT,right,movewindow,r
             bind = ${modifier}SHIFT,up,movewindow,u
@@ -165,14 +162,6 @@ in
             bind = ${modifier}SHIFT,l,movewindow,r
             bind = ${modifier}SHIFT,k,movewindow,u
             bind = ${modifier}SHIFT,j,movewindow,d
-            bind = ${modifier},left,movefocus,l
-            bind = ${modifier},right,movefocus,r
-            bind = ${modifier},up,movefocus,u
-            bind = ${modifier},down,movefocus,d
-            bind = ${modifier},h,movefocus,l
-            bind = ${modifier},l,movefocus,r
-            bind = ${modifier},k,movefocus,u
-            bind = ${modifier},j,movefocus,d
             bind = ${modifier},1,workspace,1
             bind = ${modifier},2,workspace,2
             bind = ${modifier},3,workspace,3
@@ -183,8 +172,6 @@ in
             bind = ${modifier},8,workspace,8
             bind = ${modifier},9,workspace,9
             bind = ${modifier},0,workspace,10
-            bind = ${modifier}SHIFT,SPACE,movetoworkspace,special
-            bind = ${modifier},SPACE,togglespecialworkspace
             bind = ${modifier}SHIFT,1,movetoworkspace,1
             bind = ${modifier}SHIFT,2,movetoworkspace,2
             bind = ${modifier}SHIFT,3,movetoworkspace,3
@@ -201,8 +188,41 @@ in
             bind = ${modifier},mouse_up,workspace, e-1
             bindm = ${modifier},mouse:272,movewindow
             bindm = ${modifier},mouse:273,resizewindow
-            bind = ALT,Tab,cyclenext
-            bind = ALT,Tab,bringactivetotop
+            bind = ${modifier}SHIFT,SPACE,movetoworkspace,special
+            bind = ${modifier},SPACE,togglespecialworkspace
+            bind = ${modifier},Return,exec,${terminal}
+            bind = ${modifier}SHIFT,Return,exec,rofi-launcher
+            bind = ${modifier}ALT,W,exec,wallsetter
+            bind = ${modifier}SHIFT,S,exec,screenshootin
+            bind = ${modifier},E,exec,emopicker9000
+            bind = ${modifier}SHIFT,P,exec,hyprpicker -a
+            bind = ${modifier}SHIFT,W,exec,web-search
+            bind = ${modifier}SHIFT,K,exec,galculator
+            bind = ${modifier},B,exec,btop
+            bind = ${modifier}SHIFT,B,exec,blueman-manager
+            bind = ${modifier},T,exec,thunar
+            bind = ${modifier},W,exec,${browser}
+            bind = ${modifier},S,exec,slack
+            bind = ${modifier},D,exec,discord
+            bind = ${modifier},C,exec,chromium
+            bind = ${modifier}SHIFT,C,exec,dex-claude
+            bind = ${modifier}SHIFT,G,exec,dex-chatgpt
+            bind = ${modifier}SHIFT,M,exec,dex-messenger
+            bind = ${modifier}SHIFT,T,exec,tutanota-desktop
+            bind = ${modifier},I,exec,dex-instagram
+            bind = ${modifier},R,exec,dex-portainer
+            bind = ${modifier},U,exec,dex-mastodon
+            bind = ${modifier},Y,exec,dex-dailydev
+            bind = ${modifier},V,exec,codium
+            bind = ${modifier},O,exec,onlyoffice-desktopeditors
+            bind = ${modifier}SHIFT,O,exec,obs
+            bind = ${modifier},G,exec,gimp3
+            bind = ${modifier},N,exec,dex-nextcloud
+            bind = ${modifier}SHIFT,N,exec,nextcloud
+            bind = ${modifier},L,exec,lutris
+            bind = ${modifier},A,exec,anki
+            bind = ${modifier},M,exec,plexamp
+            bind = ${modifier},Z,exec,dex-beszel
             bind = ,XF86AudioRaiseVolume,exec,wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
             bind = ,XF86AudioLowerVolume,exec,wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
             binde = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739098586,
-        "narHash": "sha256-08FW+tVGWQKdiPZqXk6FO1JNB/Zybi7IYSWSGpp8V0Y=",
+        "lastModified": 1745403023,
+        "narHash": "sha256-DEs6jbWYJFJgpaPtF5NT3DQs3erjzdm2brLNHpjrEPA=",
         "owner": "AdnanHodzic",
         "repo": "auto-cpufreq",
-        "rev": "e6bbd2c8335a33f25a3fcb3bd2376e790f460ba2",
+        "rev": "ad6e313dabf7e4da2765be6b36688db85b29ff5f",
         "type": "github"
       },
       "original": {
@@ -25,11 +25,11 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1732200724,
-        "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
+        "lastModified": 1745523430,
+        "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
         "owner": "SenchoPens",
         "repo": "base16.nix",
-        "rev": "153d52373b0fb2d343592871009a286ec8837aec",
+        "rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
         "type": "github"
       },
       "original": {
@@ -87,14 +87,36 @@
         "type": "github"
       }
     },
+    "firefox-addons": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "dir": "pkgs/firefox-addons",
+        "lastModified": 1745752599,
+        "narHash": "sha256-vX5uq4wv7FeNeeFtsTPXQ9n2hd92NFXI+u9sg1K8OhA=",
+        "owner": "rycee",
+        "repo": "nur-expressions",
+        "rev": "0388c30f59e860307b2ef0ba93f38d2e525a153e",
+        "type": "gitlab"
+      },
+      "original": {
+        "dir": "pkgs/firefox-addons",
+        "owner": "rycee",
+        "repo": "nur-expressions",
+        "type": "gitlab"
+      }
+    },
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1736899990,
-        "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=",
+        "lastModified": 1744642301,
+        "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d",
+        "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
         "type": "github"
       },
       "original": {
@@ -104,7 +126,6 @@
       }
     },
     "flake-compat": {
-      "flake": false,
       "locked": {
         "lastModified": 1733328505,
         "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@@ -119,6 +140,28 @@
         "type": "github"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "stylix",
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": [
@@ -169,11 +212,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735882644,
-        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
         "type": "github"
       },
       "original": {
@@ -228,11 +271,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739470101,
-        "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=",
+        "lastModified": 1745894335,
+        "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5031c6d2978109336637977c165f82aa49fa16a7",
+        "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa",
         "type": "github"
       },
       "original": {
@@ -244,11 +287,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739214665,
-        "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
+        "lastModified": 1745930157,
+        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
+        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
         "type": "github"
       },
       "original": {
@@ -258,9 +301,33 @@
         "type": "github"
       }
     },
+    "nur": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "stylix",
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1745459908,
+        "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "auto-cpufreq": "auto-cpufreq",
+        "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "stylix": "stylix"
@@ -283,6 +350,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
+        "nur": "nur",
         "systems": "systems",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
@@ -291,11 +359,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1739375014,
-        "narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=",
+        "lastModified": 1745962538,
+        "narHash": "sha256-UmQxI4ocPZUVHuxtaQN3zNNBU8KLK9x2gXl2kWUhMKY=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777",
+        "rev": "764fd32955e79f2742a7975f0150175f93add2fb",
         "type": "github"
       },
       "original": {
@@ -356,11 +424,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1737565458,
-        "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=",
+        "lastModified": 1744974599,
+        "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9",
+        "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
         "type": "github"
       },
       "original": {
@@ -372,11 +440,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1735737224,
-        "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=",
+        "lastModified": 1745111349,
+        "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64",
+        "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
         "type": "github"
       },
       "original": {
@@ -400,6 +468,28 @@
         "repo": "base16-zed",
         "type": "github"
       }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "stylix",
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -18,6 +18,10 @@
       url = "github:AdnanHodzic/auto-cpufreq";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    firefox-addons = {
+      url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
@@ -25,7 +29,7 @@
     home-manager,
     ...
   } @ inputs: let
-    system = "aarch64-linux";
+    system = "x86_64-linux";
     host = "garand-laptop";
     username = "garand_plg";
   in {
@@ -44,11 +48,12 @@
           home-manager.nixosModules.home-manager
           {
             home-manager.extraSpecialArgs = {
-              inherit username;
+              inherit system;
               inherit inputs;
+              inherit username;
               inherit host;
             };
-            home-manager.useGlobalPkgs = true;
+            home-manager.useGlobalPkgs = false;
             home-manager.useUserPackages = true;
             home-manager.backupFileExtension = "backup";
             home-manager.users.${username} = import ./hosts/${host}/home.nix;

hosts/default/config.nix

@@ -309,7 +309,7 @@ in {
     swaynotificationcenter
     imv
     mpv
-    gimp
+    gimp3
     pavucontrol
     tree
     greetd.tuigreet

hosts/garand-laptop/config.nix

@@ -8,7 +8,16 @@
     ./config/hardware.nix
     ./config/localization.nix
     ./config/networking.nix
+
     ./config/nixpkgs.nix
+    ./config/nixpkgs/clients.nix
+    ./config/nixpkgs/codium.nix
+    ./config/nixpkgs/fundamentals.nix
+    ./config/nixpkgs/gaming.nix
+    ./config/nixpkgs/multimedia.nix
+    ./config/nixpkgs/tools.nix
+    ./config/nixpkgs/tty.nix
+
     ./config/programs.nix
     ./config/security.nix
     ./config/services.nix

hosts/garand-laptop/config/boot.nix

@@ -15,8 +15,33 @@
     };
     # Bootloader.
     loader = {
-      systemd-boot.enable = true;
+      systemd-boot.enable = false;
       efi.canTouchEfiVariables = true;
+
+      grub = {
+        enable = true;
+        efiSupport = true;
+        device = "nodev";
+        theme = pkgs.stdenv.mkDerivation {
+          name = "garand-grub-theme";
+          src = ../../../config/garand-grub-theme;
+
+          buildPhase = ''
+            mkdir -p $out/grub/themes/garand-grub-theme
+            cp -r * $out/grub/themes/garand-grub-theme/
+          '';
+
+          installPhase = "true";
+        };
+
+        extraEntries = ''
+          menuentry "Mój system" {
+            # konfiguracja wpisu menu
+          }
+        '';
+
+        gfxmodeEfi = "1920x1080";
+      };
     };
     # Make /tmp a tmpfs
     tmp = {

hosts/garand-laptop/config/hardware.nix

@@ -25,12 +25,13 @@
   #   device = "//192.168.1.156/Garand-Library";
   #   fsType = "cifs";
   #   options = [
-  #     "rw" # Odczyt i zapis
-  #     "uid=1000" # UID użytkownika montującego (np. 1000 to często UID pierwszego użytkownika)
-  #     "gid=100" # GID grupy użytkownika montującego
-  #     "file_mode=0775" # Uprawnienia dla plików
-  #     "dir_mode=0775" # Uprawnienia dla katalogów
   #     "credentials=/etc/smb-credentials"
+  #     "uid=1000"
+  #     "gid=100"
+  #     "iocharset=utf8"
+  #     "x-systemd.automount"
+  #     "x-systemd.idle-timeout=60"
+  #     "noauto"
   #   ];
   # };
 }

hosts/garand-laptop/config/nixpkgs.nix

@@ -48,333 +48,5 @@
       ZANEYOS_VERSION = "2.2";
       ZANEYOS = "true";
     };
-
-    systemPackages = with pkgs; [
-      wget
-      killall
-      eza
-      git
-      cmatrix
-      lolcat
-      libvirt
-      lxqt.lxqt-policykit
-      lm_sensors
-      unzip
-      unrar
-      libnotify
-      v4l-utils
-      ydotool
-      duf
-      ncdu
-      wl-clipboard
-      pciutils
-      ffmpeg
-      socat
-      cowsay
-      ripgrep
-      lshw
-      bat
-      pkg-config
-      meson
-      hyprpicker
-      ninja
-      brightnessctl
-      virt-viewer
-      swappy
-      appimage-run
-      networkmanagerapplet
-      yad
-      inxi
-      playerctl
-      nh
-      nixfmt-rfc-style
-      discord
-      libvirt
-      swww
-      grim
-      slurp
-      file-roller
-      swaynotificationcenter
-      imv
-      mpv
-      gimp
-      pavucontrol
-      tree
-      greetd.tuigreet
-      librewolf
-      protonup
-      plex-media-player
-      plexamp
-      bitwarden-desktop
-      vlc
-      nixd
-      ungoogled-chromium
-      slack
-      alejandra
-      tutanota-desktop
-      ookla-speedtest
-      rustdesk
-      bun
-      docker
-      docker-compose
-      docker-slim
-      sl
-      nodejs
-      kdePackages.kdenlive
-      galculator
-      obs-studio
-      thefuck
-      cifs-utils
-      libreoffice
-      bastet
-      nsnake
-      exiftool
-      python3
-      figlet
-      fortune
-      wtf
-      pipes
-      cava
-      wineWowPackages.waylandFull # wine64
-      lazydocker
-      lazygit
-      lutris
-      gambit-chess
-      (vscode-with-extensions.override {
-        vscode = vscodium;
-        vscodeExtensions = with vscode-extensions;
-          [
-            batisteo.vscode-django
-            bradlc.vscode-tailwindcss
-            christian-kohler.npm-intellisense
-            christian-kohler.path-intellisense
-            continue.continue
-            davidanson.vscode-markdownlint
-            dbaeumer.vscode-eslint
-            donjayamanne.githistory
-            esbenp.prettier-vscode
-            ethansk.restore-terminals
-            formulahendry.auto-close-tag
-            formulahendry.auto-rename-tag
-            grapecity.gc-excelviewer
-            gruntfuggly.todo-tree
-            hediet.vscode-drawio
-            jnoortheen.nix-ide
-            mechatroner.rainbow-csv
-            ms-azuretools.vscode-docker
-            ms-python.debugpy
-            ms-python.flake8
-            ms-python.python
-            ms-python.vscode-pylance
-            njpwerner.autodocstring
-            octref.vetur
-            oderwat.indent-rainbow
-            shd101wyy.markdown-preview-enhanced
-            streetsidesoftware.code-spell-checker
-            supermaven.supermaven
-            tomoki1207.pdf
-            visualstudioexptteam.intellicode-api-usage-examples
-            visualstudioexptteam.vscodeintellicode
-            vscode-icons-team.vscode-icons
-            vue.volar
-            wholroyd.jinja
-            yoavbls.pretty-ts-errors
-          ]
-          ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-            {
-              name = "goto-alias";
-              publisher = "antfu";
-              version = "0.2.1";
-              hash = "sha256-BJBJVG/zW2BW6K0UqQ4EE12VVIxW3g+z5CecZXRPIrM=";
-            }
-            {
-              name = "vite";
-              publisher = "antfu";
-              version = "0.2.5";
-              hash = "sha256-F3uaqoaLXLE7M8OPzNIIUSraTBeRMwtjxrbgQyMIyZE=";
-            }
-            {
-              name = "django-html";
-              publisher = "bibhasdn";
-              version = "1.3.0";
-              hash = "sha256-7xVJVcjmwl6917lqkTa0KFwMLkAvHkNT2wVML14gVCk=";
-            }
-            {
-              name = "django";
-              publisher = "bigonesystems";
-              version = "1.0.2";
-              hash = "sha256-UBmvaCiNQ84qpAObDWyFL18TVFBn0z/6SBDKWeAIzTc=";
-            }
-            {
-              name = "align-imports";
-              publisher = "danielcanada";
-              version = "0.1.0";
-              hash = "sha256-Aj87mxOGer24O24/4/bGQqgLpgoBvfwOCKQyJ8NLplU=";
-            }
-            {
-              name = "python-environment-manager";
-              publisher = "donjayamanne";
-              version = "1.2.7";
-              hash = "sha256-w3csu6rJm/Z6invC/TR7tx6Aq5DD77VM62nem8/QMlg=";
-            }
-            {
-              name = "python-extension-pack";
-              publisher = "donjayamanne";
-              version = "1.7.0";
-              hash = "sha256-ewOw6nMVzNSYddLcCBGKVNvllztFwhEtncE2RFeFcOc=";
-            }
-            {
-              name = "one-dark-pro-monokai-darker";
-              publisher = "eserozvataf";
-              version = "1.1.0";
-              hash = "sha256-jUjBiy0CD7jw2WBMvM3h8bEC2ySEuj7532dC3v9lpyI=";
-            }
-            {
-              name = "imports-sorter";
-              publisher = "glhrmoura";
-              version = "0.1.6";
-              hash = "sha256-M+SWEJAwn8wPJJ+abi2mN0ziK7P6Sjt0iRAKSyTWvkg=";
-            }
-            {
-              name = "bootstrap-intellisense";
-              publisher = "hossaini";
-              version = "2.0.2";
-              hash = "sha256-io6mPkF19EYo1tVTnd87EWX1mH9zAz0Zzks6v5XN3UE=";
-            }
-            {
-              name = "tab-indent-space-align";
-              publisher = "j-zeppenfeld";
-              version = "0.0.3";
-              hash = "sha256-+WEdYJOVWW7YumfzLkvZmrnpUiC85oLsG1BKMwL1NHc=";
-            }
-            {
-              name = "bun-lockb";
-              publisher = "jaaxxx";
-              version = "0.0.7";
-              hash = "sha256-CkdH/luVTFycRn4Td6ovFnEQep+tVEIXsyUjhfJwfN4=";
-            }
-            {
-              name = "search-node-modules";
-              publisher = "jasonnutter";
-              version = "1.3.0";
-              hash = "sha256-X2CkCVF46McnXDlASlRHKixlAzR+hU4ys8A8JsbpfYI=";
-            }
-            {
-              name = "polacode-2019";
-              publisher = "jeff-hykin";
-              version = "0.6.1";
-              hash = "sha256-SbfsD28gaVHAmJskUuc1Q8kA47jrVa3OO5Ur7ULk3jI=";
-            }
-            {
-              name = "vsc-python-indent";
-              publisher = "kevinrose";
-              version = "1.19.0";
-              hash = "sha256-gX0L416RXIQ9S4kFguEJJ7u4GSo7WbpifXmL/mWCU08=";
-            }
-            {
-              name = "json-to-ts";
-              publisher = "mariusalchimavicius";
-              version = "1.8.0";
-              hash = "sha256-WoSycVtUAkVXv7BDuh+jFbnaU1IdVLvVjOYuIuUp79M=";
-            }
-            {
-              name = "inline-fold";
-              publisher = "moalamri";
-              version = "0.2.6";
-              hash = "sha256-VPEp4gtXH787iK0RxjfciIZO1cjkYacjNELzjzcs/FI=";
-            }
-            {
-              name = "vscode-language-pack-pl";
-              publisher = "ms-ceintl";
-              version = "1.97.2025020509";
-              hash = "sha256-D2x745VgarYs6vRo6Eiyx7Zy4FHmFfF01xddbWlLmjM=";
-            }
-            {
-              name = "mdc";
-              publisher = "nuxt";
-              version = "0.2.0";
-              hash = "sha256-M/29ZDg1sva9msGgRe6xqpCYDpW6X/BqKxmiJhzeVXQ=";
-            }
-            {
-              name = "nuxt-vscode-extentions";
-              publisher = "nuxtr";
-              version = "0.0.7";
-              hash = "sha256-LMShrm9fQHr0M8yXHSziq4NZWfK+n1azc5bjiM972O0=";
-            }
-            {
-              name = "nuxtr-vscode";
-              publisher = "nuxtr";
-              version = "0.2.16";
-              hash = "sha256-DVoq8zdlJ2ch8PCG34f1PRkILym9XdclUHQ9s2B5OME=";
-            }
-            {
-              name = "bun-vscode";
-              publisher = "oven";
-              version = "0.0.26";
-              hash = "sha256-klMkKAorWJj2o015FWbQQfpmYe4JM0UOM+WVh+YPtI4=";
-            }
-            {
-              name = "csv-to-table";
-              publisher = "phplasma";
-              version = "1.4.1";
-              hash = "sha256-npe7cQ4lAZr8HCyQSJmVsCDUJcOhGhL6y1QtUtqUY50=";
-            }
-            {
-              name = "nuxt-snippets";
-              publisher = "praburangki";
-              version = "1.8.0";
-              hash = "sha256-qrWrrDO/Ie/mdygw18C0mrPzNQzZLsd+fapUyTVhc14=";
-            }
-            {
-              name = "bash-debug";
-              publisher = "rogalmic";
-              version = "0.3.9";
-              hash = "sha256-f8FUZCvz/PonqQP9RCNbyQLZPnN5Oce0Eezm/hD19Fg=";
-            }
-            {
-              name = "vs-code-prettier-eslint";
-              publisher = "rvest";
-              version = "6.0.0";
-              hash = "sha256-PogNeKhIlcGxUKrW5gHvFhNluUelWDGHCdg5K+xGXJY=";
-            }
-            {
-              name = "vscode-preview-docs";
-              publisher = "selemondev";
-              version = "0.1.7";
-              hash = "sha256-Q9bEIb2m6cqHtdVjOaNivfYvbc5/VVdabM2NVTwBOFA=";
-            }
-            {
-              name = "svg-preview";
-              publisher = "simonsiefke";
-              version = "2.8.3";
-              hash = "sha256-hIVe1MmkyuHoDa56ZQUsSAGMlKWABoQ0FBOfgZZDbCw=";
-            }
-            {
-              name = "autoimport";
-              publisher = "steoates";
-              version = "1.5.4";
-              hash = "sha256-7iIwJJsoNbtTopc+BQ+195aSCLqdNAaGtMoxShyhBWY=";
-            }
-            {
-              name = "code-spell-checker-polish";
-              publisher = "streetsidesoftware";
-              version = "2.1.3";
-              hash = "sha256-MZeTvK9dO4Kj6hK+afJPWGmnKBtlLrrnoqtUd5s2te0=";
-            }
-            {
-              name = "vscode-pets";
-              publisher = "tonybaloney";
-              version = "1.30.0";
-              hash = "sha256-RxOA6xQ29JuB0NzEqMDkF9W1U+AsvgAOzGbtIUw0WyM=";
-            }
-            {
-              name = "explorer";
-              publisher = "vitest";
-              version = "1.12.1";
-              hash = "sha256-WG2/MWxU/XhSOjXuBoyszpD/HFb8mfrt525povSEES4=";
-            }
-          ];
-      })
-    ];
   };
 }

hosts/garand-laptop/config/nixpkgs/clients.nix

@@ -0,0 +1,16 @@
+# Klienty
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    # rustdesk
+    nextcloud-client
+    plexamp
+    bitwarden-desktop
+    tutanota-desktop
+    discord
+    slack
+    ungoogled-chromium
+    docker-client
+    anki-bin
+    onlyoffice-bin
+  ];
+}

hosts/garand-laptop/config/nixpkgs/codium.nix

@@ -0,0 +1,239 @@
+{pkgs, ...}: {
+  environment = {
+    systemPackages = with pkgs; [
+      (vscode-with-extensions.override {
+        vscode = vscodium;
+        vscodeExtensions = with vscode-extensions;
+          [
+            batisteo.vscode-django
+            bradlc.vscode-tailwindcss
+            christian-kohler.npm-intellisense
+            christian-kohler.path-intellisense
+            continue.continue
+            davidanson.vscode-markdownlint
+            dbaeumer.vscode-eslint
+            donjayamanne.githistory
+            esbenp.prettier-vscode
+            ethansk.restore-terminals
+            formulahendry.auto-close-tag
+            formulahendry.auto-rename-tag
+            grapecity.gc-excelviewer
+            gruntfuggly.todo-tree
+            hediet.vscode-drawio
+            jnoortheen.nix-ide
+            mechatroner.rainbow-csv
+            ms-azuretools.vscode-docker
+            njpwerner.autodocstring
+            octref.vetur
+            oderwat.indent-rainbow
+            shd101wyy.markdown-preview-enhanced
+            streetsidesoftware.code-spell-checker
+            supermaven.supermaven
+            tomoki1207.pdf
+            visualstudioexptteam.intellicode-api-usage-examples
+            visualstudioexptteam.vscodeintellicode
+            vscode-icons-team.vscode-icons
+            vue.volar
+            wholroyd.jinja
+            yoavbls.pretty-ts-errors
+            tamasfe.even-better-toml
+            ms-ceintl.vscode-language-pack-pl
+          ]
+          ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+            {
+              name = "goto-alias";
+              publisher = "antfu";
+              version = "0.2.1";
+              hash = "sha256-BJBJVG/zW2BW6K0UqQ4EE12VVIxW3g+z5CecZXRPIrM=";
+            }
+            {
+              name = "vite";
+              publisher = "antfu";
+              version = "0.2.5";
+              hash = "sha256-F3uaqoaLXLE7M8OPzNIIUSraTBeRMwtjxrbgQyMIyZE=";
+            }
+            {
+              name = "django-html";
+              publisher = "bibhasdn";
+              version = "1.3.0";
+              hash = "sha256-7xVJVcjmwl6917lqkTa0KFwMLkAvHkNT2wVML14gVCk=";
+            }
+            {
+              name = "django";
+              publisher = "bigonesystems";
+              version = "1.0.2";
+              hash = "sha256-UBmvaCiNQ84qpAObDWyFL18TVFBn0z/6SBDKWeAIzTc=";
+            }
+            {
+              name = "align-imports";
+              publisher = "danielcanada";
+              version = "0.1.0";
+              hash = "sha256-Aj87mxOGer24O24/4/bGQqgLpgoBvfwOCKQyJ8NLplU=";
+            }
+            {
+              name = "one-dark-pro-monokai-darker";
+              publisher = "eserozvataf";
+              version = "1.1.0";
+              hash = "sha256-jUjBiy0CD7jw2WBMvM3h8bEC2ySEuj7532dC3v9lpyI=";
+            }
+            {
+              name = "imports-sorter";
+              publisher = "glhrmoura";
+              version = "0.1.6";
+              hash = "sha256-M+SWEJAwn8wPJJ+abi2mN0ziK7P6Sjt0iRAKSyTWvkg=";
+            }
+            {
+              name = "bootstrap-intellisense";
+              publisher = "hossaini";
+              version = "3.0.2";
+              hash = "sha256-stZfbh42HncdRzFZ9ShumZ9Tuery9RF9c8rk3TD3P2g=";
+            }
+            {
+              name = "tab-indent-space-align";
+              publisher = "j-zeppenfeld";
+              version = "0.0.3";
+              hash = "sha256-+WEdYJOVWW7YumfzLkvZmrnpUiC85oLsG1BKMwL1NHc=";
+            }
+            {
+              name = "bun-lockb";
+              publisher = "jaaxxx";
+              version = "0.0.7";
+              hash = "sha256-CkdH/luVTFycRn4Td6ovFnEQep+tVEIXsyUjhfJwfN4=";
+            }
+            {
+              name = "search-node-modules";
+              publisher = "jasonnutter";
+              version = "1.3.0";
+              hash = "sha256-X2CkCVF46McnXDlASlRHKixlAzR+hU4ys8A8JsbpfYI=";
+            }
+            {
+              name = "polacode-2019";
+              publisher = "jeff-hykin";
+              version = "0.6.1";
+              hash = "sha256-SbfsD28gaVHAmJskUuc1Q8kA47jrVa3OO5Ur7ULk3jI=";
+            }
+            {
+              name = "better-syntax";
+              publisher = "jeff-hykin";
+              version = "2.1.0";
+              hash = "sha256-gvEItVs0IKn7N7vfnm5N/B79xeMxO8xkPwWLNPOs9zY=";
+            }
+            {
+              name = "vsc-python-indent";
+              publisher = "kevinrose";
+              version = "1.21.0";
+              hash = "sha256-SvJhVG8sofzV0PebZG4IIORX3AcfmErDQ00tRF9fk/4=";
+            }
+            {
+              name = "json-to-ts";
+              publisher = "mariusalchimavicius";
+              version = "1.8.0";
+              hash = "sha256-WoSycVtUAkVXv7BDuh+jFbnaU1IdVLvVjOYuIuUp79M=";
+            }
+            {
+              name = "inline-fold";
+              publisher = "moalamri";
+              version = "0.2.6";
+              hash = "sha256-VPEp4gtXH787iK0RxjfciIZO1cjkYacjNELzjzcs/FI=";
+            }
+            {
+              name = "mdc";
+              publisher = "nuxt";
+              version = "0.3.1";
+              hash = "sha256-YJ+7gzDjA8kzxBwGLpEmfx0erJdgAntWc2OrK2zp9DM=";
+            }
+            {
+              name = "nuxtr-vscode";
+              publisher = "nuxtr";
+              version = "0.2.16";
+              hash = "sha256-DVoq8zdlJ2ch8PCG34f1PRkILym9XdclUHQ9s2B5OME=";
+            }
+            {
+              name = "bun-vscode";
+              publisher = "oven";
+              version = "0.0.28";
+              hash = "sha256-WlGqqKbfrV0gqCCdVo/UFF+Gnxhq0TNJ4LuHwFaFYXA=";
+            }
+            {
+              name = "csv-to-table";
+              publisher = "phplasma";
+              version = "1.4.1";
+              hash = "sha256-npe7cQ4lAZr8HCyQSJmVsCDUJcOhGhL6y1QtUtqUY50=";
+            }
+            {
+              name = "nuxt-snippets";
+              publisher = "praburangki";
+              version = "1.8.0";
+              hash = "sha256-qrWrrDO/Ie/mdygw18C0mrPzNQzZLsd+fapUyTVhc14=";
+            }
+            {
+              name = "bash-debug";
+              publisher = "rogalmic";
+              version = "0.3.9";
+              hash = "sha256-f8FUZCvz/PonqQP9RCNbyQLZPnN5Oce0Eezm/hD19Fg=";
+            }
+            {
+              name = "vs-code-prettier-eslint";
+              publisher = "rvest";
+              version = "6.0.0";
+              hash = "sha256-PogNeKhIlcGxUKrW5gHvFhNluUelWDGHCdg5K+xGXJY=";
+            }
+            {
+              name = "vscode-preview-docs";
+              publisher = "selemondev";
+              version = "0.1.7";
+              hash = "sha256-Q9bEIb2m6cqHtdVjOaNivfYvbc5/VVdabM2NVTwBOFA=";
+            }
+            {
+              name = "svg-preview";
+              publisher = "simonsiefke";
+              version = "2.8.3";
+              hash = "sha256-hIVe1MmkyuHoDa56ZQUsSAGMlKWABoQ0FBOfgZZDbCw=";
+            }
+            {
+              name = "autoimport";
+              publisher = "steoates";
+              version = "1.5.4";
+              hash = "sha256-7iIwJJsoNbtTopc+BQ+195aSCLqdNAaGtMoxShyhBWY=";
+            }
+            {
+              name = "code-spell-checker-polish";
+              publisher = "streetsidesoftware";
+              version = "2.1.3";
+              hash = "sha256-MZeTvK9dO4Kj6hK+afJPWGmnKBtlLrrnoqtUd5s2te0=";
+            }
+            {
+              name = "vscode-pets";
+              publisher = "tonybaloney";
+              version = "1.30.0";
+              hash = "sha256-RxOA6xQ29JuB0NzEqMDkF9W1U+AsvgAOzGbtIUw0WyM=";
+            }
+            {
+              name = "explorer";
+              publisher = "vitest";
+              version = "1.17.0";
+              hash = "sha256-7OePMFsWIyrPkAW/+SRiOoowluLMEszEjWmBsW0LPpc=";
+            }
+            {
+              name = "prettify-json";
+              publisher = "mohsen1";
+              version = "0.0.3";
+              hash = "sha256-lvds+lFDzt1s6RikhrnAKJipRHU+Dk85ZO49d1sA8uo=";
+            }
+            {
+              name = "uv-toolkit";
+              publisher = "the0807";
+              version = "0.0.2";
+              hash = "sha256-OXHUwynWm4RqJYjcv5qXt5DyjFDxtNjZFNpnd22gUgg=";
+            }
+            {
+              name = "kylin-python";
+              publisher = "kylinideteam";
+              version = "0.4.2";
+              hash = "sha256-LhOsIvECrxLCnRjUVffS4G4fFsdP70iP/twoNoto354=";
+            }
+          ];
+      })
+    ];
+  };
+}

hosts/garand-laptop/config/nixpkgs/fundamentals.nix

@@ -0,0 +1,40 @@
+# Fundamentalne programy dla systemu
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    wget
+    killall
+    eza
+    git
+    libnotify
+    v4l-utils
+    ydotool
+    duf
+    ncdu
+    wl-clipboard
+    pciutils
+    ffmpeg
+    socat
+    ripgrep
+    lshw
+    bat
+    pkg-config
+    meson
+    ninja
+    brightnessctl
+    swappy
+    appimage-run
+    networkmanagerapplet
+    yad
+    inxi
+    playerctl
+    nh
+    nixfmt-rfc-style
+    file-roller
+    tree
+    nixd
+    alejandra
+    docker
+    docker-compose
+    cifs-utils
+  ];
+}

hosts/garand-laptop/config/nixpkgs/gaming.nix

@@ -0,0 +1,9 @@
+# Narzędzia do gier
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    protonup
+    wineWowPackages.waylandFull # wine64
+    lutris
+    space-cadet-pinball
+  ];
+}

hosts/garand-laptop/config/nixpkgs/multimedia.nix

@@ -0,0 +1,17 @@
+# Programy multimedialne
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    swww
+    grim
+    slurp
+    swaynotificationcenter
+    imv
+    mpv
+    gimp
+    pavucontrol
+    vlc
+    kdePackages.kdenlive
+    obs-studio
+    # libreoffice
+  ];
+}

hosts/garand-laptop/config/nixpkgs/tools.nix

@@ -0,0 +1,17 @@
+# Narzędzia systemowe
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    lm_sensors
+    unzip
+    unrar
+    hyprpicker
+    virt-viewer
+    libvirt
+    greetd.tuigreet
+    galculator
+    lazydocker
+    # lazygit
+    docker-slim
+    dex
+  ];
+}

hosts/garand-laptop/config/nixpkgs/tty.nix

@@ -0,0 +1,16 @@
+# Aplikacje terminalowe
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    gambit-chess
+    tty-solitaire
+    # bastet
+    # nsnake
+    cmatrix
+    cowsay
+    sl
+    fortune
+    ookla-speedtest
+    btop
+    toot
+  ];
+}

hosts/garand-laptop/config/services.nix

@@ -56,15 +56,20 @@ in {
     };
     fstrim.enable = true;
     gvfs.enable = true;
+    tumbler.enable = true;
     openssh.enable = true;
     flatpak.enable = false;
     printing = {
       enable = true;
-      drivers = [
-        # pkgs.hplipWithPlugin
-      ];
+      # drivers = with pkgs; [
+      #   # hplipWithPlugin
+      # ];
+    };
+    gnome = {
+      evolution-data-server.enable = true;
+      gnome-online-accounts.enable = true;
+      gnome-keyring.enable = true;
     };
-    gnome.gnome-keyring.enable = true;
     avahi = {
       enable = true;
       nssmdns4 = true;

hosts/garand-laptop/config/virtualization.nix

@@ -6,6 +6,7 @@
       enable = true;
       package = pkgs.docker;
     };
+    # waydroid.enable = true;
     # podman = {
     #   enable = true;
     #   dockerCompat = true;

hosts/garand-laptop/home.nix

@@ -1,12 +1,4 @@
-{
-  pkgs,
-  lib,
-  username,
-  host,
-  ...
-}: let
-  inherit (import ./variables.nix) gitUsername gitEmail;
-in {
+{...}: {
   # Import Program Configurations
   imports = [
     ../../config/emoji.nix
@@ -19,248 +11,12 @@ in {
     ../../config/waybar.nix
     ../../config/wlogout.nix
     ../../config/fastfetch
+
+    ./home/home.nix
+    ./home/misc.nix
+    ./home/programs.nix
+    ./home/programs.librewolf.nix
+    ./home/services.nix
+    ./home/styles.nix
   ];
-
-  # Home Manager Settings
-  home = {
-    username = "${username}";
-    homeDirectory = "/home/${username}";
-    stateVersion = "23.11";
-    # Place Files Inside Home Directory
-    file = {
-      "Pictures/Wallpapers".source = ../../config/wallpapers;
-      "Pictures/Wallpapers".recursive = true;
-      ".config/wlogout/icons".source = ../../config/wlogout;
-      ".config/wlogout/icons".recursive = true;
-      ".face.icon".source = ../../config/face.jpg;
-      ".config/face.jpg".source = ../../config/face.jpg;
-      ".config/swappy/config".text = ''
-        [Default]
-        save_dir=/home/${username}/Pictures/Screenshots
-        save_filename_format=swappy-%Y%m%d-%H%M%S.png
-        show_panel=false
-        line_size=5
-        text_size=20
-        text_font=Ubuntu
-        paint_mode=brush
-        early_exit=true
-        fill_shape=false
-      '';
-    };
-    # Scripts
-    packages = [
-      (import ../../scripts/emopicker9000.nix {inherit pkgs;})
-      (import ../../scripts/task-waybar.nix {inherit pkgs;})
-      (import ../../scripts/squirtle.nix {inherit pkgs;})
-      (import ../../scripts/nvidia-offload.nix {inherit pkgs;})
-      (import ../../scripts/wallsetter.nix {
-        inherit pkgs;
-        inherit username;
-      })
-      (import ../../scripts/web-search.nix {inherit pkgs;})
-      (import ../../scripts/rofi-launcher.nix {inherit pkgs;})
-      (import ../../scripts/screenshootin.nix {inherit pkgs;})
-      (import ../../scripts/list-hypr-bindings.nix {
-        inherit pkgs;
-        inherit host;
-      })
-    ];
-  };
-
-  # Create XDG Dirs
-  xdg = {
-    userDirs = {
-      enable = true;
-      createDirectories = true;
-    };
-  };
-
-  dconf.settings = {
-    "org/virt-manager/virt-manager/connections" = {
-      autoconnect = ["qemu:///system"];
-      uris = ["qemu:///system"];
-    };
-  };
-
-  # Styling Options
-  stylix = {
-    targets = {
-      waybar = {
-        enable = false;
-      };
-      rofi = {
-        enable = false;
-      };
-      hyprland = {
-        enable = false;
-      };
-    };
-  };
-  gtk = {
-    iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.papirus-icon-theme;
-    };
-    gtk3.extraConfig = {
-      gtk-application-prefer-dark-theme = 1;
-    };
-    gtk4.extraConfig = {
-      gtk-application-prefer-dark-theme = 1;
-    };
-  };
-  qt = {
-    enable = true;
-    style.name = lib.mkDefault "adwaita-dark";
-    platformTheme.name = lib.mkDefault "gtk3";
-  };
-
-  services = {
-    hypridle = {
-      settings = {
-        general = {
-          after_sleep_cmd = "hyprctl dispatch dpms on";
-          ignore_dbus_inhibit = false;
-          lock_cmd = "hyprlock";
-        };
-        listener = [
-          {
-            timeout = 900;
-            on-timeout = "hyprlock";
-          }
-          {
-            timeout = 1200;
-            on-timeout = "hyprctl dispatch dpms off";
-            on-resume = "hyprctl dispatch dpms on";
-          }
-        ];
-      };
-    };
-  };
-
-  programs = {
-    home-manager.enable = true;
-    git = {
-      enable = true;
-      userName = "${gitUsername}";
-      userEmail = "${gitEmail}";
-      extraConfig = {
-        credential.helper = "cache --timeout=3600";
-      };
-    };
-    gh.enable = true;
-    btop = {
-      enable = true;
-    };
-    kitty = {
-      enable = true;
-      package = pkgs.kitty;
-      settings = {
-        scrollback_lines = 2000;
-        wheel_scroll_min_lines = 1;
-        window_padding_width = 4;
-        confirm_os_window_close = 0;
-      };
-      extraConfig = ''
-        tab_bar_style fade
-        tab_fade 1
-        active_tab_font_style   bold
-        inactive_tab_font_style bold
-      '';
-    };
-    starship = {
-      enable = true;
-      package = pkgs.starship;
-    };
-    bash = {
-      enable = true;
-      enableCompletion = true;
-      profileExtra = ''
-        #if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
-        #  exec Hyprland
-        #fi
-      '';
-      initExtra = ''
-        fastfetch
-        if [ -f $HOME/.bashrc-personal ]; then
-          source $HOME/.bashrc-personal
-        fi
-        fc
-      '';
-      shellAliases = {
-        os-sw = "sudo nixos-rebuild switch --flake ~/zaneyos";
-        os-bt = "sudo nixos-rebuild boot --flake ~/zaneyos";
-        os-ts = "sudo nixos-rebuild test --flake ~/zaneyos";
-        os-up = "sudo nix flake update";
-        os-upg = "sudo nix flake update && sudo nixos-rebuild switch --flake ~/zaneyos";
-        os-up-np = "sudo nix flake update --update-input nixpkgs";
-        os-up-hm = "sudo nix flake update --update-input home-manager";
-        os-up-sx = "sudo nix flake update --update-input stylix";
-        os-up-af = "sudo nix flake update --update-input auto-cpufreq";
-        fr = "nh os switch --hostname ${host} /home/${username}/zaneyos";
-        fu = "nh os switch --hostname ${host} --update /home/${username}/zaneyos";
-        hypr-cli = "hyprctl clients";
-        zu = "sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)";
-        ncg = "nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
-        n = "nano";
-        f = "fuck";
-        cat = "bat";
-        st = "speedtest";
-        ls = "eza --icons";
-        ll = "eza -lh --icons --grid --group-directories-first";
-        la = "eza -lah --icons --grid --group-directories-first";
-        ssh-server = "ssh garand_plg@192.168.1.156 -p 556 -i ~/.ssh/hp-t640-homeserver";
-        fc = "fortune | cowsay";
-        terminal = "cat /home/garand_plg/Documents/terminal.txt";
-        e-terminal = "nano /home/garand_plg/Documents/terminal.txt";
-        mkgidf = "git diff > git-diff.txt";
-        ".." = "cd ..";
-        kys = "shutdown now";
-      };
-    };
-    hyprlock = {
-      enable = true;
-      settings = {
-        general = {
-          disable_loading_bar = true;
-          grace = 10;
-          hide_cursor = true;
-          no_fade_in = false;
-        };
-        background = lib.mkDefault [
-          {
-            path = "/home/${username}/Pictures/Wallpapers/attack-on-titan-mikasa-ackerman.jpg";
-            blur_passes = 3;
-            blur_size = 8;
-          }
-        ];
-        image = [
-          {
-            path = "/home/${username}/.config/face.jpg";
-            size = 150;
-            border_size = 4;
-            border_color = "rgb(0C96F9)";
-            rounding = -1; # Negative means circle
-            position = "0, 200";
-            halign = "center";
-            valign = "center";
-          }
-        ];
-        input-field = lib.mkDefault [
-          {
-            size = "200, 50";
-            position = "0, -80";
-            monitor = "";
-            dots_center = true;
-            fade_on_empty = false;
-            font_color = "rgb(CFE6F4)";
-            inner_color = "rgb(657DC2)";
-            outer_color = "rgb(0D0E15)";
-            outline_thickness = 5;
-            placeholder_text = "Password...";
-            shadow_passes = 2;
-          }
-        ];
-      };
-    };
-  };
 }

hosts/garand-laptop/home/home.nix

@@ -0,0 +1,64 @@
+{
+  pkgs,
+  username,
+  host,
+  ...
+}: let
+  dexApps = import ../../../scripts/dex-apps.nix {inherit pkgs;};
+in {
+  # Home Manager Settings
+  home = {
+    username = "${username}";
+    homeDirectory = "/home/${username}";
+    stateVersion = "23.11";
+    # Place Files Inside Home Directory
+    file = {
+      "Pictures/Wallpapers".source = ../../../config/wallpapers;
+      "Pictures/Wallpapers".recursive = true;
+      ".config/wlogout/icons".source = ../../../config/wlogout;
+      ".config/wlogout/icons".recursive = true;
+      ".face.icon".source = ../../../config/face.jpg;
+      ".config/face.jpg".source = ../../../config/face.jpg;
+      ".config/swappy/config".text = ''
+        [Default]
+        save_dir=/home/${username}/Pictures/Screenshots
+        save_filename_format=swappy-%Y%m%d-%H%M%S.png
+        show_panel=false
+        line_size=5
+        text_size=20
+        text_font=Ubuntu
+        paint_mode=brush
+        early_exit=true
+        fill_shape=false
+      '';
+    };
+    # Scripts
+    packages = [
+      (import ../../../scripts/emopicker9000.nix {inherit pkgs;})
+      (import ../../../scripts/task-waybar.nix {inherit pkgs;})
+      (import ../../../scripts/squirtle.nix {inherit pkgs;})
+      (import ../../../scripts/nvidia-offload.nix {inherit pkgs;})
+      (import ../../../scripts/wallsetter.nix {
+        inherit pkgs;
+        inherit username;
+      })
+      (import ../../../scripts/web-search.nix {inherit pkgs;})
+      (import ../../../scripts/rofi-launcher.nix {inherit pkgs;})
+      (import ../../../scripts/screenshootin.nix {inherit pkgs;})
+      (import ../../../scripts/list-hypr-bindings.nix {
+        inherit pkgs;
+        inherit host;
+      })
+
+      dexApps.dex-messenger
+      dexApps.dex-instagram
+      dexApps.dex-chatgpt
+      dexApps.dex-portainer
+      dexApps.dex-claude
+      dexApps.dex-beszel
+      dexApps.dex-mastodon
+      dexApps.dex-nextcloud
+      dexApps.dex-dailydev
+    ];
+  };
+}

hosts/garand-laptop/home/misc.nix

@@ -0,0 +1,16 @@
+{...}: {
+  # Create XDG Dirs
+  xdg = {
+    userDirs = {
+      enable = true;
+      createDirectories = true;
+    };
+  };
+
+  dconf.settings = {
+    "org/virt-manager/virt-manager/connections" = {
+      autoconnect = ["qemu:///system"];
+      uris = ["qemu:///system"];
+    };
+  };
+}

hosts/garand-laptop/home/programs.nix

@@ -0,0 +1,145 @@
+{
+  pkgs,
+  lib,
+  username,
+  host,
+  ...
+}: let
+  inherit (import ../variables.nix) gitUsername gitEmail;
+in {
+  programs = {
+    home-manager.enable = true;
+
+    git = {
+      enable = true;
+      userName = "${gitUsername}";
+      userEmail = "${gitEmail}";
+      extraConfig = {
+        credential.helper = "cache --timeout=3600";
+      };
+    };
+
+    gh.enable = true;
+
+    btop = {
+      enable = false;
+    };
+
+    kitty = {
+      enable = true;
+      package = pkgs.kitty;
+      settings = {
+        scrollback_lines = 2000;
+        wheel_scroll_min_lines = 1;
+        window_padding_width = 4;
+        confirm_os_window_close = 0;
+      };
+      extraConfig = ''
+        tab_bar_style fade
+        tab_fade 1
+        active_tab_font_style   bold
+        inactive_tab_font_style bold
+      '';
+    };
+
+    starship = {
+      enable = true;
+      package = pkgs.starship;
+    };
+
+    bash = {
+      enable = true;
+      enableCompletion = true;
+      profileExtra = ''
+        #if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
+        #  exec Hyprland
+        #fi
+      '';
+      initExtra = ''
+        fastfetch
+        if [ -f $HOME/.bashrc-personal ]; then
+          source $HOME/.bashrc-personal
+        fi
+        fc
+      '';
+      shellAliases = {
+        os-sw = "sudo nixos-rebuild switch --flake ~/zaneyos";
+        os-bt = "sudo nixos-rebuild boot --flake ~/zaneyos";
+        os-ts = "sudo nixos-rebuild test --flake ~/zaneyos";
+        os-up = "sudo nix flake update";
+        os-upg = "sudo nix flake update && sudo nixos-rebuild switch --flake ~/zaneyos";
+        os-up-np = "sudo nix flake update --update-input nixpkgs";
+        os-up-hm = "sudo nix flake update --update-input home-manager";
+        os-up-sx = "sudo nix flake update --update-input stylix";
+        os-up-af = "sudo nix flake update --update-input auto-cpufreq";
+        os-up-fa = "sudo nix flake update --update-input firefox-addons";
+        fr = "nh os switch --hostname ${host} /home/${username}/zaneyos";
+        fu = "nh os switch --hostname ${host} --update /home/${username}/zaneyos";
+        hypr-cli = "hyprctl clients";
+        zu = "sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)";
+        ncg = "nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
+        n = "nano";
+        f = "fuck";
+        cat = "bat";
+        ookla = "speedtest";
+        ls = "eza --icons";
+        ll = "eza -lh --icons --grid --group-directories-first";
+        la = "eza -lah --icons --grid --group-directories-first";
+        ssh-server = "ssh garand_plg@192.168.1.156 -p 556 -i ~/.ssh/hp-t640-homeserver";
+        fc = "fortune | cowsay";
+        terminal = "cat /home/garand_plg/Documents/terminal.txt";
+        e-terminal = "nano /home/garand_plg/Documents/terminal.txt";
+        mkgidf = "git add --intent-to-add . && git diff > git-diff.txt";
+        ".." = "cd ..";
+        kys = "shutdown now";
+        pasjans = "ttysolitaire -p 10 --no-background-color";
+      };
+    };
+
+    hyprlock = {
+      enable = true;
+      settings = {
+        general = {
+          disable_loading_bar = true;
+          grace = 10;
+          hide_cursor = true;
+          no_fade_in = false;
+        };
+        background = lib.mkForce [
+          {
+            path = "/home/${username}/Pictures/Wallpapers/attack-on-titan-mikasa-ackerman.jpg";
+            blur_passes = 3;
+            blur_size = 8;
+          }
+        ];
+        image = [
+          {
+            path = "/home/${username}/.config/face.jpg";
+            size = 150;
+            border_size = 4;
+            border_color = "rgb(0C96F9)";
+            rounding = -1; # Negative means circle
+            position = "0, 200";
+            halign = "center";
+            valign = "center";
+          }
+        ];
+        input-field = lib.mkDefault [
+          {
+            size = "200, 50";
+            position = "0, -80";
+            monitor = "";
+            dots_center = true;
+            fade_on_empty = false;
+            font_color = "rgb(CFE6F4)";
+            inner_color = "rgb(657DC2)";
+            outer_color = "rgb(0D0E15)";
+            outline_thickness = 5;
+            placeholder_text = "Password...";
+            shadow_passes = 2;
+          }
+        ];
+      };
+    };
+  };
+}

hosts/garand-laptop/home/services.nix

@@ -0,0 +1,24 @@
+{...}: {
+  services = {
+    hypridle = {
+      settings = {
+        general = {
+          after_sleep_cmd = "hyprctl dispatch dpms on";
+          ignore_dbus_inhibit = false;
+          lock_cmd = "hyprlock";
+        };
+        listener = [
+          {
+            timeout = 900;
+            on-timeout = "hyprlock";
+          }
+          {
+            timeout = 1200;
+            on-timeout = "hyprctl dispatch dpms off";
+            on-resume = "hyprctl dispatch dpms on";
+          }
+        ];
+      };
+    };
+  };
+}

hosts/garand-laptop/home/styles.nix

@@ -0,0 +1,41 @@
+{
+  pkgs,
+  lib,
+  host,
+  ...
+}: {
+  # Styling Options
+  stylix = {
+    targets = {
+      librewolf.profileNames = ["${host}"];
+      waybar = {
+        enable = false;
+      };
+      rofi = {
+        enable = false;
+      };
+      hyprland = {
+        enable = false;
+      };
+    };
+  };
+
+  gtk = {
+    iconTheme = {
+      name = "Papirus-Dark";
+      package = pkgs.papirus-icon-theme;
+    };
+    gtk3.extraConfig = {
+      gtk-application-prefer-dark-theme = 1;
+    };
+    gtk4.extraConfig = {
+      gtk-application-prefer-dark-theme = 1;
+    };
+  };
+
+  qt = {
+    enable = true;
+    style.name = lib.mkDefault "adwaita-dark";
+    platformTheme.name = lib.mkDefault "gtk3";
+  };
+}

scripts/dex-apps.nix

@@ -0,0 +1,46 @@
+{pkgs}: {
+  dex-messenger = pkgs.writeShellScriptBin "dex-messenger" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-bbdeiblfgdokhlblpgeaokenkfknecgl-Default.desktop
+  '';
+
+  dex-instagram = pkgs.writeShellScriptBin "dex-instagram" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-akpamiohjfcnimfljfndmaldlcfphjmp-Default.desktop
+  '';
+
+  dex-chatgpt = pkgs.writeShellScriptBin "dex-chatgpt" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-cadlkienfkclaiaibeoongdcgmdikeeg-Default.desktop
+  '';
+
+  dex-portainer = pkgs.writeShellScriptBin "dex-portainer" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-dbipeoijaciefjfbfdkpfncmlbfinpge-Default.desktop
+  '';
+
+  dex-claude = pkgs.writeShellScriptBin "dex-claude" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-fmpnliohjhemenmnlpbfagaolkdacoja-Default.desktop
+  '';
+
+  dex-beszel = pkgs.writeShellScriptBin "dex-beszel" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-gppdefkeejighoejcenjnohhijfbcbkj-Default.desktop
+  '';
+
+  dex-mastodon = pkgs.writeShellScriptBin "dex-mastodon" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-mcpclnpikkcgnjfknenfalelmlaccfcj-Default.desktop
+  '';
+
+  dex-nextcloud = pkgs.writeShellScriptBin "dex-nextcloud" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-nibpilkookahlimkjopijpmhgllidlok-Default.desktop
+  '';
+
+  dex-dailydev = pkgs.writeShellScriptBin "dex-dailydev" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-ppepjbbmpdbanediafpgploonglppmlk-Default.desktop
+  '';
+}

scripts/list-hypr-bindings.nix

@@ -18,31 +18,13 @@ in
     --timeout=90 \
     --timeout-indicator=right \
     " = Windows/Super/CAPS LOCK" "Klawisz modyfikatora, używany do skrótów klawiszowych" "Nie wykonuje niczego samodzielnie." \
-    " + ENTER" "Otwórz terminal" "${terminal}" \
-    " + SHIFT + ENTER" "Uruchom launcher aplikacji" "rofi" \
-    " + V" "Uruchom Visual Studio Codium" "codium" \
-    " + ALT + W" "Zmień tapetę" "wallsetter" \
     " + Q" "Zamknij aktywne okno" "killactive" \
-    " + SHIFT + W" "Szukaj w internecie" "web-search" \
-    " + SHIFT + N" "Przeładuj stylizację SwayNC" "swaync-client -rs" \
-    " + W" "Uruchom przeglądarkę internetową" "${browser}" \
-    " + E" "Uruchom selektor emotikon" "emopicker9000" \
-    " + S" "Zrób zrzut ekranu" "screenshootin" \
-    " + SHIFT + S" "Uruchom Slack" "slack" \
-    " + D" "Uruchom Discord" "discord" \
-    " + O" "Uruchom OBS" "obs" \
-    " + G" "Uruchom GIMP" "gimp" \
-    " + SHIFT + G" "Uruchom Godot4" "godot4" \
-    " + C" "Uruchom selektor kolorów" "hyprpicker -a" \
-    " + T" "Otwórz nowe okno menedżera plików" "thunar" \
-    " + SHIFT + T" "Uruchom Tutanota" "tutanota-desktop" \
-    " + M" "Uruchom Plexamp" "Plexamp" \
-    " + SHIFT + M" "Uruchom Messengera" "chrome-bbdeiblfgdokhlblpgeaokenkfknecgl-Default" \
+    " + Esc" "Wyjdź z Hyprland" "exit" \
     " + P" "Pseudo kafelkowanie" "pseudo" \
     " + SHIFT + I" "Przełącz kierunek podziału" "togglesplit" \
     " + F" "Przełącz tryb pełnoekranowy" "fullscreen" \
-    " + SHIFT + F" "Przełącz tryb pływający" "fullscreen" \
-    " + SHIFT + C" "Wyjdź z Hyprland" "exit" \
+    " + SHIFT + F" "Przełącz tryb pływający" "togglefloating" \
+    "ALT + TAB" "Zmień fokus na następne okno i przenieś je na wierzch" "cyclenext & bringactivetotop" \
     " + Lewo" "Przenieś fokus na okno po lewej" "movefocus,l" \
     " + Prawo" "Przenieś fokus na okno po prawej" "movefocus,r" \
     " + Góra" "Przenieś fokus na okno u góry" "movefocus,u" \
@@ -51,10 +33,6 @@ in
     " + SHIFT + Prawo" "Przenieś aktywne okno w prawo" "movewindow,r" \
     " + SHIFT + Góra" "Przenieś aktywne okno do góry" "movewindow,u" \
     " + SHIFT + Dół" "Przenieś aktywne okno do dołu" "movewindow,d" \
-    " + H" "Przenieś fokus na okno po lewej" "movefocus,l" \
-    " + L" "Przenieś fokus na okno po prawej" "movefocus,r" \
-    " + K" "Przenieś fokus na okno u góry" "movefocus,u" \
-    " + J" "Przenieś fokus na okno u dołu" "movefocus,d" \
     " + SHIFT + H" "Przenieś aktywne okno w lewo" "movewindow,l" \
     " + SHIFT + L" "Przenieś aktywne okno w prawo" "movewindow,r" \
     " + SHIFT + K" "Przenieś aktywne okno do góry" "movewindow,u" \
@@ -69,7 +47,39 @@ in
     " + Kliknięcie myszą w górę" "Przenieś się do poprzedniej przestrzeni roboczej" "workspace,e-1" \
     " + Lewy przycisk myszy" "Przenieś/Przeciągnij okno" "movewindow" \
     " + Prawy przycisk myszy" "Zmień rozmiar okna" "resizewindow" \
-    "ALT + TAB" "Zmień fokus na następne okno i przenieś je na wierzch" "cyclenext & bringactivetotop" \
+    " + ENTER" "Otwórz terminal" "${terminal}" \
+    " + SHIFT + ENTER" "Uruchom launcher aplikacji" "rofi-launcher" \
+    " + ALT + W" "Zmień tapetę" "wallsetter" \
+    " + SHIFT + S" "Zrób zrzut ekranu" "screenshootin" \
+    " + E" "Uruchom selektor emotikon" "emopicker9000" \
+    " + SHIFT + P" "Uruchom selektor kolorów" "hyprpicker -a" \
+    " + SHIFT + W" "Szukaj w internecie" "web-search" \
+    " + SHIFT + K" "Uruchom kalkulator" "galculator" \
+    " + B" "Uruchom monitorowanie zasobów" "btop" \
+    " + SHIFT + B" "Uruchom manager Bluethooth" "blueman-manager" \
+    " + T" "Otwórz nowe okno menedżera plików" "thunar" \
+    " + W" "Uruchom przeglądarkę internetową" "${browser}" \
+    " + S" "Uruchom Slack" "slack" \
+    " + D" "Uruchom Discord" "discord" \
+    " + C" "Uruchom Chromium" "chromium" \
+    " + SHIFT + C" "Uruchom Claude" "dex-claude" \
+    " + SHIFT + G" "Uruchom ChatGPT" "dex-chatgpt" \
+    " + SHIFT + M" "Uruchom Messengera" "dex-messenger" \
+    " + SHIFT + T" "Uruchom Tutanota" "tutanota-desktop" \
+    " + I" "Uruchom Instagram" "dex-instagram" \
+    " + R" "Uruchom Portainer" "dex-portainer" \
+    " + U" "Uruchom Mastodon" "dex-mastodon" \
+    " + Y" "Uruchom Daily.dev" "dex-dailydev" \
+    " + V" "Uruchom Visual Studio Codium" "codium" \
+    " + O" "Uruchom ONLYOFFICE" "onlyoffice-desktopeditors" \
+    " + SHIFT + O" "Uruchom OBS" "obs" \
+    " + G" "Uruchom GIMP" "gimp3" \
+    " + N" "Uruchom klienta nextcloud" "dex-nextcloud" \
+    " + SHIFT + N" "Uruchom synchronizację nextcloud" "nextcloud" \
+    " + L" "Uruchom Lutris" "lutris" \
+    " + A" "Uruchom Anki" "anki" \
+    " + M" "Uruchom Plexamp" "plexamp" \
+    " + Z" "Uruchom Beszel (monitorowanie serwerów)" "dex-beszel" \
     "+" "Zwiększ głośność" "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+" \
     "-" "Zmniejsz głośność" "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" \
     "x" "Włącz/wyłącz wyciszenie" "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" \