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`.

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

@@ -74,6 +74,7 @@ in
             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": 1744578060,
-        "narHash": "sha256-ApX5u3aXtmthemPSnZls/oxvqpNR7C9t4Ut57MTvces=",
+        "lastModified": 1745403023,
+        "narHash": "sha256-DEs6jbWYJFJgpaPtF5NT3DQs3erjzdm2brLNHpjrEPA=",
         "owner": "AdnanHodzic",
         "repo": "auto-cpufreq",
-        "rev": "b6493edc7033beac216b8836af4994e56c6682f4",
+        "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": {
@@ -95,11 +95,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1744914542,
-        "narHash": "sha256-Q6EKVSHbtWqndGWHw5E+dAN4ds5p+SD5Gyiy3KGN8DM=",
+        "lastModified": 1745752599,
+        "narHash": "sha256-vX5uq4wv7FeNeeFtsTPXQ9n2hd92NFXI+u9sg1K8OhA=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "30303c2b08c30085a784abf5c1823bd62dd8d9d7",
+        "rev": "0388c30f59e860307b2ef0ba93f38d2e525a153e",
         "type": "gitlab"
       },
       "original": {
@@ -112,11 +112,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1743774811,
-        "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=",
+        "lastModified": 1744642301,
+        "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e",
+        "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
         "type": "github"
       },
       "original": {
@@ -271,11 +271,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744919155,
-        "narHash": "sha256-IJksPW32V9gid9vDxoloJMRk+YGjxq5drFHBFeBkKU8=",
+        "lastModified": 1745894335,
+        "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "72526a5f7cde2ef9075637802a1e2a8d2d658f70",
+        "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa",
         "type": "github"
       },
       "original": {
@@ -287,11 +287,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744463964,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+        "lastModified": 1745930157,
+        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
+        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
         "type": "github"
       },
       "original": {
@@ -311,11 +311,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1743884191,
-        "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=",
+        "lastModified": 1745459908,
+        "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c",
+        "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035",
         "type": "github"
       },
       "original": {
@@ -359,11 +359,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1744910471,
-        "narHash": "sha256-HItOUMA2whFnPMJuyN2XHq9TZttgrgOAZcoUXsaD4Js=",
+        "lastModified": 1745962538,
+        "narHash": "sha256-UmQxI4ocPZUVHuxtaQN3zNNBU8KLK9x2gXl2kWUhMKY=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "8d5cd725ad591890c0cd804bf68cc842b8afca51",
+        "rev": "764fd32955e79f2742a7975f0150175f93add2fb",
         "type": "github"
       },
       "original": {
@@ -424,11 +424,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1742851696,
-        "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=",
+        "lastModified": 1744974599,
+        "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77",
+        "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
         "type": "github"
       },
       "original": {
@@ -440,11 +440,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1743296873,
-        "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=",
+        "lastModified": 1745111349,
+        "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a",
+        "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
         "type": "github"
       },
       "original": {

hosts/default/config.nix

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

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/nixpkgs/clients.nix

@@ -11,5 +11,6 @@
     ungoogled-chromium
     docker-client
     anki-bin
+    onlyoffice-bin
   ];
 }

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

@@ -23,10 +23,6 @@
             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
@@ -40,14 +36,10 @@
             vue.volar
             wholroyd.jinja
             yoavbls.pretty-ts-errors
+            tamasfe.even-better-toml
+            ms-ceintl.vscode-language-pack-pl
           ]
           ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-            {
-              name = "python";
-              publisher = "ms-python";
-              version = "2025.3.2025030601";
-              hash = "sha256-xK9esQjcdDz8pNgGjB3HUKpwySSykNTXo3ubDW0nBR8=";
-            }
             {
               name = "goto-alias";
               publisher = "antfu";
@@ -78,12 +70,6 @@
               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 = "one-dark-pro-monokai-darker";
               publisher = "eserozvataf";
@@ -99,8 +85,8 @@
             {
               name = "bootstrap-intellisense";
               publisher = "hossaini";
-              version = "2.0.2";
-              hash = "sha256-io6mPkF19EYo1tVTnd87EWX1mH9zAz0Zzks6v5XN3UE=";
+              version = "3.0.2";
+              hash = "sha256-stZfbh42HncdRzFZ9ShumZ9Tuery9RF9c8rk3TD3P2g=";
             }
             {
               name = "tab-indent-space-align";
@@ -126,11 +112,17 @@
               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.19.0";
-              hash = "sha256-gX0L416RXIQ9S4kFguEJJ7u4GSo7WbpifXmL/mWCU08=";
+              version = "1.21.0";
+              hash = "sha256-SvJhVG8sofzV0PebZG4IIORX3AcfmErDQ00tRF9fk/4=";
             }
             {
               name = "json-to-ts";
@@ -144,23 +136,11 @@
               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=";
+              version = "0.3.1";
+              hash = "sha256-YJ+7gzDjA8kzxBwGLpEmfx0erJdgAntWc2OrK2zp9DM=";
             }
             {
               name = "nuxtr-vscode";
@@ -171,8 +151,8 @@
             {
               name = "bun-vscode";
               publisher = "oven";
-              version = "0.0.26";
-              hash = "sha256-klMkKAorWJj2o015FWbQQfpmYe4JM0UOM+WVh+YPtI4=";
+              version = "0.0.28";
+              hash = "sha256-WlGqqKbfrV0gqCCdVo/UFF+Gnxhq0TNJ4LuHwFaFYXA=";
             }
             {
               name = "csv-to-table";
@@ -231,8 +211,8 @@
             {
               name = "explorer";
               publisher = "vitest";
-              version = "1.12.1";
-              hash = "sha256-WG2/MWxU/XhSOjXuBoyszpD/HFb8mfrt525povSEES4=";
+              version = "1.17.0";
+              hash = "sha256-7OePMFsWIyrPkAW/+SRiOoowluLMEszEjWmBsW0LPpc=";
             }
             {
               name = "prettify-json";
@@ -240,6 +220,18 @@
               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/gaming.nix

@@ -4,5 +4,6 @@
     protonup
     wineWowPackages.waylandFull # wine64
     lutris
+    space-cadet-pinball
   ];
 }

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

@@ -12,6 +12,6 @@
     vlc
     kdePackages.kdenlive
     obs-studio
-    libreoffice
+    # libreoffice
   ];
 }

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

@@ -12,5 +12,6 @@
     lazydocker
     # lazygit
     docker-slim
+    dex
   ];
 }

hosts/garand-laptop/home/home.nix

@@ -3,7 +3,9 @@
   username,
   host,
   ...
-}: {
+}: let
+  dexApps = import ../../../scripts/dex-apps.nix {inherit pkgs;};
+in {
   # Home Manager Settings
   home = {
     username = "${username}";
@@ -47,6 +49,16 @@
         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/programs.nix

@@ -89,7 +89,7 @@ in {
         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";
+        mkgidf = "git add --intent-to-add . && git diff > git-diff.txt";
         ".." = "cd ..";
         kys = "shutdown now";
         pasjans = "ttysolitaire -p 10 --no-background-color";

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" \