Merge pull request 'test_launcher_minecraft' (#5) from test_launcher_minecraft into main

Reviewed-on: #5

.gitignore

@@ -1 +1,2 @@
-git-diff.txt
+git-diff.txt
+packages/result

config/fastfetch/default.nix

@@ -10,16 +10,16 @@
         };
       };
 
-      logo = {
+      # logo = {
-        source = ./nixos.png;
+      #   source = ./nixos.png;
-        type = "kitty-direct";
+      #   type = "kitty-direct";
-        height = 15;
+      #   height = 15;
-        width = 30;
+      #   width = 30;
-        padding = {
+      #   padding = {
-          top = 3;
+      #     top = 3;
-          left = 3;
+      #     left = 3;
-        };
+      #   };
-      };
+      # };
 
       modules = [
         "break"

config/hyprland.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  pkgs,
   username,
   host,
   config,
@@ -18,6 +19,7 @@ in
       enable = true;
       xwayland.enable = true;
       systemd.enable = true;
+      portalPackage = pkgs.xdg-desktop-portal-hyprland;
       extraConfig = let
         modifier = "SUPER";
       in
@@ -67,13 +69,14 @@ in
               sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
               accel_profile = flat
             }
-            windowrule = noborder,^(wofi)$
+            windowrulev2 = noborder, class:^(wofi)$
-            windowrule = center,^(wofi)$
+            windowrulev2 = center, class:^(wofi)$
-            windowrule = center,^(steam)$
+            windowrulev2 = center, class:^(steam)$
-            windowrule = float, nm-connection-editor|blueman-manager
+            windowrulev2 = float, class:^(nm-connection-editor|blueman-manager)$
-            windowrule = float, swayimg|vlc|Viewnior|pavucontrol
+            windowrulev2 = float, class:^(swayimg|vlc|Viewnior|pavucontrol)$
-            windowrule = float, nwg-look|qt5ct|mpv
+            windowrulev2 = float, class:^(nwg-look|qt5ct|mpv)$
-            windowrule = float, zoom
+            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 +88,16 @@ 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)$
+            windowrulev2 = opacity 0.9 0.7, class:^(dev.warp.Warp)$
             gestures {
               workspace_swipe = true
               workspace_swipe_fingers = 3
@@ -132,31 +145,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 +165,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 +175,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 +191,42 @@ in
             bind = ${modifier},mouse_up,workspace, e-1
             bindm = ${modifier},mouse:272,movewindow
             bindm = ${modifier},mouse:273,resizewindow
-            bind = ALT,Tab,cyclenext
+            bind = ${modifier}SHIFT,SPACE,movetoworkspace,special
-            bind = ALT,Tab,bringactivetotop
+            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,freetube
+            bind = ${modifier}SHIFT,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": 1740813555,
+        "lastModified": 1746769778,
-        "narHash": "sha256-GvkG6zoBsWgI7pbt92NZjGcOZMYC1C6pW8Lc4W1xMBU=",
+        "narHash": "sha256-27w0bzr8XlxEhB+UNiEgf6iySfFu+tVHcBDGah5PtVE=",
         "owner": "AdnanHodzic",
         "repo": "auto-cpufreq",
-        "rev": "6be154724337fa74236ee811150872304db21d8b",
+        "rev": "eaf8dd1bab1b11ec78ad173ee7ada9886bed92ad",
         "type": "github"
       },
       "original": {
@@ -25,11 +25,11 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1732200724,
+        "lastModified": 1746562888,
-        "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
+        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
         "owner": "SenchoPens",
         "repo": "base16.nix",
-        "rev": "153d52373b0fb2d343592871009a286ec8837aec",
+        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
         "type": "github"
       },
       "original": {
@@ -89,18 +89,17 @@
     },
     "firefox-addons": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1741379467,
