chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

treewide: move nixos modules

Browse source
This commit is contained in:
Charlotte Van Petegem 2024-07-18 15:04:18 +02:00
parent d84be7c616
commit 8eff4c5e4f
73 changed files with 62 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -137,7 +137,7 @@
lanzaboote.nixosModules.lanzaboote lanzaboote.nixosModules.lanzaboote
nixos-mailserver.nixosModules.default nixos-mailserver.nixosModules.default
nix-index-database.nixosModules.nix-index nix-index-database.nixosModules.nix-index
./modules ./modules/nixos
]; ];
darwinModules = [ darwinModules = [
agenix.darwinModules.default agenix.darwinModules.default

0
modules/base/bluetooth/default.nix → modules/nixos/base/bluetooth/default.nix
View file

4
modules/base/default.nix → modules/nixos/base/default.nix
View file

@ -128,7 +128,7 @@
}; };
}; };
age.secrets."passwords/users/charlotte".file = ../../secrets/passwords/users/charlotte.age; age.secrets."passwords/users/charlotte".file = ../../../secrets/passwords/users/charlotte.age;
age.secrets."passwords/users/root".file = ../../secrets/passwords/users/root.age; age.secrets."passwords/users/root".file = ../../../secrets/passwords/users/root.age;
}; };
} }

0
modules/base/emacs/base-init.el → modules/nixos/base/emacs/base-init.el
View file

0
modules/base/emacs/default.nix → modules/nixos/base/emacs/default.nix
View file

0
modules/base/emacs/early-init.el → modules/nixos/base/emacs/early-init.el
View file

0
modules/base/emacs/snippets/fundamental.eld → modules/nixos/base/emacs/snippets/fundamental.eld
View file

0
modules/base/emacs/snippets/java.eld → modules/nixos/base/emacs/snippets/java.eld
View file

0
modules/base/emacs/snippets/mu4e-compose.eld → modules/nixos/base/emacs/snippets/mu4e-compose.eld
View file

0
modules/base/emacs/snippets/python.eld → modules/nixos/base/emacs/snippets/python.eld
View file

2
modules/base/mail/default.nix → modules/nixos/base/mail/default.nix
View file

@ -17,5 +17,5 @@
setSendmail = true; setSendmail = true;
}; };
age.secrets."passwords/services/ssmtp-pass".file = ../../../secrets/passwords/services/ssmtp-pass.age; age.secrets."passwords/services/ssmtp-pass".file = ../../../../secrets/passwords/services/ssmtp-pass.age;
} }

0
modules/base/network/default.nix → modules/nixos/base/network/default.nix
View file

2
modules/base/network/mobile.nix → modules/nixos/base/network/mobile.nix
View file

@ -87,7 +87,7 @@
}; };
age.secrets."passwords/networks.age" = { age.secrets."passwords/networks.age" = {
file = ../../../secrets/passwords/networks.age; file = ../../../../secrets/passwords/networks.age;
}; };
}; };
} }

0
modules/base/network/ovh.nix → modules/nixos/base/network/ovh.nix
View file

4
modules/base/network/wireguard.nix → modules/nixos/base/network/wireguard.nix
View file

@ -130,11 +130,11 @@ in
}; };
}; };
age.secrets."files/wireguard/psk" = { age.secrets."files/wireguard/psk" = {
file = ../../../secrets/files/wireguard/psk.age; file = ../../../../secrets/files/wireguard/psk.age;
owner = "systemd-network"; owner = "systemd-network";
}; };
age.secrets."files/wireguard/${config.networking.hostName}.privkey" = { age.secrets."files/wireguard/${config.networking.hostName}.privkey" = {
file = ../../../secrets/files/wireguard + "/${config.networking.hostName}.privkey.age"; file = ../../../../secrets/files/wireguard + "/${config.networking.hostName}.privkey.age";
owner = "systemd-network"; owner = "systemd-network";
}; };
}; };

0
modules/base/nix/default.nix → modules/nixos/base/nix/default.nix
View file

2
modules/base/phone-push/default.nix → modules/nixos/base/phone-push/default.nix
View file

