alyraffauf/nixcfg
1
0
Fork 0
mirror of https://github.com/alyraffauf/nixcfg.git synced 2024-11-22 03:33:55 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

moved syncthing key/cert hosts -> nixosModules

Browse source
This commit is contained in:
Aly Raffauf 2024-06-09 21:39:35 -04:00
parent 819ea712fe
commit d772abff12
7 changed files with 10 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
flake.nix
View file

@ -96,6 +96,7 @@
specialArgs = {inherit inputs self;}; specialArgs = {inherit inputs self;};
modules = [ modules = [
./hosts/${host} ./hosts/${host}
self.nixosModules.default
inputs.agenix.nixosModules.default inputs.agenix.nixosModules.default
]; ];
} }

10
hosts/fallarbor/default.nix
View file

@ -11,7 +11,6 @@
./disko.nix ./disko.nix
./hardware.nix ./hardware.nix
./home.nix ./home.nix
self.nixosModules.default
]; ];
boot = { boot = {
@ -25,17 +24,8 @@
networking.hostName = "fallarbor"; # Define your hostname. networking.hostName = "fallarbor"; # Define your hostname.
age.secrets = {
syncthingCert.file = ../../secrets/hosts + "/${config.networking.hostName}/syncthing/cert.age";
syncthingKey.file = ../../secrets/hosts + "/${config.networking.hostName}/syncthing/key.age";
};
services = { services = {
fwupd.enable = true; fwupd.enable = true;
syncthing = {
cert = config.age.secrets.syncthingCert.path;
key = config.age.secrets.syncthingKey.path;
};
}; };
alyraffauf = { alyraffauf = {

10
hosts/lavaridge/default.nix
View file

@ -11,7 +11,6 @@
./disko.nix ./disko.nix
./hardware.nix ./hardware.nix
./home.nix ./home.nix
self.nixosModules.default
]; ];
boot = { boot = {
@ -25,17 +24,8 @@
networking.hostName = "lavaridge"; # Define your hostname. networking.hostName = "lavaridge"; # Define your hostname.
age.secrets = {
syncthingCert.file = ../../secrets/hosts + "/${config.networking.hostName}/syncthing/cert.age";
syncthingKey.file = ../../secrets/hosts + "/${config.networking.hostName}/syncthing/key.age";
};
services = { services = {
fwupd.enable = true; fwupd.enable = true;
syncthing = {
cert = config.age.secrets.syncthingCert.path;
key = config.age.secrets.syncthingKey.path;
};
}; };
alyraffauf = { alyraffauf = {

11
hosts/mauville/default.nix
View file

@ -16,7 +16,6 @@ in {
imports = [ imports = [
./hardware.nix ./hardware.nix
./home.nix ./home.nix
self.nixosModules.default
]; ];
# Bootloader. # Bootloader.
@ -25,16 +24,6 @@ in {
networking.hostName = hostName; # Define your hostname. networking.hostName = hostName; # Define your hostname.
age.secrets = {
syncthingCert.file = ../../secrets/hosts + "/${config.networking.hostName}/syncthing/cert.age";
syncthingKey.file = ../../secrets/hosts + "/${config.networking.hostName}/syncthing/key.age";
};
services.syncthing = {
cert = config.age.secrets.syncthingCert.path;
key = config.age.secrets.syncthingKey.path;
};
alyraffauf = { alyraffauf = {
apps = { apps = {
nicotine-plus.enable = true; nicotine-plus.enable = true;

11
hosts/petalburg/default.nix
View file

@ -11,7 +11,6 @@
./disko.nix ./disko.nix
./hardware.nix ./hardware.nix
./home.nix ./home.nix
self.nixosModules.default
]; ];
boot = { boot = {
@ -25,16 +24,6 @@
networking.hostName = "petalburg"; # Define your hostname. networking.hostName = "petalburg"; # Define your hostname.
age.secrets = {
syncthingCert.file = ../../secrets/hosts + "/${config.networking.hostName}/syncthing/cert.age";
syncthingKey.file = ../../secrets/hosts + "/${config.networking.hostName}/syncthing/key.age";
};
services.syncthing = {
cert = config.age.secrets.syncthingCert.path;
key = config.age.secrets.syncthingKey.path;
};
alyraffauf = { alyraffauf = {
system = { system = {
plymouth.enable = true; plymouth.enable = true;

11
hosts/rustboro/default.nix
View file

@ -11,7 +11,6 @@
./disko.nix ./disko.nix
./hardware.nix ./hardware.nix
./home.nix ./home.nix
self.nixosModules.default
]; ];
boot = { boot = {
@ -22,16 +21,6 @@
networking.hostName = "rustboro"; # Define your hostname. networking.hostName = "rustboro"; # Define your hostname.
age.secrets = {
syncthingCert.file = ../../secrets/hosts + "/${config.networking.hostName}/syncthing/cert.age";
syncthingKey.file = ../../secrets/hosts + "/${config.networking.hostName}/syncthing/key.age";
};
services.syncthing = {
cert = config.age.secrets.syncthingCert.path;
key = config.age.secrets.syncthingKey.path;
};
alyraffauf = { alyraffauf = {
system = { system = {
plymouth.enable = true; plymouth.enable = true;

10
nixosModules/services/syncthing/default.nix
View file

@ -28,12 +28,20 @@
}; };
config = lib.mkIf config.alyraffauf.services.syncthing.enable { config = lib.mkIf config.alyraffauf.services.syncthing.enable {
age.secrets = {
syncthingCert.file = ../../../secrets/hosts + "/${config.networking.hostName}/syncthing/cert.age";
syncthingKey.file = ../../../secrets/hosts + "/${config.networking.hostName}/syncthing/key.age";
};
systemd.services.syncthing.environment.STNODEFAULTFOLDER = "true"; systemd.services.syncthing.environment.STNODEFAULTFOLDER = "true";
services.syncthing = { services.syncthing = {
enable = true; enable = true;
cert = config.age.secrets.syncthingCert.path;
dataDir = "/home/${config.alyraffauf.services.syncthing.user}";
key = config.age.secrets.syncthingKey.path;
openDefaultPorts = true; openDefaultPorts = true;
user = config.alyraffauf.services.syncthing.user; user = config.alyraffauf.services.syncthing.user;
dataDir = "/home/${config.alyraffauf.services.syncthing.user}";
settings = { settings = {
options = { options = {
localAnnounceEnabled = true; localAnnounceEnabled = true;