Update from update-inputs-2024-09-10-11-19
This commit is contained in:
commit
a87544b56f
3 changed files with 10 additions and 14 deletions
|
@ -1,4 +1,4 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, inputs, lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib; {
|
with lib; {
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -7,6 +7,7 @@ with lib; {
|
||||||
./openssh.nix
|
./openssh.nix
|
||||||
./users
|
./users
|
||||||
../../modules
|
../../modules
|
||||||
|
inputs.lix-module.nixosModules.default
|
||||||
];
|
];
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
kitty.terminfo
|
kitty.terminfo
|
||||||
|
@ -53,7 +54,6 @@ with lib; {
|
||||||
'';
|
'';
|
||||||
users.motdFile = "/var/lib/deployment/motd";
|
users.motdFile = "/var/lib/deployment/motd";
|
||||||
|
|
||||||
nix.package = pkgs.nixVersions.latest;
|
|
||||||
nix.gc.automatic = true;
|
nix.gc.automatic = true;
|
||||||
nix.gc.options = "--delete-older-than 7d";
|
nix.gc.options = "--delete-older-than 7d";
|
||||||
nix.optimise.automatic = true;
|
nix.optimise.automatic = true;
|
||||||
|
@ -62,7 +62,7 @@ with lib; {
|
||||||
path = pkgs.path;
|
path = pkgs.path;
|
||||||
};
|
};
|
||||||
nix.settings = {
|
nix.settings = {
|
||||||
experimental-features = [ "nix-command" "flakes" "pipe-operators" ];
|
experimental-features = [ "nix-command" "flakes" "pipe-operator" ];
|
||||||
trusted-users = [ "root" "@wheel" ];
|
trusted-users = [ "root" "@wheel" ];
|
||||||
substituters = [ "https://cache.kyouma.net" ];
|
substituters = [ "https://cache.kyouma.net" ];
|
||||||
trusted-public-keys = [ "cache.kyouma.net:Frjwu4q1rnwE/MnSTmX9yx86GNA/z3p/oElGvucLiZg=" ];
|
trusted-public-keys = [ "cache.kyouma.net:Frjwu4q1rnwE/MnSTmX9yx86GNA/z3p/oElGvucLiZg=" ];
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{ config, inputs, lib, ... }: {
|
{ config, inputs, lib, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
./nix-config.nix
|
./nix-config.nix
|
||||||
inputs.lix-module.nixosModules.default
|
|
||||||
];
|
];
|
||||||
sops.secrets."services/hydra/signKey" = {
|
sops.secrets."services/hydra/signKey" = {
|
||||||
owner = "hydra-queue-runner";
|
owner = "hydra-queue-runner";
|
||||||
|
@ -19,9 +18,6 @@
|
||||||
};
|
};
|
||||||
kyouma.deployment.auto-upgrade.cache = "daemon";
|
kyouma.deployment.auto-upgrade.cache = "daemon";
|
||||||
|
|
||||||
nix.package = lib.mkForce inputs.lix-module.packages.${config.nixpkgs.hostPlatform.system}.default;
|
|
||||||
nix.settings.experimental-features = lib.mkForce [ "nix-command" "flakes" "pipe-operator" ];
|
|
||||||
|
|
||||||
services.hydra = {
|
services.hydra = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = inputs.hydra.packages.${config.nixpkgs.hostPlatform.system}.hydra;
|
package = inputs.hydra.packages.${config.nixpkgs.hostPlatform.system}.hydra;
|
||||||
|
@ -40,7 +36,7 @@
|
||||||
};
|
};
|
||||||
services.harmonia = {
|
services.harmonia = {
|
||||||
enable = true;
|
enable = true;
|
||||||
signKeyPath = config.sops.secrets."services/hydra/signKey".path;
|
signKeyPaths = lib.singleton config.sops.secrets."services/hydra/signKey".path;
|
||||||
settings = {
|
settings = {
|
||||||
bind = "[::1]:5555";
|
bind = "[::1]:5555";
|
||||||
};
|
};
|
||||||
|
|
12
flake.lock
12
flake.lock
|
@ -569,11 +569,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725893417,
|
"lastModified": 1725948275,
|
||||||
"narHash": "sha256-fj2LxTZAncL/s5NrtXe1nLfO0XDvRixtCu3kmV9jDPw=",
|
"narHash": "sha256-4QOPemDQ9VRLQaAdWuvdDBhh+lEUOAnSMHhdr4nS1mk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "10541f19c584fe9633c921903d8c095d5411e041",
|
"rev": "e5fa72bad0c6f533e8d558182529ee2acc9454fe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -953,11 +953,11 @@
|
||||||
"treefmt-nix": "treefmt-nix_2"
|
"treefmt-nix": "treefmt-nix_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725921389,
|
"lastModified": 1725956241,
|
||||||
"narHash": "sha256-RBpN0ToD8O3qniBjqUiB1d2/LQJt5kH5P3Gt6dF91L0=",
|
"narHash": "sha256-UL8WJvT+67ZNNc0GmfhygDzggq/lidyRRSN1jPXzr+0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "facf6b2d0c9e22d858956d1d458eac6baf155a08",
|
"rev": "faa2e6306c0a1ae8e67dfdb0d75cd5ecd427ca5d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
Loading…
Reference in a new issue