@ -9,7 +9,7 @@ in
environment.systemPackages = [ phone-push ]; environment.systemPackages = [ phone-push ];
age.secrets."files/services/phone-push-url" = { age.secrets."files/services/phone-push-url" = {
file = ../../../secrets/files/services/phone-push-url.age; file = ../../../../secrets/files/services/phone-push-url.age;
owner = "charlotte"; owner = "charlotte";
}; };
} }

0
modules/base/smartd/default.nix → modules/nixos/base/smartd/default.nix
View file

4
modules/base/ssh/default.nix → modules/nixos/base/ssh/default.nix
View file

@ -35,10 +35,10 @@ in
home-manager.users.root = { ... }: (base "/root" "root"); home-manager.users.root = { ... }: (base "/root" "root");
home-manager.users.charlotte = { ... }: (base "/home/charlotte" "charlotte"); home-manager.users.charlotte = { ... }: (base "/home/charlotte" "charlotte");
age.secrets."files/programs/ssh/host_configuration_charlotte" = { age.secrets."files/programs/ssh/host_configuration_charlotte" = {
file = ../../../secrets/files/programs/ssh/host_configuration.age; file = ../../../../secrets/files/programs/ssh/host_configuration.age;
owner = "charlotte"; owner = "charlotte";
}; };
age.secrets."files/programs/ssh/host_configuration_root" = { age.secrets."files/programs/ssh/host_configuration_root" = {
file = ../../../secrets/files/programs/ssh/host_configuration.age; file = ../../../../secrets/files/programs/ssh/host_configuration.age;
}; };
} }

4
modules/base/sshd/default.nix → modules/nixos/base/sshd/default.nix
View file

@ -18,12 +18,12 @@
}; };
age.secrets."authorized_keys/root" = { age.secrets."authorized_keys/root" = {
file = ../../../secrets/authorized_keys/root.age; file = ../../../../secrets/authorized_keys/root.age;
path = "/root/.ssh/authorized_keys"; path = "/root/.ssh/authorized_keys";
symlink = false; symlink = false;
}; };
age.secrets."authorized_keys/charlotte" = { age.secrets."authorized_keys/charlotte" = {
file = ../../../secrets/authorized_keys/charlotte.age; file = ../../../../secrets/authorized_keys/charlotte.age;
owner = "charlotte"; owner = "charlotte";
path = "/home/charlotte/.ssh/authorized_keys"; path = "/home/charlotte/.ssh/authorized_keys";
symlink = false; symlink = false;

2
modules/base/telegraf/default.nix → modules/nixos/base/telegraf/default.nix
View file

@ -44,7 +44,7 @@
environmentFiles = [ config.age.secrets."passwords/services/telegraf-env".path ]; environmentFiles = [ config.age.secrets."passwords/services/telegraf-env".path ];
}; };
age.secrets."passwords/services/telegraf-env" = { age.secrets."passwords/services/telegraf-env" = {
file = ../../../secrets/passwords/services/telegraf-env.age; file = ../../../../secrets/passwords/services/telegraf-env.age;
owner = "telegraf"; owner = "telegraf";
}; };
} }

0
modules/base/tmux/default.nix → modules/nixos/base/tmux/default.nix
View file

0
modules/base/zfs/default.nix → modules/nixos/base/zfs/default.nix
View file

0
modules/base/zsh/default.nix → modules/nixos/base/zsh/default.nix
View file

0
modules/default.nix → modules/nixos/default.nix
View file

0
modules/development/android/default.nix → modules/nixos/development/android/default.nix
View file

0
modules/development/default.nix → modules/nixos/development/default.nix
View file

0
modules/development/docker/default.nix → modules/nixos/development/docker/default.nix
View file

0
modules/development/git/default.nix → modules/nixos/development/git/default.nix
View file

0
modules/games/default.nix → modules/nixos/games/default.nix
View file

0
modules/games/minecraft/default.nix → modules/nixos/games/minecraft/default.nix
View file

0
modules/games/mumble/default.nix → modules/nixos/games/mumble/default.nix
View file

0
modules/games/particles/default.nix → modules/nixos/games/particles/default.nix
View file

0
modules/games/steam/default.nix → modules/nixos/games/steam/default.nix
View file

0
modules/games/tetris/default.nix → modules/nixos/games/tetris/default.nix
View file

0
modules/graphical/compositor/color-picker.nix → modules/nixos/graphical/compositor/color-picker.nix
View file

