poprawki

- Usunięto Warp terminal z konfiguracji systemu i Hyprland.
- Zmieniono domyślny terminal na `kitty`.
- Zamieniono `btop` na `NeoHtop` w powiązaniach klawiszowych oraz w tty.
- Dodano `exercism` do zestawu narzędzi deweloperskich.
- Dodano `PrismLauncher-Cracked` do sekcji gamingowej oraz odpowiedni input do `flake.nix`.
- Uproszczono zależności w `flake.lock`, usuwając m.in. `flake-compat`, `git-hooks` i `treefmt-nix`.
- Rozszerzono konfigurację SSH o domowy serwer `hp-t640-homeserver`.

.gitignore

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

config/garand-grub-theme/theme.txt

@@ -1,33 +0,0 @@
-# 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

@@ -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
@@ -198,7 +200,7 @@ in
             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},B,exec,NeoHtop
             bind = ${modifier}SHIFT,B,exec,blueman-manager
             bind = ${modifier},T,exec,thunar
             bind = ${modifier},W,exec,${browser}
@@ -212,7 +214,8 @@ in
             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},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

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745403023,
+        "lastModified": 1752998173,
-        "narHash": "sha256-DEs6jbWYJFJgpaPtF5NT3DQs3erjzdm2brLNHpjrEPA=",
+        "narHash": "sha256-ZlYpBp2WOe03UrpjJGz5KTOL/pp7A452hJO/Vc8C4/0=",
         "owner": "AdnanHodzic",
         "repo": "auto-cpufreq",
-        "rev": "ad6e313dabf7e4da2765be6b36688db85b29ff5f",
+        "rev": "562278377ffa96f3c1af49c7b499df028ce8d8bd",
         "type": "github"
       },
       "original": {
@@ -25,11 +25,11 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1745523430,
+        "lastModified": 1746562888,
-        "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
+        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
         "owner": "SenchoPens",
         "repo": "base16.nix",
-        "rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
+        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
         "type": "github"
       },
       "original": {
@@ -57,11 +57,11 @@
     "base16-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1736852337,
+        "lastModified": 1752979451,
-        "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
+        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
         "owner": "tinted-theming",
         "repo": "base16-helix",
-        "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
+        "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
         "type": "github"
       },
       "original": {
@@ -95,11 +95,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1745752599,
+        "lastModified": 1754512310,
-        "narHash": "sha256-vX5uq4wv7FeNeeFtsTPXQ9n2hd92NFXI+u9sg1K8OhA=",
+        "narHash": "sha256-gXE5lTYMOhpDJo+siLXW/3BzySPmLMD12GVB1QFVbyw=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "0388c30f59e860307b2ef0ba93f38d2e525a153e",
+        "rev": "2008f9aa7a5ccde48bfc1de5a919be5898da09c2",
         "type": "gitlab"
       },
       "original": {
@@ -112,11 +112,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1744642301,
+        "lastModified": 1748383148,
-        "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
+        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
+        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
         "type": "github"
       },
       "original": {
@@ -125,35 +125,19 @@
         "type": "github"
       }
     },
-    "flake-compat": {
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
           "stylix",
-          "nur",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1733312601,
+        "lastModified": 1751413152,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
         "type": "github"
       },
       "original": {
@@ -162,27 +146,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "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": {
@@ -199,67 +162,19 @@
         "type": "github"
       }
     },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": [
-          "stylix",
-          "flake-compat"
-        ],
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1742649964,
-        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "gnome-shell": {
       "flake": false,
       "locked": {
-        "lastModified": 1732369855,
+        "lastModified": 1748186689,
-        "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
+        "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "dadd58f630eeea41d645ee225a63f719390829dc",
+        "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0",
         "type": "github"
       },
       "original": {
         "owner": "GNOME",
-        "ref": "47.2",
+        "ref": "48.2",
         "repo": "gnome-shell",
         "type": "github"
       }
@@ -271,11 +186,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745894335,
+        "lastModified": 1754924470,
-        "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=",
+        "narHash": "sha256-asI/or9AcUMydwzodCgpHGytnMSNUlciw3uaycpXm4E=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa",
+        "rev": "67393957c27b4e4c6c48a60108a201413ced7800",
         "type": "github"
       },
       "original": {
@@ -285,13 +200,29 @@
         "type": "github"
       }
     },
+    "libnbtplusplus": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1699286814,
+        "narHash": "sha256-yy0q+bky80LtK1GWzz7qpM+aAGrOqLuewbid8WT1ilk=",
+        "owner": "PrismLauncher",
+        "repo": "libnbtplusplus",
+        "rev": "23b955121b8217c1c348a9ed2483167a6f3ff4ad",
+        "type": "github"
+      },
+      "original": {
+        "owner": "PrismLauncher",
+        "repo": "libnbtplusplus",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745930157,
+        "lastModified": 1754725699,
-        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
+        "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
+        "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054",
         "type": "github"
       },
       "original": {
@@ -303,19 +234,21 @@
     },
     "nur": {
       "inputs": {
-        "flake-parts": "flake-parts",
+        "flake-parts": [
+          "stylix",
+          "flake-parts"
+        ],
         "nixpkgs": [
           "stylix",
           "nixpkgs"
-        ],
+        ]
-        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1745459908,
+        "lastModified": 1751906969,
-        "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=",
+        "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035",
+        "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25",
         "type": "github"
       },
       "original": {
@@ -324,12 +257,34 @@
         "type": "github"
       }
     },
+    "prismlauncher-cracked": {
+      "inputs": {
+        "libnbtplusplus": "libnbtplusplus",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1747683146,
+        "narHash": "sha256-zZS//xyNYQHvD4fUMoWx86uVUwPk+p5FjZLTTu0pelQ=",
+        "owner": "Diegiwg",
+        "repo": "PrismLauncher-Cracked",
+        "rev": "0612187254ef41a1087f3107e927e0dd59c9b29d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Diegiwg",
+        "repo": "PrismLauncher-Cracked",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "auto-cpufreq": "auto-cpufreq",
         "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
+        "prismlauncher-cracked": "prismlauncher-cracked",
         "stylix": "stylix"
       }
     },
@@ -340,13 +295,8 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-compat": "flake-compat",
+        "flake-parts": "flake-parts",
-        "flake-utils": "flake-utils",
-        "git-hooks": "git-hooks",
         "gnome-shell": "gnome-shell",
