Update flake.lock with latest revisions

Enable VirtualBox and add development aliases
Add VirtualBox support with disabled default
2026-02-02 00:38:36 +01:00 · 2026-01-31 16:48:35 +01:00 · 2026-01-30 14:15:28 +01:00 · 2026-01-29 01:55:42 +01:00 · 2026-01-27 19:43:17 +01:00 · 2026-01-21 23:43:01 +01:00
43 changed files with 1112 additions and 791 deletions
--- a/README.md
+++ b/README.md
@@ -192,6 +192,9 @@ git add .
 - `animChoice` - system animation style.

 ### 5. Review module activation options
+
+Also check my new project - [GarandOS TUI](https://gitea.garandplg.com/GarandPLG/garandos-tui)! It's an automated way of tweaking this settings. You can use it later *(simply type `tui` into the terminal)*, after the setup, or use it right now by cloning the repo.
+
 Open the module files for your host and adjust the `enable` options for the services you need:

 ```bash
--- a/flake.lock
+++ b/flake.lock
@@ -15,11 +15,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1764195413,
-        "narHash": "sha256-YNehE1Vq7Gntrpl6FYwfHU+8U/5v5OaS/KtiB35AWfE=",
+        "lastModified": 1767916874,
+        "narHash": "sha256-IcvLwoF1CIOd7yELc0Xwqskilw2FxHHRm5ZnmNdBuKc=",
        "owner": "mrshmllow",
        "repo": "affinity-nix",
-        "rev": "5312de0bb4808e256a346c58ab3607bd7ffc924b",
+        "rev": "0c110a15fb5605490f7de451073db1c775745fee",
        "type": "github"
      },
      "original": {
@@ -35,11 +35,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1763546214,
-        "narHash": "sha256-vc9seqvw2ElF8jPetsCoCQ5lo9P3fmgiTle3HlOMezk=",
+        "lastModified": 1769608722,
+        "narHash": "sha256-yWUG0Emd9EuqIZ8jQ6fxqf7USw7Gtcqb4+sBhn+S+Wg=",
        "owner": "AdnanHodzic",
        "repo": "auto-cpufreq",
-        "rev": "76ccb66f8e4875671fd746fb6b50931454ab8cd8",
+        "rev": "a11a98c46bf6a77d0c2e0ea8d87acef78507cae5",
        "type": "github"
      },
      "original": {
@@ -69,28 +69,28 @@
    "base16-fish": {
      "flake": false,
      "locked": {
-        "lastModified": 1754405784,
-        "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
+        "lastModified": 1765809053,
+        "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
        "owner": "tomyun",
        "repo": "base16-fish",
-        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
+        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
        "type": "github"
      },
      "original": {
        "owner": "tomyun",
        "repo": "base16-fish",
-        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
+        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
        "type": "github"
      }
    },
    "base16-helix": {
      "flake": false,
      "locked": {
-        "lastModified": 1752979451,
-        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
+        "lastModified": 1760703920,
+        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
        "owner": "tinted-theming",
        "repo": "base16-helix",
-        "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
+        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
        "type": "github"
      },
      "original": {
@@ -135,6 +135,28 @@
        "type": "gitlab"
      }
    },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "garandos-tui",
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1762929886,
+        "narHash": "sha256-TQZ3Ugb1FoHpTSc8KLrzN4njIZU4FemAMHyS4M3mt6s=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "6998514dce2c365142a0a119a95ef95d89b84086",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
    "firefox-addons": {
      "inputs": {
        "nixpkgs": [
@@ -143,11 +165,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1764389080,
-        "narHash": "sha256-BEn1Z9Uv20u2DS6wzLKdzx5kAzynM3wMQ9JnGf3VJvI=",
+        "lastModified": 1769918637,
+        "narHash": "sha256-3XyGk89S0UFvKRZiKpFL4ImP5qP/2AOJUaYC7ogXnJo=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "897437c09bf22ce59efb3370f0783d0c662dba31",
+        "rev": "5659e4c18d1350d1b511fcdce885fdd879effa22",
        "type": "gitlab"
      },
      "original": {
@@ -160,11 +182,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1758112371,
-        "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
+        "lastModified": 1764873433,
+        "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
+        "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
        "type": "github"
      },
      "original": {
@@ -189,15 +211,15 @@
    "flake-compat_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
-        "owner": "edolstra",
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
        "type": "github"
      },
      "original": {
-        "owner": "edolstra",
+        "owner": "NixOS",
        "repo": "flake-compat",
        "type": "github"
      }
@@ -207,11 +229,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1762980239,
-        "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=",
+        "lastModified": 1767609335,
+        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da",
+        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
        "type": "github"
      },
      "original": {
@@ -227,11 +249,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1756770412,
-        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
+        "lastModified": 1767609335,
+        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
+        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
        "type": "github"
      },
      "original": {
@@ -256,6 +278,29 @@
        "type": "github"
      }
    },
+    "garandos-tui": {
+      "inputs": {
+        "fenix": "fenix",
+        "naersk": "naersk",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1765060905,
+        "narHash": "sha256-YLU5g2aSs1Sh+6j301BtQYUdQ8IqLvoeR4Eivr4eVYc=",
+        "ref": "main",
+        "rev": "028b50c9e4d7160cfa8fac8150a54a52680f4ff5",
+        "revCount": 13,
+        "type": "git",
+        "url": "https://gitea.garandplg.com/GarandPLG/garandos-tui"
+      },
+      "original": {
+        "ref": "main",
+        "type": "git",
+        "url": "https://gitea.garandplg.com/GarandPLG/garandos-tui"
+      }
+    },
    "git-hooks": {
      "inputs": {
        "flake-compat": "flake-compat_2",
@@ -265,11 +310,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1763319842,
-        "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=",
+        "lastModified": 1767281941,
+        "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761",
+        "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
        "type": "github"
      },
      "original": {
@@ -302,11 +347,11 @@
      "flake": false,
      "locked": {
        "host": "gitlab.gnome.org",
-        "lastModified": 1762869044,
-        "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=",
+        "lastModified": 1767737596,
+        "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
        "owner": "GNOME",
        "repo": "gnome-shell",
-        "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad",
+        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
        "type": "gitlab"
      },
      "original": {
@@ -324,11 +369,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1764361670,
-        "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=",
+        "lastModified": 1769952507,
+        "narHash": "sha256-eNTfxT3v8b7s1dqswgposi5Y1CUMoOUhQKiy29QY25U=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6",
+        "rev": "b59376563943ce163b2553aeb63d0c170967d74e",
        "type": "github"
      },
      "original": {
@@ -341,11 +386,11 @@
    "libnbtplusplus": {
      "flake": false,
      "locked": {
-        "lastModified": 1699286814,
-        "narHash": "sha256-yy0q+bky80LtK1GWzz7qpM+aAGrOqLuewbid8WT1ilk=",
+        "lastModified": 1744811532,
+        "narHash": "sha256-qhmjaRkt+O7A+gu6HjUkl7QzOEb4r8y8vWZMG2R/C6o=",
        "owner": "PrismLauncher",
        "repo": "libnbtplusplus",
-        "rev": "23b955121b8217c1c348a9ed2483167a6f3ff4ad",
+        "rev": "531449ba1c930c98e0bcf5d332b237a8566f9d78",
        "type": "github"
      },
      "original": {
@@ -354,13 +399,38 @@
        "type": "github"
      }
    },
+    "naersk": {
+      "inputs": {
+        "fenix": [
+          "garandos-tui",
+          "fenix"
+        ],
+        "nixpkgs": [
+          "garandos-tui",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1752689277,
+        "narHash": "sha256-uldUBFkZe/E7qbvxa3mH1ItrWZyT6w1dBKJQF/3ZSsc=",
+        "owner": "nix-community",
+        "repo": "naersk",
+        "rev": "0e72363d0938b0208d6c646d10649164c43f4d64",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "naersk",
+        "type": "github"
+      }
+    },
    "nix-flatpak": {
      "locked": {
-        "lastModified": 1739444422,
-        "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
+        "lastModified": 1767983141,
+        "narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=",
        "owner": "gmodena",
        "repo": "nix-flatpak",
-        "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
+        "rev": "440818969ac2cbd77bfe025e884d0aa528991374",
        "type": "github"
      },
      "original": {
@@ -372,11 +442,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1764242076,
-        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
+        "lastModified": 1769789167,
+        "narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
+        "rev": "62c8382960464ceb98ea593cb8321a2cf8f9e3e5",
        "type": "github"
      },
      "original": {
@@ -388,11 +458,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1761765539,
-        "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
+        "lastModified": 1765674936,
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
        "type": "github"
      },
      "original": {
@@ -428,11 +498,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1758998580,
-        "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
+        "lastModified": 1767810917,
+        "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
+        "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
        "type": "github"
      },
      "original": {
@@ -444,11 +514,11 @@
    "on-linux": {
      "flake": false,
      "locked": {
-        "lastModified": 1763514293,
-        "narHash": "sha256-x766SlDqS6DoOQyW4u1zV3iZbrEKoy4P9K6XDjZ4fGU=",
+        "lastModified": 1766544016,
+        "narHash": "sha256-3X1426N7n6bwM7GAQOvpCq2OVdlQevCzbpak0l9B6BU=",
        "owner": "seapear",
        "repo": "AffinityOnLinux",
-        "rev": "2eacfdf625bfafa3099d411f8e2d5afec565fcd6",
+        "rev": "da601564dfefe2ae3ec10e3f177db81578847b7b",
        "type": "github"
      },
      "original": {
@@ -477,11 +547,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1747683146,
-        "narHash": "sha256-zZS//xyNYQHvD4fUMoWx86uVUwPk+p5FjZLTTu0pelQ=",
+        "lastModified": 1768437816,
+        "narHash": "sha256-GG+V2g5NfVrypTs8qbtGnUWTXTMkGtohy/uIDa5duI0=",
        "owner": "Diegiwg",
        "repo": "PrismLauncher-Cracked",
-        "rev": "0612187254ef41a1087f3107e927e0dd59c9b29d",
+        "rev": "e8418b74059bdbe4fcc97522b25dc17373b0cc21",
        "type": "github"
      },
      "original": {
@@ -495,11 +565,30 @@
        "affinity-nix": "affinity-nix",
        "auto-cpufreq": "auto-cpufreq",
        "firefox-addons": "firefox-addons",
+        "garandos-tui": "garandos-tui",
        "home-manager": "home-manager",
        "nix-flatpak": "nix-flatpak",
        "nixpkgs": "nixpkgs",
        "prismlauncher-cracked": "prismlauncher-cracked",
-        "stylix": "stylix"
+        "stylix": "stylix",
+        "wrappers": "wrappers"
+      }
+    },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1762860488,
+        "narHash": "sha256-rMfWMCOo/pPefM2We0iMBLi2kLBAnYoB9thi4qS7uk4=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "2efc80078029894eec0699f62ec8d5c1a56af763",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
      }
    },
    "stylix": {
@@ -523,11 +612,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1764254063,
-        "narHash": "sha256-V22JzkaTLF/GAL2LgqvOsJhAr8JbJsKaD8hnHjGwXfE=",
+        "lastModified": 1769888473,
+        "narHash": "sha256-4KWbaJwaYnZ60bFyTudZYAKskjr7Sa17R3/yh+oXS7w=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "a1451bc40413870f0c7b576b751c1ca92055e323",
+        "rev": "ae5c0239ae4f82a8c7e33ad8a456535d5a9ba813",
        "type": "github"
      },
      "original": {
@@ -587,11 +676,11 @@
    "tinted-schemes": {
      "flake": false,
      "locked": {
-        "lastModified": 1757716333,
-        "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
+        "lastModified": 1767710407,
+        "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
        "owner": "tinted-theming",
        "repo": "schemes",
-        "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
+        "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
        "type": "github"
      },
      "original": {
@@ -603,11 +692,11 @@
    "tinted-tmux": {
      "flake": false,
      "locked": {
-        "lastModified": 1757811970,
-        "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
+        "lastModified": 1767489635,
+        "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
        "owner": "tinted-theming",
        "repo": "tinted-tmux",
-        "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
+        "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
        "type": "github"
      },
      "original": {
@@ -619,11 +708,11 @@
    "tinted-zed": {
      "flake": false,
      "locked": {
-        "lastModified": 1757811247,
-        "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
+        "lastModified": 1767488740,
+        "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
        "owner": "tinted-theming",
        "repo": "base16-zed",
-        "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
+        "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
        "type": "github"
      },
      "original": {
@@ -639,11 +728,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1762938485,
-        "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=",
+        "lastModified": 1767801790,
+        "narHash": "sha256-QfX6g3Wj2vQe7oBJEbTf0npvC6sJoDbF9hb2+gM5tf8=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4",
+        "rev": "778a1d691f1ef45dd68c661715c5bf8cbf131c80",
        "type": "github"
      },
      "original": {
@@ -651,6 +740,26 @@
        "repo": "treefmt-nix",
        "type": "github"
      }
+    },
+    "wrappers": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1769799671,
+        "narHash": "sha256-b1LwqiIjgNLw6/aJlOwIqe1mfqc4PQqeRpKOo5sFWu0=",
+        "owner": "lassulus",
+        "repo": "wrappers",
+        "rev": "8bef93dddd89a0b45486d5cd9f0bdd5ce8aceced",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lassulus",
+        "repo": "wrappers",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@@ -49,12 +49,23 @@
    };

    nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest";
+
+    garandos-tui = {
+      url = "git+https://gitea.garandplg.com/GarandPLG/garandos-tui?ref=main";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    wrappers = {
+      url = "github:lassulus/wrappers";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
  };

  outputs = {
    nixpkgs,
    nix-flatpak,
    auto-cpufreq,
+    garandos-tui,
    ...
  } @ inputs: let
    hostDirs = builtins.attrNames (builtins.readDir ./hosts);
@@ -81,6 +92,7 @@
          ./profiles/${profile}
          nix-flatpak.nixosModules.nix-flatpak
          auto-cpufreq.nixosModules.default
+          garandos-tui.nixosModules.garandos-tui
        ];
      };
  in {
--- a/hosts/Garand-Desktop/home-modules.nix
+++ b/hosts/Garand-Desktop/home-modules.nix
@@ -2,65 +2,65 @@ _: {
  /*
  Development editors and IDEs
  */
-  # VSCodium: a free and open-source "demicrosofted" VSCode
-  vscodium.enable = false;
-  # Zed Editor: a modern, high‑performance code editor
+  vscodium.enable = false; # VSCodium: a free and open-source "demicrosofted" VSCode
  zed-editor = {
-    # Enable Zed Editor
-    enable = true;
-    # Remote Server: enable remote editing capabilities
-    remote-server = true;
+    enable = true; # Zed Editor: a modern, high‑performance code editor
+    remote-server.enable = true; # Remote Server: enable remote editing capabilities
  };

  /*
  Web browsers
  */
-  # Librewolf: a privacy-focused Firefox fork
-  librewolf.enable = true;
-  # Ungoogled Chromium: a privacy-focused Chromium fork
-  ungoogled-chromium.enable = true;
+  librewolf.enable = true; # Librewolf: a privacy-focused Firefox fork
+  ungoogled-chromium.enable = true; # Ungoogled Chromium: a privacy-focused Chromium fork

  /*
  System utilities
  */
-  # Btop: a resource monitor for the terminal
-  btop.enable = true;
-  # Cava: terminal audio visualizer
-  cava.enable = false;
-  # Fastfetch: a fast system information tool
-  fastfetch.enable = true;
+  btop.enable = true; # Btop: a resource monitor for the terminal
+  cava.enable = false; # Cava: terminal audio visualizer
+  fastfetch.enable = true; # Fastfetch: a fast system information tool
+  peaclock.enable = true; # Peaclock: Clock, timer, and stopwatch for the terminal

  /*
  Communication and synchronization
  */
-  # KDE Connect: integrate your phone and desktop
-  kdeconnect.enable = false;
-  # Nextcloud Client: sync files with a Nextcloud server
-  nextcloud-client.enable = true;
-  # Vesktop: a community‑driven Discord client
-  vesktop.enable = true;
+  kdeconnect.enable = false; # KDE Connect: integrate your phone and desktop
+  nextcloud-client.enable = true; # Nextcloud Client: sync files with a Nextcloud server
+  vesktop.enable = true; # Vesktop: a community‑driven Discord client

  /*
  Gaming
  */
-  # Lutris: an open gaming platform
-  lutris.enable = false;
+  lutris.enable = false; # Lutris: an open gaming platform

  /*
  Media recording and streaming
  */
-  # OBS Studio: streaming and recording software
-  obs-studio.enable = false;
+  obs-studio.enable = false; # OBS Studio: streaming and recording software

  /*
  Office suite
  */
-  # OnlyOffice: an office suite compatible with Microsoft formats
-  onlyoffice.enable = true;
+  onlyoffice.enable = true; # OnlyOffice: an office suite compatible with Microsoft formats

  /*
  Learning tools
  */
-  # Anki: spaced‑repetition flashcard program
-  anki.enable = true;
+  anki.enable = true; # Anki: spaced‑repetition flashcard program
+
+  /*
+  XDG desktop entries (PWA)
+  */
+  xdgDesktopEntries = {
+    enable = true; # Enable XDG desktop entries
+    entries = {
+      messenger.enable = true; # Messenger: Facebook Messenger
+      mastodon.enable = true; # Mastodon: a decentralized social network
+      garandcloud.enable = true; # GarandCloud: my Nextcloud instance
+      chatgpt.enable = true; # ChatGPT: a large language model
+      claude.enable = true; # Claude: a large language model
+      glance.enable = true; # Glance: my home server dashboard
+    };
+  };
 }
--- a/hosts/Garand-Desktop/system-modules.nix
+++ b/hosts/Garand-Desktop/system-modules.nix
@@ -2,86 +2,89 @@ _: {
  /*
  Container & Packaging
  */
-  # Docker: container runtime and management
-  docker.enable = true;
-  # Distrobox: containerized development environments
-  distrobox.enable = false;
-  # Flatpak: universal packaging system for Linux
-  flatpak.enable = true;
-  # Lazydocker: simple TUI for Docker
-  lazydocker.enable = false;
+  docker.enable = true; # Docker: container runtime and management
+  virtualbox.enable = true; # VirtualBox: PC emulator
+  flatpak = {
+    enable = true; # Flatpak: universal packaging system for Linux
+    packages = {
+      sober.enable = false; # Roblox client
+      warehouse.enable = true; # Flatpak manager
+      flatseal.enable = true; # Flatpak permissions manager
+    };
+  };
+
+  /*
+  Networking
+  */
+  tailscale.enable = true; # Tailscale: secure network for remote access

  /*
  Gaming
  */
-  # GameMode: optimizes system performance for gaming
-  gamemode.enable = true;
-  # Gamescope: micro-compositor for games
-  gamescope.enable = false;
-  # Prism Launcher: Minecraft modded launcher
-  prismlauncher.enable = false;
-  # Steam: platform for buying and playing games
-  steam.enable = true;
-  # SpaceCadet Pinball: classic pinball game
-  spaceCadetPinball.enable = true;
-  # TTY Solitaire: terminal based solitaire game
-  ttySolitaire.enable = true;
+  gamemode.enable = true; # GameMode: optimizes system performance for gaming
+  gamescope.enable = false; # Gamescope: micro‑compositor for games
+  steam.enable = true; # Steam: platform for buying and playing games

-  /*
-  Development Tools
-  */
-  # Exercism: coding practice platform
-  exercism.enable = true;
-  # Gedit: GNOME text editor
-  gedit.enable = false;
-  # Lazygit: simple TUI for git
-  lazygit.enable = false;
-  # OpenCode: tools for coding and development
-  opencode.enable = true;
+  packages = {
+    /*
+    Container & Packaging
+    */
+    distrobox.enable = false; # Distrobox: containerized development environments
+    lazydocker.enable = false; # Lazydocker: simple TUI for Docker
+    bottles.enable = false; # Bottles: Easy-to-use wineprefix manager

-  /*
-  Communication & Collaboration
-  */
-  # Mattermost: open-source Slack alternative
-  mattermost.enable = true;
-  # Slack: team communication and collaboration tool
-  slack.enable = true;
-  # Tutanota: secure email client
-  tutanota.enable = true;
+    /*
+    Gaming
+    */
+    prismlauncher.enable = true; # Prism Launcher: Minecraft modded launcher
+    spaceCadetPinball.enable = true; # SpaceCadet Pinball: classic pinball game
+    ttySolitaire.enable = true; # TTY Solitaire: terminal‑based solitaire game
+    heroic.enable = false; # Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac

-  /*
-  Productivity / Knowledge Management
-  */
-  # Bitwarden: password manager (desktop)
-  bitwarden.enable = false;
-  # Iotas: lightweight notes manager
-  iotas.enable = true;
-  # Logseq: knowledge base and outliner
-  logseq.enable = false;
+    /*
+    Development Tools
+    */
+    exercism.enable = true; # Exercism: coding practice platform
+    lazygit.enable = false; # Lazygit: simple TUI for Git
+    opencode.enable = false; # OpenCode: tools for coding and development
+    jan.enable = true; # Jan: AI chat UI
+    logisim-evolution.enable = true; # Logisim-Evolution: Digital logic designer and simulator

-  /*
-  Media & Graphics
-  */
-  # Affinity: professional graphics suite
-  affinity.enable = false;
-  # Eye of GNOME: image viewer
-  eyeOfGnome.enable = true;
-  # FreeTube: privacy‑friendly YouTube client
-  freetube.enable = false;
-  # GIMP: gnu image manipulation program
-  gimp.enable = false;
-  # Kdenlive: video editing software
-  kdenlive.enable = false;
-  # Plex: media player and server client
-  plex.enable = true;
+    /*
+    Communication & Collaboration
+    */
+    mattermost.enable = true; # Mattermost: open‑source Slack alternative
+    slack.enable = true; # Slack: team communication and collaboration tool
+    tutanota.enable = true; # Tutanota: secure email client
+    signal.enable = true; # Signal: secure messaging app
+    teams.enable = true; # Teams-for-linux: Unofficial Microsoft Teams client for Linux
+    ferdium.enable = false; # Ferdium: All your services in one place built by the community

-  /*
-  Utilities / Misc
-  */
-  # Eddie AirVPN: VPN client
-  eddieAirVPN.enable = true;
-  # Galculator: simple calculator
-  galculator.enable = true;
-  # Winboat: Windows remote desktop via RDP
-  winboat.enable = false;
+    /*
+    Productivity / Knowledge Management
+    */
+    bitwarden.enable = false; # Bitwarden: password manager (desktop)
+    iotas.enable = true; # Iotas: lightweight notes manager
+    logseq.enable = false; # Logseq: knowledge base and outliner
+
+    /*
+    Media & Graphics
+    */
+    affinity.enable = false; # Affinity: professional graphics suite
+    eyeOfGnome.enable = true; # Eye of GNOME: image viewer
+    freetube.enable = false; # FreeTube: privacy‑friendly YouTube client
+    gimp.enable = false; # GIMP: GNU Image Manipulation Program
+    kdenlive.enable = false; # Kdenlive: video editing software
+    pixieditor.enable = true; # Pixieditor: Universal editor for all your 2D needs
+    plex.enable = true; # Plex: media player and server client
+
+    /*
+    Utilities / Misc
+    */
+    eddieAirVPN.enable = true; # Eddie AirVPN: VPN client
+    galculator.enable = false; # Galculator: simple calculator
+    gedit.enable = true; # Gedit: GNOME text editor
+    winboat.enable = true; # Winboat: Windows remote desktop via RDP
+    adb.enable = false; # ADB: Android SDK platform tools
+  };
 }
--- a/hosts/Garand-Laptop/home-modules.nix
+++ b/hosts/Garand-Laptop/home-modules.nix
@@ -2,65 +2,65 @@ _: {
  /*
  Development editors and IDEs
  */
-  # VSCodium: a free and open-source "demicrosofted" VSCode
-  vscodium.enable = false;
-  # Zed Editor: a modern, high‑performance code editor
+  vscodium.enable = false; # VSCodium: a free and open-source "demicrosofted" VSCode
  zed-editor = {
-    # Enable Zed Editor
-    enable = true;
-    # Remote Server: enable remote editing capabilities
-    remote-server = true;
+    enable = true; # Zed Editor: a modern, high‑performance code editor
+    remote-server.enable = true; # Remote Server: enable remote editing capabilities
  };

  /*
  Web browsers
  */
-  # Librewolf: a privacy-focused Firefox fork
-  librewolf.enable = true;
-  # Ungoogled Chromium: a privacy-focused Chromium fork
-  ungoogled-chromium.enable = true;
+  librewolf.enable = true; # Librewolf: a privacy-focused Firefox fork
+  ungoogled-chromium.enable = true; # Ungoogled Chromium: a privacy-focused Chromium fork

  /*
  System utilities
  */
-  # Btop: a resource monitor for the terminal
-  btop.enable = true;
-  # Cava: terminal audio visualizer
-  cava.enable = false;
-  # Fastfetch: a fast system information tool
-  fastfetch.enable = true;
+  btop.enable = true; # Btop: a resource monitor for the terminal
+  cava.enable = false; # Cava: terminal audio visualizer
+  fastfetch.enable = true; # Fastfetch: a fast system information tool
+  peaclock.enable = true; # Peaclock: Clock, timer, and stopwatch for the terminal

  /*
  Communication and synchronization
  */
-  # KDE Connect: integrate your phone and desktop
-  kdeconnect.enable = false;
-  # Nextcloud Client: sync files with a Nextcloud server
-  nextcloud-client.enable = true;
-  # Vesktop: a community‑driven Discord client
-  vesktop.enable = true;
+  kdeconnect.enable = false; # KDE Connect: integrate your phone and desktop
+  nextcloud-client.enable = true; # Nextcloud Client: sync files with a Nextcloud server
+  vesktop.enable = true; # Vesktop: a community‑driven Discord client

  /*
  Gaming
  */
-  # Lutris: an open gaming platform
-  lutris.enable = false;
+  lutris.enable = false; # Lutris: an open gaming platform

  /*
  Media recording and streaming
  */
-  # OBS Studio: streaming and recording software
-  obs-studio.enable = false;
+  obs-studio.enable = false; # OBS Studio: streaming and recording software

  /*
  Office suite
  */
-  # OnlyOffice: an office suite compatible with Microsoft formats
-  onlyoffice.enable = true;
+  onlyoffice.enable = true; # OnlyOffice: an office suite compatible with Microsoft formats

  /*
  Learning tools
  */
-  # Anki: spaced‑repetition flashcard program
-  anki.enable = true;
+  anki.enable = true; # Anki: spaced‑repetition flashcard program
+
+  /*
+  XDG desktop entries (PWA)
+  */
+  xdgDesktopEntries = {
+    enable = true; # Enable XDG desktop entries
+    entries = {
+      messenger.enable = true; # Messenger: Facebook Messenger
+      mastodon.enable = true; # Mastodon: a decentralized social network
+      garandcloud.enable = true; # GarandCloud: my Nextcloud instance
+      chatgpt.enable = true; # ChatGPT: a large language model
+      claude.enable = true; # Claude: a large language model
+      glance.enable = true; # Glance: my home server dashboard
+    };
+  };
 }
--- a/hosts/Garand-Laptop/system-modules.nix
+++ b/hosts/Garand-Laptop/system-modules.nix
@@ -2,86 +2,89 @@ _: {
  /*
  Container & Packaging
  */
-  # Docker: container runtime and management
-  docker.enable = true;
-  # Distrobox: containerized development environments
-  distrobox.enable = false;
-  # Flatpak: universal packaging system for Linux
-  flatpak.enable = true;
-  # Lazydocker: simple TUI for Docker
-  lazydocker.enable = false;
+  docker.enable = true; # Docker: container runtime and management
+  virtualbox.enable = false; # VirtualBox: PC emulator
+  flatpak = {
+    enable = true; # Flatpak: universal packaging system for Linux
+    packages = {
+      sober.enable = false; # Roblox client
+      warehouse.enable = true; # Flatpak manager
+      flatseal.enable = true; # Flatpak permissions manager
+    };
+  };
+
+  /*
+  Networking
+  */
+  tailscale.enable = true; # Tailscale: secure network for remote access

  /*
  Gaming
  */
-  # GameMode: optimizes system performance for gaming
-  gamemode.enable = true;
-  # Gamescope: micro-compositor for games
-  gamescope.enable = false;
-  # Prism Launcher: Minecraft modded launcher
-  prismlauncher.enable = false;
-  # Steam: platform for buying and playing games
-  steam.enable = true;
-  # SpaceCadet Pinball: classic pinball game
-  spaceCadetPinball.enable = true;
-  # TTY Solitaire: terminal based solitaire game
-  ttySolitaire.enable = true;
+  gamemode.enable = true; # GameMode: optimizes system performance for gaming
+  gamescope.enable = false; # Gamescope: micro‑compositor for games
+  steam.enable = true; # Steam: platform for buying and playing games

-  /*
-  Development Tools
-  */
-  # Exercism: coding practice platform
-  exercism.enable = true;
-  # Gedit: GNOME text editor
-  gedit.enable = false;
-  # Lazygit: simple TUI for git
-  lazygit.enable = false;
-  # OpenCode: tools for coding and development
-  opencode.enable = true;
+  packages = {
+    /*
+    Container & Packaging
+    */
+    distrobox.enable = false; # Distrobox: containerized development environments
+    lazydocker.enable = false; # Lazydocker: simple TUI for Docker
+    bottles.enable = false; # Bottles: Easy-to-use wineprefix manager

-  /*
-  Communication & Collaboration
-  */
-  # Mattermost: open-source Slack alternative
-  mattermost.enable = true;
-  # Slack: team communication and collaboration tool
-  slack.enable = true;
-  # Tutanota: secure email client
-  tutanota.enable = true;
+    /*
+    Gaming
+    */
+    prismlauncher.enable = true; # Prism Launcher: Minecraft modded launcher
+    spaceCadetPinball.enable = true; # SpaceCadet Pinball: classic pinball game
+    ttySolitaire.enable = true; # TTY Solitaire: terminal‑based solitaire game
+    heroic.enable = false; # Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac

-  /*
-  Productivity / Knowledge Management
-  */
-  # Bitwarden: password manager (desktop)
-  bitwarden.enable = false;
-  # Iotas: lightweight notes manager
-  iotas.enable = true;
-  # Logseq: knowledge base and outliner
-  logseq.enable = false;
+    /*
+    Development Tools
+    */
+    exercism.enable = true; # Exercism: coding practice platform
+    lazygit.enable = false; # Lazygit: simple TUI for Git
+    opencode.enable = false; # OpenCode: tools for coding and development
+    jan.enable = true; # Jan: AI chat UI
+    logisim-evolution.enable = false; # Logisim-Evolution: Digital logic designer and simulator

-  /*
-  Media & Graphics
-  */
-  # Affinity: professional graphics suite
-  affinity.enable = false;
-  # Eye of GNOME: image viewer
-  eyeOfGnome.enable = true;
-  # FreeTube: privacy‑friendly YouTube client
-  freetube.enable = false;
-  # GIMP: gnu image manipulation program
-  gimp.enable = false;
-  # Kdenlive: video editing software
-  kdenlive.enable = false;
-  # Plex: media player and server client
-  plex.enable = true;
+    /*
+    Communication & Collaboration
+    */
+    mattermost.enable = true; # Mattermost: open‑source Slack alternative
+    slack.enable = true; # Slack: team communication and collaboration tool
+    tutanota.enable = true; # Tutanota: secure email client
+    signal.enable = true; # Signal: secure messaging app
+    teams.enable = true; # Teams-for-linux: Unofficial Microsoft Teams client for Linux
+    ferdium.enable = false; # Ferdium: All your services in one place built by the community

-  /*
-  Utilities / Misc
-  */
-  # Eddie AirVPN: VPN client
-  eddieAirVPN.enable = true;
-  # Galculator: simple calculator
-  galculator.enable = true;
-  # Winboat: Windows remote desktop via RDP
-  winboat.enable = false;
+    /*
+    Productivity / Knowledge Management
+    */
+    bitwarden.enable = false; # Bitwarden: password manager (desktop)
+    iotas.enable = true; # Iotas: lightweight notes manager
+    logseq.enable = false; # Logseq: knowledge base and outliner
+
+    /*
+    Media & Graphics
+    */
+    affinity.enable = false; # Affinity: professional graphics suite
+    eyeOfGnome.enable = true; # Eye of GNOME: image viewer
+    freetube.enable = false; # FreeTube: privacy‑friendly YouTube client
+    gimp.enable = false; # GIMP: GNU Image Manipulation Program
+    kdenlive.enable = false; # Kdenlive: video editing software
+    pixieditor.enable = false; # Pixieditor: Universal editor for all your 2D needs
+    plex.enable = true; # Plex: media player and server client
+
+    /*
+    Utilities / Misc
+    */
+    eddieAirVPN.enable = true; # Eddie AirVPN: VPN client
+    galculator.enable = false; # Galculator: simple calculator
+    gedit.enable = false; # Gedit: GNOME text editor
+    winboat.enable = false; # Winboat: Windows remote desktop via RDP
+    adb.enable = false; # ADB: Android SDK platform tools
+  };
 }
--- a/hosts/default/home-modules.nix
+++ b/hosts/default/home-modules.nix
@@ -2,65 +2,65 @@ _: {
  /*
  Development editors and IDEs
  */
-  # VSCodium: a free and open-source "demicrosofted" VSCode
-  vscodium.enable = false;
-  # Zed Editor: a modern, high‑performance code editor
+  vscodium.enable = false; # VSCodium: a free and open-source "demicrosofted" VSCode
  zed-editor = {
-    # Enable Zed Editor
-    enable = true;
-    # Remote Server: enable remote editing capabilities
-    remote-server = true;
+    enable = true; # Zed Editor: a modern, high‑performance code editor
+    remote-server.enable = true; # Remote Server: enable remote editing capabilities
  };

  /*
  Web browsers
  */
-  # Librewolf: a privacy-focused Firefox fork
-  librewolf.enable = true;
-  # Ungoogled Chromium: a privacy-focused Chromium fork
-  ungoogled-chromium.enable = true;
+  librewolf.enable = true; # Librewolf: a privacy-focused Firefox fork
+  ungoogled-chromium.enable = true; # Ungoogled Chromium: a privacy-focused Chromium fork

  /*
  System utilities
  */
-  # Btop: a resource monitor for the terminal
-  btop.enable = true;
-  # Cava: terminal audio visualizer
-  cava.enable = false;
-  # Fastfetch: a fast system information tool
-  fastfetch.enable = true;
+  btop.enable = true; # Btop: a resource monitor for the terminal
+  cava.enable = false; # Cava: terminal audio visualizer
+  fastfetch.enable = true; # Fastfetch: a fast system information tool
+  peaclock.enable = true; # Peaclock: Clock, timer, and stopwatch for the terminal

  /*
  Communication and synchronization
  */
-  # KDE Connect: integrate your phone and desktop
-  kdeconnect.enable = false;
-  # Nextcloud Client: sync files with a Nextcloud server
-  nextcloud-client.enable = true;
-  # Vesktop: a community‑driven Discord client
-  vesktop.enable = true;
+  kdeconnect.enable = false; # KDE Connect: integrate your phone and desktop
+  nextcloud-client.enable = true; # Nextcloud Client: sync files with a Nextcloud server
+  vesktop.enable = true; # Vesktop: a community‑driven Discord client

  /*
  Gaming
  */
-  # Lutris: an open gaming platform
-  lutris.enable = false;
+  lutris.enable = false; # Lutris: an open gaming platform

  /*
  Media recording and streaming
  */
-  # OBS Studio: streaming and recording software
-  obs-studio.enable = false;
+  obs-studio.enable = false; # OBS Studio: streaming and recording software

  /*
  Office suite
  */
-  # OnlyOffice: an office suite compatible with Microsoft formats
-  onlyoffice.enable = true;
+  onlyoffice.enable = true; # OnlyOffice: an office suite compatible with Microsoft formats

  /*
  Learning tools
  */
-  # Anki: spaced‑repetition flashcard program
-  anki.enable = true;
+  anki.enable = true; # Anki: spaced‑repetition flashcard program
+
+  /*
+  XDG desktop entries (PWA)
+  */
+  xdgDesktopEntries = {
+    enable = true; # Enable XDG desktop entries
+    entries = {
+      messenger.enable = true; # Messenger: Facebook Messenger
+      mastodon.enable = true; # Mastodon: a decentralized social network
+      garandcloud.enable = true; # GarandCloud: my Nextcloud instance
+      chatgpt.enable = true; # ChatGPT: a large language model
+      claude.enable = true; # Claude: a large language model
+      glance.enable = true; # Glance: my home server dashboard
+    };
+  };
 }
--- a/hosts/default/system-modules.nix
+++ b/hosts/default/system-modules.nix
@@ -2,86 +2,89 @@ _: {
  /*
  Container & Packaging
  */
-  # Docker: container runtime and management
-  docker.enable = true;
-  # Distrobox: containerized development environments
-  distrobox.enable = false;
-  # Flatpak: universal packaging system for Linux
-  flatpak.enable = true;
-  # Lazydocker: simple TUI for Docker
-  lazydocker.enable = false;
+  docker.enable = true; # Docker: container runtime and management
+  virtualbox.enable = false; # VirtualBox: PC emulator
+  flatpak = {
+    enable = true; # Flatpak: universal packaging system for Linux
+    packages = {
+      sober.enable = false; # Roblox client
+      warehouse.enable = true; # Flatpak manager
+      flatseal.enable = true; # Flatpak permissions manager
+    };
+  };
+
+  /*
+  Networking
+  */
+  tailscale.enable = false; # Tailscale: secure network for remote access

  /*
  Gaming
  */
-  # GameMode: optimizes system performance for gaming
-  gamemode.enable = true;
-  # Gamescope: micro-compositor for games
-  gamescope.enable = false;
-  # Prism Launcher: Minecraft modded launcher
-  prismlauncher.enable = false;
-  # Steam: platform for buying and playing games
-  steam.enable = true;
-  # SpaceCadet Pinball: classic pinball game
-  spaceCadetPinball.enable = true;
-  # TTY Solitaire: terminal based solitaire game
-  ttySolitaire.enable = true;
+  gamemode.enable = true; # GameMode: optimizes system performance for gaming
+  gamescope.enable = false; # Gamescope: micro‑compositor for games
+  steam.enable = true; # Steam: platform for buying and playing games

-  /*
-  Development Tools
-  */
-  # Exercism: coding practice platform
-  exercism.enable = true;
-  # Gedit: GNOME text editor
-  gedit.enable = false;
-  # Lazygit: simple TUI for git
-  lazygit.enable = false;
-  # OpenCode: tools for coding and development
-  opencode.enable = true;
+  packages = {
+    /*
+    Container & Packaging
+    */
+    distrobox.enable = false; # Distrobox: containerized development environments
+    lazydocker.enable = false; # Lazydocker: simple TUI for Docker
+    bottles.enable = false; # Bottles: Easy-to-use wineprefix manager

-  /*
-  Communication & Collaboration
-  */
-  # Mattermost: open-source Slack alternative
-  mattermost.enable = true;
-  # Slack: team communication and collaboration tool
-  slack.enable = true;
-  # Tutanota: secure email client
-  tutanota.enable = true;
+    /*
+    Gaming
+    */
+    prismlauncher.enable = false; # Prism Launcher: Minecraft modded launcher
+    spaceCadetPinball.enable = true; # SpaceCadet Pinball: classic pinball game
+    ttySolitaire.enable = true; # TTY Solitaire: terminal‑based solitaire game
+    heroic.enable = false; # Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac

-  /*
-  Productivity / Knowledge Management
-  */
-  # Bitwarden: password manager (desktop)
-  bitwarden.enable = false;
-  # Iotas: lightweight notes manager
-  iotas.enable = true;
-  # Logseq: knowledge base and outliner
-  logseq.enable = false;
+    /*
+    Development Tools
+    */
+    exercism.enable = true; # Exercism: coding practice platform
+    lazygit.enable = false; # Lazygit: simple TUI for Git
+    opencode.enable = false; # OpenCode: tools for coding and development
+    jan.enable = true; # Jan: AI chat UI
+    logisim-evolution.enable = false; # Logisim-Evolution: Digital logic designer and simulator

-  /*
-  Media & Graphics
-  */
-  # Affinity: professional graphics suite
-  affinity.enable = false;
-  # Eye of GNOME: image viewer
-  eyeOfGnome.enable = true;
-  # FreeTube: privacy‑friendly YouTube client
-  freetube.enable = false;
-  # GIMP: gnu image manipulation program
-  gimp.enable = false;
-  # Kdenlive: video editing software
-  kdenlive.enable = false;
-  # Plex: media player and server client
-  plex.enable = true;
+    /*
+    Communication & Collaboration
+    */
+    mattermost.enable = true; # Mattermost: open‑source Slack alternative
+    slack.enable = true; # Slack: team communication and collaboration tool
+    tutanota.enable = true; # Tutanota: secure email client
+    signal.enable = true; # Signal: secure messaging app
+    teams.enable = true; # Teams-for-linux: Unofficial Microsoft Teams client for Linux
+    ferdium.enable = false; # Ferdium: All your services in one place built by the community

-  /*
-  Utilities / Misc
-  */
-  # Eddie AirVPN: VPN client
-  eddieAirVPN.enable = true;
-  # Galculator: simple calculator
-  galculator.enable = true;
-  # Winboat: Windows remote desktop via RDP
-  winboat.enable = false;
+    /*
+    Productivity / Knowledge Management
+    */
+    bitwarden.enable = false; # Bitwarden: password manager (desktop)
+    iotas.enable = true; # Iotas: lightweight notes manager
+    logseq.enable = false; # Logseq: knowledge base and outliner
+
+    /*
+    Media & Graphics
+    */
+    affinity.enable = false; # Affinity: professional graphics suite
+    eyeOfGnome.enable = true; # Eye of GNOME: image viewer
+    freetube.enable = false; # FreeTube: privacy‑friendly YouTube client
+    gimp.enable = false; # GIMP: GNU Image Manipulation Program
+    kdenlive.enable = false; # Kdenlive: video editing software
+    pixieditor.enable = false; # Pixieditor: Universal editor for all your 2D needs
+    plex.enable = true; # Plex: media player and server client
+
+    /*
+    Utilities / Misc
+    */
+    eddieAirVPN.enable = true; # Eddie AirVPN: VPN client
+    galculator.enable = false; # Galculator: simple calculator
+    gedit.enable = false; # Gedit: GNOME text editor
+    winboat.enable = false; # Winboat: Windows remote desktop via RDP
+    adb.enable = false; # ADB: Android SDK platform tools
+  };
 }
--- a/modules/core/boot.nix
+++ b/modules/core/boot.nix
@@ -19,7 +19,7 @@
          wallpapers = [
            ./../../wallpapers/attack-on-titan-mikasa-ackerman.jpg
          ];
-          wallpaperStyle = lib.mkDefault "centered";
+          wallpaperStyle = lib.mkForce "centered";
          backdrop = "${config.stylix.base16Scheme.base00}";
          interface = {
            branding = "GarandOS Bootloader";
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -6,6 +6,7 @@
    ./docker.nix
    ./flatpak.nix
    ./fonts.nix
+    ./garandos-tui.nix
    ./hardware.nix
    ./network.nix
    ./nfs.nix
@@ -18,8 +19,10 @@
    ./stylix.nix
    ./syncthing.nix
    ./system.nix
+    ./tailscale.nix
    ./thunar.nix
    ./user.nix
+    ./virtualbox.nix
    ./xdg.nix
    ./xserver.nix
    inputs.stylix.nixosModules.stylix
--- a/modules/core/flatpak.nix
+++ b/modules/core/flatpak.nix
@@ -2,16 +2,27 @@
  lib,
  config,
  ...
-}: {
+}: let
+  mkFlatpakPackage = name: pkgId: {
+    options.flatpak.packages.${name}.enable = lib.mkEnableOption "Flatpak: ${name}";
+
+    config.services.flatpak.packages =
+      lib.mkIf config.flatpak.packages.${name}.enable [pkgId];
+  };
+
+  flatpakPackages = {
+    sober = "org.vinegarhq.Sober";
+    warehouse = "io.github.flattool.Warehouse";
+    flatseal = "com.github.tchx84.Flatseal";
+  };
+in {
  options.flatpak.enable = lib.mkEnableOption "Flatpak";

  config.services.flatpak = lib.mkIf config.flatpak.enable {
    enable = true;
    update.onActivation = true;
-    packages = [
-      # "org.vinegarhq.Sober"
-      "io.github.flattool.Warehouse"
-      "com.github.tchx84.Flatseal"
-    ];
+    packages = [];
  };
+
+  imports = builtins.attrValues (builtins.mapAttrs mkFlatpakPackage flatpakPackages);
 }
--- a/modules/core/garandos-tui.nix
+++ b/modules/core/garandos-tui.nix
@@ -0,0 +1,11 @@
+{
+  host,
+  username,
+  ...
+}: {
+  programs.garandos-tui = {
+    enable = true;
+    systemModulesFilePath = "/home/${username}/garandos/hosts/${host}/system-modules.nix";
+    homeModulesFilePath = "/home/${username}/garandos/hosts/${host}/home-modules.nix";
+  };
+}
--- a/modules/core/packages/essentials.nix
+++ b/modules/core/packages/essentials.nix
@@ -12,6 +12,7 @@
    file-roller
    unrar
    unzip
+    p7zip
    # System monitoring & info
    inxi
    lm_sensors
--- a/modules/core/packages/packages.nix
+++ b/modules/core/packages/packages.nix
@@ -7,9 +7,9 @@
  ...
 }: let
  mkPackage = name: pkgsOrList: {
-    options.${name}.enable = lib.mkEnableOption name;
+    options.packages.${name}.enable = lib.mkEnableOption name;
    config.environment.systemPackages =
-      lib.mkIf config.${name}.enable
+      lib.mkIf config.packages.${name}.enable
      (lib.toList pkgsOrList);
  };

@@ -25,6 +25,7 @@
    tutanota = tutanota-desktop;
    exercism = exercism;
    opencode = opencode;
+    jan = jan;
    lazygit = lazygit;
    prismlauncher = inputs.prismlauncher-cracked.packages.${system}.default;
    spaceCadetPinball = space-cadet-pinball;
@@ -41,6 +42,14 @@
    lazydocker = lazydocker;
    distrobox = [distrobox pkgs.boxbuddy];
    winboat = [winboat freerdp];
+    signal = signal-desktop;
+    pixieditor = pixieditor;
+    bottles = bottles;
+    heroic = heroic;
+    adb = android-tools;
+    teams = teams-for-linux;
+    ferdium = ferdium;
+    logisim-evolution = logisim-evolution;
  };
 in {
  imports = builtins.attrValues (builtins.mapAttrs mkPackage packages);
--- a/modules/core/packages/programs.nix
+++ b/modules/core/packages/programs.nix
@@ -1,7 +1,3 @@
-# {
-#   pkgs
-#   ...
-# }
 _: {
  programs = {
    nano.enable = true;
@@ -13,7 +9,6 @@ _: {
    seahorse.enable = true;
    fuse.userAllowOther = true;
    mtr.enable = true;
-    adb.enable = true;
    hyprlock.enable = true;
    gnupg.agent = {
      enable = true;
--- a/modules/core/tailscale.nix
+++ b/modules/core/tailscale.nix
@@ -0,0 +1,14 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: {
+  options.tailscale.enable = lib.mkEnableOption "Tailscale";
+
+  config.services.tailscale = lib.mkIf config.tailscale.enable {
+    enable = true;
+    package = pkgs.tailscale;
+    openFirewall = true;
+  };
+}
--- a/modules/core/thunar.nix
+++ b/modules/core/thunar.nix
@@ -1,7 +1,7 @@
 {pkgs, ...}: {
  programs.thunar = {
    enable = true;
-    plugins = with pkgs.xfce; [
+    plugins = with pkgs; [
      thunar-archive-plugin
      thunar-volman
    ];
--- a/modules/core/virtualbox.nix
+++ b/modules/core/virtualbox.nix
@@ -0,0 +1,17 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  options.virtualbox.enable = lib.mkEnableOption "Enable VirtualBox";
+
+  config.virtualisation.virtualbox.host = lib.mkIf config.virtualbox.enable {
+    enable = true;
+    package = pkgs.virtualbox;
+    enableKvm = true;
+    enableHardening = true;
+    enableExtensionPack = false;
+    addNetworkInterface = false;
+  };
+}
--- a/modules/home/bash/aliases.nix
+++ b/modules/home/bash/aliases.nix
@@ -8,10 +8,12 @@
    pullos = "git -C /home/${username}/garandos pull";
    upd = "nh os switch --hostname ${host}";
    upg = "nh os switch --hostname ${host} --update";
-    upf = "sudo nix flake update";
+    upf = "sudo nix flake update --flake /home/${username}/garandos";
+    upf-undo = "git -C /home/${username}/garandos restore /home/${username}/garandos/flake.lock";
    upd-bt = "nh os boot --hostname ${host}";
    upd-ts = "nh os test --hostname ${host}";
    upd-bd = "nh os build --hostname ${host}";
+    tui = "garandos-tui";
    ncg = "nh clean all";

    # Development aliases
@@ -32,6 +34,12 @@
    nrd = "nix run .#develop";
    nbrd = "nix build .#develop && nix run .#develop";

+    # Development aliases for docker
+    dcu = "docker compose up -d";
+    dcd = "docker compose down";
+    dcb = "docker compose build";
+    dcub = "docker compose up -d --build";
+
    # System aliases
    # flush-codium = "sudo killall codium && sudo rm -rf ~/.config/VSCodium/Cache && sudo rm -rf ~/.config/VSCodium/CachedData";
    kys = "shutdown now";
@@ -122,7 +130,9 @@
    fc = "fortune | cowsay";

    # Network aliases
-    kssh-server = "kssh garand_plg@192.168.1.156 -i ~/.ssh/hp-t640-homeserver";
-    ssh-server = "ssh garand_plg@192.168.1.156 -i ~/.ssh/hp-t640-homeserver";
+    kssh-server = "kssh hp-t640-homeserver";
+    kssh-server-ts = "kssh hp-t640-homeserver-tailscale";
+    ssh-server = "ssh hp-t640-homeserver";
+    ssh-server-ts = "ssh hp-t640-homeserver-tailscale";
  };
 }
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -8,6 +8,7 @@ in {
    ./hyprland
    ./kitty
    ./librewolf
+    ./peaclock
    ./rofi
    ./scripts
    ./swaync
--- a/modules/home/fastfetch/garandos.png
+++ b/modules/home/fastfetch/garandos.png
--- a/modules/home/hyprland/animations-def.nix
+++ b/modules/home/hyprland/animations-def.nix
@@ -1,22 +1,20 @@
 _: {
-  wayland.windowManager.hyprland.settings = {
-    animations = {
-      enabled = true;
-      bezier = [
-        "wind, -1.05, 0.9, 0.1, 1.05"
-        "winIn, -1.1, 1.1, 0.1, 1.1"
-        "winOut, -1.3, -0.3, 0, 1"
-        "liner, 0, 1, 1, 1"
-      ];
-      animation = [
-        "windows, 0, 6, wind, slide"
-        "windowsIn, 0, 6, winIn, slide"
-        "windowsOut, 0, 5, winOut, slide"
-        "windowsMove, 0, 5, wind, slide"
-        "border, 0, 1, liner"
-        "fade, 0, 10, default"
-        "workspaces, 0, 5, wind"
-      ];
-    };
+  wayland.windowManager.hyprland.settings.animations = {
+    enabled = true;
+    bezier = [
+      "wind, -1.05, 0.9, 0.1, 1.05"
+      "winIn, -1.1, 1.1, 0.1, 1.1"
+      "winOut, -1.3, -0.3, 0, 1"
+      "liner, 0, 1, 1, 1"
+    ];
+    animation = [
+      "windows, 0, 6, wind, slide"
+      "windowsIn, 0, 6, winIn, slide"
+      "windowsOut, 0, 5, winOut, slide"
+      "windowsMove, 0, 5, wind, slide"
+      "border, 0, 1, liner"
+      "fade, 0, 10, default"
+      "workspaces, 0, 5, wind"
+    ];
  };
 }
--- a/modules/home/hyprland/animations-dynamic.nix
+++ b/modules/home/hyprland/animations-dynamic.nix
@@ -1,25 +1,22 @@
 _: {
-  wayland.windowManager.hyprland.settings = {
-    # name "Dynamic"
-    # credit https://github.com/mylinuxforwork/dotfiles
-    animations = {
-      enabled = true;
-      bezier = [
-        "wind, 0.05, 0.9, 0.1, 1.05"
-        "winIn, 0.1, 1.1, 0.1, 1.1"
-        "winOut, 0.3, -0.3, 0, 1"
-        "liner, 1, 1, 1, 1"
-      ];
-      animation = [
-        "windows, 1, 6, wind, slide"
-        "windowsIn, 1, 6, winIn, slide"
-        "windowsOut, 1, 5, winOut, slide"
-        "windowsMove, 1, 5, wind, slide"
-        "border, 1, 1, liner"
-        "borderangle, 1, 30, liner, loop"
-        "fade, 1, 10, default"
-        "workspaces, 1, 5, wind"
-      ];
-    };
+  # name "Dynamic"
+  wayland.windowManager.hyprland.settings.animations = {
+    enabled = true;
+    bezier = [
+      "wind, 0.05, 0.9, 0.1, 1.05"
+      "winIn, 0.1, 1.1, 0.1, 1.1"
+      "winOut, 0.3, -0.3, 0, 1"
+      "liner, 1, 1, 1, 1"
+    ];
+    animation = [
+      "windows, 1, 6, wind, slide"
+      "windowsIn, 1, 6, winIn, slide"
+      "windowsOut, 1, 5, winOut, slide"
+      "windowsMove, 1, 5, wind, slide"
+      "border, 1, 1, liner"
+      "borderangle, 1, 30, liner, loop"
+      "fade, 1, 10, default"
+      "workspaces, 1, 5, wind"
+    ];
  };
 }
--- a/modules/home/hyprland/animations-end4.nix
+++ b/modules/home/hyprland/animations-end4.nix
@@ -1,37 +1,34 @@
 _: {
-  wayland.windowManager.hyprland.settings = {
-    # Name: END-4
-    # Credit: END-4 project https://github.com/end-4/dots-hyprland
-    animations = {
-      enabled = true;
-      bezier = [
-        "linear, 0, 0, 1, 1"
-        "md3_standard, 0.2, 0, 0, 1"
-        "md3_decel, 0.05, 0.7, 0.1, 1"
-        "md3_accel, 0.3, 0, 0.8, 0.15"
-        "overshot, 0.05, 0.9, 0.1, 1.1"
-        "crazyshot, 0.1, 1.5, 0.76, 0.92 "
-        "hyprnostretch, 0.05, 0.9, 0.1, 1.0"
-        "menu_decel, 0.1, 1, 0, 1"
-        "menu_accel, 0.38, 0.04, 1, 0.07"
-        "easeInOutCirc, 0.85, 0, 0.15, 1"
-        "easeOutCirc, 0, 0.55, 0.45, 1"
-        "easeOutExpo, 0.16, 1, 0.3, 1"
-        "softAcDecel, 0.26, 0.26, 0.15, 1"
-        "md2, 0.4, 0, 0.2, 1 # use with .2s duration"
-      ];
-      animation = [
-        "windows, 1, 3, md3_decel, popin 60%"
-        "windowsIn, 1, 3, md3_decel, popin 60%"
-        "windowsOut, 1, 3, md3_accel, popin 60%"
-        "border, 1, 10, default"
-        "fade, 1, 3, md3_decel"
-        "layersIn, 1, 3, menu_decel, slide"
-        "layersOut, 1, 1.6, menu_accel"
-        "fadeLayersIn, 1, 2, menu_decel"
-        "fadeLayersOut, 1, 4.5, menu_accel"
-        "workspaces, 1, 7, menu_decel, slide"
-      ];
-    };
+  # Name: END-4
+  wayland.windowManager.hyprland.settings.animations = {
+    enabled = true;
+    bezier = [
+      "linear, 0, 0, 1, 1"
+      "md3_standard, 0.2, 0, 0, 1"
+      "md3_decel, 0.05, 0.7, 0.1, 1"
+      "md3_accel, 0.3, 0, 0.8, 0.15"
+      "overshot, 0.05, 0.9, 0.1, 1.1"
+      "crazyshot, 0.1, 1.5, 0.76, 0.92 "
+      "hyprnostretch, 0.05, 0.9, 0.1, 1.0"
+      "menu_decel, 0.1, 1, 0, 1"
+      "menu_accel, 0.38, 0.04, 1, 0.07"
+      "easeInOutCirc, 0.85, 0, 0.15, 1"
+      "easeOutCirc, 0, 0.55, 0.45, 1"
+      "easeOutExpo, 0.16, 1, 0.3, 1"
+      "softAcDecel, 0.26, 0.26, 0.15, 1"
+      "md2, 0.4, 0, 0.2, 1 # use with .2s duration"
+    ];
+    animation = [
+      "windows, 1, 3, md3_decel, popin 60%"
+      "windowsIn, 1, 3, md3_decel, popin 60%"
+      "windowsOut, 1, 3, md3_accel, popin 60%"
+      "border, 1, 10, default"
+      "fade, 1, 3, md3_decel"
+      "layersIn, 1, 3, menu_decel, slide"
+      "layersOut, 1, 1.6, menu_accel"
+      "fadeLayersIn, 1, 2, menu_decel"
+      "fadeLayersOut, 1, 4.5, menu_accel"
+      "workspaces, 1, 7, menu_decel, slide"
+    ];
  };
 }
--- a/modules/home/hyprland/animations-moving.nix
+++ b/modules/home/hyprland/animations-moving.nix
@@ -1,24 +1,21 @@
 _: {
-  wayland.windowManager.hyprland.settings = {
-    # name "moving"
-    # credit https://github.com/mylinuxforwork/dotfiles
-    animations = {
-      enabled = true;
-      bezier = [
-        "overshot, 0.05, 0.9, 0.1, 1.05"
-        "smoothOut, 0.5, 0, 0.99, 0.99"
-        "smoothIn, 0.5, -0.5, 0.68, 1.5"
-      ];
-      animation = [
-        "windows, 1, 5, overshot, slide"
-        "windowsOut, 1, 3, smoothOut"
-        "windowsIn, 1, 3, smoothOut"
-        "windowsMove, 1, 4, smoothIn, slide"
-        "border, 1, 5, default"
-        "fade, 1, 5, smoothIn"
-        "fadeDim, 1, 5, smoothIn"
-        "workspaces, 1, 6, default"
-      ];
-    };
+  # name "moving"
+  wayland.windowManager.hyprland.settings.animations = {
+    enabled = true;
+    bezier = [
+      "overshot, 0.05, 0.9, 0.1, 1.05"
+      "smoothOut, 0.5, 0, 0.99, 0.99"
+      "smoothIn, 0.5, -0.5, 0.68, 1.5"
+    ];
+    animation = [
+      "windows, 1, 5, overshot, slide"
+      "windowsOut, 1, 3, smoothOut"
+      "windowsIn, 1, 3, smoothOut"
+      "windowsMove, 1, 4, smoothIn, slide"
+      "border, 1, 5, default"
+      "fade, 1, 5, smoothIn"
+      "fadeDim, 1, 5, smoothIn"
+      "workspaces, 1, 6, default"
+    ];
  };
 }
--- a/modules/home/hyprland/binds.nix
+++ b/modules/home/hyprland/binds.nix
@@ -11,127 +11,130 @@ in {
      # =============================================================================
      # APLIKACJE - GŁÓWNE
      # =============================================================================
-      "$modifier, A, exec, anki"
-      "$modifier, B, exec, bitwarden"
-      "$modifier, C, exec, chromium"
-      "$modifier, D, exec, vesktop"
-      "$modifier, G, exec, affinity-v3"
-      "$modifier, I, exec, iotas"
-      "$modifier, L, exec, logseq"
-      "$modifier, M, exec, plexamp"
-      "$modifier, N, exec, dex ${desktopEntriesPath}/garandcloud.desktop"
-      "$modifier, O, exec, obs"
-      "$modifier, P, exec, plex-desktop"
-      "$modifier, Return, exec, ${terminal}"
-      "$modifier, S, exec, steam"
-      "$modifier, T, exec, thunar"
-      "$modifier, V, exec, codium"
-      "$modifier, W, exec, ${browser}"
-      "$modifier, Z, exec, zeditor"
+      "SUPER, A, exec, anki"
+      "SUPER, B, exec, bitwarden"
+      "SUPER, C, exec, chromium"
+      "SUPER, D, exec, vesktop"
+      "SUPER, G, exec, affinity-v3"
+      "SUPER, I, exec, iotas"
+      "SUPER, J, exec, Jan"
+      "SUPER, L, exec, logseq"
+      "SUPER, M, exec, plexamp"
+      "SUPER, N, exec, dex ${desktopEntriesPath}/garandcloud.desktop"
+      "SUPER, O, exec, obs"
+      "SUPER, P, exec, plex-desktop"
+      "SUPER, Return, exec, ${terminal}"
+      "SUPER, S, exec, steam"
+      "SUPER, T, exec, thunar"
+      "SUPER, V, exec, codium"
+      "SUPER, W, exec, ${browser}"
+      "SUPER, Z, exec, zeditor"

      # =============================================================================
      # APLIKACJE - Z SHIFT
      # =============================================================================
-      "$modifier SHIFT, B, exec, blueman-manager"
-      "$modifier SHIFT, C, exec, dex ${desktopEntriesPath}/claude.desktop"
-      "$modifier SHIFT, G, exec, dex ${desktopEntriesPath}/chatgpt.desktop"
-      "$modifier SHIFT, M, exec, dex ${desktopEntriesPath}/messenger.desktop"
-      "$modifier SHIFT, N, exec, nextcloud"
-      "$modifier SHIFT, O, exec, onlyoffice-desktopeditors"
-      "$modifier SHIFT, Return, exec, rofi-launcher"
-      "$modifier SHIFT, T, exec, tutanota-desktop"
-      "$modifier SHIFT, W, exec, web-search"
+      "SUPER SHIFT, B, exec, blueman-manager"
+      "SUPER SHIFT, C, exec, dex ${desktopEntriesPath}/claude.desktop"
+      "SUPER SHIFT, G, exec, dex ${desktopEntriesPath}/chatgpt.desktop"
+      "SUPER SHIFT, M, exec, dex ${desktopEntriesPath}/messenger.desktop"
+      "SUPER SHIFT, N, exec, nextcloud"
+      "SUPER SHIFT, O, exec, onlyoffice-desktopeditors"
+      "SUPER SHIFT, Return, exec, rofi-launcher"
+      "SUPER SHIFT, T, exec, tutanota-desktop"
+      "SUPER SHIFT, W, exec, web-search"

      # =============================================================================
      # APLIKACJE - Z ALT
      # =============================================================================
-      "$modifier ALT, G, exec, dex ${desktopEntriesPath}/glance.desktop"
-      "$modifier ALT, M, exec, dex ${desktopEntriesPath}/mastodon.desktop"
-      "$modifier ALT, S, exec, slack"
-      "$modifier ALT, T, exec, gedit"
+      "SUPER ALT, G, exec, dex ${desktopEntriesPath}/glance.desktop"
+      "SUPER ALT, M, exec, dex ${desktopEntriesPath}/mastodon.desktop"
+      "SUPER ALT, S, exec, slack"
+      "SUPER ALT, T, exec, gedit"

      # =============================================================================
      # APLIKACJE - Z CONTROL
      # =============================================================================
-      "$modifier CONTROL, G, exec, gimp"
-      "$modifier CONTROL, M, exec, mattermost-desktop"
+      "SUPER CONTROL, G, exec, gimp"
+      "SUPER CONTROL, M, exec, mattermost-desktop"
+      "SUPER CONTROL, S, exec, signal-desktop"

      # =============================================================================
      # NARZĘDZIA SYSTEMOWE
      # =============================================================================
-      "$modifier, E, exec, emopicker9000"
-      "$modifier, K, exec, galculator"
-      "$modifier ALT, W, exec, wallsetter"
-      "$modifier CONTROL, P, exec, hyprpicker -a"
-      "$modifier SHIFT, K, exec, list-keybinds"
-      "$modifier SHIFT, P, exec, pavucontrol"
-      "$modifier SHIFT, S, exec, screenshootin"
+      "SUPER, E, exec, emopicker9000"
+      "SUPER, K, exec, galculator"
+      "SUPER ALT, W, exec, wallsetter"
+      "SUPER CONTROL, P, exec, hyprpicker -a"
+      "SUPER SHIFT, K, exec, list-keybinds"
+      "SUPER SHIFT, P, exec, pavucontrol"
+      "SUPER SHIFT, S, exec, screenshootin"

      # =============================================================================
      # ZARZĄDZANIE OKNAMI
      # =============================================================================
-      "$modifier, Escape, exec, hyprlock"
-      "$modifier, F, fullscreen,"
-      "$modifier, Q, killactive,"
-      "$modifier CONTROL, Escape, exec, wlogout"
-      "$modifier SHIFT, Escape, exit,"
-      "$modifier SHIFT, I, togglesplit,"
+      "SUPER, Escape, exec, hyprlock"
+      "SUPER, F, fullscreen,"
+      "SUPER, Q, killactive,"
+      "SUPER CONTROL, Escape, exec, wlogout"
+      "SUPER SHIFT, Escape, exit,"
+      "SUPER SHIFT, I, togglesplit,"
+      "SUPER SHIFT, F, togglefloating,"

      # =============================================================================
      # FOKUS OKIEN
      # =============================================================================
-      "$modifier, down, movefocus, d"
-      "$modifier, left, movefocus, l"
-      "$modifier, right, movefocus, r"
-      "$modifier, up, movefocus, u"
+      "SUPER, down, movefocus, d"
+      "SUPER, left, movefocus, l"
+      "SUPER, right, movefocus, r"
+      "SUPER, up, movefocus, u"

      # =============================================================================
      # PRZEMIESZCZANIE OKIEN
      # =============================================================================
-      "$modifier SHIFT, down, movewindow, d"
-      "$modifier SHIFT, left, movewindow, l"
-      "$modifier SHIFT, right, movewindow, r"
-      "$modifier SHIFT, up, movewindow, u"
+      "SUPER SHIFT, down, movewindow, d"
+      "SUPER SHIFT, left, movewindow, l"
+      "SUPER SHIFT, right, movewindow, r"
+      "SUPER SHIFT, up, movewindow, u"

      # =============================================================================
      # ZAMIANA OKIEN
      # =============================================================================
-      "$modifier ALT, down, swapwindow, d"
-      "$modifier ALT, left, swapwindow, l"
-      "$modifier ALT, right, swapwindow, r"
-      "$modifier ALT, up, swapwindow, u"
+      "SUPER ALT, down, swapwindow, d"
+      "SUPER ALT, left, swapwindow, l"
+      "SUPER ALT, right, swapwindow, r"
+      "SUPER ALT, up, swapwindow, u"

      # =============================================================================
      # WORKSPACES - PRZEŁĄCZANIE
      # =============================================================================
-      "$modifier, 0, workspace, 10"
-      "$modifier, 1, workspace, 1"
-      "$modifier, 2, workspace, 2"
-      "$modifier, 3, workspace, 3"
-      "$modifier, 4, workspace, 4"
-      "$modifier, 5, workspace, 5"
-      "$modifier, 6, workspace, 6"
-      "$modifier, 7, workspace, 7"
-      "$modifier, 8, workspace, 8"
-      "$modifier, 9, workspace, 9"
-      "$modifier CONTROL, left, workspace, e-1"
-      "$modifier CONTROL, right, workspace, e+1"
-      "$modifier, mouse_down, workspace, e+1"
-      "$modifier, mouse_up, workspace, e-1"
+      "SUPER, 0, workspace, 10"
+      "SUPER, 1, workspace, 1"
+      "SUPER, 2, workspace, 2"
+      "SUPER, 3, workspace, 3"
+      "SUPER, 4, workspace, 4"
+      "SUPER, 5, workspace, 5"
+      "SUPER, 6, workspace, 6"
+      "SUPER, 7, workspace, 7"
+      "SUPER, 8, workspace, 8"
+      "SUPER, 9, workspace, 9"
+      "SUPER CONTROL, left, workspace, e-1"
+      "SUPER CONTROL, right, workspace, e+1"
+      "SUPER, mouse_down, workspace, e+1"
+      "SUPER, mouse_up, workspace, e-1"

      # =============================================================================
      # WORKSPACES - PRZENOSZENIE OKIEN
      # =============================================================================
-      "$modifier SHIFT, 0, movetoworkspace, 10"
-      "$modifier SHIFT, 1, movetoworkspace, 1"
-      "$modifier SHIFT, 2, movetoworkspace, 2"
-      "$modifier SHIFT, 3, movetoworkspace, 3"
-      "$modifier SHIFT, 4, movetoworkspace, 4"
-      "$modifier SHIFT, 5, movetoworkspace, 5"
-      "$modifier SHIFT, 6, movetoworkspace, 6"
-      "$modifier SHIFT, 7, movetoworkspace, 7"
-      "$modifier SHIFT, 8, movetoworkspace, 8"
-      "$modifier SHIFT, 9, movetoworkspace, 9"
+      "SUPER SHIFT, 0, movetoworkspace, 10"
+      "SUPER SHIFT, 1, movetoworkspace, 1"
+      "SUPER SHIFT, 2, movetoworkspace, 2"
+      "SUPER SHIFT, 3, movetoworkspace, 3"
+      "SUPER SHIFT, 4, movetoworkspace, 4"
+      "SUPER SHIFT, 5, movetoworkspace, 5"
+      "SUPER SHIFT, 6, movetoworkspace, 6"
+      "SUPER SHIFT, 7, movetoworkspace, 7"
+      "SUPER SHIFT, 8, movetoworkspace, 8"
+      "SUPER SHIFT, 9, movetoworkspace, 9"

      # =============================================================================
      # MEDIA I KONTROLKI SYSTEMOWE
@@ -149,19 +152,18 @@ in {
      # =============================================================================
      # NIEUŻYWANE KEYBINDY
      # =============================================================================
-      # "$modifier SHIFT, N, exec, swaync-client -rs"
-      # "$modifier, P, pseudo,"
-      # "$modifier SHIFT,F, togglefloating,"
-      # "$modifier ALT,F, workspaceopt, allfloat"
-      # "$modifier SHIFT, SPACE, movetoworkspace, special"
-      # "$modifier, SPACE, togglespecialworkspace"
+      # "SUPER SHIFT, N, exec, swaync-client -rs"
+      # "SUPER, P, pseudo,"
+      # "SUPER ALT,F, workspaceopt, allfloat"
+      # "SUPER SHIFT, SPACE, movetoworkspace, special"
+      # "SUPER, SPACE, togglespecialworkspace"
      # "ALT,Tab,cyclenext"
      # "ALT,Tab,bringactivetotop"
    ];

    bindm = [
-      "$modifier, mouse:272, movewindow"
-      "$modifier, mouse:273, resizewindow"
+      "SUPER, mouse:272, movewindow"
+      "SUPER, mouse:273, resizewindow"
    ];
  };
 }
--- a/modules/home/hyprland/env.nix
+++ b/modules/home/hyprland/env.nix
@@ -1,36 +1,32 @@
 _: {
-  wayland.windowManager.hyprland = {
-    settings = {
-      env = [
-        "NIXOS_OZONE_WL, 1"
-        "NIXPKGS_ALLOW_UNFREE, 1"
-        "XDG_CURRENT_DESKTOP, Hyprland"
-        "XDG_SESSION_TYPE, wayland"
-        "XDG_SESSION_DESKTOP, Hyprland"
-        "GDK_BACKEND, wayland, x11"
-        "CLUTTER_BACKEND, wayland"
-        "QT_QPA_PLATFORM=wayland;xcb"
-        "QT_WAYLAND_DISABLE_WINDOWDECORATION, 1"
-        "QT_AUTO_SCREEN_SCALE_FACTOR, 1"
-        "SDL_VIDEODRIVER, x11"
-        "MOZ_ENABLE_WAYLAND, 1"
-        # This is to make electron apps start in wayland
-        "ELECTRON_OZONE_PLATFORM_HINT,wayland"
-        # Disabling this by default as it can result in inop cfg
-        # Added card2 in case this gets enabled. For better coverage
-        # This is mostly needed by Hybrid laptops.
-        # but if you have multiple discrete GPUs this will set order
-        #"AQ_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1:/dev/card2"
-        "GDK_SCALE,1"
-        "QT_SCALE_FACTOR,1"
-        "EDITOR,nano"
-        # Set terminal and xdg_terminal_emulator to kitty
-        # To provent yazi from starting xterm when run from rofi menu
-        # You can set to your preferred terminal if you you like
-        # ToDo: Pull default terminal from config
-        "TERMINAL,kitty"
-        "XDG_TERMINAL_EMULATOR,kitty"
-      ];
-    };
-  };
+  wayland.windowManager.hyprland.settings.env = [
+    "NIXOS_OZONE_WL, 1"
+    "NIXPKGS_ALLOW_UNFREE, 1"
+    "XDG_CURRENT_DESKTOP, Hyprland"
+    "XDG_SESSION_TYPE, wayland"
+    "XDG_SESSION_DESKTOP, Hyprland"
+    "GDK_BACKEND, wayland, x11"
+    "CLUTTER_BACKEND, wayland"
+    "QT_QPA_PLATFORM=wayland;xcb"
+    "QT_WAYLAND_DISABLE_WINDOWDECORATION, 1"
+    "QT_AUTO_SCREEN_SCALE_FACTOR, 1"
+    "SDL_VIDEODRIVER, x11"
+    "MOZ_ENABLE_WAYLAND, 1"
+    # This is to make electron apps start in wayland
+    "ELECTRON_OZONE_PLATFORM_HINT,wayland"
+    # Disabling this by default as it can result in inop cfg
+    # Added card2 in case this gets enabled. For better coverage
+    # This is mostly needed by Hybrid laptops.
+    # but if you have multiple discrete GPUs this will set order
+    #"AQ_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1:/dev/card2"
+    "GDK_SCALE,1"
+    "QT_SCALE_FACTOR,1"
+    "EDITOR,nano"
+    # Set terminal and xdg_terminal_emulator to kitty
+    # To provent yazi from starting xterm when run from rofi menu
+    # You can set to your preferred terminal if you you like
+    # ToDo: Pull default terminal from config
+    "TERMINAL,kitty"
+    "XDG_TERMINAL_EMULATOR,kitty"
+  ];
 }
--- a/modules/home/hyprland/exec-once.nix
+++ b/modules/home/hyprland/exec-once.nix
@@ -4,21 +4,19 @@
    stylixImage
    ;
 in {
-  wayland.windowManager.hyprland.settings = {
-    exec-once = [
-      "wl-paste --type text --watch cliphist store" # Saves text
-      "wl-paste --type image --watch cliphist store" # Saves images
-      "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
-      "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
-      "systemctl --user start hyprpolkitagent"
+  wayland.windowManager.hyprland.settings.exec-once = [
+    "wl-paste --type text --watch cliphist store" # Saves text
+    "wl-paste --type image --watch cliphist store" # Saves images
+    "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
+    "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
+    "systemctl --user start hyprpolkitagent"

-      "killall -q swww;sleep .5 && swww-daemon"
-      "killall -q waybar;sleep .5 && waybar"
-      "killall -q swaync;sleep .5 && swaync"
-      "#wallsetter &"
-      "pypr &"
-      "nm-applet --indicator"
-      "sleep 1.0 && swww img ${stylixImage}"
-    ];
-  };
+    "killall -q swww;sleep .5 && swww-daemon"
+    "killall -q waybar;sleep .5 && waybar"
+    "killall -q swaync;sleep .5 && swaync"
+    "#wallsetter &"
+    "pypr &"
+    "nm-applet --indicator"
+    "sleep 1.0 && swww img ${stylixImage}"
+  ];
 }
--- a/modules/home/hyprland/hypridle.nix
+++ b/modules/home/hyprland/hypridle.nix
@@ -1,25 +1,23 @@
 _: {
-  services = {
-    hypridle = {
-      enable = true;
-      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";
-          }
-        ];
+  services.hypridle = {
+    enable = true;
+    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";
+        }
+      ];
    };
  };
 }
--- a/modules/home/hyprland/hyprland.nix
+++ b/modules/home/hyprland/hyprland.nix
@@ -26,9 +26,7 @@ in {
      enableXdgAutostart = true;
      variables = ["--all"];
    };
-    xwayland = {
-      enable = true;
-    };
+    xwayland.enable = true;
    settings = {
      input = {
        kb_layout = "${keyboardLayout}";
@@ -60,7 +58,6 @@ in {
      };

      general = {
-        "$modifier" = "SUPER";
        layout = "dwindle";
        gaps_in = 6;
        gaps_out = 8;
@@ -132,9 +129,7 @@ in {
        direct_scanout = 0;
      };

-      debug = {
-        full_cm_proto = true;
-      };
+      debug.full_cm_proto = true;

      master = {
        new_status = "master";
@@ -143,9 +138,7 @@ in {
      };

      # Ensure Xwayland windows render at integer scale; compositor scales them
-      xwayland = {
-        force_zero_scaling = true;
-      };
+      xwayland.force_zero_scaling = true;
    };

    extraConfig = "
--- a/modules/home/hyprland/windowrules.nix
+++ b/modules/home/hyprland/windowrules.nix
@@ -1,101 +1,97 @@
 _: {
-  wayland.windowManager.hyprland = {
-    settings = {
-      windowrule = [
-        # XWayland specific rules
-        #"noblur, xwayland:1" # Helps prevent odd borders/shadows for xwayland apps
-        # downside it can impact other xwayland apps
-        # This rule is a template for a more targeted approach
-        "noblur, class:^(\bresolve\b)$, xwayland:1" # Window rule for just resolve
+  wayland.windowManager.hyprland.settings.windowrule = [
+    # XWayland specific rules
+    #"noblur, xwayland:1" # Helps prevent odd borders/shadows for xwayland apps
+    # downside it can impact other xwayland apps
+    # This rule is a template for a more targeted approach
+    "no_blur on, match:class resolve, match:xwayland 1" # Window rule for just resolve

-        # Application tags
-        "tag +file-manager, class:^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$"
-        "tag +terminal, class:^(com.mitchellh.ghostty|org.wezfurlong.wezterm|Alacritty|kitty|kitty-dropterm)$"
-        "tag +browser, class:^(Brave-browser(-beta|-dev|-unstable)?)$"
-        "tag +browser, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$"
-        "tag +browser, class:^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$"
-        "tag +browser, class:^([Tt]horium-browser|[Cc]achy-browser)$"
-        "tag +projects, class:^(codium|codium-url-handler|VSCodium)$"
-        "tag +projects, class:^(VSCode|code-url-handler)$"
-        "tag +im, class:^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$"
-        "tag +im, class:^([Ff]erdium)$"
-        "tag +im, class:^([Ww]hatsapp-for-linux)$"
-        "tag +im, class:^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$"
-        "tag +im, class:^(teams-for-linux)$"
-        "tag +games, class:^(gamescope)$"
-        "tag +games, class:^(steam_app_\d+)$"
-        "tag +gamestore, class:^([Ss]team)$"
-        "tag +gamestore, title:^([Ll]utris)$"
-        "tag +gamestore, class:^(com.heroicgameslauncher.hgl)$"
-        "tag +settings, class:^(gnome-disks|wihotspot(-gui)?)$"
-        "tag +settings, class:^([Rr]ofi)$"
-        "tag +settings, class:^(file-roller|org.gnome.FileRoller)$"
-        "tag +settings, class:^(nm-applet|nm-connection-editor|blueman-manager)$"
-        "tag +settings, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$"
-        "tag +settings, class:^(nwg-look|qt5ct|qt6ct|[Yy]ad)$"
-        "tag +settings, class:(xdg-desktop-portal-gtk)"
-        "tag +settings, class:(.blueman-manager-wrapped)"
-        "tag +settings, class:(nwg-displays)"
+    # Application tags
+    "tag +file-manager, match:class [Tt]hunar|org\.gnome\.Nautilus|[Pp]cmanfm-qt"
+    "tag +terminal, match:class com\.mitchellh\.ghostty|org\.wezfurlong\.wezterm|Alacritty|kitty|kitty-dropterm"
+    "tag +browser, match:class [Ff]irefox|org\.mozilla\.firefox|[Ff]irefox-esr"
+    "tag +browser, match:class [Ll]ibrewolf|io\.gitlab\.librewolf-community"
+    "tag +browser, match:class [Gg]oogle-chrome(-beta|-dev|-unstable)?|[Cc]hromium-browser(-beta|-dev|-unstable)?"
+    "tag +projects, match:class VSCode|code|code-url-handler|codium|codium-url-handler|VSCodium|VSCodium-url-handler"
+    "tag +projects, match:class dev\.zed\.Zed"
+    "tag +im, match:class [Dd]iscord|[Ww]ebCord|[Vv]esktop"
+    "tag +im, match:class [Ff]erdium"
+    "tag +im, match:class [Ss]ignal"
+    "tag +im, match:class [Ss]lack"
+    "tag +im, match:class [Tt]eams-for-linux"
+    "tag +games, match:class gamescope"
+    "tag +games, match:class ?:steam_app_\d+"
+    "tag +games, match:class tf_linux64"
+    "tag +games, match:class Minecraft\*.*"
+    "tag +gamestore, match:class [Ss]team"
+    "tag +gamestore, match:title [Ll]utris"
+    "tag +gamestore, match:class com\.heroicgameslauncher\.hgl"
+    "tag +gamestore, match:class org\.prismlauncher\.PrismLauncher"
+    "tag +settings, match:class gnome-disks|wihotspot(-gui)?"
+    "tag +settings, match:class [Rr]ofi"
+    "tag +settings, match:class file-roller|org\.gnome\.FileRoller"
+    "tag +settings, match:class nm-applet|nm-connection-editor|blueman-manager"
+    "tag +settings, match:class pavucontrol|org\.pulseaudio\.pavucontrol|com\.saivert\.pwvucontrol"
+    "tag +settings, match:class nwg-look|qt5ct|qt6ct|[Yy]ad"
+    "tag +settings, match:class xdg-desktop-portal-gtk"
+    "tag +settings, match:class ?:blueman-manager-wrapped"
+    "tag +settings, match:class nwg-displays"

-        # Position and movement rules
-        "move 72% 7%,title:^(Picture-in-Picture)$"
-        "center, class:^([Ff]erdium)$"
-        "center, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$"
-        "center, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)"
-        "center, title:^(Authentication Required)$"
+    # Position and movement rules
+    "move 72% 7%, match:title Picture-in-Picture"
+    "center on, match:class pavucontrol|org\.pulseaudio\.pavucontrol|com\.saivert\.pwvucontrol"
+    "center on, match:class [Tt]hunar, match:title negative:.*[Tt]hunar.*"
+    "center on, match:title Authentication Required"

-        # Idle inhibit rules
-        "idleinhibit fullscreen, class:^(*)$"
-        "idleinhibit fullscreen, title:^(*)$"
-        "idleinhibit fullscreen, fullscreen:1"
+    # Idle inhibit rules
+    "idle_inhibit fullscreen, match:class .*"
+    "idle_inhibit fullscreen, match:title .*"
+    "idle_inhibit fullscreen, match:fullscreen 1"

-        # Float rules
-        "float, class:^([Ww]aypaper)$"
-        "float, tag:settings*"
-        "float, class:^([Ff]erdium)$"
-        "float, title:^(Picture-in-Picture)$"
-        "float, class:^(mpv)$"
-        "float, title:^(Authentication Required)$"
-        "float, title:^(War in Tunnels)$"
-        "float, class:(codium|codium-url-handler|VSCodium), title:negative:(.*codium.*|.*VSCodium.*)"
-        "float, class:^(com.heroicgameslauncher.hgl)$, title:negative:(Heroic Games Launcher)"
-        "float, class:^([Ss]team)$, title:negative:^([Ss]team)$"
-        "float, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)"
-        "float, class:^(galculator)$"
-        "float, initialTitle:(Add Folder to Workspace)"
-        "float, initialTitle:(Open Files)"
-        "float, initialTitle:(wants to save)"
+    # Float rules
+    "float on, match:class [Ww]aypaper"
+    "float on, match:tag settings*"
+    "float on, match:title Picture-in-Picture"
+    "float on, match:title Authentication Required"
+    "float on, match:title War in Tunnels"
+    "float on, match:class codium|codium-url-handler|VSCodium, match:title negative:.*(?:codium|VSCodium).*"
+    "float on, match:class com\.heroicgameslauncher\.hgl, match:title negative Heroic Games Launcher"
+    "float on, match:class [Ss]team, match:title negative:[Ss]team"
+    "float on, match:class [Tt]hunar, match:title negative:.*[Tt]hunar.*"
+    "float on, match:class galculator"
+    "float on, match:initial_title Add Folder to Workspace"
+    "float on, match:initial_title Open Files"
+    "float on, match:initial_title wants to save"

-        # Size rules
-        "size 70% 60%, initialTitle:(Open Files)"
-        "size 70% 60%, initialTitle:(Add Folder to Workspace)"
-        "size 70% 70%, tag:settings*"
-        "size 60% 70%, class:^([Ff]erdium)$"
-        "size 70% 70%, class:^(mpv)$"
+    # Size rules
+    "size 70% 60%, match:initial_title Open Files"
+    "size 70% 60%, match:initial_title Add Folder to Workspace"
+    "size 70% 70%, match:tag settings*"

-        # Tile rules
-        "tile, class:^(affinity.exe)$"
-        "tile, class:^(dev.zed.Zed)$"
+    # Tile rules
+    "tile on, match:class affinity\.exe"
+    "tile on, match:class dev\.zed\.Zed"
+    "tile on, match:class mpv"
+    "tile on, match:class com-cburch-logisim-Main"

-        # Opacity rules
-        "opacity 1.0 1.0, tag:browser*"
-        "opacity 0.9 0.8, tag:projects*"
-        "opacity 0.94 0.86, tag:im*"
-        "opacity 0.9 0.8, tag:file-manager*"
-        "opacity 0.8 0.7, tag:terminal*"
-        "opacity 0.8 0.7, tag:settings*"
-        "opacity 0.8 0.7, class:^(gedit|org.gnome.TextEditor|mousepad)$"
-        "opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui"
-        "opacity 0.95 0.75, title:^(Picture-in-Picture)$"
+    # Opacity rules
+    "opacity 1.0 1.0, match:tag browser*"
+    "opacity 0.9 0.8, match:tag projects*"
+    "opacity 0.94 0.86, match:tag im*"
+    "opacity 0.85 0.75, match:tag gamestore*"
+    "opacity 0.9 0.8, match:tag file-manager*"
+    "opacity 0.8 0.7, match:tag terminal*"
+    "opacity 0.8 0.7, match:tag settings*"
+    "opacity 0.8 0.7, match:class gedit|org\.gnome\.TextEditor|mousepad"
+    "opacity 0.9 0.8, match:class seahorse # gnome-keyring gui"
+    "opacity 0.95 0.75, match:title Picture-in-Picture"

-        # Picture-in-Picture specific rules
-        "pin, title:^(Picture-in-Picture)$"
-        "keepaspectratio, title:^(Picture-in-Picture)$"
+    # Picture-in-Picture specific rules
+    "pin on, match:title Picture-in-Picture"
+    "keep_aspect_ratio on, match:title Picture-in-Picture"

-        # Games specific rules
-        "noblur, tag:games*"
-        "fullscreen, tag:games*"
-      ];
-    };
-  };
+    # Games specific rules
+    "no_blur on, match:tag games*"
+    "fullscreen on, match:tag games*"
+  ];
 }
--- a/modules/home/librewolf/default.nix
+++ b/modules/home/librewolf/default.nix
@@ -8,7 +8,7 @@

  config.programs.librewolf = lib.mkIf config.librewolf.enable {
    enable = true;
-    package = pkgs.librewolf-bin;
+    package = pkgs.librewolf;
    # nativeMessagingHosts = [pkgs.firefoxpwa];
    languagePacks = [
      "pl"
--- a/modules/home/librewolf/profiles/search.nix
+++ b/modules/home/librewolf/profiles/search.nix
@@ -75,13 +75,7 @@
        icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
        urls = [
          {
-            template = "https://search.nixos.org/options";
-            params = [
-              {
-                name = "query";
-                value = "{searchTerms}";
-              }
-            ];
+            template = "https://search.nixos.org/options?channel=unstable&query={searchTerms}";
          }
        ];
      };
--- a/modules/home/peaclock/default.nix
+++ b/modules/home/peaclock/default.nix
@@ -0,0 +1,25 @@
+{
+  pkgs,
+  lib,
+  config,
+  inputs,
+  username,
+  ...
+}: let
+in {
+  options.peaclock.enable = lib.mkEnableOption "Peaclock";
+
+  config.home.packages = lib.mkIf config.peaclock.enable [
+    (inputs.wrappers.lib.wrapPackage
+      {
+        inherit pkgs;
+        package = pkgs.peaclock;
+        flags = {
+          "--config-dir" = "/home/${username}/.peaclock";
+          "--config" = "/home/${username}/.peaclock/config/digital";
+        };
+      })
+  ];
+
+  imports = [./digital.nix];
+}
--- a/modules/home/peaclock/digital.nix
+++ b/modules/home/peaclock/digital.nix
@@ -0,0 +1,61 @@
+{config, ...}: {
+  home.file.".peaclock/config/digital" = {
+    # recursive = true;
+    text = let
+      colors = config.stylix.base16Scheme;
+    in ''
+      # peaclock
+      # digital config
+      #
+      # For more information, refer to the 'Configuration' and 'Commands'
+      # sections of the programs help output with '--help' or '-h'.
+
+      # -----------------------------------------------------------------------------
+      # general
+      # -----------------------------------------------------------------------------
+
+      block 2 1
+      padding 2 1
+      margin 2 1
+      ratio 2 1
+      date-padding 1
+      locale 'pl_PL.utf8'
+      timezone 'Europe/Warsaw'
+      date '%a %b %d %p'
+      mode stopwatch
+      view digital
+      toggle padding
+      stopwatch start
+      timer 10m:0s
+      timer-exec 'notify-send -a peaclock "timer complete"'
+      rate-input 50
+      rate-refresh 250
+      rate-status 5000
+
+      # -----------------------------------------------------------------------------
+      # toggles
+      # -----------------------------------------------------------------------------
+      set hour-24 on
+      set seconds on
+      set date on
+      set auto-size on
+      set auto-ratio on
+
+      # -----------------------------------------------------------------------------
+      # styles
+      # -----------------------------------------------------------------------------
+      style active-fg #${colors.base05}
+      style inactive-fg #${colors.base03}
+      style colon-fg #${colors.base07}
+      style active-bg #${colors.base0E}
+      style inactive-bg #${colors.base00}
+      style colon-bg #${colors.base00}
+      style date #${colors.base04}
+      style background #${colors.base00}
+      style text #${colors.base05}
+      style prompt #${colors.base09}
+      style success #${colors.base0A}
+      style error #${colors.base02}
+    '';
+  };
+}
--- a/modules/home/scripts/keybinds.nix
+++ b/modules/home/scripts/keybinds.nix
@@ -14,13 +14,13 @@ in
    msg=' = Windows/Super/CAPS LOCK (Enter nie wykonuje skrótu)'
    keybinds=$(cat ~/.config/hypr/hyprland.conf | grep -E '^bind')

-    # replace $modifier with SUPER and clean up paths
-    display_keybinds=$(echo "$keybinds" | sed 's/\$modifier//g' | sed 's|${desktopEntriesPath}/||g')
+    # replace SUPER with SUPER and clean up paths
+    display_keybinds=$(echo "$keybinds" | sed 's/\SUPER//g' | sed 's|${desktopEntriesPath}/||g')

    # remove "bind=" and "bindm=" prefixes
    display_keybinds=$(echo "$display_keybinds" | sed 's/^bind=//' | sed 's/^bindm=/🖱️/')

-    # add + before CONTROL, SHIFT, ALT when they appear after removed $modifier
+    # add + before CONTROL, SHIFT, ALT when they appear after removed SUPER
    display_keybinds=$(echo "$display_keybinds" | sed 's/ CONTROL/ + CONTROL/g' | sed 's/ SHIFT/ + SHIFT/g' | sed 's/ ALT/ + ALT/g')

    # replace commas: first comma -> " +", second comma -> " =", remaining commas -> " ->"
--- a/modules/home/ssh.nix
+++ b/modules/home/ssh.nix
@@ -1,11 +1,17 @@
-_: {
+{username, ...}: {
  programs.ssh = {
    enable = true;
    enableDefaultConfig = false;
    matchBlocks = {
      "hp-t640-homeserver" = {
        hostname = "192.168.1.156";
-        user = "garand_plg";
+        user = "${username}";
+        port = 22;
+        identityFile = "~/.ssh/hp-t640-homeserver";
+      };
+      "hp-t640-homeserver-tailscale" = {
+        hostname = "100.106.225.106";
+        user = "${username}";
        port = 22;
        identityFile = "~/.ssh/hp-t640-homeserver";
      };
--- a/modules/home/xdg/desktop-entries.nix
+++ b/modules/home/xdg/desktop-entries.nix
@@ -1,4 +1,9 @@
-{pkgs, ...}: let
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
  fetchIcon = url: sha256:
    pkgs.fetchurl {
      inherit url sha256;
@@ -57,18 +62,37 @@
      iconUrl = "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/glance.png";
      iconSha = "sha256-xyFlmPpt+DABoGX5oBqj/aQVdxtmNflat9Jb2BE7SOY=";
    }
-    {
-      name = "microsoftTeams";
-      displayName = "Microsoft Teams";
-      url = "https://teams.microsoft.com/v2/";
-      iconUrl = "https://i.pinimg.com/236x/e6/b6/28/e6b628706696320cd0ede93f7053abd8.jpg";
-      iconSha = "sha256-bZVmoWHeG8rycS8lj7LQaxFggXINjUx/7NWKPVhPTFw=";
-    }
  ];
 in {
-  xdg.desktopEntries = builtins.listToAttrs (builtins.map (app: {
-      name = app.name;
-      value = makeEntry app;
-    })
-    apps);
+  options.xdgDesktopEntries = {
+    enable = lib.mkEnableOption "PWA Apps";
+    entries = builtins.listToAttrs (
+      map (app: {
+        name = app.name;
+        value = {
+          enable = lib.mkEnableOption "Enable ${app.displayName} PWA";
+        };
+      })
+      apps
+    );
+  };
+
+  config.xdg.desktopEntries = lib.mkIf config.xdgDesktopEntries.enable (
+    builtins.listToAttrs (
+      builtins.concatMap (
+        app: let
+          entryConfig = config.xdgDesktopEntries.entries.${app.name};
+        in
+          if entryConfig.enable
+          then [
+            {
+              name = app.name;
+              value = makeEntry app;
+            }
+          ]
+          else []
+      )
+      apps
+    )
+  );
 }
--- a/modules/home/zed/default.nix
+++ b/modules/home/zed/default.nix
@@ -6,13 +6,13 @@
 }: {
  options.zed-editor = {
    enable = lib.mkEnableOption "Zed Editor";
-    remote-server = lib.mkEnableOption "Zed Editor Remote Server";
+    remote-server.enable = lib.mkEnableOption "Zed Editor Remote Server";
  };

  config.programs.zed-editor = lib.mkIf config.zed-editor.enable {
    enable = true;
    package = pkgs.zed-editor;
-    installRemoteServer = lib.mkIf config.zed-editor.remote-server true;
+    installRemoteServer = lib.mkIf config.zed-editor.remote-server.enable true;
  };

  imports = [
--- a/modules/home/zed/extra-packages.nix
+++ b/modules/home/zed/extra-packages.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
  programs.zed-editor.extraPackages = with pkgs; [
-    biome
+    # biome
    rust-analyzer
    nixd
    alejandra
--- a/modules/home/zed/user-settings/languages.nix
+++ b/modules/home/zed/user-settings/languages.nix
@@ -62,5 +62,9 @@ _: {
      };
      tab_size = 2;
    };
+    "C++" = {
+      format_on_save = "on";
+      tab_size = 2;
+    };
  };
 }
--- a/modules/home/zed/user-settings/lsp.nix
+++ b/modules/home/zed/user-settings/lsp.nix
@@ -6,6 +6,15 @@
  ...
 }: {
  programs.zed-editor.userSettings.lsp = {
+    # biome = {
+    #   binary = {
+    #     path = lib.getExe pkgs.bash;
+    #     arguments = [
+    #       "-c"
+    #       "if [ -e flake.nix ]; then nix develop --command bun --bun run biome; else biome; fi"
+    #     ];
+    #   };
+    # };
    rust-analyzer = {
      binary = {
        path = lib.getExe pkgs.bash;
@@ -27,6 +36,27 @@
        };
      };
    };
+    clangd = {
+      binary = {
+        path = lib.getExe pkgs.bash;
+        arguments = [
+          "-c"
+          "if [ -e flake.nix ]; then nix develop --command clangd; else clangd; fi"
+        ];
+      };
+      initialization_options = {
+        inlayHints = {
+          maxLength = null;
+          lifetimeElisionHints = {
+            enable = "skip_trivial";
+            useParameterNames = true;
+          };
+          closureReturnTypeHints = {
+            enable = "always";
+          };
+        };
+      };
+    };
    nixd = {
      initialization_options.formatting.command = [
        "alejandra"
Author	SHA1	Message	Date
GarandPLG	51ad90dc9c	Update flake.lock with latest revisions	2026-02-02 00:38:36 +01:00
GarandPLG	248b2f1dbb	Enable VirtualBox and add development aliases	2026-01-31 16:48:35 +01:00
GarandPLG	c258681d10	Add VirtualBox support with disabled default	2026-01-30 14:15:28 +01:00
GarandPLG	5314aba270	update	2026-01-29 01:55:42 +01:00
GarandPLG	0f00938787	Enable Winboat remote desktop module	2026-01-27 19:43:17 +01:00
GarandPLG	6cbbd0110d	Tile mpv windows instead of floating	2026-01-21 23:43:01 +01:00
GarandPLG	01cc53fff1	Add tailscale SSH host and use username variable - Simplify server aliases and add tailscale‑specific aliases - Make SSH module accept a username argument - Add match block for Tailscale host with port 22 and identity file	2026-01-19 11:14:41 +01:00
GarandPLG	7501159100	Add Logisim Evolution support - Include logisim‑evolution in the core packages list. - Add `logisim-evolution.enable` option to system modules (enabled on desktop). - Bind `SUPER SHIFT F` to toggle floating windows. - Add tiling rule for Logisim windows. - Update `upf` alias to specify the flake path. - Refresh flake.lock revisions for firefox‑addons and wrappers.	2026-01-18 02:12:59 +01:00
GarandPLG	727462ffd3	Update flake.lock with latest revisions	2026-01-17 13:57:47 +01:00
GarandPLG	7446d8c239	Enable Tailscale and Prism Launcher in Garand-Laptop config	2026-01-15 08:30:32 +01:00
GarandPLG	085e02f539	Update flake.lock and add game window rules - Bump all flake.lock entries to their latest revisions (updated lastModified, narHash, and rev values). - Add Hyprland rule to tag Minecraft windows as games. - Tag PrismLauncher windows as gamestore. - Apply reduced opacity for the gamestore tag.	2026-01-12 05:52:55 +01:00
GarandPLG	9d9ed0f04b	Add Teams, disable Ferdium, refactor Hyprland Enable teams-for-linux and disable ferdium in system modules; add both to core packages. Simplify Hyprland configuration by using direct settings for animations, window rules, env, exec‑once and hypridle. Remove unused Microsoft Teams PWA entry.	2026-01-07 19:49:21 +01:00
GarandPLG	28daa28c6b	Replace $modifier with SUPER and update defaults	2026-01-06 21:46:12 +01:00
GarandPLG	b8a7ead4be	Add Tailscale module	2026-01-04 13:49:01 +01:00
GarandPLG	2881d84c16	Add Peaclock home module and wrappers input Enable Peaclock in the user’s home configuration and add a new `wrappers` input to the flake. System‑level Peaclock references are commented out, and default and digital config files for Peaclock are included.	2026-01-03 18:00:23 +01:00
GarandPLG	591e42fe61	aktualizacja	2025-12-29 01:14:13 +01:00
GarandPLG	f21640749a	Disable Opencode; update flake.lock and librewolf - Opencode module disabled in desktop, laptop, and default host configs - Updated flake.lock revisions for firefox‑addons, home‑manager, nixpkgs and stylix - Librewolf now uses pkgs.librewolf (source) instead of the binary package	2025-12-23 06:05:45 +01:00
GarandPLG	0b9623241a	Add Bottles and Heroic Update flake.lock revisions for firefox‑addons, home‑manager and nixpkgs to reflect the inclusion of the new Bottles and Heroic packages.	2025-12-20 14:36:34 +01:00
GarandPLG	7a6e3916f5	Add p7zip to essential packages	2025-12-17 16:30:45 +01:00
GarandPLG	43c657523e	Enable peaclock and bump locked revisions Add peaclock to the core packages list and enable the peaclock module in all system configurations. Update the flake.lock entries for several packages with newer revisions and nar hashes.	2025-12-16 23:31:30 +01:00
GarandPLG	594accfe8d	Update flake.lock and force wallpaper style Bump locked revisions for firefox‑addons, home‑manager, nixpkgs and stylix in flake.lock, updating their lastModified timestamps, narHash values and rev identifiers. Change wallpaperStyle in boot.nix from lib.mkDefault to lib.mkForce to ensure the centered style is always applied.	2025-12-15 15:55:39 +01:00
GarandPLG	86c5e8ad5b	Add Pixieditor module	2025-12-10 15:54:42 +01:00
GarandPLG	f7fe35b3be	update	2025-12-10 01:50:19 +01:00
GarandPLG	629e7b6a9e	Add enable XDG PWA entries and enable Signal	2025-12-08 21:43:17 +01:00
GarandPLG	29c62adbd1	dodanie `garandos-tui`	2025-12-07 00:00:33 +01:00
GarandPLG	5747e449b2	Update flake.lock with latest revisions	2025-12-04 10:47:39 +01:00
GarandPLG	087ffd4194	Refactor Zed/Flatpak options and add C++ & clangd settings - Switch Zed remote server and Flatpak packages to use `enable` suboption - Update host modules to match the new option hierarchy - Add default C++ settings (format on save, tab size) to Zed user settings - Introduce clangd LSP configuration with inlay hints and fallback command	2025-12-01 13:28:43 +01:00
GarandPLG	7a2382cb3c	zmiana logo	2025-11-30 22:01:42 +01:00
GarandPLG	be74b351e8	Restructure system-modules and bump flake.lock - Consolidate enable flags into a `packages` attribute in all host system-modules.nix files. - Rename package option paths to `config.packages.<name>.enable` in modules/core/packages/packages.nix. - Update locked revisions (lastModified, narHash, rev) for firefox‑addons and stylix in flake.lock.	2025-11-30 14:05:19 +01:00
GarandPLG	8d3fd7dbe2	Add Jan UI and selective Flatpak options - Expose Jan as a core package and add a Hyprland shortcut (Mod + J). - Refactor Flatpak module to provide per‑package enable options; default package list is now empty. - Update librewolf search template to use a single‑parameter URL. - Minor comment formatting changes across host module files.	2025-11-30 13:26:51 +01:00