0
modules/graphical/compositor/default.nix → modules/nixos/graphical/compositor/default.nix
View file

0
modules/graphical/compositor/launcher.nix → modules/nixos/graphical/compositor/launcher.nix
View file

0
modules/graphical/compositor/launcher.zsh → modules/nixos/graphical/compositor/launcher.zsh
View file

0
modules/graphical/compositor/screenshot.nix → modules/nixos/graphical/compositor/screenshot.nix
View file

0
modules/graphical/default.nix → modules/nixos/graphical/default.nix
View file

0
modules/graphical/firefox/default.nix → modules/nixos/graphical/firefox/default.nix
View file

0
modules/graphical/gnupg/default.nix → modules/nixos/graphical/gnupg/default.nix
View file

0
modules/graphical/mail/default.nix → modules/nixos/graphical/mail/default.nix
View file

0
modules/graphical/nextcloud-client/default.nix → modules/nixos/graphical/nextcloud-client/default.nix
View file

0
modules/graphical/pass/default.nix → modules/nixos/graphical/pass/default.nix
View file

0
modules/graphical/sound/default.nix → modules/nixos/graphical/sound/default.nix
View file

0
modules/graphical/terminal/default.nix → modules/nixos/graphical/terminal/default.nix
View file

0
modules/graphical/theme/default.nix → modules/nixos/graphical/theme/default.nix
View file

0
modules/graphical/xdg/default.nix → modules/nixos/graphical/xdg/default.nix
View file

0
modules/programs/calibre/default.nix → modules/nixos/programs/calibre/default.nix
View file

0
modules/programs/default.nix → modules/nixos/programs/default.nix
View file

0
modules/programs/eid/default.nix → modules/nixos/programs/eid/default.nix
View file

0
modules/programs/element/default.nix → modules/nixos/programs/element/default.nix
View file

0
modules/programs/hledger/default.nix → modules/nixos/programs/hledger/default.nix
View file

0
modules/programs/obs/default.nix → modules/nixos/programs/obs/default.nix
View file

0
modules/programs/torrents/default.nix → modules/nixos/programs/torrents/default.nix
View file

2
modules/services/accentor/default.nix → modules/nixos/services/accentor/default.nix
View file

@ -35,7 +35,7 @@
}]; }];
age.secrets."passwords/services/accentor" = { age.secrets."passwords/services/accentor" = {
file = ../../../secrets/passwords/services/accentor.age; file = ../../../../secrets/passwords/services/accentor.age;
owner = "accentor"; owner = "accentor";
}; };
}; };

0
modules/services/containers/default.nix → modules/nixos/services/containers/default.nix
View file

0
modules/services/data-access/config.nix → modules/nixos/services/data-access/config.nix
View file

20
modules/services/data-access/default.nix → modules/nixos/services/data-access/default.nix
View file