-        "home-manager": [
-          "home-manager"
-        ],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -359,11 +309,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1745962538,
+        "lastModified": 1754851076,
-        "narHash": "sha256-UmQxI4ocPZUVHuxtaQN3zNNBU8KLK9x2gXl2kWUhMKY=",
+        "narHash": "sha256-k3+/24lN6E9BFRhryHocm7314t0Wtku0hgIdEWi15XI=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "764fd32955e79f2742a7975f0150175f93add2fb",
+        "rev": "afcfed6fd2a51615cd63aa7fa7608d670e7b61e5",
         "type": "github"
       },
       "original": {
@@ -407,28 +357,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": 1744974599,
+        "lastModified": 1750770351,
-        "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
+        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
+        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
         "type": "github"
       },
       "original": {
@@ -440,11 +389,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1745111349,
+        "lastModified": 1751159871,
-        "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
+        "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
+        "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
         "type": "github"
       },
       "original": {
@@ -456,11 +405,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1725758778,
+        "lastModified": 1751158968,
-        "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
+        "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
+        "rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
         "type": "github"
       },
       "original": {
@@ -468,28 +417,6 @@
         "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

@@ -11,7 +11,7 @@
       url = "github:danth/stylix";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        home-manager.follows = "home-manager";
+        # home-manager.follows = "home-manager";
       };
     };
     auto-cpufreq = {
@@ -22,6 +22,10 @@
       url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    prismlauncher-cracked = {
+      url = "github:Diegiwg/PrismLauncher-Cracked";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {

hosts/default/config.nix

@@ -1,17 +1,29 @@
-{
+{...}: {
-  inputs,
-  config,
-  pkgs,
-  host,
-  username,
-  options,
-  ...
-}: let
-  inherit (import ./variables.nix) keyboardLayout;
-in {
   imports = [
     ./hardware.nix
     ./users.nix
+
+    ./config/boot.nix
+    ./config/drivers.nix
+    ./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
+    ./config/stylix.nix
+    ./config/virtualization.nix
+
     ../../modules/amd-drivers.nix
     ../../modules/nvidia-drivers.nix
     ../../modules/nvidia-prime-drivers.nix
@@ -20,564 +32,6 @@ in {
     ../../modules/local-hardware-clock.nix
   ];
 
-  boot = {
-    # Kernel
-    kernelPackages = pkgs.linuxPackages_zen;
-    # This is for OBS Virtual Cam Support
-    kernelModules = ["v4l2loopback"];
-    extraModulePackages = [config.boot.kernelPackages.v4l2loopback];
-    # Needed For Some Steam Games
-    kernel.sysctl = {
-      "vm.max_map_count" = 2147483642;
-    };
-    # Bootloader.
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-    # Make /tmp a tmpfs
-    tmp = {
-      useTmpfs = false;
-      tmpfsSize = "30%";
-    };
-    # Appimage Support
-    binfmt.registrations.appimage = {
-      wrapInterpreterInShell = false;
-      interpreter = "${pkgs.appimage-run}/bin/appimage-run";
-      recognitionType = "magic";
-      offset = 0;
-      mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
-      magicOrExtension = ''\x7fELF....AI\x02'';
-    };
-    plymouth.enable = true;
-  };
-
-  # Styling Options
-  stylix = {
-    enable = true;
-    image = ../../config/wallpapers/attack-on-titan-mikasa-ackerman.jpg;
-    # base16Scheme = {
-    #   base00 = "232136";
-    #   base01 = "2a273f";
-    #   base02 = "393552";
-    #   base03 = "6e6a86";
-    #   base04 = "908caa";
-    #   base05 = "e0def4";
-    #   base06 = "e0def4";
-    #   base07 = "56526e";
-    #   base08 = "eb6f92";
-    #   base09 = "f6c177";
-    #   base0A = "ea9a97";
-    #   base0B = "3e8fb0";
-    #   base0C = "9ccfd8";
-    #   base0D = "c4a7e7";
-    #   base0E = "f6c177";
-    #   base0F = "56526e";
-    # };
-    polarity = "dark";
-    opacity.terminal = 0.8;
-    cursor = {
-      package = pkgs.bibata-cursors;
-      name = "Bibata-Modern-Ice";
-      size = 24;
-    };
-    fonts = {
-      monospace = {
-        package = pkgs.nerd-fonts.fira-mono;
-        name = "FiraCode Nerd Fonts Mono";
-      };
-      sansSerif = {
-        package = pkgs.nerd-fonts.fira-code;
-        name = "FiraCode Nerd Fonts";
-      };
-      serif = {
-        package = pkgs.nerd-fonts.fira-code;
-        name = "FiraCode Nerd Fonts";
-      };
-      sizes = {
-        applications = 12;
-        terminal = 15;
-        desktop = 11;
-        popups = 12;
-      };
-    };
-  };
-
-  # Extra Module Options
-  drivers = {
-    amdgpu.enable = true;
-    nvidia.enable = false;
-    nvidia-prime = {
-      enable = false;
-      intelBusID = "";
-      nvidiaBusID = "";
-    };
-    intel.enable = false;
-  };
-  vm.guest-services.enable = false;
-  local.hardware-clock.enable = false;
-
-  # Enable networking
-  networking = {
-    nameservers = ["176.9.1.117" "213.196.191.96" "2a01:4f8:151:34aa::198"];
-    networkmanager.enable = true;
-    hostName = host;
-    timeServers = options.networking.timeServers.default ++ ["pool.ntp.org"];
-  };
-
-  # Set your time zone.
-  time.timeZone = "Europe/Warsaw";
-
-  i18n = {
-    defaultLocale = "pl_PL.UTF-8";
-    extraLocaleSettings = {
-      LC_ADDRESS = "pl_PL.UTF-8";
-      LC_IDENTIFICATION = "pl_PL.UTF-8";
-      LC_MEASUREMENT = "pl_PL.UTF-8";
-      LC_MONETARY = "pl_PL.UTF-8";
-      LC_NAME = "pl_PL.UTF-8";
-      LC_NUMERIC = "pl_PL.UTF-8";
-      LC_PAPER = "pl_PL.UTF-8";
-      LC_TELEPHONE = "pl_PL.UTF-8";
-      LC_TIME = "pl_PL.UTF-8";
-    };
-  };
-
-  programs = {
-    firefox.enable = false;
-    starship = {
-      enable = true;
-      settings = {
-        add_newline = false;
-        buf = {
-          symbol = " ";
-        };
-        c = {
-          symbol = " ";
-        };
-        directory = {
-          read_only = " 󰌾";
-        };
-        docker_context = {
-          symbol = " ";
-        };
-        fossil_branch = {
-          symbol = " ";
-        };
-        git_branch = {
-          symbol = " ";
-        };
-        golang = {
-          symbol = " ";
-        };
-        hg_branch = {
-          symbol = " ";
-        };
-        hostname = {
-          ssh_symbol = " ";
-        };
-        lua = {
-          symbol = " ";
-        };
-        memory_usage = {
-          symbol = "󰍛 ";
-        };
-        meson = {
-          symbol = "󰔷 ";
-        };
-        nim = {
-          symbol = "󰆥 ";
-        };
-        nix_shell = {
-          symbol = " ";
-        };
-        nodejs = {
-          symbol = " ";
-        };
-        ocaml = {
-          symbol = " ";
-        };
-        package = {
-          symbol = "󰏗 ";
-        };
-        python = {
-          symbol = " ";
-        };
-        rust = {
-          symbol = " ";
-        };
-        swift = {
-          symbol = " ";
-        };
-        zig = {
-          symbol = " ";
-        };
-      };
-    };
-    dconf.enable = true;
-    seahorse.enable = true;
-    fuse.userAllowOther = true;
-    mtr.enable = true;
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-    virt-manager.enable = true;
-    steam = {
-      enable = true;
-      gamescopeSession.enable = true;
-      remotePlay.openFirewall = true;
-      dedicatedServer.openFirewall = true;
-    };
-    auto-cpufreq = {
-      enable = true;
-      settings = {
-        charger = {
-          governor = "performance";
-          turbo = "auto";
-        };
-
-        battery = {
-          governor = "powersave";
-          turbo = "auto";
-        };
-      };
-    };
-    thunar = {
-      enable = true;
-      plugins = with pkgs.xfce; [
-        thunar-archive-plugin
-        thunar-volman
-      ];
-    };
-  };
-
-  nixpkgs.config = {
-    allowUnfree = true;
-    pulseaudio = true;
-  };
-
-  users = {
-    mutableUsers = true;
-  };
-
-  environment.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
-    gimp3
-    pavucontrol
-    tree
-    greetd.tuigreet
-    librewolf
-    protonup
-    plex-media-player
-    plexamp
-    bitwarden-desktop
-    vlc
-    nixd
-    ungoogled-chromium
-    slack
-    alejandra
-    tutanota-desktop
-    ookla-speedtest
-    anydesk
-    bun
-    docker
-    docker-compose
-    docker-slim
-    sl
-    nodejs
-    kdePackages.kdenlive
-    obs-studio
-    thefuck
-    cifs-utils
-    libreoffice
-    bastet
-    nsnake
-    exiftool
-    (vscode-with-extensions.override {
-      vscode = vscodium;
-      vscodeExtensions = with vscode-extensions;
-        []
-        ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-          # {
-          #   name = "[nazwa rozszerzenia]";
-          #   publisher = "[autor]";
-          #   version = "[wersja]";
-          #   hash = "[hash. przebuduj system bez odkomentowania tej opcji, a poda ci poprawny hash]";
-          # }
-        ];
-    })
-  ];
-
-  fonts = {
-    packages = with pkgs; [
-      noto-fonts-emoji
-      noto-fonts-cjk-sans
-      font-awesome
-      # Commenting Symbola out to fix install this will need to be fixed or an alternative found.
-      # symbola
-      material-icons
-    ];
-  };
-
-  environment.variables = {
-    ZANEYOS_VERSION = "2.2";
-    ZANEYOS = "true";
-  };
-
-  # Extra Portal Configuration
-  xdg.portal = {
-    enable = true;
-    wlr.enable = true;
-    extraPortals = [
-      pkgs.xdg-desktop-portal-gtk
-      pkgs.xdg-desktop-portal
-    ];
-    configPackages = [
-      pkgs.xdg-desktop-portal-gtk
-      pkgs.xdg-desktop-portal-hyprland
-      pkgs.xdg-desktop-portal
-    ];
-  };
-
-  # Services to start
-  services = {
-    xserver = {
-      enable = false;
-      xkb = {
-        layout = "${keyboardLayout}";
-        variant = "";
-      };
-    };
-    resolved = {
-      enable = true;
-      dnssec = "true";
-      domains = ["~."]; # "use as default interface for all requests"
-      # (see man resolved.conf)
-      # let Avahi handle mDNS publication
-      extraConfig = ''
-        DNSOverTLS=opportunistic
-        MulticastDNS=resolve
-      '';
-      llmnr = "true";
-    };
-    greetd = {
-      enable = true;
-      vt = 3;
-      settings = {
-        default_session = {
-          # Wayland Desktop Manager is installed only for user ryan via home-manager!
-          user = username;
-          # .wayland-session is a script generated by home-manager, which links to the current wayland compositor(sway/hyprland or others).
-          # with such a vendor-no-locking script, we can switch to another wayland compositor without modifying greetd's config here.
-          # command = "$HOME/.wayland-session"; # start a wayland session directly without a login manager
-          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland"; # start Hyprland with a TUI login manager
-        };
-      };
-    };
-    smartd = {
-      enable = false;
-      autodetect = true;
-    };
-    libinput.enable = true;
-    fstrim.enable = true;
-    gvfs.enable = true;
-    openssh.enable = true;
-    flatpak.enable = false;
-    printing = {
-      enable = true;
-      drivers = [
-        # pkgs.hplipWithPlugin
-      ];
-    };
-    # auto-cpufreq.enable = true;
-    gnome.gnome-keyring.enable = true;
-    avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true;
-    };
-    ipp-usb.enable = true;
-    syncthing = {
-      enable = false;
-      user = "${username}";
-      dataDir = "/home/${username}";
-      configDir = "/home/${username}/.config/syncthing";
-    };
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
-    pulseaudio = {
-      enable = false;
-      extraConfig = "load-module module-combine-sink";
-    };
-    rpcbind.enable = false;
-    nfs.server.enable = false;
-  };
-  systemd.services.flatpak-repo = {
-    path = [pkgs.flatpak];
-    script = ''
-      flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-    '';
-  };
-
-  hardware = {
-    sane = {
-      enable = true;
-      extraBackends = [pkgs.sane-airscan];
-      disabledDefaultBackends = ["escl"];
-    };
-    logitech = {
-      wireless = {
-        enable = false;
-        enableGraphical = false;
-      };
-    };
-    bluetooth = {
-      enable = true;
-      powerOnBoot = true;
-    };
-    graphics = {
-      enable = true;
-      enable32Bit = true;
-    };
-  };
-  services.blueman.enable = true;
-
-  # Security / Polkit
-  security = {
-    rtkit.enable = true;
-    polkit = {
-      enable = true;
-      extraConfig = ''
-        polkit.addRule(function(action, subject) {
-          if (
-            subject.isInGroup("users")
-              && (
-                action.id == "org.freedesktop.login1.reboot" ||
-                action.id == "org.freedesktop.login1.reboot-multiple-sessions" ||
-                action.id == "org.freedesktop.login1.power-off" ||
-                action.id == "org.freedesktop.login1.power-off-multiple-sessions"
-              )
-            )
-          {
-            return polkit.Result.YES;
-          }
-        })
-      '';
-    };
-    pam.services.swaylock = {
-      text = ''
-        auth include login
-      '';
-    };
-    sudo = {
-      enable = true;
-      extraConfig = ''
-        Defaults	pwfeedback
-      '';
-    };
-  };
-
-  # Optimization settings and garbage collection automation
-  nix = {
-    settings = {
-      auto-optimise-store = true;
-      experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
-      substituters = ["https://hyprland.cachix.org"];
-      trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
-    };
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 7d";
-    };
-    nixPath = ["nixpkgs=${inputs.nixpkgs}"];
-  };
-
-  # Virtualization / Containers
-  virtualisation = {
-    libvirtd.enable = true;
-    docker = {
-      enable = true;
-      package = pkgs.docker;
-    };
-    # podman = {
-    #   enable = true;
-    #   dockerCompat = true;
-    #   defaultNetwork.settings.dns_enabled = true;
-    # };
-  };
-
-  # services.openvpn.servers = {
-  #   RO-P2P = {
-  #     config = ''
-  #       config /home/garand_plg/Documents/RO-ovpn-tcp.ovpn
-  #     '';
-  #     updateResolvConf = true;
-  #   };
-  # };
-
-  console.keyMap = "${keyboardLayout}";
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave

hosts/default/config/boot.nix

@@ -0,0 +1,38 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  boot = {
+    # Kernel
+    kernelPackages = pkgs.linuxPackages_zen;
+    # This is for OBS Virtual Cam Support
+    kernelModules = ["v4l2loopback"];
+    extraModulePackages = [config.boot.kernelPackages.v4l2loopback];
+    # Needed For Some Steam Games
+    kernel.sysctl = {
+      "vm.max_map_count" = 2147483642;
+    };
+    # Bootloader.
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+    initrd.systemd.dbus.enable = true;
+    # Make /tmp a tmpfs
+    tmp = {
+      useTmpfs = false;
+      tmpfsSize = "30%";
+    };
+    # Appimage Support
+    binfmt.registrations.appimage = {
+      wrapInterpreterInShell = false;
+      interpreter = "${pkgs.appimage-run}/bin/appimage-run";
+      recognitionType = "magic";
+      offset = 0;
+      mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
+      magicOrExtension = ''\x7fELF....AI\x02'';
+    };
+    plymouth.enable = true;
+  };
+}

hosts/default/config/drivers.nix

@@ -0,0 +1,15 @@
+{...}: {
+  # Extra Module Options
+  drivers = {
+    amdgpu.enable = true;
+    nvidia.enable = false;
+    nvidia-prime = {
+      enable = false;
+      intelBusID = "";
+      nvidiaBusID = "";
+    };
+    intel.enable = false;
+  };
+  vm.guest-services.enable = false;
+  local.hardware-clock.enable = false;
+}

hosts/default/config/hardware.nix

@@ -0,0 +1,23 @@
+{pkgs, ...}: {
+  hardware = {
+    sane = {
+      enable = true;
+      extraBackends = [pkgs.sane-airscan];
+      disabledDefaultBackends = ["escl"];
+    };
+    logitech = {
+      wireless = {
+        enable = false;
+        enableGraphical = false;
+      };
+    };
+    bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+    };
+    graphics = {
+      enable = true;
+      enable32Bit = true;
+    };
+  };
+}

