Zamiana systemd-boot na GRUB z własnym motywem

- Wyłączono `systemd-boot`, włączono `grub` z obsługą EFI. - Dodano własny motyw GRUB z grafiką `jablon.png` i plikiem `theme.txt`. - Motyw zawiera spersonalizowane kolory, czcionki i układ menu GRUB-a. - Dodano dodatkowy wpis menu GRUB-a zatytułowany „Mój system”. - Motyw kompilowany jest jako niestandardowe źródło w `pkgs.stdenv.mkDerivation`.
2025-05-05 20:32:50 +02:00
28 changed files with 408 additions and 1465 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-git-diff.txt
-packages/result
+git-diff.txt
--- a/config/fastfetch/default.nix
+++ b/config/fastfetch/default.nix
@@ -10,16 +10,16 @@
        };
      };

-      # logo = {
-      #   source = ./nixos.png;
-      #   type = "kitty-direct";
-      #   height = 15;
-      #   width = 30;
-      #   padding = {
-      #     top = 3;
-      #     left = 3;
-      #   };
-      # };
+      logo = {
+        source = ./nixos.png;
+        type = "kitty-direct";
+        height = 15;
+        width = 30;
+        padding = {
+          top = 3;
+          left = 3;
+        };
+      };

      modules = [
        "break"
--- a/config/garand-grub-theme/jablon.png
+++ b/config/garand-grub-theme/jablon.png
--- a/config/garand-grub-theme/theme.txt
+++ b/config/garand-grub-theme/theme.txt
@@ -0,0 +1,33 @@
+# GRUB2 gfxmenu theme
+desktop-image: "jablon.png"
+title-text: ""
+terminal-left: "0"
+terminal-top: "0"
+terminal-width: "100%"
+terminal-height: "100%"
+terminal-border: "0"
+
+ boot_menu {
+  left = 15%
+  top = 30%
+  width = 70%
+  height = 40%
+  item_font = "DejaVu Sans Regular 12"
+  item_color = "#cccccc"
+  selected_item_color = "#ffffff"
+  icon_width = 32
+  icon_height = 32
+  item_height = 24
+  item_spacing = 12
+  selected_item_pixmap_style = "select_*.png"
+}
+
+ label {
+  top = 82%
+  left = 15%
+  width = 70%
+  align = "center"
+  text = "Użyj strzałek do wyboru pozycji menu i Enter aby potwierdzić."
+  color = "#ffffff"
+  font = "DejaVu Sans Bold 10"
+}
--- a/config/hyprland.nix
+++ b/config/hyprland.nix
@@ -1,6 +1,5 @@
 {
  lib,
-  pkgs,
  username,
  host,
  config,
@@ -19,7 +18,6 @@ in
      enable = true;
      xwayland.enable = true;
      systemd.enable = true;
-      portalPackage = pkgs.xdg-desktop-portal-hyprland;
      extraConfig = let
        modifier = "SUPER";
      in
@@ -97,7 +95,6 @@ in
            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
@@ -215,8 +212,7 @@ in
            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},Y,exec,dex-dailydev
            bind = ${modifier},V,exec,codium
            bind = ${modifier},O,exec,onlyoffice-desktopeditors
            bind = ${modifier}SHIFT,O,exec,obs
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748372346,
-        "narHash": "sha256-7y7NZ6uW0GbT0h4gqfD2xvRuJj5IlPGw32oIc9Twga8=",
+        "lastModified": 1745403023,
+        "narHash": "sha256-DEs6jbWYJFJgpaPtF5NT3DQs3erjzdm2brLNHpjrEPA=",
        "owner": "AdnanHodzic",
        "repo": "auto-cpufreq",
-        "rev": "becd5b89963fa54fef3566147f3fd2087f8a5842",
+        "rev": "ad6e313dabf7e4da2765be6b36688db85b29ff5f",
        "type": "github"
      },
      "original": {
@@ -25,11 +25,11 @@
        "fromYaml": "fromYaml"
      },
      "locked": {
-        "lastModified": 1746562888,
-        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
+        "lastModified": 1745523430,
+        "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
        "owner": "SenchoPens",
        "repo": "base16.nix",
-        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
+        "rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
        "type": "github"
      },
      "original": {
@@ -95,11 +95,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1748664200,
-        "narHash": "sha256-D8sWEVVvxDBJsr8h26AGDfYjp56iKUIHCWaOKucDT2c=",
+        "lastModified": 1745752599,
+        "narHash": "sha256-vX5uq4wv7FeNeeFtsTPXQ9n2hd92NFXI+u9sg1K8OhA=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "b7d07ac2748936643abe8192065a2156f1a46d6e",
+        "rev": "0388c30f59e860307b2ef0ba93f38d2e525a153e",
        "type": "gitlab"
      },
      "original": {
@@ -144,6 +144,7 @@
      "inputs": {
        "nixpkgs-lib": [
          "stylix",
+          "nur",
          "nixpkgs"
        ]
      },
@@ -161,6 +162,27 @@
        "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": {
@@ -228,16 +250,16 @@
    "gnome-shell": {
      "flake": false,
      "locked": {
-        "lastModified": 1744584021,
-        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
+        "lastModified": 1732369855,
+        "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
        "owner": "GNOME",
        "repo": "gnome-shell",
-        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
+        "rev": "dadd58f630eeea41d645ee225a63f719390829dc",
        "type": "github"
      },
      "original": {
        "owner": "GNOME",
-        "ref": "48.1",
+        "ref": "47.2",
        "repo": "gnome-shell",
        "type": "github"
      }
@@ -249,11 +271,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748668774,
-        "narHash": "sha256-fYk/vk4ClmvHIgnGv/5GNRiDLtNCwXo9aLq36L/x+P4=",
+        "lastModified": 1745894335,
+        "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "60e4624302d956fe94d3f7d96a560d14d70591b9",
+        "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa",
        "type": "github"
      },
      "original": {
@@ -265,11 +287,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1748460289,
-        "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=",
+        "lastModified": 1745930157,
+        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102",
+        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
        "type": "github"
      },
      "original": {
@@ -281,10 +303,7 @@
    },
    "nur": {
      "inputs": {
-        "flake-parts": [
-          "stylix",
-          "flake-parts"
-        ],
+        "flake-parts": "flake-parts",
        "nixpkgs": [
          "stylix",
          "nixpkgs"
@@ -292,11 +311,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1746056780,
-        "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
+        "lastModified": 1745459908,
+        "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "d476cd0972dd6242d76374fcc277e6735715c167",
+        "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035",
        "type": "github"
      },
      "original": {
@@ -322,7 +341,7 @@
        "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": [
@@ -340,11 +359,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1748621009,
-        "narHash": "sha256-X7SqoEEHVsR01GwL9WBs3tuSXdit7YdeBdIHrl+MlZQ=",
+        "lastModified": 1745962538,
+        "narHash": "sha256-UmQxI4ocPZUVHuxtaQN3zNNBU8KLK9x2gXl2kWUhMKY=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "b69e9b761ee682b722e2c9ce46637e767b50f6dc",
+        "rev": "764fd32955e79f2742a7975f0150175f93add2fb",
        "type": "github"
      },
      "original": {
@@ -388,16 +407,17 @@
    "tinted-kitty": {
      "flake": false,
      "locked": {
-        "lastModified": 1735730497,
-        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
+        "lastModified": 1716423189,
+        "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
        "owner": "tinted-theming",
        "repo": "tinted-kitty",
-        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
+        "rev": "eb39e141db14baef052893285df9f266df041ff8",
        "type": "github"
      },
      "original": {
        "owner": "tinted-theming",
        "repo": "tinted-kitty",
+        "rev": "eb39e141db14baef052893285df9f266df041ff8",
        "type": "github"
      }
    },
--- a/hosts/garand-laptop/config.nix
+++ b/hosts/garand-laptop/config.nix
@@ -11,7 +11,7 @@

    ./config/nixpkgs.nix
    ./config/nixpkgs/clients.nix
-    # ./config/nixpkgs/codium.nix
+    ./config/nixpkgs/codium.nix
    ./config/nixpkgs/fundamentals.nix
    ./config/nixpkgs/gaming.nix
    ./config/nixpkgs/multimedia.nix
--- a/hosts/garand-laptop/config/boot.nix
+++ b/hosts/garand-laptop/config/boot.nix
@@ -15,10 +15,34 @@
    };
    # Bootloader.
    loader = {
-      systemd-boot.enable = true;
+      systemd-boot.enable = false;
      efi.canTouchEfiVariables = true;
+
+      grub = {
+        enable = true;
+        efiSupport = true;
+        device = "nodev";
+        theme = pkgs.stdenv.mkDerivation {
+          name = "garand-grub-theme";
+          src = ../../../config/garand-grub-theme;
+
+          buildPhase = ''
+            mkdir -p $out/grub/themes/garand-grub-theme
+            cp -r * $out/grub/themes/garand-grub-theme/
+          '';
+
+          installPhase = "true";
+        };
+
+        extraEntries = ''
+          menuentry "Mój system" {
+            # konfiguracja wpisu menu
+          }
+        '';
+
+        gfxmodeEfi = "1920x1080";
+      };
    };
-    initrd.systemd.dbus.enable = true;
    # Make /tmp a tmpfs
    tmp = {
      useTmpfs = false;
--- a/hosts/garand-laptop/config/nixpkgs.nix
+++ b/hosts/garand-laptop/config/nixpkgs.nix
@@ -25,11 +25,6 @@
  nixpkgs.config = {
    allowUnfree = true;
    pulseaudio = true;
-    # packageOverrides = pkgs: {
-    #   ulauncher = pkgs.ulauncher.override {
-    #     autoStart = true;
-    #   };
-    # };
  };

  # Extra Portal Configuration
@@ -39,19 +34,12 @@
    wlr.enable = true;
    extraPortals = [
      pkgs.xdg-desktop-portal-gtk
-      pkgs.xdg-desktop-portal-hyprland
+      pkgs.xdg-desktop-portal
    ];
-    config = {
-      common = {
-        default = [
-          "gtk"
-          "hyprland"
-        ];
-      };
-    };
    configPackages = [
      pkgs.xdg-desktop-portal-gtk
      pkgs.xdg-desktop-portal-hyprland
+      pkgs.xdg-desktop-portal
    ];
  };

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

-    ./home/codium.nix
    ./home/home.nix
    ./home/misc.nix
    ./home/programs.nix
--- a/hosts/garand-laptop/home/codium.nix
+++ b/hosts/garand-laptop/home/codium.nix
@@ -1,23 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: let
-  default = import ./codium/default.nix {inherit pkgs;};
-  webdev-vue = import ./codium/webdev-vue.nix {inherit pkgs;};
-  python-django = import ./codium/python-django.nix {inherit pkgs;};
-  rust-tauri = import ./codium/rust-tauri.nix {inherit pkgs;};
-  rust-bevy = import ./codium/rust-bevy.nix {inherit pkgs;};
-in {
-  programs.vscode = lib.mkDefault {
-    enable = true;
-    package = pkgs.vscodium;
-    profiles = {
-      inherit (default.programs.vscode.profiles) default;
-      inherit (webdev-vue.programs.vscode.profiles) webdev-vue;
-      inherit (python-django.programs.vscode.profiles) python-django;
-      inherit (rust-tauri.programs.vscode.profiles) rust-tauri;
-      inherit (rust-bevy.programs.vscode.profiles) rust-bevy;
-    };
-  };
-}
--- a/hosts/garand-laptop/home/codium/default.nix
+++ b/hosts/garand-laptop/home/codium/default.nix
@@ -1,261 +0,0 @@
-{pkgs, ...}: {
-  programs.vscode.profiles.default = {
-    extensions = with pkgs.vscode-extensions;
-      [
-        christian-kohler.path-intellisense
-        continue.continue
-        davidanson.vscode-markdownlint
-        donjayamanne.githistory
-        ethansk.restore-terminals
-        formulahendry.auto-close-tag
-        formulahendry.auto-rename-tag
-        gruntfuggly.todo-tree
-        jnoortheen.nix-ide
-        mechatroner.rainbow-csv
-        ms-azuretools.vscode-docker
-        oderwat.indent-rainbow
-        shd101wyy.markdown-preview-enhanced
-        streetsidesoftware.code-spell-checker
-        supermaven.supermaven
-        tomoki1207.pdf
-        visualstudioexptteam.intellicode-api-usage-examples
-        visualstudioexptteam.vscodeintellicode
-        vscode-icons-team.vscode-icons
-        tamasfe.even-better-toml
-        ms-ceintl.vscode-language-pack-pl
-      ]
-      ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-        {
-          name = "one-dark-pro-monokai-darker";
-          publisher = "eserozvataf";
-          version = "1.1.0";
-          hash = "sha256-jUjBiy0CD7jw2WBMvM3h8bEC2ySEuj7532dC3v9lpyI=";
-        }
-        {
-          name = "tab-indent-space-align";
-          publisher = "j-zeppenfeld";
-          version = "0.0.3";
-          hash = "sha256-+WEdYJOVWW7YumfzLkvZmrnpUiC85oLsG1BKMwL1NHc=";
-        }
-        {
-          name = "polacode-2019";
-          publisher = "jeff-hykin";
-          version = "0.6.1";
-          hash = "sha256-SbfsD28gaVHAmJskUuc1Q8kA47jrVa3OO5Ur7ULk3jI=";
-        }
-        {
-          name = "csv-to-table";
-          publisher = "phplasma";
-          version = "1.4.1";
-          hash = "sha256-npe7cQ4lAZr8HCyQSJmVsCDUJcOhGhL6y1QtUtqUY50=";
-        }
-        {
-          name = "bash-debug";
-          publisher = "rogalmic";
-          version = "0.3.9";
-          hash = "sha256-f8FUZCvz/PonqQP9RCNbyQLZPnN5Oce0Eezm/hD19Fg=";
-        }
-        {
-          name = "svg-preview";
-          publisher = "simonsiefke";
-          version = "2.8.3";
-          hash = "sha256-hIVe1MmkyuHoDa56ZQUsSAGMlKWABoQ0FBOfgZZDbCw=";
-        }
-        {
-          name = "autoimport";
-          publisher = "steoates";
-          version = "1.5.4";
-          hash = "sha256-7iIwJJsoNbtTopc+BQ+195aSCLqdNAaGtMoxShyhBWY=";
-        }
-        {
-          name = "code-spell-checker-polish";
-          publisher = "streetsidesoftware";
-          version = "2.1.3";
-          hash = "sha256-MZeTvK9dO4Kj6hK+afJPWGmnKBtlLrrnoqtUd5s2te0=";
-        }
-        {
-          name = "vscode-pets";
-          publisher = "tonybaloney";
-          version = "1.30.0";
-          hash = "sha256-RxOA6xQ29JuB0NzEqMDkF9W1U+AsvgAOzGbtIUw0WyM=";
-        }
-        {
-          name = "prettify-json";
-          publisher = "mohsen1";
-          version = "0.0.3";
-          hash = "sha256-lvds+lFDzt1s6RikhrnAKJipRHU+Dk85ZO49d1sA8uo=";
-        }
-      ];
-    userSettings = {
-      # Editor appearance and behavior
-      "editor.cursorBlinking" = "expand";
-      "editor.foldingImportsByDefault" = true;
-      "editor.fontFamily" = "FiraCode Nerd Font";
-      "editor.formatOnPaste" = true;
-      "editor.formatOnSave" = true;
-      "editor.guides.bracketPairs" = false;
-      "editor.guides.indentation" = false;
-      "editor.inlayHints.enabled" = "off";
-      "editor.inlineSuggest.showToolbar" = "always";
-      "editor.largeFileOptimizations" = false;
-      "editor.minimap.enabled" = false;
-      "editor.quickSuggestions" = {
-        "strings" = "on";
-      };
-      "editor.suggestFontSize" = 16;
-      "editor.suggestLineHeight" = 30;
-      "editor.tabSize" = 2;
-      "editor.unicodeHighlight.ambiguousCharacters" = false;
-      "editor.unicodeHighlight.invisibleCharacters" = false;
-      "editor.wordWrap" = "off";
-      "editor.hover.enabled" = true;
-      "editor.gotoLocation.multipleDefinitions" = "goto";
-      # Workbench settings
-      "workbench.colorCustomizations" = {
-        "editor.lineHighlightBackground" = "#1073cf2d";
-        "editor.lineHighlightBorder" = "#9fced11f";
-      };
-      "workbench.colorTheme" = "One Dark Pro Monokai Darker";
-      "workbench.iconTheme" = "vscode-icons";
-      "workbench.startupEditor" = "none";
-      # Terminal settings
-      "terminal.integrated.fontFamily" = "FiraCode Nerd Fonts Mono";
-      # Git settings
-      "git.confirmSync" = false;
-      "git.enableSmartCommit" = true;
-      # Explorer settings
-      "explorer.confirmDelete" = false;
-      "explorer.confirmDragAndDrop" = false;
-      # Diff editor settings
-      "diffEditor.ignoreTrimWhitespace" = false;
-      "diffEditor.wordWrap" = "off";
-      # Zen mode settings
-      "zenMode.centerLayout" = false;
-      "zenMode.hideActivityBar" = false;
-      "zenMode.hideLineNumbers" = false;
-      # File associations
-      "files.associations" = {
-        "*.html" = "html";
-        "*.txt" = "plaintext";
-      };
-      # Navigation and intellisense
-      "path-intellisense.extensionOnImport" = true;
-      # Markdown settings
-      "markdown-preview-enhanced.previewTheme" = "one-dark.css";
-      # Extension specific settings
-      "supermaven.allowGitignore" = true;
-      "supermaven.enable" = {
-        "*" = true;
-      };
-      "continue.enableTabAutocomplete" = false;
-      "continue.showInlineTip" = false;
-      "continue.telemetryEnabled" = false;
-      "hediet.vscode-drawio.resizeImages" = null;
-      "todo-tree.highlights.useColourScheme" = true;
-      "vite.autoStart" = false;
-      # Syntax highlighting and appearance
-      "indentRainbow.colorOnWhiteSpaceOnly" = true;
-      "indentRainbow.indicatorStyle" = "light";
-      "indentRainbow.lightIndicatorStyleLineWidth" = 4;
-      # Spelling and language
-      "cSpell.language" = "en,pl";
-      "cSpell.userWords" = [
-        "garand"
-        "Garand's"
-        "garandplg"
-        "garands"
-        "lockb"
-        "Shadcn"
-        "Vite"
-      ];
-      # Security and trust
-      "security.workspace.trust.untrustedFiles" = "open";
-      # Remote development
-      "remote.autoForwardPortsSource" = "hybrid";
-      # Misc
-      "vsintellicode.modify.editor.suggestSelection" = "automaticallyOverrodeDefaultValue";
-      "githubLocalActions.workflowsDirectory" = ".gitea/workflows";
-    };
-    languageSnippets = {
-      "jsonc,json,jsonl" = {
-        "Restore Terminals" = {
-          body = [
-            " \"restoreTerminals.terminals\": ["
-            "    {"
-            "      \"splitTerminals\": ["
-            "        {"
-            "          \"name\": \"server\","
-            "          \"commands\": [\"npm i\", \"npm run dev\"]"
-            "        },"
-            "        {"
-            "          \"name\": \"client\","
-            "          \"commands\": [\"npm run dev:client\"]"
-            "        },"
-            "        {"
-            "          \"name\": \"test\","
-            "          \"commands\": [\"jest --watch\"]"
-            "        }"
-            "      ]"
-            "    },"
-            "    {"
-            "      \"splitTerminals\": ["
-            "        {"
-            "          \"name\": \"build & e2e\","
-            "          \"commands\": [\"npm run eslint\", \"npm run build\", \"npm run e2e\"],"
-            "          \"shouldRunCommands\": false"
-            "        },"
-            "        {"
-            "          \"name\": \"worker\","
-            "          \"commands\": [\"npm-run-all --parallel redis tsc-watch-start worker\"]"
-            "        }"
-            "      ]"
-            "    }"
-            "  ]"
-          ];
-          description = "Boilerplate for restore terminals";
-          prefix = [
-            "term"
-          ];
-        };
-      };
-      "nix" = {
-        "Nix-Shell-Default" = {
-          body = [
-            "{"
-            "  pkgs ? import <nixpkgs> {},"
-            "}:"
-            "pkgs.mkShell {"
-            "  packages = with pkgs; [];"
-            "}"
-          ];
-          description = "Podstawa do shelli nix";
-          prefix = [
-            "nix-shell"
-          ];
-        };
-      };
-    };
-    keybindings = [
-      {
-        "key" = "tab";
-        "command" = "-editor.emmet.action.expandAbbreviation";
-        "when" = "config.emmet.triggerExpansionOnTab && editorTextFocus && !editorReadonly && !editorTabMovesFocus";
-      }
-      {
-        "key" = "tab";
-        "command" = "-editor.action.inlineSuggest.jump";
-        "when" = "inlineEditIsVisible && tabShouldJumpToInlineEdit && !editorHoverFocused && !editorTabMovesFocus && !suggestWidgetVisible";
-      }
-      {
-        "key" = "tab";
-        "command" = "-Alignment Preserving Indent";
-        "when" = "editorTextFocus && !editorReadOnly && !editorTabMovesFocus && !inSnippetMode && !suggestWidgetVisible && config.editor.tabCompletion != 'on'";
-      }
-      {
-        "key" = "tab";
-        "command" = "-Alignment Preserving Indent";
-        "when" = "editorTextFocus && !editorReadOnly && !editorTabMovesFocus && !hasOtherSuggestions && !inSnippetMode && !suggestWidgetVisible && config.editor.tabCompletion == 'on'";
-      }
-    ];
-  };
-}
--- a/hosts/garand-laptop/home/codium/lib.nix
+++ b/hosts/garand-laptop/home/codium/lib.nix
@@ -1,23 +0,0 @@
-{...}: {
-  # This function merges a default profile with specific overrides
-  # It takes the default profile settings, extensions, keybindings, etc., and merges them with profile-specific ones
-  mergeProfile = defaultProfile: specificProfile: {
-    extensions = (defaultProfile.extensions or []) ++ (specificProfile.extensions or []);
-
-    userSettings = (defaultProfile.userSettings or {}) // (specificProfile.userSettings or {});
-
-    # Merge keybindings by concatenating arrays
-    keybindings = (defaultProfile.keybindings or []) ++ (specificProfile.keybindings or []);
-
-    languageSnippets =
-      (defaultProfile.languageSnippets or {})
-      // (let
-        snippets = specificProfile.languageSnippets or {};
-        mergeSnippets = language: defaultSnippets:
-          if builtins.hasAttr language snippets
-          then defaultSnippets // snippets.${language}
-          else defaultSnippets;
-      in
-        builtins.mapAttrs mergeSnippets (defaultProfile.languageSnippets or {}));
-  };
-}
--- a/hosts/garand-laptop/home/codium/python-django.nix
+++ b/hosts/garand-laptop/home/codium/python-django.nix
@@ -1,62 +0,0 @@
-{pkgs}: let
-  defaultProfile = import ./default.nix {inherit pkgs;};
-  lib = import ./lib.nix {inherit pkgs;};
-in {
-  programs.vscode.profiles.python-django =
-    lib.mergeProfile
-    defaultProfile.programs.vscode.profiles.default
-    {
-      # Only add Python-specific extensions here
-      extensions = with pkgs.vscode-extensions;
-        [
-          # Add Python/Django-specific extensions only
-          # ms-python.python
-          # ms-python.vscode-pylance
-        ]
-        ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-          # Additional Python-specific extensions from marketplace
-          {
-            name = "kylin-python";
-            publisher = "kylinideteam";
-            version = "0.4.2";
-            hash = "sha256-LhOsIvECrxLCnRjUVffS4G4fFsdP70iP/twoNoto354=";
-          }
-        ];
-
-      # Only override or add Python-specific settings
-      userSettings = {
-        # "python.linting.enabled" = true;
-        # "python.formatting.provider" = "black";
-        # Other Python-specific settings
-      };
-
-      # Add Python-specific keybindings (optional)
-      keybindings = [
-        # For example:
-        # {
-        #   "key" = "ctrl+shift+p";
-        #   "command" = "python.execInTerminal";
-        #   "when" = "editorLangId == 'python'";
-        # }
-      ];
-
-      # Only add Python-specific snippets
-      languageSnippets = {
-        "python" = {
-          "Main" = {
-            body = [
-              "def main() -> None:"
-              "    ..."
-              "if __name__ == '__main__':"
-              "    main()"
-            ];
-            description = "boilerplate dla main";
-            prefix = [
-              "main"
-            ];
-          };
-          # Other Python snippets
-        };
-      };
-    };
-}
--- a/hosts/garand-laptop/home/codium/rust-bevy.nix
+++ b/hosts/garand-laptop/home/codium/rust-bevy.nix
@@ -1,239 +0,0 @@
-{pkgs, ...}: {
-  programs.vscode.profiles.rust-bevy = {
-    extensions = with pkgs.vscode-extensions;
-      [
-        christian-kohler.path-intellisense
-        continue.continue
-        davidanson.vscode-markdownlint
-        donjayamanne.githistory
-        ethansk.restore-terminals
-        formulahendry.auto-close-tag
-        formulahendry.auto-rename-tag
-        gruntfuggly.todo-tree
-        jnoortheen.nix-ide
-        mechatroner.rainbow-csv
-        ms-azuretools.vscode-docker
-        oderwat.indent-rainbow
-        shd101wyy.markdown-preview-enhanced
-        streetsidesoftware.code-spell-checker
-        supermaven.supermaven
-        tomoki1207.pdf
-        visualstudioexptteam.intellicode-api-usage-examples
-        visualstudioexptteam.vscodeintellicode
-        vscode-icons-team.vscode-icons
-        tamasfe.even-better-toml
-        ms-ceintl.vscode-language-pack-pl
-      ]
-      ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-        {
-          name = "one-dark-pro-monokai-darker";
-          publisher = "eserozvataf";
-          version = "1.1.0";
-          hash = "sha256-jUjBiy0CD7jw2WBMvM3h8bEC2ySEuj7532dC3v9lpyI=";
-        }
-        {
-          name = "tab-indent-space-align";
-          publisher = "j-zeppenfeld";
-          version = "0.0.3";
-          hash = "sha256-+WEdYJOVWW7YumfzLkvZmrnpUiC85oLsG1BKMwL1NHc=";
-        }
-        {
-          name = "polacode-2019";
-          publisher = "jeff-hykin";
-          version = "0.6.1";
-          hash = "sha256-SbfsD28gaVHAmJskUuc1Q8kA47jrVa3OO5Ur7ULk3jI=";
-        }
-        {
-          name = "csv-to-table";
-          publisher = "phplasma";
-          version = "1.4.1";
-          hash = "sha256-npe7cQ4lAZr8HCyQSJmVsCDUJcOhGhL6y1QtUtqUY50=";
-        }
-        {
-          name = "bash-debug";
-          publisher = "rogalmic";
-          version = "0.3.9";
-          hash = "sha256-f8FUZCvz/PonqQP9RCNbyQLZPnN5Oce0Eezm/hD19Fg=";
-        }
-        {
-          name = "svg-preview";
-          publisher = "simonsiefke";
-          version = "2.8.3";
-          hash = "sha256-hIVe1MmkyuHoDa56ZQUsSAGMlKWABoQ0FBOfgZZDbCw=";
-        }
-        {
-          name = "autoimport";
-          publisher = "steoates";
-          version = "1.5.4";
-          hash = "sha256-7iIwJJsoNbtTopc+BQ+195aSCLqdNAaGtMoxShyhBWY=";
-        }
-        {
-          name = "code-spell-checker-polish";
-          publisher = "streetsidesoftware";
-          version = "2.1.3";
-          hash = "sha256-MZeTvK9dO4Kj6hK+afJPWGmnKBtlLrrnoqtUd5s2te0=";
-        }
-        {
-          name = "vscode-pets";
-          publisher = "tonybaloney";
-          version = "1.30.0";
-          hash = "sha256-RxOA6xQ29JuB0NzEqMDkF9W1U+AsvgAOzGbtIUw0WyM=";
-        }
-        {
-          name = "prettify-json";
-          publisher = "mohsen1";
-          version = "0.0.3";
-          hash = "sha256-lvds+lFDzt1s6RikhrnAKJipRHU+Dk85ZO49d1sA8uo=";
-        }
-      ];
-    userSettings = {
-      # Editor appearance and behavior
-      "editor.cursorBlinking" = "expand";
-      "editor.foldingImportsByDefault" = true;
-      "editor.fontFamily" = "FiraCode Nerd Font";
-      "editor.formatOnPaste" = true;
-      "editor.formatOnSave" = true;
-      "editor.guides.bracketPairs" = false;
-      "editor.guides.indentation" = false;
-      "editor.inlayHints.enabled" = "off";
-      "editor.inlineSuggest.showToolbar" = "always";
-      "editor.largeFileOptimizations" = false;
-      "editor.minimap.enabled" = false;
-      "editor.quickSuggestions" = {
-        "strings" = "on";
-      };
-      "editor.suggestFontSize" = 16;
-      "editor.suggestLineHeight" = 30;
-      "editor.tabSize" = 2;
-      "editor.unicodeHighlight.ambiguousCharacters" = false;
-      "editor.unicodeHighlight.invisibleCharacters" = false;
-      "editor.wordWrap" = "off";
-      "editor.hover.enabled" = true;
-      "editor.gotoLocation.multipleDefinitions" = "goto";
-      # Workbench settings
-      "workbench.colorCustomizations" = {
-        "editor.lineHighlightBackground" = "#1073cf2d";
-        "editor.lineHighlightBorder" = "#9fced11f";
-      };
-      "workbench.colorTheme" = "One Dark Pro Monokai Darker";
-      "workbench.iconTheme" = "vscode-icons";
-      "workbench.startupEditor" = "none";
-      # Terminal settings
-      "terminal.integrated.fontFamily" = "FiraCode Nerd Fonts Mono";
-      # Git settings
-      "git.confirmSync" = false;
-      "git.enableSmartCommit" = true;
-      # Explorer settings
-      "explorer.confirmDelete" = false;
-      "explorer.confirmDragAndDrop" = false;
-      # Diff editor settings
-      "diffEditor.ignoreTrimWhitespace" = false;
-      "diffEditor.wordWrap" = "off";
-      # Zen mode settings
-      "zenMode.centerLayout" = false;
-      "zenMode.hideActivityBar" = false;
-      "zenMode.hideLineNumbers" = false;
-      # File associations
-      "files.associations" = {
-        "*.html" = "html";
-        "*.txt" = "plaintext";
-      };
-      # Navigation and intellisense
-      "path-intellisense.extensionOnImport" = true;
-      # Markdown settings
-      "markdown-preview-enhanced.previewTheme" = "one-dark.css";
-      # Extension specific settings
-      "supermaven.allowGitignore" = true;
-      "supermaven.enable" = {
-        "*" = true;
-      };
-      "continue.enableTabAutocomplete" = false;
-      "continue.showInlineTip" = false;
-      "continue.telemetryEnabled" = false;
-      "hediet.vscode-drawio.resizeImages" = null;
-      "todo-tree.highlights.useColourScheme" = true;
-      "vite.autoStart" = false;
-      # Syntax highlighting and appearance
-      "indentRainbow.colorOnWhiteSpaceOnly" = true;
-      "indentRainbow.indicatorStyle" = "light";
-      "indentRainbow.lightIndicatorStyleLineWidth" = 4;
-      # Spelling and language
-      "cSpell.language" = "en,pl";
-      "cSpell.userWords" = [
-        "garand"
-        "Garand's"
-        "garandplg"
-        "garands"
-        "lockb"
-        "Shadcn"
-        "Vite"
-      ];
-      # Security and trust
-      "security.workspace.trust.untrustedFiles" = "open";
-      # Remote development
-      "remote.autoForwardPortsSource" = "hybrid";
-      # Misc
-      "vsintellicode.modify.editor.suggestSelection" = "automaticallyOverrodeDefaultValue";
-      "githubLocalActions.workflowsDirectory" = ".gitea/workflows";
-    };
-    languageSnippets = {
-      "jsonc,json,jsonl" = {
-        "Restore Terminals" = {
-          body = [
-            " \"restoreTerminals.terminals\": ["
-            "    {"
-            "      \"splitTerminals\": ["
-            "        {"
-            "          \"name\": \"server\","
-            "          \"commands\": [\"npm i\", \"npm run dev\"]"
-            "        },"
-            "        {"
-            "          \"name\": \"client\","
-            "          \"commands\": [\"npm run dev:client\"]"
-            "        },"
-            "        {"
-            "          \"name\": \"test\","
-            "          \"commands\": [\"jest --watch\"]"
-            "        }"
-            "      ]"
-            "    },"
-            "    {"
-            "      \"splitTerminals\": ["
-            "        {"
-            "          \"name\": \"build & e2e\","
-            "          \"commands\": [\"npm run eslint\", \"npm run build\", \"npm run e2e\"],"
-            "          \"shouldRunCommands\": false"
-            "        },"
-            "        {"
-            "          \"name\": \"worker\","
-            "          \"commands\": [\"npm-run-all --parallel redis tsc-watch-start worker\"]"
-            "        }"
-            "      ]"
-            "    }"
-            "  ]"
-          ];
-          description = "Boilerplate for restore terminals";
-          prefix = [
-            "term"
-          ];
-        };
-      };
-      "nix" = {
-        "Nix-Shell-Default" = {
-          body = [
-            "{"
-            "  pkgs ? import <nixpkgs> {},"
-            "}:"
-            "pkgs.mkShell {"
-            "  packages = with pkgs; [];"
-            "}"
-          ];
-          description = "Podstawa do shelli nix";
-          prefix = [
-            "nix-shell"
-          ];
-        };
-      };
-    };
-  };
-}
--- a/hosts/garand-laptop/home/codium/rust-tauri.nix
+++ b/hosts/garand-laptop/home/codium/rust-tauri.nix
@@ -1,239 +0,0 @@
-{pkgs, ...}: {
-  programs.vscode.profiles.rust-tauri = {
-    extensions = with pkgs.vscode-extensions;
-      [
-        christian-kohler.path-intellisense
-        continue.continue
-        davidanson.vscode-markdownlint
-        donjayamanne.githistory
-        ethansk.restore-terminals
-        formulahendry.auto-close-tag
-        formulahendry.auto-rename-tag
-        gruntfuggly.todo-tree
-        jnoortheen.nix-ide
-        mechatroner.rainbow-csv
-        ms-azuretools.vscode-docker
-        oderwat.indent-rainbow
-        shd101wyy.markdown-preview-enhanced
-        streetsidesoftware.code-spell-checker
-        supermaven.supermaven
-        tomoki1207.pdf
-        visualstudioexptteam.intellicode-api-usage-examples
-        visualstudioexptteam.vscodeintellicode
-        vscode-icons-team.vscode-icons
-        tamasfe.even-better-toml
-        ms-ceintl.vscode-language-pack-pl
-      ]
-      ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-        {
-          name = "one-dark-pro-monokai-darker";
-          publisher = "eserozvataf";
-          version = "1.1.0";
-          hash = "sha256-jUjBiy0CD7jw2WBMvM3h8bEC2ySEuj7532dC3v9lpyI=";
-        }
-        {
-          name = "tab-indent-space-align";
-          publisher = "j-zeppenfeld";
-          version = "0.0.3";
-          hash = "sha256-+WEdYJOVWW7YumfzLkvZmrnpUiC85oLsG1BKMwL1NHc=";
-        }
-        {
-          name = "polacode-2019";
-          publisher = "jeff-hykin";
-          version = "0.6.1";
-          hash = "sha256-SbfsD28gaVHAmJskUuc1Q8kA47jrVa3OO5Ur7ULk3jI=";
-        }
-        {
-          name = "csv-to-table";
-          publisher = "phplasma";
-          version = "1.4.1";
-          hash = "sha256-npe7cQ4lAZr8HCyQSJmVsCDUJcOhGhL6y1QtUtqUY50=";
-        }
-        {
-          name = "bash-debug";
-          publisher = "rogalmic";
-          version = "0.3.9";
-          hash = "sha256-f8FUZCvz/PonqQP9RCNbyQLZPnN5Oce0Eezm/hD19Fg=";
-        }
-        {
-          name = "svg-preview";
-          publisher = "simonsiefke";
-          version = "2.8.3";
-          hash = "sha256-hIVe1MmkyuHoDa56ZQUsSAGMlKWABoQ0FBOfgZZDbCw=";
-        }
-        {
-          name = "autoimport";
-          publisher = "steoates";
-          version = "1.5.4";
-          hash = "sha256-7iIwJJsoNbtTopc+BQ+195aSCLqdNAaGtMoxShyhBWY=";
-        }
-        {
-          name = "code-spell-checker-polish";
-          publisher = "streetsidesoftware";
-          version = "2.1.3";
-          hash = "sha256-MZeTvK9dO4Kj6hK+afJPWGmnKBtlLrrnoqtUd5s2te0=";
-        }
-        {
-          name = "vscode-pets";
-          publisher = "tonybaloney";
-          version = "1.30.0";
-          hash = "sha256-RxOA6xQ29JuB0NzEqMDkF9W1U+AsvgAOzGbtIUw0WyM=";
-        }
-        {
-          name = "prettify-json";
-          publisher = "mohsen1";
-          version = "0.0.3";
-          hash = "sha256-lvds+lFDzt1s6RikhrnAKJipRHU+Dk85ZO49d1sA8uo=";
-        }
-      ];
-    userSettings = {
-      # Editor appearance and behavior
-      "editor.cursorBlinking" = "expand";
-      "editor.foldingImportsByDefault" = true;
-      "editor.fontFamily" = "FiraCode Nerd Font";
-      "editor.formatOnPaste" = true;
-      "editor.formatOnSave" = true;
-      "editor.guides.bracketPairs" = false;
-      "editor.guides.indentation" = false;
-      "editor.inlayHints.enabled" = "off";
-      "editor.inlineSuggest.showToolbar" = "always";
-      "editor.largeFileOptimizations" = false;
-      "editor.minimap.enabled" = false;
-      "editor.quickSuggestions" = {
-        "strings" = "on";
-      };
-      "editor.suggestFontSize" = 16;
-      "editor.suggestLineHeight" = 30;
-      "editor.tabSize" = 2;
-      "editor.unicodeHighlight.ambiguousCharacters" = false;
-      "editor.unicodeHighlight.invisibleCharacters" = false;
-      "editor.wordWrap" = "off";
-      "editor.hover.enabled" = true;
-      "editor.gotoLocation.multipleDefinitions" = "goto";
-      # Workbench settings
-      "workbench.colorCustomizations" = {
-        "editor.lineHighlightBackground" = "#1073cf2d";
-        "editor.lineHighlightBorder" = "#9fced11f";
-      };
-      "workbench.colorTheme" = "One Dark Pro Monokai Darker";
-      "workbench.iconTheme" = "vscode-icons";
-      "workbench.startupEditor" = "none";
-      # Terminal settings
-      "terminal.integrated.fontFamily" = "FiraCode Nerd Fonts Mono";
-      # Git settings
-      "git.confirmSync" = false;
-      "git.enableSmartCommit" = true;
-      # Explorer settings
-      "explorer.confirmDelete" = false;
-      "explorer.confirmDragAndDrop" = false;
-      # Diff editor settings
-      "diffEditor.ignoreTrimWhitespace" = false;
-      "diffEditor.wordWrap" = "off";
-      # Zen mode settings
-      "zenMode.centerLayout" = false;
-      "zenMode.hideActivityBar" = false;
-      "zenMode.hideLineNumbers" = false;
-      # File associations
-      "files.associations" = {
-        "*.html" = "html";
-        "*.txt" = "plaintext";
-      };
-      # Navigation and intellisense
-      "path-intellisense.extensionOnImport" = true;
-      # Markdown settings
-      "markdown-preview-enhanced.previewTheme" = "one-dark.css";
-      # Extension specific settings
-      "supermaven.allowGitignore" = true;
-      "supermaven.enable" = {
-        "*" = true;
-      };
-      "continue.enableTabAutocomplete" = false;
-      "continue.showInlineTip" = false;
-      "continue.telemetryEnabled" = false;
-      "hediet.vscode-drawio.resizeImages" = null;
-      "todo-tree.highlights.useColourScheme" = true;
-      "vite.autoStart" = false;
-      # Syntax highlighting and appearance
-      "indentRainbow.colorOnWhiteSpaceOnly" = true;
-      "indentRainbow.indicatorStyle" = "light";
-      "indentRainbow.lightIndicatorStyleLineWidth" = 4;
-      # Spelling and language
-      "cSpell.language" = "en,pl";
-      "cSpell.userWords" = [
-        "garand"
-        "Garand's"
-        "garandplg"
-        "garands"
-        "lockb"
-        "Shadcn"
-        "Vite"
-      ];
-      # Security and trust
-      "security.workspace.trust.untrustedFiles" = "open";
-      # Remote development
-      "remote.autoForwardPortsSource" = "hybrid";
-      # Misc
-      "vsintellicode.modify.editor.suggestSelection" = "automaticallyOverrodeDefaultValue";
-      "githubLocalActions.workflowsDirectory" = ".gitea/workflows";
-    };
-    languageSnippets = {
-      "jsonc,json,jsonl" = {
-        "Restore Terminals" = {
-          body = [
-            " \"restoreTerminals.terminals\": ["
-            "    {"
-            "      \"splitTerminals\": ["
-            "        {"
-            "          \"name\": \"server\","
-            "          \"commands\": [\"npm i\", \"npm run dev\"]"
-            "        },"
-            "        {"
-            "          \"name\": \"client\","
-            "          \"commands\": [\"npm run dev:client\"]"
-            "        },"
-            "        {"
-            "          \"name\": \"test\","
-            "          \"commands\": [\"jest --watch\"]"
-            "        }"
-            "      ]"
-            "    },"
-            "    {"
-            "      \"splitTerminals\": ["
-            "        {"
-            "          \"name\": \"build & e2e\","
-            "          \"commands\": [\"npm run eslint\", \"npm run build\", \"npm run e2e\"],"
-            "          \"shouldRunCommands\": false"
-            "        },"
-            "        {"
-            "          \"name\": \"worker\","
-            "          \"commands\": [\"npm-run-all --parallel redis tsc-watch-start worker\"]"
-            "        }"
-            "      ]"
-            "    }"
-            "  ]"
-          ];
-          description = "Boilerplate for restore terminals";
-          prefix = [
-            "term"
-          ];
-        };
-      };
-      "nix" = {
-        "Nix-Shell-Default" = {
-          body = [
-            "{"
-            "  pkgs ? import <nixpkgs> {},"
-            "}:"
-            "pkgs.mkShell {"
-            "  packages = with pkgs; [];"
-            "}"
-          ];
-          description = "Podstawa do shelli nix";
-          prefix = [
-            "nix-shell"
-          ];
-        };
-      };
-    };
-  };
-}
--- a/hosts/garand-laptop/home/codium/webdev-vue.nix
+++ b/hosts/garand-laptop/home/codium/webdev-vue.nix
@@ -1,239 +0,0 @@
-{pkgs, ...}: {
-  programs.vscode.profiles.webdev-vue = {
-    extensions = with pkgs.vscode-extensions;
-      [
-        christian-kohler.path-intellisense
-        continue.continue
-        davidanson.vscode-markdownlint
-        donjayamanne.githistory
-        ethansk.restore-terminals
-        formulahendry.auto-close-tag
-        formulahendry.auto-rename-tag
-        gruntfuggly.todo-tree
-        jnoortheen.nix-ide
-        mechatroner.rainbow-csv
-        ms-azuretools.vscode-docker
-        oderwat.indent-rainbow
-        shd101wyy.markdown-preview-enhanced
-        streetsidesoftware.code-spell-checker
-        supermaven.supermaven
-        tomoki1207.pdf
-        visualstudioexptteam.intellicode-api-usage-examples
-        visualstudioexptteam.vscodeintellicode
-        vscode-icons-team.vscode-icons
-        tamasfe.even-better-toml
-        ms-ceintl.vscode-language-pack-pl
-      ]
-      ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-        {
-          name = "one-dark-pro-monokai-darker";
-          publisher = "eserozvataf";
-          version = "1.1.0";
-          hash = "sha256-jUjBiy0CD7jw2WBMvM3h8bEC2ySEuj7532dC3v9lpyI=";
-        }
-        {
-          name = "tab-indent-space-align";
-          publisher = "j-zeppenfeld";
-          version = "0.0.3";
-          hash = "sha256-+WEdYJOVWW7YumfzLkvZmrnpUiC85oLsG1BKMwL1NHc=";
-        }
-        {
-          name = "polacode-2019";
-          publisher = "jeff-hykin";
-          version = "0.6.1";
-          hash = "sha256-SbfsD28gaVHAmJskUuc1Q8kA47jrVa3OO5Ur7ULk3jI=";
-        }
-        {
-          name = "csv-to-table";
-          publisher = "phplasma";
-          version = "1.4.1";
-          hash = "sha256-npe7cQ4lAZr8HCyQSJmVsCDUJcOhGhL6y1QtUtqUY50=";
-        }
-        {
-          name = "bash-debug";
-          publisher = "rogalmic";
-          version = "0.3.9";
-          hash = "sha256-f8FUZCvz/PonqQP9RCNbyQLZPnN5Oce0Eezm/hD19Fg=";
-        }
-        {
-          name = "svg-preview";
-          publisher = "simonsiefke";
-          version = "2.8.3";
-          hash = "sha256-hIVe1MmkyuHoDa56ZQUsSAGMlKWABoQ0FBOfgZZDbCw=";
-        }
-        {
-          name = "autoimport";
-          publisher = "steoates";
-          version = "1.5.4";
-          hash = "sha256-7iIwJJsoNbtTopc+BQ+195aSCLqdNAaGtMoxShyhBWY=";
-        }
-        {
-          name = "code-spell-checker-polish";
-          publisher = "streetsidesoftware";
-          version = "2.1.3";
-          hash = "sha256-MZeTvK9dO4Kj6hK+afJPWGmnKBtlLrrnoqtUd5s2te0=";
-        }
-        {
-          name = "vscode-pets";
-          publisher = "tonybaloney";
-          version = "1.30.0";
-          hash = "sha256-RxOA6xQ29JuB0NzEqMDkF9W1U+AsvgAOzGbtIUw0WyM=";
-        }
-        {
-          name = "prettify-json";
-          publisher = "mohsen1";
-          version = "0.0.3";
-          hash = "sha256-lvds+lFDzt1s6RikhrnAKJipRHU+Dk85ZO49d1sA8uo=";
-        }
-      ];
-    userSettings = {
-      # Editor appearance and behavior
-      "editor.cursorBlinking" = "expand";
-      "editor.foldingImportsByDefault" = true;
-      "editor.fontFamily" = "FiraCode Nerd Font";
-      "editor.formatOnPaste" = true;
-      "editor.formatOnSave" = true;
-      "editor.guides.bracketPairs" = false;
-      "editor.guides.indentation" = false;
-      "editor.inlayHints.enabled" = "off";
-      "editor.inlineSuggest.showToolbar" = "always";
-      "editor.largeFileOptimizations" = false;
-      "editor.minimap.enabled" = false;
-      "editor.quickSuggestions" = {
-        "strings" = "on";
-      };
-      "editor.suggestFontSize" = 16;
-      "editor.suggestLineHeight" = 30;
-      "editor.tabSize" = 2;
-      "editor.unicodeHighlight.ambiguousCharacters" = false;
-      "editor.unicodeHighlight.invisibleCharacters" = false;
-      "editor.wordWrap" = "off";
-      "editor.hover.enabled" = true;
-      "editor.gotoLocation.multipleDefinitions" = "goto";
-      # Workbench settings
-      "workbench.colorCustomizations" = {
-        "editor.lineHighlightBackground" = "#1073cf2d";
-        "editor.lineHighlightBorder" = "#9fced11f";
-      };
-      "workbench.colorTheme" = "One Dark Pro Monokai Darker";
-      "workbench.iconTheme" = "vscode-icons";
-      "workbench.startupEditor" = "none";
-      # Terminal settings
-      "terminal.integrated.fontFamily" = "FiraCode Nerd Fonts Mono";
-      # Git settings
-      "git.confirmSync" = false;
-      "git.enableSmartCommit" = true;
-      # Explorer settings
-      "explorer.confirmDelete" = false;
-      "explorer.confirmDragAndDrop" = false;
-      # Diff editor settings
-      "diffEditor.ignoreTrimWhitespace" = false;
-      "diffEditor.wordWrap" = "off";
-      # Zen mode settings
-      "zenMode.centerLayout" = false;
-      "zenMode.hideActivityBar" = false;
-      "zenMode.hideLineNumbers" = false;
-      # File associations
-      "files.associations" = {
-        "*.html" = "html";
-        "*.txt" = "plaintext";
-      };
-      # Navigation and intellisense
-      "path-intellisense.extensionOnImport" = true;
-      # Markdown settings
-      "markdown-preview-enhanced.previewTheme" = "one-dark.css";
-      # Extension specific settings
-      "supermaven.allowGitignore" = true;
-      "supermaven.enable" = {
-        "*" = true;
-      };
-      "continue.enableTabAutocomplete" = false;
-      "continue.showInlineTip" = false;
-      "continue.telemetryEnabled" = false;
-      "hediet.vscode-drawio.resizeImages" = null;
-      "todo-tree.highlights.useColourScheme" = true;
-      "vite.autoStart" = false;
-      # Syntax highlighting and appearance
-      "indentRainbow.colorOnWhiteSpaceOnly" = true;
-      "indentRainbow.indicatorStyle" = "light";
-      "indentRainbow.lightIndicatorStyleLineWidth" = 4;
-      # Spelling and language
-      "cSpell.language" = "en,pl";
-      "cSpell.userWords" = [
-        "garand"
-        "Garand's"
-        "garandplg"
-        "garands"
-        "lockb"
-        "Shadcn"
-        "Vite"
-      ];
-      # Security and trust
-      "security.workspace.trust.untrustedFiles" = "open";
-      # Remote development
-      "remote.autoForwardPortsSource" = "hybrid";
-      # Misc
-      "vsintellicode.modify.editor.suggestSelection" = "automaticallyOverrodeDefaultValue";
-      "githubLocalActions.workflowsDirectory" = ".gitea/workflows";
-    };
-    languageSnippets = {
-      "jsonc,json,jsonl" = {
-        "Restore Terminals" = {
-          body = [
-            " \"restoreTerminals.terminals\": ["
-            "    {"
-            "      \"splitTerminals\": ["
-            "        {"
-            "          \"name\": \"server\","
-            "          \"commands\": [\"npm i\", \"npm run dev\"]"
-            "        },"
-            "        {"
-            "          \"name\": \"client\","
-            "          \"commands\": [\"npm run dev:client\"]"
-            "        },"
-            "        {"
-            "          \"name\": \"test\","
-            "          \"commands\": [\"jest --watch\"]"
-            "        }"
-            "      ]"
-            "    },"
-            "    {"
-            "      \"splitTerminals\": ["
-            "        {"
-            "          \"name\": \"build & e2e\","
-            "          \"commands\": [\"npm run eslint\", \"npm run build\", \"npm run e2e\"],"
-            "          \"shouldRunCommands\": false"
-            "        },"
-            "        {"
-            "          \"name\": \"worker\","
-            "          \"commands\": [\"npm-run-all --parallel redis tsc-watch-start worker\"]"
-            "        }"
-            "      ]"
-            "    }"
-            "  ]"
-          ];
-          description = "Boilerplate for restore terminals";
-          prefix = [
-            "term"
-          ];
-        };
-      };
-      "nix" = {
-        "Nix-Shell-Default" = {
-          body = [
-            "{"
-            "  pkgs ? import <nixpkgs> {},"
-            "}:"
-            "pkgs.mkShell {"
-            "  packages = with pkgs; [];"
-            "}"
-          ];
-          description = "Podstawa do shelli nix";
-          prefix = [
-            "nix-shell"
-          ];
-        };
-      };
-    };
-  };
-}
--- a/hosts/garand-laptop/home/home.nix
+++ b/hosts/garand-laptop/home/home.nix
@@ -7,7 +7,6 @@
  dexApps = import ../../../scripts/dex-apps.nix {inherit pkgs;};
 in {
  # Home Manager Settings
-  nixpkgs.config.allowUnfree = true;
  home = {
    username = "${username}";
    homeDirectory = "/home/${username}";
--- a/hosts/garand-laptop/home/misc.nix
+++ b/hosts/garand-laptop/home/misc.nix
@@ -1,31 +1,10 @@
-{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 = {
--- a/hosts/garand-laptop/home/programs.librewolf.nix
+++ b/hosts/garand-laptop/home/programs.librewolf.nix
@@ -59,7 +59,6 @@
              "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"];
--- a/hosts/garand-laptop/home/programs.nix
+++ b/hosts/garand-laptop/home/programs.nix
@@ -60,6 +60,7 @@ in {
        if [ -f $HOME/.bashrc-personal ]; then
          source $HOME/.bashrc-personal
        fi
+        fc
      '';
      shellAliases = {
        os-sw = "sudo nixos-rebuild switch --flake ~/zaneyos";
@@ -85,7 +86,6 @@ in {
        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";
--- a/hosts/garand-laptop/variables.nix
+++ b/hosts/garand-laptop/variables.nix
@@ -1,12 +1,16 @@
 {
+  # Git Configuration ( For Pulling Software Repos )
  gitUsername = "GarandPLG";
  gitEmail = "garandplg@garandplg.com";

+  # Hyprland Settings
  extraMonitorSettings = "";

+  # Waybar Settings
  clock24h = true;

-  browser = "librewolf";
-  terminal = "warp-terminal";
+  # Program Options
+  browser = "librewolf"; # Set Default Browser (google-chrome-stable for google-chrome)
+  terminal = "kitty"; # Set Default System Terminal
  keyboardLayout = "pl";
 }
--- a/scripts/list-hypr-bindings.nix
+++ b/scripts/list-hypr-bindings.nix
@@ -69,8 +69,7 @@ in
    " + 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" \
+    " + Y" "Uruchom Daily.dev" "dex-dailydev" \
    " + V" "Uruchom Visual Studio Codium" "codium" \
    " + O" "Uruchom ONLYOFFICE" "onlyoffice-desktopeditors" \
    " + SHIFT + O" "Uruchom OBS" "obs" \
--- a/scripts/web-search.nix
+++ b/scripts/web-search.nix
@@ -1,43 +1,43 @@
 {pkgs}:
 pkgs.writeShellScriptBin "web-search" ''
-  declare -A URLS
+   declare -A URLS

-  URLS=(
-    ["🌎 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="
-    ["🎞️ YouTube"]="https://www.youtube.com/results?search_query="
-    ["❄️ NixOS Wiki"]="https://nixos.wiki/index.php?search="
-    ["🔎 Wikipedia"]="https://pl.wikipedia.org/w/index.php?ns0=1&search="
-    ["👨‍💻 StackOverflow"]="https://stackoverflow.com/search?q="
-  )
+   URLS=(
+     ["🌎 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="
+     ["🎞️ YouTube"]="https://www.youtube.com/results?search_query="
+     ["❄️ NixOS Wiki"]="https://nixos.wiki/index.php?search="
+     ["🔎 Wikipedia"]="https://pl.wikipedia.org/w/index.php?ns0=1&search="
+     ["👨‍💻 StackOverflow"]="https://stackoverflow.com/search?q="
+   )

-  # List for rofi
-  gen_list() {
-    for i in "''${!URLS[@]}"
-    do
-      echo "$i"
-    done
-  }
+   # List for rofi
+   gen_list() {
+     for i in "''${!URLS[@]}"
+     do
+       echo "$i"
+     done
+   }

-  main() {
-    # Pass the list to rofi
-    platform=$( (gen_list) | ${pkgs.wofi}/bin/wofi -dmenu )
+   main() {
+     # Pass the list to rofi
+     platform=$( (gen_list) | ${pkgs.wofi}/bin/wofi -dmenu )

-    if [[ -n "$platform" ]]; then
-      query=$( (echo ) | ${pkgs.wofi}/bin/wofi -dmenu )
+     if [[ -n "$platform" ]]; then
+       query=$( (echo ) | ${pkgs.wofi}/bin/wofi -dmenu )

-      if [[ -n "$query" ]]; then
-        url=''${URLS[$platform]}$query
-        xdg-open "$url"
-      else
-        exit
-      fi
-    else
-      exit
-    fi
-  }
+       if [[ -n "$query" ]]; then
+  url=''${URLS[$platform]}$query
+  xdg-open "$url"
+       else
+  exit
+       fi
+     else
+       exit
+     fi
+   }

-  main
+   main

-  exit 0
+   exit 0
 ''