@ -66,56 +66,56 @@
}; };
age.secrets."data-access/ssh_host_rsa_key" = { age.secrets."data-access/ssh_host_rsa_key" = {
file = ../../../secrets/data-access/ssh_host_rsa_key.age; file = ../../../../secrets/data-access/ssh_host_rsa_key.age;
path = "/run/data-access/ssh_host_rsa_key"; path = "/run/data-access/ssh_host_rsa_key";
symlink = false; symlink = false;
}; };
age.secrets."data-access/ssh_host_rsa_key.pub" = { age.secrets."data-access/ssh_host_rsa_key.pub" = {
file = ../../../secrets/data-access/ssh_host_rsa_key.pub.age; file = ../../../../secrets/data-access/ssh_host_rsa_key.pub.age;
path = "/run/data-access/ssh_host_rsa_key.pub"; path = "/run/data-access/ssh_host_rsa_key.pub";
symlink = false; symlink = false;
}; };
age.secrets."data-access/ssh_host_ed25519_key" = { age.secrets."data-access/ssh_host_ed25519_key" = {
file = ../../../secrets/data-access/ssh_host_ed25519_key.age; file = ../../../../secrets/data-access/ssh_host_ed25519_key.age;
path = "/run/data-access/ssh_host_ed25519_key"; path = "/run/data-access/ssh_host_ed25519_key";
symlink = false; symlink = false;
}; };
age.secrets."data-access/ssh_host_ed25519_key.pub" = { age.secrets."data-access/ssh_host_ed25519_key.pub" = {
file = ../../../secrets/data-access/ssh_host_ed25519_key.pub.age; file = ../../../../secrets/data-access/ssh_host_ed25519_key.pub.age;
path = "/run/data-access/ssh_host_ed25519_key.pub"; path = "/run/data-access/ssh_host_ed25519_key.pub";
symlink = false; symlink = false;
}; };
age.secrets."data-access/password_file" = { age.secrets."data-access/password_file" = {
file = ../../../secrets/data-access/password_file.age; file = ../../../../secrets/data-access/password_file.age;
path = "/run/data-access/password_file"; path = "/run/data-access/password_file";
symlink = false; symlink = false;
}; };
age.secrets."data-access/readonly_password_file" = { age.secrets."data-access/readonly_password_file" = {
file = ../../../secrets/data-access/readonly_password_file.age; file = ../../../../secrets/data-access/readonly_password_file.age;
path = "/run/data-access/readonly_password_file"; path = "/run/data-access/readonly_password_file";
symlink = false; symlink = false;
}; };
age.secrets."data-access/authorized_keys" = { age.secrets."data-access/authorized_keys" = {
file = ../../../secrets/data-access/authorized_keys.age; file = ../../../../secrets/data-access/authorized_keys.age;
owner = "charlotte"; owner = "charlotte";
path = "/run/data-access/data_authorized_keys"; path = "/run/data-access/data_authorized_keys";
symlink = false; symlink = false;
}; };
age.secrets."data-access/readonly_authorized_keys" = { age.secrets."data-access/readonly_authorized_keys" = {
file = ../../../secrets/data-access/readonly_authorized_keys.age; file = ../../../../secrets/data-access/readonly_authorized_keys.age;
owner = "1001"; owner = "1001";
group = "65534"; group = "65534";
path = "/run/data-access/readonly_authorized_keys"; path = "/run/data-access/readonly_authorized_keys";
symlink = false; symlink = false;
}; };
age.secrets."data-access/create_torrent" = { age.secrets."data-access/create_torrent" = {
file = ../../../secrets/data-access/create_torrent.age; file = ../../../../secrets/data-access/create_torrent.age;
owner = "charlotte"; owner = "charlotte";
path = "/run/data-access/create_torrent"; path = "/run/data-access/create_torrent";
symlink = false; symlink = false;
}; };
age.secrets."passwords/services/data-basic-auth" = { age.secrets."passwords/services/data-basic-auth" = {
file = ../../../secrets/passwords/services/data-basic-auth.age; file = ../../../../secrets/passwords/services/data-basic-auth.age;
owner = "nginx"; owner = "nginx";
}; };
}; };

0
modules/services/default.nix → modules/nixos/services/default.nix
View file

2
modules/services/garmin-scraper/default.nix → modules/nixos/services/garmin-scraper/default.nix
View file

@ -32,7 +32,7 @@ in
timers.garmin2influx.timerConfig.RandomizedDelaySec = "30min"; timers.garmin2influx.timerConfig.RandomizedDelaySec = "30min";
}; };
age.secrets."passwords/services/garmin2influx-env" = { age.secrets."passwords/services/garmin2influx-env" = {
file = ../../../secrets/passwords/services/garmin2influx-env.age; file = ../../../../secrets/passwords/services/garmin2influx-env.age;
owner = "charlotte"; owner = "charlotte";
}; };
}; };

0
modules/services/garmin-scraper/garmin2influx.py → modules/nixos/services/garmin-scraper/garmin2influx.py
View file

10
modules/services/git/default.nix → modules/nixos/services/git/default.nix
View file

@ -62,23 +62,23 @@
}; };
age.secrets."passwords/services/git/initial-root-password" = { age.secrets."passwords/services/git/initial-root-password" = {
file = ../../../secrets/passwords/services/git/initial-root-password.age; file = ../../../../secrets/passwords/services/git/initial-root-password.age;
owner = "git"; owner = "git";
}; };
age.secrets."passwords/services/git/db" = { age.secrets."passwords/services/git/db" = {
file = ../../../secrets/passwords/services/git/db.age; file = ../../../../secrets/passwords/services/git/db.age;
owner = "git"; owner = "git";
}; };
age.secrets."passwords/services/git/jws" = { age.secrets."passwords/services/git/jws" = {
file = ../../../secrets/passwords/services/git/jws.age; file = ../../../../secrets/passwords/services/git/jws.age;
owner = "git"; owner = "git";
}; };
age.secrets."passwords/services/git/otp" = { age.secrets."passwords/services/git/otp" = {
file = ../../../secrets/passwords/services/git/otp.age; file = ../../../../secrets/passwords/services/git/otp.age;
owner = "git"; owner = "git";
}; };
age.secrets."passwords/services/git/secret" = { age.secrets."passwords/services/git/secret" = {
file = ../../../secrets/passwords/services/git/secret.age; file = ../../../../secrets/passwords/services/git/secret.age;
owner = "git"; owner = "git";
}; };
}; };

