From 8eff4c5e4ff2c97b9ac11f2ada4ea42f0258d3d6 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 18 Jul 2024 15:04:18 +0200 Subject: [PATCH] treewide: move nixos modules --- flake.nix | 2 +- .../{ => nixos}/base/bluetooth/default.nix | 0 modules/{ => nixos}/base/default.nix | 4 ++-- modules/{ => nixos}/base/emacs/base-init.el | 0 modules/{ => nixos}/base/emacs/default.nix | 0 modules/{ => nixos}/base/emacs/early-init.el | 0 .../base/emacs/snippets/fundamental.eld | 0 .../{ => nixos}/base/emacs/snippets/java.eld | 0 .../base/emacs/snippets/mu4e-compose.eld | 0 .../base/emacs/snippets/python.eld | 0 modules/{ => nixos}/base/mail/default.nix | 2 +- modules/{ => nixos}/base/network/default.nix | 0 modules/{ => nixos}/base/network/mobile.nix | 2 +- modules/{ => nixos}/base/network/ovh.nix | 0 .../{ => nixos}/base/network/wireguard.nix | 4 ++-- modules/{ => nixos}/base/nix/default.nix | 0 .../{ => nixos}/base/phone-push/default.nix | 2 +- modules/{ => nixos}/base/smartd/default.nix | 0 modules/{ => nixos}/base/ssh/default.nix | 4 ++-- modules/{ => nixos}/base/sshd/default.nix | 4 ++-- modules/{ => nixos}/base/telegraf/default.nix | 2 +- modules/{ => nixos}/base/tmux/default.nix | 0 modules/{ => nixos}/base/zfs/default.nix | 0 modules/{ => nixos}/base/zsh/default.nix | 0 modules/{ => nixos}/default.nix | 0 .../development/android/default.nix | 0 modules/{ => nixos}/development/default.nix | 0 .../development/docker/default.nix | 0 .../{ => nixos}/development/git/default.nix | 0 modules/{ => nixos}/games/default.nix | 0 .../{ => nixos}/games/minecraft/default.nix | 0 modules/{ => nixos}/games/mumble/default.nix | 0 .../{ => nixos}/games/particles/default.nix | 0 modules/{ => nixos}/games/steam/default.nix | 0 modules/{ => nixos}/games/tetris/default.nix | 0 .../graphical/compositor/color-picker.nix | 0 .../graphical/compositor/default.nix | 0 .../graphical/compositor/launcher.nix | 0 .../graphical/compositor/launcher.zsh | 0 .../graphical/compositor/screenshot.nix | 0 modules/{ => nixos}/graphical/default.nix | 0 .../{ => nixos}/graphical/firefox/default.nix | 0 .../{ => nixos}/graphical/gnupg/default.nix | 0 .../{ => nixos}/graphical/mail/default.nix | 0 .../graphical/nextcloud-client/default.nix | 0 .../{ => nixos}/graphical/pass/default.nix | 0 .../{ => nixos}/graphical/sound/default.nix | 0 .../graphical/terminal/default.nix | 0 .../{ => nixos}/graphical/theme/default.nix | 0 modules/{ => nixos}/graphical/xdg/default.nix | 0 .../{ => nixos}/programs/calibre/default.nix | 0 modules/{ => nixos}/programs/default.nix | 0 modules/{ => nixos}/programs/eid/default.nix | 0 .../{ => nixos}/programs/element/default.nix | 0 .../{ => nixos}/programs/hledger/default.nix | 0 modules/{ => nixos}/programs/obs/default.nix | 0 .../{ => nixos}/programs/torrents/default.nix | 0 .../{ => nixos}/services/accentor/default.nix | 2 +- .../services/containers/default.nix | 0 .../services/data-access/config.nix | 0 .../services/data-access/default.nix | 20 ++++++++-------- modules/{ => nixos}/services/default.nix | 0 .../services/garmin-scraper/default.nix | 2 +- .../services/garmin-scraper/garmin2influx.py | 0 modules/{ => nixos}/services/git/default.nix | 10 ++++---- modules/{ => nixos}/services/git/runner.nix | 2 +- .../{ => nixos}/services/grafana/default.nix | 6 ++--- modules/{ => nixos}/services/mail/default.nix | 18 +++++++------- .../{ => nixos}/services/mastodon/default.nix | 8 +++---- .../{ => nixos}/services/matrix/default.nix | 24 +++++++++---------- .../services/nextcloud/default.nix | 2 +- .../{ => nixos}/services/nginx/default.nix | 2 +- .../{ => nixos}/services/torrents/default.nix | 2 +- 73 files changed, 62 insertions(+), 62 deletions(-) rename modules/{ => nixos}/base/bluetooth/default.nix (100%) rename modules/{ => nixos}/base/default.nix (93%) rename modules/{ => nixos}/base/emacs/base-init.el (100%) rename modules/{ => nixos}/base/emacs/default.nix (100%) rename modules/{ => nixos}/base/emacs/early-init.el (100%) rename modules/{ => nixos}/base/emacs/snippets/fundamental.eld (100%) rename modules/{ => nixos}/base/emacs/snippets/java.eld (100%) rename modules/{ => nixos}/base/emacs/snippets/mu4e-compose.eld (100%) rename modules/{ => nixos}/base/emacs/snippets/python.eld (100%) rename modules/{ => nixos}/base/mail/default.nix (82%) rename modules/{ => nixos}/base/network/default.nix (100%) rename modules/{ => nixos}/base/network/mobile.nix (98%) rename modules/{ => nixos}/base/network/ovh.nix (100%) rename modules/{ => nixos}/base/network/wireguard.nix (96%) rename modules/{ => nixos}/base/nix/default.nix (100%) rename modules/{ => nixos}/base/phone-push/default.nix (83%) rename modules/{ => nixos}/base/smartd/default.nix (100%) rename modules/{ => nixos}/base/ssh/default.nix (90%) rename modules/{ => nixos}/base/sshd/default.nix (86%) rename modules/{ => nixos}/base/telegraf/default.nix (94%) rename modules/{ => nixos}/base/tmux/default.nix (100%) rename modules/{ => nixos}/base/zfs/default.nix (100%) rename modules/{ => nixos}/base/zsh/default.nix (100%) rename modules/{ => nixos}/default.nix (100%) rename modules/{ => nixos}/development/android/default.nix (100%) rename modules/{ => nixos}/development/default.nix (100%) rename modules/{ => nixos}/development/docker/default.nix (100%) rename modules/{ => nixos}/development/git/default.nix (100%) rename modules/{ => nixos}/games/default.nix (100%) rename modules/{ => nixos}/games/minecraft/default.nix (100%) rename modules/{ => nixos}/games/mumble/default.nix (100%) rename modules/{ => nixos}/games/particles/default.nix (100%) rename modules/{ => nixos}/games/steam/default.nix (100%) rename modules/{ => nixos}/games/tetris/default.nix (100%) rename modules/{ => nixos}/graphical/compositor/color-picker.nix (100%) rename modules/{ => nixos}/graphical/compositor/default.nix (100%) rename modules/{ => nixos}/graphical/compositor/launcher.nix (100%) rename modules/{ => nixos}/graphical/compositor/launcher.zsh (100%) rename modules/{ => nixos}/graphical/compositor/screenshot.nix (100%) rename modules/{ => nixos}/graphical/default.nix (100%) rename modules/{ => nixos}/graphical/firefox/default.nix (100%) rename modules/{ => nixos}/graphical/gnupg/default.nix (100%) rename modules/{ => nixos}/graphical/mail/default.nix (100%) rename modules/{ => nixos}/graphical/nextcloud-client/default.nix (100%) rename modules/{ => nixos}/graphical/pass/default.nix (100%) rename modules/{ => nixos}/graphical/sound/default.nix (100%) rename modules/{ => nixos}/graphical/terminal/default.nix (100%) rename modules/{ => nixos}/graphical/theme/default.nix (100%) rename modules/{ => nixos}/graphical/xdg/default.nix (100%) rename modules/{ => nixos}/programs/calibre/default.nix (100%) rename modules/{ => nixos}/programs/default.nix (100%) rename modules/{ => nixos}/programs/eid/default.nix (100%) rename modules/{ => nixos}/programs/element/default.nix (100%) rename modules/{ => nixos}/programs/hledger/default.nix (100%) rename modules/{ => nixos}/programs/obs/default.nix (100%) rename modules/{ => nixos}/programs/torrents/default.nix (100%) rename modules/{ => nixos}/services/accentor/default.nix (93%) rename modules/{ => nixos}/services/containers/default.nix (100%) rename modules/{ => nixos}/services/data-access/config.nix (100%) rename modules/{ => nixos}/services/data-access/default.nix (81%) rename modules/{ => nixos}/services/default.nix (100%) rename modules/{ => nixos}/services/garmin-scraper/default.nix (94%) rename modules/{ => nixos}/services/garmin-scraper/garmin2influx.py (100%) rename modules/{ => nixos}/services/git/default.nix (86%) rename modules/{ => nixos}/services/git/runner.nix (96%) rename modules/{ => nixos}/services/grafana/default.nix (93%) rename modules/{ => nixos}/services/mail/default.nix (89%) rename modules/{ => nixos}/services/mastodon/default.nix (87%) rename modules/{ => nixos}/services/matrix/default.nix (88%) rename modules/{ => nixos}/services/nextcloud/default.nix (96%) rename modules/{ => nixos}/services/nginx/default.nix (97%) rename modules/{ => nixos}/services/torrents/default.nix (93%) diff --git a/flake.nix b/flake.nix index cc854eb2..d3fa55f8 100644 --- a/flake.nix +++ b/flake.nix @@ -137,7 +137,7 @@ lanzaboote.nixosModules.lanzaboote nixos-mailserver.nixosModules.default nix-index-database.nixosModules.nix-index - ./modules + ./modules/nixos ]; darwinModules = [ agenix.darwinModules.default diff --git a/modules/base/bluetooth/default.nix b/modules/nixos/base/bluetooth/default.nix similarity index 100% rename from modules/base/bluetooth/default.nix rename to modules/nixos/base/bluetooth/default.nix diff --git a/modules/base/default.nix b/modules/nixos/base/default.nix similarity index 93% rename from modules/base/default.nix rename to modules/nixos/base/default.nix index e2c7a1e8..533bdfc8 100644 --- a/modules/base/default.nix +++ b/modules/nixos/base/default.nix @@ -128,7 +128,7 @@ }; }; - 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/charlotte".file = ../../../secrets/passwords/users/charlotte.age; + age.secrets."passwords/users/root".file = ../../../secrets/passwords/users/root.age; }; } diff --git a/modules/base/emacs/base-init.el b/modules/nixos/base/emacs/base-init.el similarity index 100% rename from modules/base/emacs/base-init.el rename to modules/nixos/base/emacs/base-init.el diff --git a/modules/base/emacs/default.nix b/modules/nixos/base/emacs/default.nix similarity index 100% rename from modules/base/emacs/default.nix rename to modules/nixos/base/emacs/default.nix diff --git a/modules/base/emacs/early-init.el b/modules/nixos/base/emacs/early-init.el similarity index 100% rename from modules/base/emacs/early-init.el rename to modules/nixos/base/emacs/early-init.el diff --git a/modules/base/emacs/snippets/fundamental.eld b/modules/nixos/base/emacs/snippets/fundamental.eld similarity index 100% rename from modules/base/emacs/snippets/fundamental.eld rename to modules/nixos/base/emacs/snippets/fundamental.eld diff --git a/modules/base/emacs/snippets/java.eld b/modules/nixos/base/emacs/snippets/java.eld similarity index 100% rename from modules/base/emacs/snippets/java.eld rename to modules/nixos/base/emacs/snippets/java.eld diff --git a/modules/base/emacs/snippets/mu4e-compose.eld b/modules/nixos/base/emacs/snippets/mu4e-compose.eld similarity index 100% rename from modules/base/emacs/snippets/mu4e-compose.eld rename to modules/nixos/base/emacs/snippets/mu4e-compose.eld diff --git a/modules/base/emacs/snippets/python.eld b/modules/nixos/base/emacs/snippets/python.eld similarity index 100% rename from modules/base/emacs/snippets/python.eld rename to modules/nixos/base/emacs/snippets/python.eld diff --git a/modules/base/mail/default.nix b/modules/nixos/base/mail/default.nix similarity index 82% rename from modules/base/mail/default.nix rename to modules/nixos/base/mail/default.nix index 8d9758dc..ec2922de 100644 --- a/modules/base/mail/default.nix +++ b/modules/nixos/base/mail/default.nix @@ -17,5 +17,5 @@ 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; } diff --git a/modules/base/network/default.nix b/modules/nixos/base/network/default.nix similarity index 100% rename from modules/base/network/default.nix rename to modules/nixos/base/network/default.nix diff --git a/modules/base/network/mobile.nix b/modules/nixos/base/network/mobile.nix similarity index 98% rename from modules/base/network/mobile.nix rename to modules/nixos/base/network/mobile.nix index d971bbc2..30f62282 100644 --- a/modules/base/network/mobile.nix +++ b/modules/nixos/base/network/mobile.nix @@ -87,7 +87,7 @@ }; age.secrets."passwords/networks.age" = { - file = ../../../secrets/passwords/networks.age; + file = ../../../../secrets/passwords/networks.age; }; }; } diff --git a/modules/base/network/ovh.nix b/modules/nixos/base/network/ovh.nix similarity index 100% rename from modules/base/network/ovh.nix rename to modules/nixos/base/network/ovh.nix diff --git a/modules/base/network/wireguard.nix b/modules/nixos/base/network/wireguard.nix similarity index 96% rename from modules/base/network/wireguard.nix rename to modules/nixos/base/network/wireguard.nix index 374d54a6..e797f2dc 100644 --- a/modules/base/network/wireguard.nix +++ b/modules/nixos/base/network/wireguard.nix @@ -130,11 +130,11 @@ in }; }; age.secrets."files/wireguard/psk" = { - file = ../../../secrets/files/wireguard/psk.age; + file = ../../../../secrets/files/wireguard/psk.age; owner = "systemd-network"; }; 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"; }; }; diff --git a/modules/base/nix/default.nix b/modules/nixos/base/nix/default.nix similarity index 100% rename from modules/base/nix/default.nix rename to modules/nixos/base/nix/default.nix diff --git a/modules/base/phone-push/default.nix b/modules/nixos/base/phone-push/default.nix similarity index 83% rename from modules/base/phone-push/default.nix rename to modules/nixos/base/phone-push/default.nix index e9f1f7ba..a63d060e 100644 --- a/modules/base/phone-push/default.nix +++ b/modules/nixos/base/phone-push/default.nix @@ -9,7 +9,7 @@ in environment.systemPackages = [ phone-push ]; 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"; }; } diff --git a/modules/base/smartd/default.nix b/modules/nixos/base/smartd/default.nix similarity index 100% rename from modules/base/smartd/default.nix rename to modules/nixos/base/smartd/default.nix diff --git a/modules/base/ssh/default.nix b/modules/nixos/base/ssh/default.nix similarity index 90% rename from modules/base/ssh/default.nix rename to modules/nixos/base/ssh/default.nix index 53d4c09b..37f75e20 100644 --- a/modules/base/ssh/default.nix +++ b/modules/nixos/base/ssh/default.nix @@ -35,10 +35,10 @@ in home-manager.users.root = { ... }: (base "/root" "root"); home-manager.users.charlotte = { ... }: (base "/home/charlotte" "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"; }; age.secrets."files/programs/ssh/host_configuration_root" = { - file = ../../../secrets/files/programs/ssh/host_configuration.age; + file = ../../../../secrets/files/programs/ssh/host_configuration.age; }; } diff --git a/modules/base/sshd/default.nix b/modules/nixos/base/sshd/default.nix similarity index 86% rename from modules/base/sshd/default.nix rename to modules/nixos/base/sshd/default.nix index 8e2d7297..63024111 100644 --- a/modules/base/sshd/default.nix +++ b/modules/nixos/base/sshd/default.nix @@ -18,12 +18,12 @@ }; age.secrets."authorized_keys/root" = { - file = ../../../secrets/authorized_keys/root.age; + file = ../../../../secrets/authorized_keys/root.age; path = "/root/.ssh/authorized_keys"; symlink = false; }; age.secrets."authorized_keys/charlotte" = { - file = ../../../secrets/authorized_keys/charlotte.age; + file = ../../../../secrets/authorized_keys/charlotte.age; owner = "charlotte"; path = "/home/charlotte/.ssh/authorized_keys"; symlink = false; diff --git a/modules/base/telegraf/default.nix b/modules/nixos/base/telegraf/default.nix similarity index 94% rename from modules/base/telegraf/default.nix rename to modules/nixos/base/telegraf/default.nix index 2b6238d4..e2f3e518 100644 --- a/modules/base/telegraf/default.nix +++ b/modules/nixos/base/telegraf/default.nix @@ -44,7 +44,7 @@ environmentFiles = [ config.age.secrets."passwords/services/telegraf-env".path ]; }; age.secrets."passwords/services/telegraf-env" = { - file = ../../../secrets/passwords/services/telegraf-env.age; + file = ../../../../secrets/passwords/services/telegraf-env.age; owner = "telegraf"; }; } diff --git a/modules/base/tmux/default.nix b/modules/nixos/base/tmux/default.nix similarity index 100% rename from modules/base/tmux/default.nix rename to modules/nixos/base/tmux/default.nix diff --git a/modules/base/zfs/default.nix b/modules/nixos/base/zfs/default.nix similarity index 100% rename from modules/base/zfs/default.nix rename to modules/nixos/base/zfs/default.nix diff --git a/modules/base/zsh/default.nix b/modules/nixos/base/zsh/default.nix similarity index 100% rename from modules/base/zsh/default.nix rename to modules/nixos/base/zsh/default.nix diff --git a/modules/default.nix b/modules/nixos/default.nix similarity index 100% rename from modules/default.nix rename to modules/nixos/default.nix diff --git a/modules/development/android/default.nix b/modules/nixos/development/android/default.nix similarity index 100% rename from modules/development/android/default.nix rename to modules/nixos/development/android/default.nix diff --git a/modules/development/default.nix b/modules/nixos/development/default.nix similarity index 100% rename from modules/development/default.nix rename to modules/nixos/development/default.nix diff --git a/modules/development/docker/default.nix b/modules/nixos/development/docker/default.nix similarity index 100% rename from modules/development/docker/default.nix rename to modules/nixos/development/docker/default.nix diff --git a/modules/development/git/default.nix b/modules/nixos/development/git/default.nix similarity index 100% rename from modules/development/git/default.nix rename to modules/nixos/development/git/default.nix diff --git a/modules/games/default.nix b/modules/nixos/games/default.nix similarity index 100% rename from modules/games/default.nix rename to modules/nixos/games/default.nix diff --git a/modules/games/minecraft/default.nix b/modules/nixos/games/minecraft/default.nix similarity index 100% rename from modules/games/minecraft/default.nix rename to modules/nixos/games/minecraft/default.nix diff --git a/modules/games/mumble/default.nix b/modules/nixos/games/mumble/default.nix similarity index 100% rename from modules/games/mumble/default.nix rename to modules/nixos/games/mumble/default.nix diff --git a/modules/games/particles/default.nix b/modules/nixos/games/particles/default.nix similarity index 100% rename from modules/games/particles/default.nix rename to modules/nixos/games/particles/default.nix diff --git a/modules/games/steam/default.nix b/modules/nixos/games/steam/default.nix similarity index 100% rename from modules/games/steam/default.nix rename to modules/nixos/games/steam/default.nix diff --git a/modules/games/tetris/default.nix b/modules/nixos/games/tetris/default.nix similarity index 100% rename from modules/games/tetris/default.nix rename to modules/nixos/games/tetris/default.nix diff --git a/modules/graphical/compositor/color-picker.nix b/modules/nixos/graphical/compositor/color-picker.nix similarity index 100% rename from modules/graphical/compositor/color-picker.nix rename to modules/nixos/graphical/compositor/color-picker.nix diff --git a/modules/graphical/compositor/default.nix b/modules/nixos/graphical/compositor/default.nix similarity index 100% rename from modules/graphical/compositor/default.nix rename to modules/nixos/graphical/compositor/default.nix diff --git a/modules/graphical/compositor/launcher.nix b/modules/nixos/graphical/compositor/launcher.nix similarity index 100% rename from modules/graphical/compositor/launcher.nix rename to modules/nixos/graphical/compositor/launcher.nix diff --git a/modules/graphical/compositor/launcher.zsh b/modules/nixos/graphical/compositor/launcher.zsh similarity index 100% rename from modules/graphical/compositor/launcher.zsh rename to modules/nixos/graphical/compositor/launcher.zsh diff --git a/modules/graphical/compositor/screenshot.nix b/modules/nixos/graphical/compositor/screenshot.nix similarity index 100% rename from modules/graphical/compositor/screenshot.nix rename to modules/nixos/graphical/compositor/screenshot.nix diff --git a/modules/graphical/default.nix b/modules/nixos/graphical/default.nix similarity index 100% rename from modules/graphical/default.nix rename to modules/nixos/graphical/default.nix diff --git a/modules/graphical/firefox/default.nix b/modules/nixos/graphical/firefox/default.nix similarity index 100% rename from modules/graphical/firefox/default.nix rename to modules/nixos/graphical/firefox/default.nix diff --git a/modules/graphical/gnupg/default.nix b/modules/nixos/graphical/gnupg/default.nix similarity index 100% rename from modules/graphical/gnupg/default.nix rename to modules/nixos/graphical/gnupg/default.nix diff --git a/modules/graphical/mail/default.nix b/modules/nixos/graphical/mail/default.nix similarity index 100% rename from modules/graphical/mail/default.nix rename to modules/nixos/graphical/mail/default.nix diff --git a/modules/graphical/nextcloud-client/default.nix b/modules/nixos/graphical/nextcloud-client/default.nix similarity index 100% rename from modules/graphical/nextcloud-client/default.nix rename to modules/nixos/graphical/nextcloud-client/default.nix diff --git a/modules/graphical/pass/default.nix b/modules/nixos/graphical/pass/default.nix similarity index 100% rename from modules/graphical/pass/default.nix rename to modules/nixos/graphical/pass/default.nix diff --git a/modules/graphical/sound/default.nix b/modules/nixos/graphical/sound/default.nix similarity index 100% rename from modules/graphical/sound/default.nix rename to modules/nixos/graphical/sound/default.nix diff --git a/modules/graphical/terminal/default.nix b/modules/nixos/graphical/terminal/default.nix similarity index 100% rename from modules/graphical/terminal/default.nix rename to modules/nixos/graphical/terminal/default.nix diff --git a/modules/graphical/theme/default.nix b/modules/nixos/graphical/theme/default.nix similarity index 100% rename from modules/graphical/theme/default.nix rename to modules/nixos/graphical/theme/default.nix diff --git a/modules/graphical/xdg/default.nix b/modules/nixos/graphical/xdg/default.nix similarity index 100% rename from modules/graphical/xdg/default.nix rename to modules/nixos/graphical/xdg/default.nix diff --git a/modules/programs/calibre/default.nix b/modules/nixos/programs/calibre/default.nix similarity index 100% rename from modules/programs/calibre/default.nix rename to modules/nixos/programs/calibre/default.nix diff --git a/modules/programs/default.nix b/modules/nixos/programs/default.nix similarity index 100% rename from modules/programs/default.nix rename to modules/nixos/programs/default.nix diff --git a/modules/programs/eid/default.nix b/modules/nixos/programs/eid/default.nix similarity index 100% rename from modules/programs/eid/default.nix rename to modules/nixos/programs/eid/default.nix diff --git a/modules/programs/element/default.nix b/modules/nixos/programs/element/default.nix similarity index 100% rename from modules/programs/element/default.nix rename to modules/nixos/programs/element/default.nix diff --git a/modules/programs/hledger/default.nix b/modules/nixos/programs/hledger/default.nix similarity index 100% rename from modules/programs/hledger/default.nix rename to modules/nixos/programs/hledger/default.nix diff --git a/modules/programs/obs/default.nix b/modules/nixos/programs/obs/default.nix similarity index 100% rename from modules/programs/obs/default.nix rename to modules/nixos/programs/obs/default.nix diff --git a/modules/programs/torrents/default.nix b/modules/nixos/programs/torrents/default.nix similarity index 100% rename from modules/programs/torrents/default.nix rename to modules/nixos/programs/torrents/default.nix diff --git a/modules/services/accentor/default.nix b/modules/nixos/services/accentor/default.nix similarity index 93% rename from modules/services/accentor/default.nix rename to modules/nixos/services/accentor/default.nix index 14782605..9bc63943 100644 --- a/modules/services/accentor/default.nix +++ b/modules/nixos/services/accentor/default.nix @@ -35,7 +35,7 @@ }]; age.secrets."passwords/services/accentor" = { - file = ../../../secrets/passwords/services/accentor.age; + file = ../../../../secrets/passwords/services/accentor.age; owner = "accentor"; }; }; diff --git a/modules/services/containers/default.nix b/modules/nixos/services/containers/default.nix similarity index 100% rename from modules/services/containers/default.nix rename to modules/nixos/services/containers/default.nix diff --git a/modules/services/data-access/config.nix b/modules/nixos/services/data-access/config.nix similarity index 100% rename from modules/services/data-access/config.nix rename to modules/nixos/services/data-access/config.nix diff --git a/modules/services/data-access/default.nix b/modules/nixos/services/data-access/default.nix similarity index 81% rename from modules/services/data-access/default.nix rename to modules/nixos/services/data-access/default.nix index 20d03f4e..d1d479c3 100644 --- a/modules/services/data-access/default.nix +++ b/modules/nixos/services/data-access/default.nix @@ -66,56 +66,56 @@ }; 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"; symlink = false; }; 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"; symlink = false; }; 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"; symlink = false; }; 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"; symlink = false; }; 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"; symlink = false; }; 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"; symlink = false; }; age.secrets."data-access/authorized_keys" = { - file = ../../../secrets/data-access/authorized_keys.age; + file = ../../../../secrets/data-access/authorized_keys.age; owner = "charlotte"; path = "/run/data-access/data_authorized_keys"; symlink = false; }; 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"; group = "65534"; path = "/run/data-access/readonly_authorized_keys"; symlink = false; }; age.secrets."data-access/create_torrent" = { - file = ../../../secrets/data-access/create_torrent.age; + file = ../../../../secrets/data-access/create_torrent.age; owner = "charlotte"; path = "/run/data-access/create_torrent"; symlink = false; }; 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"; }; }; diff --git a/modules/services/default.nix b/modules/nixos/services/default.nix similarity index 100% rename from modules/services/default.nix rename to modules/nixos/services/default.nix diff --git a/modules/services/garmin-scraper/default.nix b/modules/nixos/services/garmin-scraper/default.nix similarity index 94% rename from modules/services/garmin-scraper/default.nix rename to modules/nixos/services/garmin-scraper/default.nix index 74f55d58..c223736e 100644 --- a/modules/services/garmin-scraper/default.nix +++ b/modules/nixos/services/garmin-scraper/default.nix @@ -32,7 +32,7 @@ in timers.garmin2influx.timerConfig.RandomizedDelaySec = "30min"; }; age.secrets."passwords/services/garmin2influx-env" = { - file = ../../../secrets/passwords/services/garmin2influx-env.age; + file = ../../../../secrets/passwords/services/garmin2influx-env.age; owner = "charlotte"; }; }; diff --git a/modules/services/garmin-scraper/garmin2influx.py b/modules/nixos/services/garmin-scraper/garmin2influx.py similarity index 100% rename from modules/services/garmin-scraper/garmin2influx.py rename to modules/nixos/services/garmin-scraper/garmin2influx.py diff --git a/modules/services/git/default.nix b/modules/nixos/services/git/default.nix similarity index 86% rename from modules/services/git/default.nix rename to modules/nixos/services/git/default.nix index 51cd4a0a..66e551e4 100644 --- a/modules/services/git/default.nix +++ b/modules/nixos/services/git/default.nix @@ -62,23 +62,23 @@ }; 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"; }; age.secrets."passwords/services/git/db" = { - file = ../../../secrets/passwords/services/git/db.age; + file = ../../../../secrets/passwords/services/git/db.age; owner = "git"; }; age.secrets."passwords/services/git/jws" = { - file = ../../../secrets/passwords/services/git/jws.age; + file = ../../../../secrets/passwords/services/git/jws.age; owner = "git"; }; age.secrets."passwords/services/git/otp" = { - file = ../../../secrets/passwords/services/git/otp.age; + file = ../../../../secrets/passwords/services/git/otp.age; owner = "git"; }; age.secrets."passwords/services/git/secret" = { - file = ../../../secrets/passwords/services/git/secret.age; + file = ../../../../secrets/passwords/services/git/secret.age; owner = "git"; }; }; diff --git a/modules/services/git/runner.nix b/modules/nixos/services/git/runner.nix similarity index 96% rename from modules/services/git/runner.nix rename to modules/nixos/services/git/runner.nix index d3012ec1..bd8eb9e9 100644 --- a/modules/services/git/runner.nix +++ b/modules/nixos/services/git/runner.nix @@ -51,7 +51,7 @@ storageDriver = "zfs"; }; age.secrets."passwords/services/gitlab-runner/registration" = { - file = ../../../secrets/passwords/services/gitlab-runner/registration.age; + file = ../../../../secrets/passwords/services/gitlab-runner/registration.age; }; }; } diff --git a/modules/services/grafana/default.nix b/modules/nixos/services/grafana/default.nix similarity index 93% rename from modules/services/grafana/default.nix rename to modules/nixos/services/grafana/default.nix index 4095fd32..fb9d845c 100644 --- a/modules/services/grafana/default.nix +++ b/modules/nixos/services/grafana/default.nix @@ -82,15 +82,15 @@ }; }; age.secrets."passwords/services/grafana/smtp" = { - file = ../../../secrets/passwords/services/grafana/smtp.age; + file = ../../../../secrets/passwords/services/grafana/smtp.age; owner = "grafana"; }; 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"; }; 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"; }; }; diff --git a/modules/services/mail/default.nix b/modules/nixos/services/mail/default.nix similarity index 89% rename from modules/services/mail/default.nix rename to modules/nixos/services/mail/default.nix index 216f7959..04bb2660 100644 --- a/modules/services/mail/default.nix +++ b/modules/nixos/services/mail/default.nix @@ -152,15 +152,15 @@ in ''; age.secrets = { - "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/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/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/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/webmaster@vanpetegem.be".file = ../../../secrets/passwords/services/mail/webmaster_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/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/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/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/webmaster@vanpetegem.be".file = ../../../../secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age; }; }; } diff --git a/modules/services/mastodon/default.nix b/modules/nixos/services/mastodon/default.nix similarity index 87% rename from modules/services/mastodon/default.nix rename to modules/nixos/services/mastodon/default.nix index 46d98078..debdc07a 100644 --- a/modules/services/mastodon/default.nix +++ b/modules/nixos/services/mastodon/default.nix @@ -56,19 +56,19 @@ }; 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"; }; 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"; }; age.secrets."passwords/services/mastodon/key" = { - file = ../../../secrets/passwords/services/mastodon/key.age; + file = ../../../../secrets/passwords/services/mastodon/key.age; owner = "mastodon"; }; age.secrets."passwords/services/mastodon/otp" = { - file = ../../../secrets/passwords/services/mastodon/otp.age; + file = ../../../../secrets/passwords/services/mastodon/otp.age; owner = "mastodon"; }; }; diff --git a/modules/services/matrix/default.nix b/modules/nixos/services/matrix/default.nix similarity index 88% rename from modules/services/matrix/default.nix rename to modules/nixos/services/matrix/default.nix index 82bd22be..716ff53d 100644 --- a/modules/services/matrix/default.nix +++ b/modules/nixos/services/matrix/default.nix @@ -180,50 +180,50 @@ }; 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"; }; 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"; }; 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"; }; 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"; }; age.secrets."files/services/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"; }; 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"; }; 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"; }; 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"; }; 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"; }; 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"; }; 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"; }; - 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; }; } diff --git a/modules/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix similarity index 96% rename from modules/services/nextcloud/default.nix rename to modules/nixos/services/nextcloud/default.nix index 6b8e6807..e74cb93c 100644 --- a/modules/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -55,7 +55,7 @@ }; }; age.secrets."passwords/services/nextcloud-admin" = { - file = ../../../secrets/passwords/services/nextcloud-admin.age; + file = ../../../../secrets/passwords/services/nextcloud-admin.age; owner = "nextcloud"; }; systemd.services."nextcloud-setup" = { diff --git a/modules/services/nginx/default.nix b/modules/nixos/services/nginx/default.nix similarity index 97% rename from modules/services/nginx/default.nix rename to modules/nixos/services/nginx/default.nix index 849676fa..5cb78694 100644 --- a/modules/services/nginx/default.nix +++ b/modules/nixos/services/nginx/default.nix @@ -50,7 +50,7 @@ preliminarySelfsigned = false; }; age.secrets."passwords/services/acme" = { - file = ../../../secrets/passwords/services/acme.age; + file = ../../../../secrets/passwords/services/acme.age; owner = "acme"; }; chvp.base.zfs.systemLinks = [ diff --git a/modules/services/torrents/default.nix b/modules/nixos/services/torrents/default.nix similarity index 93% rename from modules/services/torrents/default.nix rename to modules/nixos/services/torrents/default.nix index b9e1c460..3e990f99 100644 --- a/modules/services/torrents/default.nix +++ b/modules/nixos/services/torrents/default.nix @@ -34,7 +34,7 @@ }; }; 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"; }; };