hosts/default/config/localization.nix

@@ -0,0 +1,19 @@
+{...}: {
+  # Set your time zone.
+  time.timeZone = "Europe/Warsaw";
+
+  i18n = {
+    defaultLocale = "pl_PL.UTF-8";
+    extraLocaleSettings = {
+      LC_ADDRESS = "pl_PL.UTF-8";
+      LC_IDENTIFICATION = "pl_PL.UTF-8";
+      LC_MEASUREMENT = "pl_PL.UTF-8";
+      LC_MONETARY = "pl_PL.UTF-8";
+      LC_NAME = "pl_PL.UTF-8";
+      LC_NUMERIC = "pl_PL.UTF-8";
+      LC_PAPER = "pl_PL.UTF-8";
+      LC_TELEPHONE = "pl_PL.UTF-8";
+      LC_TIME = "pl_PL.UTF-8";
+    };
+  };
+}

hosts/default/config/networking.nix

@@ -0,0 +1,19 @@
+{
+  host,
+  options,
+  ...
+}: {
+  # Enable networking
+  networking = {
+    nameservers = ["194.242.2.4" "217.12.221.61" "2a07:e340::4"];
+    networkmanager.enable = true;
+    hostName = host;
+    timeServers = options.networking.timeServers.default ++ ["pool.ntp.org"];
+  };
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+}