2
modules/services/git/runner.nix → modules/nixos/services/git/runner.nix
View file

@ -51,7 +51,7 @@
storageDriver = "zfs"; storageDriver = "zfs";
}; };
age.secrets."passwords/services/gitlab-runner/registration" = { age.secrets."passwords/services/gitlab-runner/registration" = {
file = ../../../secrets/passwords/services/gitlab-runner/registration.age; file = ../../../../secrets/passwords/services/gitlab-runner/registration.age;
}; };
}; };
} }

6
modules/services/grafana/default.nix → modules/nixos/services/grafana/default.nix
View file

@ -82,15 +82,15 @@
}; };
}; };
age.secrets."passwords/services/grafana/smtp" = { age.secrets."passwords/services/grafana/smtp" = {
file = ../../../secrets/passwords/services/grafana/smtp.age; file = ../../../../secrets/passwords/services/grafana/smtp.age;
owner = "grafana"; owner = "grafana";
}; };
age.secrets."passwords/services/grafana/admin-password" = { age.secrets."passwords/services/grafana/admin-password" = {
file = ../../../secrets/passwords/services/grafana/admin-password.age; file = ../../../../secrets/passwords/services/grafana/admin-password.age;
owner = "grafana"; owner = "grafana";
}; };
age.secrets."passwords/services/grafana/secret-key" = { age.secrets."passwords/services/grafana/secret-key" = {
file = ../../../secrets/passwords/services/grafana/secret-key.age; file = ../../../../secrets/passwords/services/grafana/secret-key.age;
owner = "grafana"; owner = "grafana";
}; };
}; };

18
modules/services/mail/default.nix → modules/nixos/services/mail/default.nix
View file

@ -152,15 +152,15 @@ in
''; '';
age.secrets = { age.secrets = {
"passwords/services/mail/charlotte@vanpetegem.be".file = ../../../secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age; "passwords/services/mail/charlotte@vanpetegem.be".file = ../../../../secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age;
"passwords/services/mail/hallo@robbe.be".file = ../../../secrets/passwords/services/mail/hallo_at_robbe.be.age; "passwords/services/mail/hallo@robbe.be".file = ../../../../secrets/passwords/services/mail/hallo_at_robbe.be.age;
"passwords/services/mail/huis@vanpetegem.me".file = ../../../secrets/passwords/services/mail/huis_at_vanpetegem.me.age; "passwords/services/mail/huis@vanpetegem.me".file = ../../../../secrets/passwords/services/mail/huis_at_vanpetegem.me.age;
"passwords/services/mail/noreply@vanpetegem.me".file = ../../../secrets/passwords/services/mail/noreply_at_vanpetegem.me.age; "passwords/services/mail/noreply@vanpetegem.me".file = ../../../../secrets/passwords/services/mail/noreply_at_vanpetegem.me.age;
"passwords/services/mail/peter@vanpetegem.me".file = ../../../secrets/passwords/services/mail/peter_at_vanpetegem.me.age; "passwords/services/mail/peter@vanpetegem.me".file = ../../../../secrets/passwords/services/mail/peter_at_vanpetegem.me.age;
"passwords/services/mail/postbot@vanpetegem.be".file = ../../../secrets/passwords/services/mail/postbot_at_vanpetegem.be.age; "passwords/services/mail/postbot@vanpetegem.be".file = ../../../../secrets/passwords/services/mail/postbot_at_vanpetegem.be.age;
"passwords/services/mail/robbe@robbevanpetegem.be".file = ../../../secrets/passwords/services/mail/robbe_at_robbevanpetegem.be.age; "passwords/services/mail/robbe@robbevanpetegem.be".file = ../../../../secrets/passwords/services/mail/robbe_at_robbevanpetegem.be.age;
"passwords/services/mail/robbe@vanpetegem.be".file = ../../../secrets/passwords/services/mail/robbe_at_vanpetegem.be.age; "passwords/services/mail/robbe@vanpetegem.be".file = ../../../../secrets/passwords/services/mail/robbe_at_vanpetegem.be.age;
"passwords/services/mail/webmaster@vanpetegem.be".file = ../../../secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age; "passwords/services/mail/webmaster@vanpetegem.be".file = ../../../../secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age;
}; };
}; };
} }

