SK-Development-Studios/Nixos-Configuration
2
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: SK-Development-Studios:088ac726326776bea3065f5c549a0e2059e9446c
Branches Tags
SK-Development-Studios:main
..
compare: SK-Development-Studios:3f7b1c538015b0252d1ce7d438d9ccf3bd8f73d6
Branches Tags
SK-Development-Studios:main

No commits in common. "088ac726326776bea3065f5c549a0e2059e9446c" and "3f7b1c538015b0252d1ce7d438d9ccf3bd8f73d6" have entirely different histories.
088ac72632 ... 3f7b1c5380

2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/flake/deploy.nix
View file

@ -5,6 +5,7 @@ let
deploy-rs deploy-rs
nixpkgs nixpkgs
nixos-anywhere nixos-anywhere
agenix
; ;
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
@ -29,11 +30,11 @@ in
{ {
apps = rec { apps = rec {
default = deploy; default = deploy;
# secrets = { secrets = {
# type = "app"; type = "app";
# program = "${agenix.packages.${system}.agenix}/bin/agenix"; program = "${agenix.packages.${system}.agenix}/bin/agenix";
# meta.description = ""; meta.description = "";
# }; };
install = { install = {
type = "app"; type = "app";
program = "${nixos-anywhere.packages.${system}.nixos-anywhere}/bin/nixos-anywhere"; program = "${nixos-anywhere.packages.${system}.nixos-anywhere}/bin/nixos-anywhere";

5
modules/nixos/common/otf.nix
View file

@ -19,10 +19,6 @@ in
}; };
package = lib.mkPackageOption pkgs "otf" { }; package = lib.mkPackageOption pkgs "otf" { };
pgPackage = lib.mkPackageOption pkgs "postgresql_16" { }; pgPackage = lib.mkPackageOption pkgs "postgresql_16" { };
environmentFile = lib.mkEnableOption {
type = with lib.types; nullOr path;
default = lib.types.null;
};
# this application is configured entirely by environment variables and needs to be exposed # this application is configured entirely by environment variables and needs to be exposed
environment = lib.mkOption { environment = lib.mkOption {
type = type =
@ -89,7 +85,6 @@ in
WorkingDirectory = cfg.dataDir; WorkingDirectory = cfg.dataDir;
ExecStart = "${cfg.package}/bin/otfd"; ExecStart = "${cfg.package}/bin/otfd";
Restart = "on-failure"; Restart = "on-failure";
EnvironmentFile = lib.mkIf (cfg.environment.file != null) cfg.environment.file;
}; };
}; };
}; };