hosts/default/config/nixpkgs.nix

@@ -0,0 +1,59 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  # Optimization settings and garbage collection automation
+  nix = {
+    settings = {
+      auto-optimise-store = true;
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
+      substituters = ["https://hyprland.cachix.org"];
+      trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
+    };
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 7d";
+    };
+    nixPath = ["nixpkgs=${inputs.nixpkgs}"];
+  };
+
+  nixpkgs.config = {
+    allowUnfree = true;
+    pulseaudio = true;
+  };
+
+  # Extra Portal Configuration
+  xdg.portal = {
+    enable = true;
+    xdgOpenUsePortal = true;
+    wlr.enable = 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
+    ];
+  };
+
+  environment = {
+    variables = {
+      ZANEYOS_VERSION = "2.2";
+      ZANEYOS = "true";
+    };
+  };
+}

hosts/default/config/nixpkgs/clients.nix

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

hosts/default/config/nixpkgs/codium.nix

@@ -0,0 +1,14 @@
+{pkgs, ...}: {
+  environment = {
+    systemPackages = with pkgs; [
+      (vscode-with-extensions.override {
+        vscode = vscodium;
+        vscodeExtensions = with vscode-extensions;
+          [
+          ]
+          ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+          ];
+      })
+    ];
+  };
+}