8
modules/services/mastodon/default.nix → modules/nixos/services/mastodon/default.nix
View file

@ -56,19 +56,19 @@
}; };
age.secrets."passwords/services/mastodon/vapid-public" = { age.secrets."passwords/services/mastodon/vapid-public" = {
file = ../../../secrets/passwords/services/mastodon/vapid-public.age; file = ../../../../secrets/passwords/services/mastodon/vapid-public.age;
owner = "mastodon"; owner = "mastodon";
}; };
age.secrets."passwords/services/mastodon/vapid-private" = { age.secrets."passwords/services/mastodon/vapid-private" = {
file = ../../../secrets/passwords/services/mastodon/vapid-private.age; file = ../../../../secrets/passwords/services/mastodon/vapid-private.age;
owner = "mastodon"; owner = "mastodon";
}; };
age.secrets."passwords/services/mastodon/key" = { age.secrets."passwords/services/mastodon/key" = {
file = ../../../secrets/passwords/services/mastodon/key.age; file = ../../../../secrets/passwords/services/mastodon/key.age;
owner = "mastodon"; owner = "mastodon";
}; };
age.secrets."passwords/services/mastodon/otp" = { age.secrets."passwords/services/mastodon/otp" = {
file = ../../../secrets/passwords/services/mastodon/otp.age; file = ../../../../secrets/passwords/services/mastodon/otp.age;
owner = "mastodon"; owner = "mastodon";
}; };
}; };

24
modules/services/matrix/default.nix → modules/nixos/services/matrix/default.nix
View file

