diff options
Diffstat (limited to '')
| -rw-r--r-- | flake.nix | 72 |
1 files changed, 30 insertions, 42 deletions
@@ -47,7 +47,6 @@ libssh libxml2 libz - musl openssl util-linux xz @@ -69,28 +68,15 @@ backupFileExtension = "backup"; }; } - ./modules/common - ]; - - ClientModules = [ - flatpaks.nixosModules.nix-flatpak - ./modules/client - ]; - - ServerModules = [ - ./modules/server - ( - { - pkgs, - ... - }: - { - environment.systemPackages = with pkgs; [ - winapps.packages."x86_64-linux".winapps - winapps.packages."x86_64-linux".winapps-launcher # optional - ]; - } - ) + ./modules/bluetooth + ./modules/doas + ./modules/fonts + ./modules/gnupg + ./modules/i18n + ./modules/nh + ./modules/pipewire + ./modules/ssh + ./modules/users ]; mkHost = { hostPath, extraModules }: @@ -103,17 +89,34 @@ nixosConfigurations = { pad = mkHost { hostPath = ./hosts/pad; - extraModules = commonModules ++ ClientModules; + extraModules = commonModules ++ [ ]; }; station = mkHost { hostPath = ./hosts/station; - extraModules = commonModules ++ ClientModules ++ ServerModules; + extraModules = commonModules ++ [ ]; + }; + + work = mkHost { + hostPath = ./hosts/work; + extraModules = commonModules ++ [ + flatpaks.nixosModules.nix-flatpak + ./modules/1password + ./modules/adguard + ./modules/cinnamon + ./modules/flatpak + ./modules/monero + ./modules/nginx + ./modules/nvidia + ./modules/ollama + ./modules/searx + ./modules/open-webui + ]; }; server = mkHost { hostPath = ./hosts/server; - extraModules = commonModules ++ ServerModules; + extraModules = commonModules ++ [ ]; }; }; @@ -132,9 +135,8 @@ shellHook = '' echo "$(python --version)" - echo "" echo "$(poetry --version)" - echo "" + echo "$(pylsp --version)" ''; env.LD_LIBRARY_PATH = commonLibs; @@ -143,7 +145,6 @@ nim = pkgs.mkShell { name = "nim"; packages = with pkgs; [ - musl nim nimble nimlangserver @@ -160,19 +161,6 @@ env.LD_LIBRARY_PATH = commonLibs; }; - - js = pkgs.mkShell { - name = "js"; - packages = with pkgs; [ - bun - ]; - - shellHook = '' - echo "$(bun --version)" - ''; - - env.LD_LIBRARY_PATH = commonLibs; - }; }; }; } |