oysteikt/nix-dotfiles
oysteikt
/
nix-dotfiles
2
1
Fork 0
Code Issues Pull Requests Activity

`hosts/common.nix` -> `hosts/common/default.nix`

This commit is contained in:
Oystein Kristoffer Tveit 2024-06-29 12:46:20 +02:00
parent 28f94f3888
commit 977864f85b
Signed by: oysteikt
GPG Key ID: 9F2F7D8250F35146
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -9,7 +9,7 @@ Here are some of the interesting files and dirs:
|------|---------| |------|---------|
| `/home` | [home-manager][home-manager] configuration. | | `/home` | [home-manager][home-manager] configuration. |
| `/hosts` | Machine specific NixOS configurations. | | `/hosts` | Machine specific NixOS configurations. |
| `/hosts/common.nix` | Configuration that is equal for all hosts. | | `/hosts/common/default.nix` | Configuration that is equal for all hosts. |
| `/lib` | Custom lib functions that has not been upstreamed (or should not be) to nixpkgs. I'm trying to phase these out as much as possible. | | `/lib` | Custom lib functions that has not been upstreamed (or should not be) to nixpkgs. I'm trying to phase these out as much as possible. |
| `/modules` | Custom nixos modules that I use in my own configuration. If you see options that does not appear in [NixOS Search][nixos-search], they might be defined here. | | `/modules` | Custom nixos modules that I use in my own configuration. If you see options that does not appear in [NixOS Search][nixos-search], they might be defined here. |
| `/package-overrides` | Updated or pinned versions of packages that have not been upstreamed to nixpkgs (yet). | | `/package-overrides` | Updated or pinned versions of packages that have not been upstreamed to nixpkgs (yet). |

2
flake.nix
View File

@ -171,7 +171,7 @@
"${home-manager}/nixos" "${home-manager}/nixos"
./modules/machineVars.nix ./modules/machineVars.nix
./modules/socketActivation.nix ./modules/socketActivation.nix
./hosts/common.nix ./hosts/common
./hosts/${name}/configuration.nix ./hosts/${name}/configuration.nix
matrix-synapse-next.nixosModules.default matrix-synapse-next.nixosModules.default

14
hosts/common.nix → hosts/common/default.nix
View File

@ -2,19 +2,19 @@
let let
inherit (config) machineVars; inherit (config) machineVars;
in { in {
sops.defaultSopsFile = ./.. + "/secrets/${config.networking.hostName}.yaml"; sops.defaultSopsFile = ./../.. + "/secrets/${config.networking.hostName}.yaml";
sops.secrets = { sops.secrets = {
"ssh/nix-builders/tsuki/key" = { sopsFile = ./../secrets/common.yaml; }; "ssh/nix-builders/tsuki/key" = { sopsFile = ./../../secrets/common.yaml; };
"ssh/nix-builders/tsuki/pub" = { sopsFile = ./../secrets/common.yaml; }; "ssh/nix-builders/tsuki/pub" = { sopsFile = ./../../secrets/common.yaml; };
"ssh/nix-builders/isvegg/key" = { sopsFile = ./../secrets/common.yaml; }; "ssh/nix-builders/isvegg/key" = { sopsFile = ./../../secrets/common.yaml; };
"ssh/nix-builders/bob/key" = { sopsFile = ./../secrets/common.yaml; }; "ssh/nix-builders/bob/key" = { sopsFile = ./../../secrets/common.yaml; };
# "ssh/nix-builders/isvegg/pub" = { }; # "ssh/nix-builders/isvegg/pub" = { };
"nix/access-tokens" = { sopsFile = ./../secrets/common.yaml; }; "nix/access-tokens" = { sopsFile = ./../../secrets/common.yaml; };
"ssh/secret-config/global" = { "ssh/secret-config/global" = {
sopsFile = ./../secrets/common.yaml; sopsFile = ./../../secrets/common.yaml;
mode = "0444"; mode = "0444";
}; };
}; };

2
hosts/eisei/configuration.nix
View File

@ -8,7 +8,7 @@ in {
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
# TODO: See ../common.nix # TODO: See ../common/default.nix
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.displayManager.lightdm.enable = true; services.xserver.displayManager.lightdm.enable = true;