hosts/default/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/default/config/nixpkgs/gaming.nix

@@ -0,0 +1,14 @@
+# Narzędzia do gier
+{
+  pkgs,
+  inputs,
+  system,
+  ...
+}: {
+  environment.systemPackages = with pkgs; [
+    wineWowPackages.waylandFull # wine64
+    lutris
+    space-cadet-pinball
+    inputs.prismlauncher-cracked.packages.${system}.default
+  ];
+}

hosts/default/config/nixpkgs/multimedia.nix

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

hosts/default/config/nixpkgs/tools.nix

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

hosts/default/config/nixpkgs/tty.nix

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

hosts/default/config/programs.nix

@@ -0,0 +1,123 @@
+{pkgs, ...}: {
+  programs = {
+    starship = {
+      enable = true;
+      settings = {
+        add_newline = false;
+        buf = {
+          symbol = " ";
+        };
+        c = {
+          symbol = " ";
+        };
+        directory = {
+          read_only = " 󰌾";
+        };
+        docker_context = {
+          symbol = " ";
+        };
+        fossil_branch = {
+          symbol = " ";
+        };
+        git_branch = {
+          symbol = " ";
+        };
+        golang = {
+          symbol = " ";
+        };
+        hg_branch = {
+          symbol = " ";
+        };
+        hostname = {
+          ssh_symbol = " ";
+        };
+        lua = {
+          symbol = " ";
+        };
+        memory_usage = {
+          symbol = "󰍛 ";
+        };
+        meson = {
+          symbol = "󰔷 ";
+        };
+        nim = {
+          symbol = "󰆥 ";
+        };
+        nix_shell = {
+          symbol = " ";
+        };
+        nodejs = {
+          symbol = " ";
+        };
+        ocaml = {
+          symbol = " ";
+        };
+        package = {
+          symbol = "󰏗 ";
+        };
+        python = {
+          symbol = " ";
+        };
+        rust = {
+          symbol = " ";
+        };
+        swift = {
+          symbol = " ";
+        };
+        zig = {
+          symbol = " ";
+        };
+      };
+    };
+    hyprland = {
+      enable = true;
+      withUWSM = true;
+      portalPackage = pkgs.xdg-desktop-portal-hyprland;
+    };
+    dconf.enable = true;
+    seahorse.enable = true;
+    fuse.userAllowOther = true;
+    mtr.enable = true;
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
+    virt-manager.enable = true;
+    steam = {
+      enable = true;
+      gamescopeSession.enable = true;
+      remotePlay.openFirewall = true;
+      dedicatedServer.openFirewall = true;
+      extraCompatPackages = with pkgs; [
+        proton-ge-bin
+      ];
+    };
+    gamescope = {
+      enable = true;
+      capSysNice = true;
+    };
+    gamemode.enable = true;
+    auto-cpufreq = {
+      enable = true;
+      settings = {
+        charger = {
+          governor = "performance";
+          turbo = "auto";
+        };
+
+        battery = {
+          governor = "powersave";
+          turbo = "auto";
+        };
+      };
+    };
+    thunar = {
+      enable = true;
+      plugins = with pkgs.xfce; [
+        thunar-archive-plugin
+        thunar-volman
+      ];
+    };
+    kdeconnect.enable = true;
+  };
+}

hosts/default/config/security.nix

@@ -0,0 +1,40 @@
+{...}: {
+  # Security / Polkit
+  security = {
+    rtkit.enable = true;
+    polkit = {
+      enable = true;
+      extraConfig = ''
+        polkit.addRule(function(action, subject) {
+          if (
+            subject.isInGroup("users")
+              && (
+                action.id == "org.freedesktop.login1.reboot" ||
+                action.id == "org.freedesktop.login1.reboot-multiple-sessions" ||
+                action.id == "org.freedesktop.login1.power-off" ||
+                action.id == "org.freedesktop.login1.power-off-multiple-sessions"
+              )
+            )
+          {
+            return polkit.Result.YES;
+          }
+        })
+      '';
+    };
+    pam.services.swaylock = {
+      text = ''
+        auth include login
+      '';
+    };
+    sudo = {
+      enable = true;
+      extraConfig = ''
+        Defaults	pwfeedback
+      '';
+    };
+  };
+
+  users = {
+    mutableUsers = true;
+  };
+}

hosts/default/config/services.nix