@ -180,50 +180,50 @@
}; };
age.secrets."files/services/matrix-appservice-slack/config.yml" = { age.secrets."files/services/matrix-appservice-slack/config.yml" = {
file = ../../../secrets/files/services/matrix-appservice-slack/config.yml.age; file = ../../../../secrets/files/services/matrix-appservice-slack/config.yml.age;
owner = "matrix_appservice_slack"; owner = "matrix_appservice_slack";
}; };
age.secrets."files/services/matrix-appservice-slack/registration.yml" = { age.secrets."files/services/matrix-appservice-slack/registration.yml" = {
file = ../../../secrets/files/services/matrix-appservice-slack/registration.yml.age; file = ../../../../secrets/files/services/matrix-appservice-slack/registration.yml.age;
owner = "matrix_appservice_slack"; owner = "matrix_appservice_slack";
}; };
age.secrets."files/services/matrix-hookshot/config.yml" = { age.secrets."files/services/matrix-hookshot/config.yml" = {
file = ../../../secrets/files/services/matrix-hookshot/config.yml.age; file = ../../../../secrets/files/services/matrix-hookshot/config.yml.age;
owner = "matrix_hookshot"; owner = "matrix_hookshot";
}; };
age.secrets."files/services/matrix-hookshot/registration.yml" = { age.secrets."files/services/matrix-hookshot/registration.yml" = {
file = ../../../secrets/files/services/matrix-hookshot/registration.yml.age; file = ../../../../secrets/files/services/matrix-hookshot/registration.yml.age;
owner = "matrix_hookshot"; owner = "matrix_hookshot";
}; };
age.secrets."files/services/matrix-hookshot/passkey.pem" = { age.secrets."files/services/matrix-hookshot/passkey.pem" = {
path = "/var/lib/matrix-hookshot/passkey.pem"; path = "/var/lib/matrix-hookshot/passkey.pem";
file = ../../../secrets/files/services/matrix-hookshot/passkey.pem.age; file = ../../../../secrets/files/services/matrix-hookshot/passkey.pem.age;
owner = "matrix_hookshot"; owner = "matrix_hookshot";
}; };
age.secrets."files/services/mautrix-whatsapp/config.yml" = { age.secrets."files/services/mautrix-whatsapp/config.yml" = {
file = ../../../secrets/files/services/mautrix-whatsapp/config.yml.age; file = ../../../../secrets/files/services/mautrix-whatsapp/config.yml.age;
owner = "mautrix_whatsapp"; owner = "mautrix_whatsapp";
}; };
age.secrets."files/services/mautrix-whatsapp/registration.yml" = { age.secrets."files/services/mautrix-whatsapp/registration.yml" = {
file = ../../../secrets/files/services/mautrix-whatsapp/registration.yml.age; file = ../../../../secrets/files/services/mautrix-whatsapp/registration.yml.age;
owner = "mautrix_whatsapp"; owner = "mautrix_whatsapp";
}; };
age.secrets."files/services/matrix-synapse/config.yml" = { age.secrets."files/services/matrix-synapse/config.yml" = {
file = ../../../secrets/files/services/matrix-synapse/config.yml.age; file = ../../../../secrets/files/services/matrix-synapse/config.yml.age;
owner = "matrix-synapse"; owner = "matrix-synapse";
}; };
age.secrets."files/services/matrix-synapse/slack-registration.yml" = { age.secrets."files/services/matrix-synapse/slack-registration.yml" = {
file = ../../../secrets/files/services/matrix-appservice-slack/registration.yml.age; file = ../../../../secrets/files/services/matrix-appservice-slack/registration.yml.age;
owner = "matrix-synapse"; owner = "matrix-synapse";
}; };
age.secrets."files/services/matrix-synapse/whatsapp-registration.yml" = { age.secrets."files/services/matrix-synapse/whatsapp-registration.yml" = {
file = ../../../secrets/files/services/mautrix-whatsapp/registration.yml.age; file = ../../../../secrets/files/services/mautrix-whatsapp/registration.yml.age;
owner = "matrix-synapse"; owner = "matrix-synapse";
}; };
age.secrets."files/services/matrix-synapse/hookshot-registration.yml" = { age.secrets."files/services/matrix-synapse/hookshot-registration.yml" = {
file = ../../../secrets/files/services/matrix-hookshot/registration.yml.age; file = ../../../../secrets/files/services/matrix-hookshot/registration.yml.age;
owner = "matrix-synapse"; owner = "matrix-synapse";
}; };
age.secrets."files/servers/matrix-sliding-sync/env".file = ../../../secrets/files/services/matrix-sliding-sync/env.age; age.secrets."files/servers/matrix-sliding-sync/env".file = ../../../../secrets/files/services/matrix-sliding-sync/env.age;
}; };
} }

2
modules/services/nextcloud/default.nix → modules/nixos/services/nextcloud/default.nix
View file

@ -55,7 +55,7 @@
}; };
}; };
age.secrets."passwords/services/nextcloud-admin" = { age.secrets."passwords/services/nextcloud-admin" = {
file = ../../../secrets/passwords/services/nextcloud-admin.age; file = ../../../../secrets/passwords/services/nextcloud-admin.age;
owner = "nextcloud"; owner = "nextcloud";
}; };
systemd.services."nextcloud-setup" = { systemd.services."nextcloud-setup" = {

2
modules/services/nginx/default.nix → modules/nixos/services/nginx/default.nix
View file

@ -50,7 +50,7 @@
preliminarySelfsigned = false; preliminarySelfsigned = false;
}; };
age.secrets."passwords/services/acme" = { age.secrets."passwords/services/acme" = {
file = ../../../secrets/passwords/services/acme.age; file = ../../../../secrets/passwords/services/acme.age;
owner = "acme"; owner = "acme";
}; };
chvp.base.zfs.systemLinks = [ chvp.base.zfs.systemLinks = [

2
modules/services/torrents/default.nix → modules/nixos/services/torrents/default.nix
View file

@ -34,7 +34,7 @@
}; };
}; };
age.secrets."files/programs/transmission/config.json" = { age.secrets."files/programs/transmission/config.json" = {
file = ../../../secrets/files/programs/transmission/config.json.age; file = ../../../../secrets/files/programs/transmission/config.json.age;
owner = "charlotte"; owner = "charlotte";
}; };
}; };