diff --git a/hosts/hl-fwdesk.nix b/hosts/hl-fwdesk.nix index 3ae881e..357595d 100644 --- a/hosts/hl-fwdesk.nix +++ b/hosts/hl-fwdesk.nix @@ -1,5 +1,6 @@ { pkgs , config +, nixosUtils , ... }: let @@ -191,20 +192,35 @@ in PUID = "1000"; # ari's UID PGID = "100"; # GID of the 'users' group in NixOS }; - extraConfig.shm_size = "1g"; + extraConfig = { + shm_size = "1g"; + extra_hosts = [ "host.docker.internal:host-gateway" ]; + }; files = { - "/opt/data/config.yaml" = '' + "/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" + + 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 398134f..386e6d8 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -16,7 +16,7 @@ let allPkgs = eachSystem ( system: import nixpkgs { - system = system; + inherit system; config = { allowUnfree = true; }; @@ -27,6 +27,12 @@ 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 @@ -60,7 +66,7 @@ in home-manager.lib.homeManagerConfiguration { inherit pkgs; extraSpecialArgs = specialArgs // { - inherit system skygUtils; + inherit system skygUtils nixosUtils; user = userConfig; unstablePkgs = nixpkgs-unstable.legacyPackages.${system}; }; @@ -82,7 +88,7 @@ in , configuration ? [ ] }: nixpkgs.lib.nixosSystem { specialArgs = specialArgs // { - inherit system skygUtils user; + inherit system skygUtils nixosUtils user; unstablePkgs = nixpkgs-unstable.legacyPackages.${system}; }; inherit system; @@ -104,7 +110,7 @@ in , configuration ? [ ] }: nixpkgs.lib.nixosSystem { specialArgs = specialArgs // { - inherit system skygUtils user; + inherit system skygUtils nixosUtils user; unstablePkgs = nixpkgs-unstable.legacyPackages.${system}; }; inherit system; @@ -132,7 +138,7 @@ in nix-darwin.lib.darwinSystem { inherit system; specialArgs = specialArgs // { - inherit system skygUtils user; + inherit system skygUtils nixosUtils user; unstablePkgs = nixpkgs-unstable.legacyPackages.${system}; }; modules = [ diff --git a/modules/nixos-utils.nix b/modules/nixos-utils.nix new file mode 100644 index 0000000..201d84d --- /dev/null +++ b/modules/nixos-utils.nix @@ -0,0 +1,15 @@ +{ 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/nixos/common/containers/container-services/files.nix b/modules/nixos/common/containers/container-services/files.nix index 1746b2c..0bd8660 100644 --- a/modules/nixos/common/containers/container-services/files.nix +++ b/modules/nixos/common/containers/container-services/files.nix @@ -76,7 +76,6 @@ rec { before = [ "container-services-${groupName}.service" ]; serviceConfig = { Type = "oneshot"; - RemainAfterExit = true; ExecStart = scriptFile; }; };