@@ -0,0 +1,106 @@
+{
+  pkgs,
+  username,
+  ...
+}: let
+  inherit (import ../variables.nix) keyboardLayout;
+in {
+  # Services to start
+  services = {
+    blueman.enable = true;
+    xserver = {
+      enable = false;
+      xkb = {
+        layout = "${keyboardLayout}";
+        variant = "";
+      };
+    };
+    resolved = {
+      enable = true;
+      dnssec = "true";
+      domains = ["~."]; # "use as default interface for all requests"
+      # (see man resolved.conf)
+      # let Avahi handle mDNS publication
+      extraConfig = ''
+        DNSOverTLS=opportunistic
+        MulticastDNS=resolve
+      '';
+      llmnr = "true";
+    };
+    greetd = {
+      enable = true;
+      settings = {
+        default_session = {
+          # Wayland Desktop Manager is installed only for user ryan via home-manager!
+          user = username;
+          # .wayland-session is a script generated by home-manager, which links to the current wayland compositor(sway/hyprland or others).
+          # with such a vendor-no-locking script, we can switch to another wayland compositor without modifying greetd's config here.
+          # command = "$HOME/.wayland-session"; # start a wayland session directly without a login manager
+          command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd Hyprland"; # start Hyprland with a TUI login manager
+        };
+      };
+    };
+    smartd = {
+      enable = false;
+      autodetect = true;
+    };
+    libinput = {
+      enable = true;
+      mouse = {
+        accelProfile = "flat";
+      };
+      touchpad = {
+        accelProfile = "flat";
+      };
+    };
+    fstrim.enable = true;
+    gvfs.enable = true;
+    tumbler.enable = true;
+    openssh.enable = true;
+    flatpak.enable = false;
+    printing = {
+      enable = true;
+      # drivers = with pkgs; [
+      #   # hplipWithPlugin
+      # ];
+    };
+    gnome = {
+      evolution-data-server.enable = true;
+      gnome-online-accounts.enable = true;
+      gnome-keyring.enable = true;
+    };
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+    ipp-usb.enable = true;
+    syncthing = {
+      enable = false;
+      user = "${username}";
+      dataDir = "/home/${username}";
+      configDir = "/home/${username}/.config/syncthing";
+    };
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+    };
+    pulseaudio = {
+      enable = false;
+      extraConfig = "load-module module-combine-sink";
+    };
+    rpcbind.enable = false;
+    nfs.server.enable = false;
+  };
+
+  console.keyMap = "${keyboardLayout}";
+
+  systemd.services.flatpak-repo = {
+    path = [pkgs.flatpak];
+    script = ''
+      flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+    '';
+  };
+}

hosts/default/config/stylix.nix

@@ -0,0 +1,63 @@
+{pkgs, ...}: {
+  # Styling Options
+  stylix = {
+    enable = true;
+    image = ../../../config/wallpapers/attack-on-titan-mikasa-ackerman.jpg;
+    # base16Scheme = {
+    #   base00 = "232136";
+    #   base01 = "2a273f";
+    #   base02 = "393552";
+    #   base03 = "6e6a86";
+    #   base04 = "908caa";
+    #   base05 = "e0def4";
+    #   base06 = "e0def4";
+    #   base07 = "56526e";
+    #   base08 = "eb6f92";
+    #   base09 = "f6c177";
+    #   base0A = "ea9a97";
+    #   base0B = "3e8fb0";
+    #   base0C = "9ccfd8";
+    #   base0D = "c4a7e7";
+    #   base0E = "f6c177";
+    #   base0F = "56526e";
+    # };
+    polarity = "dark";
+    opacity.terminal = 0.8;
+    cursor = {
+      package = pkgs.bibata-cursors;
+      name = "Bibata-Modern-Ice";
+      size = 24;
+    };
+    fonts = {
+      monospace = {
+        package = pkgs.nerd-fonts.fira-mono;
+        name = "FiraCode Nerd Fonts Mono";
+      };
+      sansSerif = {
+        package = pkgs.nerd-fonts.fira-code;
+        name = "FiraCode Nerd Fonts";
+      };
+      serif = {
+        package = pkgs.nerd-fonts.fira-code;
+        name = "FiraCode Nerd Fonts";
+      };
+      sizes = {
+        applications = 12;
+        terminal = 15;
+        desktop = 11;
+        popups = 12;
+      };
+    };
+  };
+
+  fonts = {
+    packages = with pkgs; [
+      noto-fonts-emoji
+      noto-fonts-cjk-sans
+      font-awesome
+      # Commenting Symbola out to fix install this will need to be fixed or an alternative found.
+      # symbola
+      material-icons
+    ];
+  };
+}

hosts/default/config/virtualization.nix

@@ -0,0 +1,10 @@
+{pkgs, ...}: {
+  # Virtualization / Containers
+  virtualisation = {
+    libvirtd.enable = true;
+    docker = {
+      enable = true;
+      package = pkgs.docker;
+    };
+  };
+}

hosts/default/hardware.nix

@@ -1,38 +1,47 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = ["nvme" "xhci_pci"];
   boot.initrd.kernelModules = [];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/c537152e-ea4f-4bb7-b453-088612e0024a";
+    device = "/dev/disk/by-uuid/a96dc5a2-e2bf-4725-a7be-6b9d2b020fa6";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  boot.initrd.luks.devices."luks-9b24a6b5-14e7-4e50-bd1d-c1af7382027c".device = "/dev/disk/by-uuid/9b24a6b5-14e7-4e50-bd1d-c1af7382027c";
-    { device = "/dev/disk/by-uuid/DA7B-269C";
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/3D12-F697";
     fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
+    options = ["fmask=0077" "dmask=0077"];
   };
 
-  swapDevices = [ ];
+  swapDevices = [
+    {device = "/dev/disk/by-uuid/f1c0ee39-01a9-4508-916a-978650d6c514";}
+  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/default/home.nix

@@ -1,17 +1,4 @@
-{
+{...}: {
-  pkgs,
-  lib,
-  username,
-  host,
-  ...
-}: let
-  inherit (import ./variables.nix) gitUsername gitEmail;
-in {
-  # Home Manager Settings
-  home.username = "${username}";
-  home.homeDirectory = "/home/${username}";
-  home.stateVersion = "23.11";
-
   # Import Program Configurations
   imports = [
     ../../config/emoji.nix
@@ -24,236 +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
   ];
-
-  # Place Files Inside Home Directory
-  home.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
-    '';
-  };
-
-  # Install & Configure Git
-  programs.git = {
-    enable = true;
-    userName = "${gitUsername}";
-    userEmail = "${gitEmail}";
-  };
-
-  # 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 = "adwaita-dark";
-    platformTheme.name = "gtk3";
-  };
-
-  # Scripts
-  home.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;
-    })
-  ];
-
-  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 = {
-    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
-      '';
-      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";
-        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";
-        terminal = "cat /home/garand_plg/Documents/terminal.txt";
-        e-terminal = "nano /home/garand_plg/Documents/terminal.txt";
-        ".." = "cd ..";
-      };
-    };
-    home-manager.enable = true;
-    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/default/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/default/home/misc.nix

@@ -0,0 +1,37 @@
+{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 = {
+    "org/virt-manager/virt-manager/connections" = {
+      autoconnect = ["qemu:///system"];
+      uris = ["qemu:///system"];
+    };
+  };
+}

hosts/default/home/programs.nix

