mikael/nixfiles-emily
1
0
Fork 0
forked from emily/nixfiles
Code Pull requests Activity

Use lix everywhere

Browse source
This commit is contained in:
emily 2024-09-10 10:45:08 +02:00
parent 7ea51e7e28
commit ed3c9c2c7e
Signed by untrusted user: emily
GPG key ID: F6F4C66207FCF995
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/common/default.nix
View file

@ -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=" ];

6
config/services/hydra/default.nix
View file

@ -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";
}; };