diff --git a/README.md b/README.md index d9ceba6..f1d02b7 100644 --- a/README.md +++ b/README.md @@ -191,7 +191,10 @@ git add . - `waybarChoice` - system top bar style. - `animChoice` - system animation style. -### 5. Review module activation options +### 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 diff --git a/flake.lock b/flake.lock index 536a9df..8e1f6f8 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ ] }, "locked": { - "lastModified": 1763546214, - "narHash": "sha256-vc9seqvw2ElF8jPetsCoCQ5lo9P3fmgiTle3HlOMezk=", + "lastModified": 1765042799, + "narHash": "sha256-G7UJDUNcuHm1n2EuA+2iKPNISSWoUgqk85ktncJoelo=", "owner": "AdnanHodzic", "repo": "auto-cpufreq", - "rev": "76ccb66f8e4875671fd746fb6b50931454ab8cd8", + "rev": "2e5c725be0a7da2c749a345e09f3df3b9ef8c209", "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": 1764821331, - "narHash": "sha256-Q6ePRWpunc2WRFyQ72TRx7qDqyCfadpe1IFNRHoE6K0=", + "lastModified": 1765057342, + "narHash": "sha256-a9hxZjrSl3WFp77yzWwTgBkgVZVavejafIb7CJYH+g8=", "owner": "rycee", "repo": "nur-expressions", - "rev": "9d6adaef3c5648eaa0979bc9e84b906daa2f4797", + "rev": "b0719627ac28759a9dc0d84f59a6f447591eff91", "type": "gitlab" }, "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", @@ -324,11 +369,11 @@ ] }, "locked": { - "lastModified": 1764788330, - "narHash": "sha256-hE/gXK+Z0j654T0tsW+KcndRqsgZXe8HyWchjBJgQpw=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "fca4cba863e76c26cfe48e5903c2ff4bac2b2d5d", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -354,6 +399,31 @@ "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, @@ -372,11 +442,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -495,6 +565,7 @@ "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", @@ -502,6 +573,23 @@ "stylix": "stylix" } }, + "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": { "inputs": { "base16": "base16", @@ -523,11 +611,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1764798099, - "narHash": "sha256-IIwR5ZWo7tjxjRpkz0tViF9KFbQ1YXs9Wkan46WQbfk=", + "lastModified": 1765047449, + "narHash": "sha256-VQcqjJ2g0kT9TW4ENwA2HBQJzfbCUd5s1Wm3K+R2QZY=", "owner": "danth", "repo": "stylix", - "rev": "4b9e0e7ba3cccb86fe2bf0f4a2dd18256bef1cc6", + "rev": "bd00e01aab676aee88e6cc5c9238b4a5a7d6639a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7791f67..16bf091 100644 --- a/flake.nix +++ b/flake.nix @@ -49,12 +49,18 @@ }; 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"; + }; }; outputs = { nixpkgs, nix-flatpak, auto-cpufreq, + garandos-tui, ... } @ inputs: let hostDirs = builtins.attrNames (builtins.readDir ./hosts); @@ -81,6 +87,7 @@ ./profiles/${profile} nix-flatpak.nixosModules.nix-flatpak auto-cpufreq.nixosModules.default + garandos-tui.nixosModules.garandos-tui ]; }; in { diff --git a/modules/core/default.nix b/modules/core/default.nix index 5f8f437..d268fe9 100644 --- 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 diff --git a/modules/core/garandos-tui.nix b/modules/core/garandos-tui.nix new file mode 100644 index 0000000..1bd6f7d --- /dev/null +++ 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"; + }; +} diff --git a/modules/home/bash/aliases.nix b/modules/home/bash/aliases.nix index d4f2eb6..0f9c5f3 100644 --- a/modules/home/bash/aliases.nix +++ b/modules/home/bash/aliases.nix @@ -12,6 +12,7 @@ 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