+        "lastModified": 1747800214,
-        "narHash": "sha256-f314Ke28BGoVh4TK8FCzlPZgOl+oV7PvLyPF++ln9M4=",
+        "narHash": "sha256-4zStSk4O6GT0kZhN/zERhMHbcJnwFtYt3rM01t6gNhA=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "0b95936d94ea2a3ce66538f299351cf0b491aa15",
+        "rev": "54be6f6687f510002f7a1e6c3583278d989f3833",
         "type": "gitlab"
       },
       "original": {
@@ -113,11 +112,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1739223196,
+        "lastModified": 1744642301,
-        "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=",
+        "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21",
+        "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
         "type": "github"
       },
       "original": {
@@ -145,7 +144,6 @@
       "inputs": {
         "nixpkgs-lib": [
           "stylix",
-          "nur",
           "nixpkgs"
         ]
       },
@@ -163,42 +161,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1629284811,
-        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": [
-          "stylix",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -228,11 +190,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737465171,
+        "lastModified": 1742649964,
-        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
         "type": "github"
       },
       "original": {
@@ -266,16 +228,16 @@
     "gnome-shell": {
       "flake": false,
       "locked": {
-        "lastModified": 1732369855,
+        "lastModified": 1744584021,
-        "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
+        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "dadd58f630eeea41d645ee225a63f719390829dc",
+        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
         "type": "github"
       },
       "original": {
         "owner": "GNOME",
-        "ref": "47.2",
+        "ref": "48.1",
         "repo": "gnome-shell",
         "type": "github"
       }
@@ -287,11 +249,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741378606,
+        "lastModified": 1747875884,
-        "narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=",
+        "narHash": "sha256-tdVx4kghhdy62LKuTnwE2RytOe8o88tah/yhpyuL0D4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "95711f926676018d279ba09fe7530d03b5d5b3e2",
+        "rev": "f9186c64fcc6ee5f0114547acf9e814c806a640b",
         "type": "github"
       },
       "original": {
@@ -303,11 +265,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1741246872,
+        "lastModified": 1747744144,
-        "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
+        "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
+        "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
         "type": "github"
       },
       "original": {
@@ -319,7 +281,10 @@
     },
     "nur": {
       "inputs": {
-        "flake-parts": "flake-parts",
+        "flake-parts": [
+          "stylix",
+          "flake-parts"
+        ],
         "nixpkgs": [
           "stylix",
           "nixpkgs"
@@ -327,11 +292,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1740408283,
+        "lastModified": 1746056780,
-        "narHash": "sha256-2xECnhgF3MU9YjmvOkrRp8wRFo2OjjewgCtlfckhL5s=",
+        "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "496a4a11162bdffb9a7b258942de138873f019f7",
+        "rev": "d476cd0972dd6242d76374fcc277e6735715c167",
         "type": "github"
       },
       "original": {
@@ -357,7 +322,7 @@
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils_2",
+        "flake-parts": "flake-parts",
         "git-hooks": "git-hooks",
         "gnome-shell": "gnome-shell",
         "home-manager": [
@@ -375,11 +340,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1741381249,
+        "lastModified": 1747904607,
-        "narHash": "sha256-lr62m73oNjkSX0ar7tPalTSTzaqCsuZCEYyK8mPbXPU=",
+        "narHash": "sha256-2JWxCVAb8qnssrn/4FeIgs+Gk0VZuAfDsF+rUBE7cZU=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "4891f1471b682af073574dc51fa4810f1470ef8f",
+        "rev": "230705d5fb6c308402579b17e0261e9f15de6f46",
         "type": "github"
       },
       "original": {
@@ -423,28 +388,27 @@
     "tinted-kitty": {
       "flake": false,
       "locked": {
-        "lastModified": 1716423189,
+        "lastModified": 1735730497,
-        "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
+        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
         "owner": "tinted-theming",
         "repo": "tinted-kitty",
-        "rev": "eb39e141db14baef052893285df9f266df041ff8",
+        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
         "type": "github"
       },
       "original": {
         "owner": "tinted-theming",
         "repo": "tinted-kitty",
-        "rev": "eb39e141db14baef052893285df9f266df041ff8",
         "type": "github"
       }
     },
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1740351358,
+        "lastModified": 1744974599,
-        "narHash": "sha256-Hdk850xgAd3DL8KX0AbyU7tC834d3Lej1jOo3duWiOA=",
+        "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "a1bc2bd89e693e7e3f5764cfe8114e2ae150e184",
+        "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
         "type": "github"
       },
       "original": {
@@ -456,11 +420,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1740272597,
+        "lastModified": 1745111349,
-        "narHash": "sha256-/etfUV3HzAaLW3RSJVwUaW8ULbMn3v6wbTlXSKbcoWQ=",
+        "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "b6c7f46c8718cc484f2db8b485b06e2a98304cd0",
+        "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

@@ -18,6 +18,7 @@
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
     };
+    initrd.systemd.dbus.enable = true;
     # Make /tmp a tmpfs
     tmp = {
       useTmpfs = false;

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

@@ -25,6 +25,11 @@
   nixpkgs.config = {
     allowUnfree = true;
     pulseaudio = true;
+    # packageOverrides = pkgs: {
+    #   ulauncher = pkgs.ulauncher.override {
+    #     autoStart = true;
+    #   };
+    # };
   };
 
   # Extra Portal Configuration
@@ -34,12 +39,19 @@
     wlr.enable = true;
     extraPortals = [
       pkgs.xdg-desktop-portal-gtk
-      pkgs.xdg-desktop-portal
+      pkgs.xdg-desktop-portal-hyprland
     ];
+    config = {
+      common = {
+        default = [
+          "gtk"
+          "hyprland"
+        ];
+      };
+    };
     configPackages = [
       pkgs.xdg-desktop-portal-gtk
       pkgs.xdg-desktop-portal-hyprland
-      pkgs.xdg-desktop-portal
     ];
   };
 

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

@@ -9,6 +9,9 @@
     discord
     slack
     ungoogled-chromium
-    # firefoxpwa
+    docker-client
+    anki-bin
+    onlyoffice-bin
+    freetube
   ];
 }

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";
+              version = "3.0.2";
-              hash = "sha256-io6mPkF19EYo1tVTnd87EWX1mH9zAz0Zzks6v5XN3UE=";
+              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";
+              version = "1.21.0";
-              hash = "sha256-gX0L416RXIQ9S4kFguEJJ7u4GSo7WbpifXmL/mWCU08=";
+              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";
+              version = "0.3.1";
-              hash = "sha256-M/29ZDg1sva9msGgRe6xqpCYDpW6X/BqKxmiJhzeVXQ=";
+              hash = "sha256-YJ+7gzDjA8kzxBwGLpEmfx0erJdgAntWc2OrK2zp9DM=";
-            }
-            {
-              name = "nuxt-vscode-extentions";
-              publisher = "nuxtr";
-              version = "0.0.7";
-              hash = "sha256-LMShrm9fQHr0M8yXHSziq4NZWfK+n1azc5bjiM972O0=";
             }
             {
               name = "nuxtr-vscode";
@@ -171,8 +151,8 @@
             {
               name = "bun-vscode";
               publisher = "oven";
-              version = "0.0.26";
+              version = "0.0.28";
-              hash = "sha256-klMkKAorWJj2o015FWbQQfpmYe4JM0UOM+WVh+YPtI4=";
+              hash = "sha256-WlGqqKbfrV0gqCCdVo/UFF+Gnxhq0TNJ4LuHwFaFYXA=";
             }
             {
               name = "csv-to-table";
@@ -231,8 +211,8 @@
             {
               name = "explorer";
               publisher = "vitest";
-              version = "1.12.1";
+              version = "1.17.0";
-              hash = "sha256-WG2/MWxU/XhSOjXuBoyszpD/HFb8mfrt525povSEES4=";
+              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/fundamentals.nix

@@ -1,6 +1,7 @@
 # Fundamentalne programy dla systemu
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
+    warp-terminal
     wget
     killall
     eza

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

@@ -9,9 +9,9 @@
     libvirt
     greetd.tuigreet
     galculator
-    thefuck
     lazydocker
-    lazygit
+    # lazygit
     docker-slim
+    dex
   ];
 }

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

@@ -3,17 +3,14 @@
   environment.systemPackages = with pkgs; [
     gambit-chess
     tty-solitaire
-    bastet
+    # bastet
-    nsnake
+    # nsnake
     cmatrix
-    lolcat
     cowsay
     sl
-    figlet
     fortune
-    wtf
-    pipes
-    cava
     ookla-speedtest
+    btop
+    toot
   ];
 }

hosts/garand-laptop/config/programs.nix

@@ -69,6 +69,11 @@
         };
       };
     };