@@ -0,0 +1,132 @@
+{
+  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;
+
+    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
+      '';
+      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";
+        fr = "nh os switch --hostname ${host} /home/${username}/zaneyos";
+        fu = "nh os switch --hostname ${host} --update /home/${username}/zaneyos";
+        hypr-cli = "hyprctl clients";
+        ncg = "nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
+        n = "nano";
+        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";
+        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/default/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/default/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";
+  };
+}

hosts/default/users.nix

@@ -18,11 +18,11 @@ in {
         "lp"
         "docker"
         "audio"
+        "gamemode"
       ];
       shell = pkgs.bash;
       ignoreShellProgramCheck = true;
-      # packages = with pkgs; [
+      # packages = with pkgs; [];
-      # ];
     };
     # "newuser" = {
     #   homeMode = "755";

hosts/default/variables.nix

@@ -1,16 +1,12 @@
 {
-  # Git Configuration ( For Pulling Software Repos )
+  gitUsername = "";
-  gitUsername = "GarandPLG";
+  gitEmail = "";
-  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 = "kitty";
-  terminal = "kitty"; # Set Default System Terminal
   keyboardLayout = "pl";
 }

hosts/garand-laptop/config/boot.nix

@@ -15,34 +15,10 @@
     };
     # Bootloader.
     loader = {
-      systemd-boot.enable = false;
+      systemd-boot.enable = true;
       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";
-      };
     };
+    initrd.systemd.dbus.enable = true;
     # Make /tmp a tmpfs
     tmp = {
       useTmpfs = false;

hosts/garand-laptop/config/hardware.nix

@@ -20,18 +20,4 @@
       enable32Bit = true;
     };
   };
-
-  # fileSystems."/mnt/Garand-Library" = {
-  #   device = "//192.168.1.156/Garand-Library";
-  #   fsType = "cifs";
-  #   options = [
-  #     "credentials=/etc/smb-credentials"
-  #     "uid=1000"
-  #     "gid=100"
-  #     "iocharset=utf8"
-  #     "x-systemd.automount"
-  #     "x-systemd.idle-timeout=60"
-  #     "noauto"
-  #   ];
-  # };
 }

hosts/garand-laptop/config/networking.nix

@@ -5,7 +5,7 @@
 }: {
   # Enable networking
   networking = {
-    nameservers = ["176.9.1.117" "213.196.191.96" "2a01:4f8:151:34aa::198"];
+    nameservers = ["194.242.2.4" "217.12.221.61" "2a07:e340::4"];
     networkmanager.enable = true;
     hostName = host;
     timeServers = options.networking.timeServers.default ++ ["pool.ntp.org"];

hosts/garand-laptop/config/nixpkgs.nix

@@ -34,12 +34,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

@@ -12,5 +12,7 @@
     docker-client
     anki-bin
     onlyoffice-bin
+    freetube
+    mattermost-desktop
   ];
 }

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

@@ -17,9 +17,7 @@
             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
@@ -38,6 +36,15 @@
             yoavbls.pretty-ts-errors
             tamasfe.even-better-toml
             ms-ceintl.vscode-language-pack-pl
+            rust-lang.rust-analyzer
+            fill-labs.dependi
+            usernamehw.errorlens
+            bierner.docs-view
+            stkb.rewrap
+            ms-vscode.live-server
+            vadimcn.vscode-lldb
+            batisteo.vscode-django
+            vitaliymaz.vscode-svg-previewer
           ]
           ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
             {
@@ -58,30 +65,12 @@
               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";
@@ -112,12 +101,6 @@
               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";
@@ -131,10 +114,10 @@
               hash = "sha256-WoSycVtUAkVXv7BDuh+jFbnaU1IdVLvVjOYuIuUp79M=";
             }
             {
-              name = "inline-fold";
+              name = "inline-fold-new";
-              publisher = "moalamri";
+              publisher = "ctf0";
-              version = "0.2.6";
+              version = "0.0.2";
-              hash = "sha256-VPEp4gtXH787iK0RxjfciIZO1cjkYacjNELzjzcs/FI=";
+              hash = "sha256-DpXTBYN1Ohh3ZvvpUtas0G99fZcimsp1NL7mpIC07yk=";
             }
             {
               name = "mdc";
@@ -184,12 +167,6 @@
               version = "0.1.7";
               hash = "sha256-Q9bEIb2m6cqHtdVjOaNivfYvbc5/VVdabM2NVTwBOFA=";
             }
-            {
-              name = "svg-preview";
-              publisher = "simonsiefke";
-              version = "2.8.3";
-              hash = "sha256-hIVe1MmkyuHoDa56ZQUsSAGMlKWABoQ0FBOfgZZDbCw=";
-            }
             {
               name = "autoimport";
               publisher = "steoates";
@@ -232,6 +209,36 @@
               version = "0.4.2";
               hash = "sha256-LhOsIvECrxLCnRjUVffS4G4fFsdP70iP/twoNoto354=";
             }
+            {
+              name = "rust-flash-snippets";
+              publisher = "lorenzopirro";
+              version = "3.1.1";
+              hash = "sha256-L8x/OqbrsKDmyphzV3CDpoZ27rTnPS0U1YGv9KakW+U=";
+            }
+            {
+              name = "rustowl-vscode";
+              publisher = "cordx56";
+              version = "0.3.4";
+              hash = "sha256-sM4CxQfdtDkZg5B7gxw66k7ZpIfHQFORIukHRpg0+S8=";
+            }
+            {
+              name = "vscode-coverage-gutters";
+              publisher = "ryanluker";
+              version = "2.13.0";
+              hash = "sha256-qgPKGikqNIeZkKfd0P0keAdxRl9XNzvEJKQy58eaUZk=";
+            }
+            {
+              name = "vscode-change-case";
+              publisher = "hjdarnel";
+              version = "1.4.0";
+              hash = "sha256-6LS4MrG16054DQkPmr7BQJeekpEtcL2NtRe0Ckfq2w4=";
+            }
+            {
+              name = "vscode-bevy-inspector";
+              publisher = "splo";
+              version = "0.3.0";
+              hash = "sha256-f0FAgQ0wm3FYPz5qpMHWHnTf3un0xw+5gcyBG7PYM2E=";
+            }
           ];
       })
     ];

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

@@ -1,9 +1,14 @@
 # Narzędzia do gier
