diff --git a/hosts/hl-fwdesk.nix b/hosts/hl-fwdesk.nix index 357595d..47e8d4c 100644 --- a/hosts/hl-fwdesk.nix +++ b/hosts/hl-fwdesk.nix @@ -1,6 +1,7 @@ { pkgs , config -, nixosUtils +, skygUtils +, lib , ... }: let @@ -197,30 +198,34 @@ in extra_hosts = [ "host.docker.internal:host-gateway" ]; }; files = { - "/opt/data/config.yaml" = nixosUtils.validateYaml "hermes-config" '' - model: - provider: custom - model: gpt-oss:20b - base_url: http://host.docker.internal:11434/v1 - api_key: "none" - - memory: - memory_enabled: true - user_profile_enabled: true - - terminal: - backend: docker - - gateway: - platforms: - telegram: - extra: - status_indicator: true - status_online: "🟢 Online" - status_offline: "🔴 Offline" - ''; + "/opt/data/config.yaml" = lib.generators.toYAML { } + { + model = { + provider = "custom"; + model = "gpt-oss:20b"; + base_url = "http://host.docker.internal:11434/v1"; + api_key = "none"; + }; + memory = { + memory_enabled = true; + user_profile_enabled = true; + }; + terminal = { + backend = "local"; + }; + gateway = { + platforms = { + telegram = { + extra = { + status_indicator = true; + status_online = "🟢 Online"; + status_offline = "🔴 Offline"; + }; + }; + }; + }; + }; }; - extraConfig.shm_size = "1g"; }; }; # Signal CLI diff --git a/modules/lib.nix b/modules/lib.nix index 386e6d8..8e8e434 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -11,7 +11,10 @@ , specialArgs }: let - skygUtils = import ./skyg-utils.nix; + skygUtils = import ./skyg-utils.nix { + pkgs = allPkgs.x86_64-linux; + lib = nixpkgs.lib; + }; eachSystem = nixpkgs.lib.genAttrs (import systems); allPkgs = eachSystem ( system: @@ -28,11 +31,6 @@ let } ); # Build nixosUtils with access to pkgs and lib - nixosUtils = import ./nixos-utils.nix { - pkgs = allPkgs.x86_64-linux; - lib = nixpkgs.lib; - }; - osModules = [ determinate.nixosModules.default stylix.nixosModules.stylix @@ -66,7 +64,7 @@ in home-manager.lib.homeManagerConfiguration { inherit pkgs; extraSpecialArgs = specialArgs // { - inherit system skygUtils nixosUtils; + inherit system skygUtils; user = userConfig; unstablePkgs = nixpkgs-unstable.legacyPackages.${system}; }; @@ -88,7 +86,7 @@ in , configuration ? [ ] }: nixpkgs.lib.nixosSystem { specialArgs = specialArgs // { - inherit system skygUtils nixosUtils user; + inherit system skygUtils user; unstablePkgs = nixpkgs-unstable.legacyPackages.${system}; }; inherit system; @@ -110,7 +108,7 @@ in , configuration ? [ ] }: nixpkgs.lib.nixosSystem { specialArgs = specialArgs // { - inherit system skygUtils nixosUtils user; + inherit system skygUtils user; unstablePkgs = nixpkgs-unstable.legacyPackages.${system}; }; inherit system; @@ -138,7 +136,7 @@ in nix-darwin.lib.darwinSystem { inherit system; specialArgs = specialArgs // { - inherit system skygUtils nixosUtils user; + inherit system skygUtils user; unstablePkgs = nixpkgs-unstable.legacyPackages.${system}; }; modules = [ diff --git a/modules/nixos-utils.nix b/modules/nixos-utils.nix deleted file mode 100644 index 201d84d..0000000 --- a/modules/nixos-utils.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, lib }: - -{ - # YAML validation helper — validates YAML syntax at build time - validateYaml = name: content: - let - validated = pkgs.runCommand "${name}-validated" { } '' - ${pkgs.yq}/bin/yq eval -e '.' > /dev/null <<'EOF' - ${content} - EOF - echo "${content}" > $out - ''; - in - validated; -} diff --git a/modules/skyg-utils.nix b/modules/skyg-utils.nix index 09db6b2..187504d 100644 --- a/modules/skyg-utils.nix +++ b/modules/skyg-utils.nix @@ -1,3 +1,4 @@ +{ pkgs, lib }: { makeHyperlinkScriptToConfigs = { filePath diff --git a/secrets/hermes-env.age b/secrets/hermes-env.age index 214663d..d9c1ecd 100644 Binary files a/secrets/hermes-env.age and b/secrets/hermes-env.age differ