+    hyprland = {
+      enable = true;
+      withUWSM = true;
+      portalPackage = pkgs.xdg-desktop-portal-hyprland;
+    };
     dconf.enable = true;
     seahorse.enable = true;
     fuse.userAllowOther = true;

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 = [
+      # drivers = with pkgs; [
-        # pkgs.hplipWithPlugin
+      #   # 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/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/misc.nix

@@ -1,10 +1,31 @@
-{...}: {
+{pkgs, ...}: {
   # Create XDG Dirs
   xdg = {
+    enable = true;
     userDirs = {
       enable = true;
       createDirectories = true;
     };
+    portal = {
+      enable = true;
+      xdgOpenUsePortal = true;
+      extraPortals = [
+        pkgs.xdg-desktop-portal-gtk
+        pkgs.xdg-desktop-portal-hyprland
+      ];
+      config = {
+        common = {
+          default = [
+            "gtk"
+            "hyprland"
+          ];
+        };
+      };
+      configPackages = [
+        pkgs.xdg-desktop-portal-gtk
+        pkgs.xdg-desktop-portal-hyprland
+      ];
+    };
   };
 
   dconf.settings = {

hosts/garand-laptop/home/programs.nix

@@ -60,7 +60,6 @@ in {
         if [ -f $HOME/.bashrc-personal ]; then
           source $HOME/.bashrc-personal
         fi
-        fc
       '';
       shellAliases = {
         os-sw = "sudo nixos-rebuild switch --flake ~/zaneyos";
@@ -81,17 +80,19 @@ in {
         n = "nano";
         f = "fuck";
         cat = "bat";
-        st = "speedtest";
+        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";
+        scp-to-server = "function scp-to-server() { scp -i ~/.ssh/hp-t640-homeserver -P 556 $1 garand_plg@192.168.1.156:$2; }; scp-to-server";
         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";
       };
     };
 

hosts/garand-laptop/home/styles.nix

@@ -1,11 +1,13 @@
 {
   pkgs,
   lib,
+  host,
   ...
 }: {
   # Styling Options
   stylix = {
     targets = {
+      librewolf.profileNames = ["${host}"];
       waybar = {
         enable = false;
       };

hosts/garand-laptop/variables.nix

@@ -1,16 +1,12 @@
 {
-  # Git Configuration ( For Pulling Software Repos )
   gitUsername = "GarandPLG";
   gitEmail = "garandplg@garandplg.com";
 
-  # Hyprland Settings
   extraMonitorSettings = "";
 
-  # Waybar Settings
   clock24h = true;
 
-  # Program Options
+  browser = "librewolf";
-  browser = "librewolf"; # Set Default Browser (google-chrome-stable for google-chrome)
+  terminal = "warp-terminal";
-  terminal = "kitty"; # Set Default System Terminal
   keyboardLayout = "pl";
 }

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" \
+    " + Esc" "Wyjdź z Hyprland" "exit" \
-    " + 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" \
     " + 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 + F" "Przełącz tryb pływający" "togglefloating" \
-    " + SHIFT + C" "Wyjdź z Hyprland" "exit" \
+    "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,40 @@ 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 FreeTube" "freetube" \
+    " + SHIFT + 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" \

scripts/web-search.nix

@@ -1,43 +1,43 @@
 {pkgs}:
 pkgs.writeShellScriptBin "web-search" ''
-   declare -A URLS
+  declare -A URLS
 
-   URLS=(
+  URLS=(
-     ["🌎 Search"]="https://search.garandplg.com/search?q="
+    ["🌎 Search"]="https://search.garandplg.com/search?q="
-     ["❄️  Unstable Packages"]="https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query="
+    ["❄️  Unstable Packages"]="https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query="
-     ["🎞️ YouTube"]="https://www.youtube.com/results?search_query="
+    ["🎞️ YouTube"]="https://www.youtube.com/results?search_query="
-     ["❄️ NixOS Wiki"]="https://nixos.wiki/index.php?search="
+    ["❄️ NixOS Wiki"]="https://nixos.wiki/index.php?search="
-     ["🔎 Wikipedia"]="https://pl.wikipedia.org/w/index.php?ns0=1&search="
+    ["🔎 Wikipedia"]="https://pl.wikipedia.org/w/index.php?ns0=1&search="
-     ["👨‍💻 StackOverflow"]="https://stackoverflow.com/search?q="
+    ["👨‍💻 StackOverflow"]="https://stackoverflow.com/search?q="
-   )
+  )
 
-   # List for rofi
+  # List for rofi
-   gen_list() {
+  gen_list() {
-     for i in "''${!URLS[@]}"
+    for i in "''${!URLS[@]}"
-     do
+    do
-       echo "$i"
+      echo "$i"
-     done
+    done
-   }
+  }
 
-   main() {
+  main() {
-     # Pass the list to rofi
+    # Pass the list to rofi
-     platform=$( (gen_list) | ${pkgs.wofi}/bin/wofi -dmenu )
+    platform=$( (gen_list) | ${pkgs.wofi}/bin/wofi -dmenu )
 
-     if [[ -n "$platform" ]]; then
+    if [[ -n "$platform" ]]; then
-       query=$( (echo ) | ${pkgs.wofi}/bin/wofi -dmenu )
+      query=$( (echo ) | ${pkgs.wofi}/bin/wofi -dmenu )
 
-       if [[ -n "$query" ]]; then
+      if [[ -n "$query" ]]; then
-  url=''${URLS[$platform]}$query
+        url=''${URLS[$platform]}$query
-  xdg-open "$url"
+        xdg-open "$url"
-       else
+      else
-  exit
+        exit
-       fi
+      fi
-     else
+    else
-       exit
+      exit
-     fi
+    fi
-   }
+  }
 
-   main
+  main
 
-   exit 0
+  exit 0
 ''