-{pkgs, ...}: {
+{
+  pkgs,
+  inputs,
+  system,
+  ...
+}: {
   environment.systemPackages = with pkgs; [
-    protonup
     wineWowPackages.waylandFull # wine64
     lutris
     space-cadet-pinball
+    inputs.prismlauncher-cracked.packages.${system}.default
   ];
 }

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

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

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

@@ -13,5 +13,6 @@
     # lazygit
     docker-slim
     dex
+    exercism
   ];
 }

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

@@ -3,14 +3,12 @@
   environment.systemPackages = with pkgs; [
     gambit-chess
     tty-solitaire
-    # bastet
-    # nsnake
     cmatrix
     cowsay
     sl
     fortune
     ookla-speedtest
-    btop
+    neohtop
     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;
@@ -83,7 +88,15 @@
       gamescopeSession.enable = true;
       remotePlay.openFirewall = true;
       dedicatedServer.openFirewall = true;
+      extraCompatPackages = with pkgs; [
+        proton-ge-bin
+      ];
     };
+    gamescope = {
+      enable = true;
+      capSysNice = true;
+    };
+    gamemode.enable = true;
     auto-cpufreq = {
       enable = true;
       settings = {
@@ -105,5 +118,6 @@
         thunar-volman
       ];
     };
+    kdeconnect.enable = true;
   };
 }

hosts/garand-laptop/config/services.nix

@@ -29,7 +29,6 @@ in {
     };
     greetd = {
       enable = true;
-      vt = 3;
       settings = {
         default_session = {
           # Wayland Desktop Manager is installed only for user ryan via home-manager!
@@ -37,7 +36,7 @@ in {
           # .wayland-session is a script generated by home-manager, which links to the current wayland compositor(sway/hyprland or others).
           # with such a vendor-no-locking script, we can switch to another wayland compositor without modifying greetd's config here.
           # command = "$HOME/.wayland-session"; # start a wayland session directly without a login manager
-          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland"; # start Hyprland with a TUI login manager
+          command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd Hyprland"; # start Hyprland with a TUI login manager
         };
       };
     };
@@ -94,31 +93,6 @@ in {
     };
     rpcbind.enable = false;
     nfs.server.enable = false;
-    # ollama = {
-    #   enable = true;
-    #   package = pkgs.ollama;
-    #   # acceleration = "rocm";
-    #   # environmentVariables = {
-    #   #   HCC_AMDGPU_TARGET = "gfx1036";
-    #   # };
-    #   # rocmOverrideGfx = "10.3.6";
-    #   loadModels = [
-    #     # "deepseek-r1:1.5b"
-    #     # "deepseek-r1:7b"
-    #   ];
-    # };
-    # open-webui = {
-    #   enable = true;
-    #   package = pkgs.open-webui;
-    # };
-    # penvpn.servers = {
-    #   RO-P2P = {
-    #     config = ''
-    #       config /home/garand_plg/Documents/RO-ovpn-tcp.ovpn
-    #     '';
-    #     updateResolvConf = true;
-    #   };
-    # };
   };
 
   console.keyMap = "${keyboardLayout}";

hosts/garand-laptop/config/virtualization.nix

@@ -6,11 +6,5 @@
       enable = true;
       package = pkgs.docker;
     };
-    # waydroid.enable = true;
-    # podman = {
-    #   enable = true;
-    #   dockerCompat = true;
-    #   defaultNetwork.settings.dns_enabled = true;
-    # };
   };
 }

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.librewolf.nix

@@ -11,7 +11,10 @@
       enable = true;
       package = pkgs.librewolf;
       # nativeMessagingHosts = [pkgs.firefoxpwa];
-      languagePacks = ["pl" "en-US"];
+      languagePacks = [
+        "pl"
+        "en-US"
+      ];
       profiles = {
         "${host}" = {
           id = 0;
@@ -59,6 +62,7 @@
               "garand's-search" = {
                 definedAliases = ["@g"];
                 urls = [{template = "https://search.garandplg.com/search?q={searchTerms}";}];
+                suggestUrl = "https://search.garandplg.com/autocompleter?q={searchTerms}";
               };
               "youtube" = {
                 definedAliases = ["@yt"];

hosts/garand-laptop/home/programs.nix

@@ -21,10 +21,6 @@ in {
 
     gh.enable = true;
 
-    btop = {
-      enable = false;
-    };
-
     kitty = {
       enable = true;
       package = pkgs.kitty;
@@ -60,7 +56,6 @@ in {
         if [ -f $HOME/.bashrc-personal ]; then
           source $HOME/.bashrc-personal
         fi
-        fc
       '';
       shellAliases = {
         os-sw = "sudo nixos-rebuild switch --flake ~/zaneyos";
@@ -69,17 +64,11 @@ in {
         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";
@@ -87,8 +76,6 @@ in {
         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";
@@ -141,5 +128,17 @@ in {
         ];
       };
     };
+
+    ssh = {
+      enable = true;
+      matchBlocks = {
+        "hp-t640-homeserver" = {
+          hostname = "192.168.1.156";
+          user = "garand_plg";
+          port = 556;
+          identityFile = "~/.ssh/hp-t640-homeserver";
+        };
+      };
+    };
   };
 }

hosts/garand-laptop/users.nix

@@ -18,6 +18,7 @@ in {
         "lp"
         "docker"
         "audio"
+        "gamemode"
       ];
       shell = pkgs.bash;
       ignoreShellProgramCheck = true;

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 = "kitty";
-  terminal = "kitty"; # Set Default System Terminal
   keyboardLayout = "pl";
 }

scripts/list-hypr-bindings.nix

@@ -55,7 +55,7 @@ in
     " + 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" \
+    " + B" "Uruchom monitorowanie zasobów" "NeoHtop" \
     " + SHIFT + B" "Uruchom manager Bluethooth" "blueman-manager" \
     " + T" "Otwórz nowe okno menedżera plików" "thunar" \
     " + W" "Uruchom przeglądarkę internetową" "${browser}" \
@@ -69,7 +69,8 @@ in
     " + I" "Uruchom Instagram" "dex-instagram" \
     " + R" "Uruchom Portainer" "dex-portainer" \
     " + U" "Uruchom Mastodon" "dex-mastodon" \
-    " + Y" "Uruchom Daily.dev" "dex-dailydev" \
+    " + 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" \