From 82821bcc3f42c20b22d6703aed7f4161f5b54d27 Mon Sep 17 00:00:00 2001 From: MrSnowy Date: Thu, 29 Jan 2026 21:15:25 +0100 Subject: [PATCH] Change folder structure --- default.nix | 6 +-- {desktop => hosts/desktop}/default.nix | 0 {desktop => hosts/desktop}/hjem-rum/snowy.nix | 0 .../hjem-rum/snowy/hypr/hyprland.conf | 0 .../desktop}/hjem-rum/snowy/mpv/mpv.conf | 0 .../desktop}/hjem-rum/snowy/stow.sh | 0 .../desktop}/system/configuration.nix | 0 .../system/hardware-configuration.nix | 0 .../desktop}/system/networking.nix | 0 .../desktop}/system/services.nix | 0 .../home-server}/default.nix | 0 .../home-server}/home-manager/apps/fish.nix | 0 .../home-server}/home-manager/user.nix | 0 {home-server => hosts/home-server}/justfile | 0 {home-server => hosts/home-server}/ports.nix | 0 .../home-server}/system/configuration.nix | 0 .../system/hardware-configuration.nix | 0 .../home-server}/system/network.nix | 0 .../home-server}/system/services.nix | 0 .../server}/containers/default.nix | 0 .../server}/containers/nixos-mailserver.nix | 0 {server => hosts/server}/default.nix | 0 .../server}/home-manager/apps/fastfetch.nix | 0 .../server}/home-manager/apps/fish.nix | 0 .../server}/home-manager/apps/helix.nix | 0 .../server}/home-manager/snow.nix | 0 {server => hosts/server}/services/caddy.nix | 0 {server => hosts/server}/services/default.nix | 0 {server => hosts/server}/services/garage.nix | 0 {server => hosts/server}/services/incus.nix | 0 hosts/server/services/postgres.nix | 50 +++++++++++++++++++ {server => hosts/server}/services/random.nix | 0 .../server}/system/configuration.nix | 0 .../server}/system/hardware-configuration.nix | 0 {server => hosts/server}/system/network.nix | 0 {server => hosts/server}/system/ports.nix | 3 +- 36 files changed, 55 insertions(+), 4 deletions(-) rename {desktop => hosts/desktop}/default.nix (100%) rename {desktop => hosts/desktop}/hjem-rum/snowy.nix (100%) rename {desktop => hosts/desktop}/hjem-rum/snowy/hypr/hyprland.conf (100%) rename {desktop => hosts/desktop}/hjem-rum/snowy/mpv/mpv.conf (100%) rename {desktop => hosts/desktop}/hjem-rum/snowy/stow.sh (100%) rename {desktop => hosts/desktop}/system/configuration.nix (100%) rename {desktop => hosts/desktop}/system/hardware-configuration.nix (100%) rename {desktop => hosts/desktop}/system/networking.nix (100%) rename {desktop => hosts/desktop}/system/services.nix (100%) rename {home-server => hosts/home-server}/default.nix (100%) rename {home-server => hosts/home-server}/home-manager/apps/fish.nix (100%) rename {home-server => hosts/home-server}/home-manager/user.nix (100%) rename {home-server => hosts/home-server}/justfile (100%) rename {home-server => hosts/home-server}/ports.nix (100%) rename {home-server => hosts/home-server}/system/configuration.nix (100%) rename {home-server => hosts/home-server}/system/hardware-configuration.nix (100%) rename {home-server => hosts/home-server}/system/network.nix (100%) rename {home-server => hosts/home-server}/system/services.nix (100%) rename {server => hosts/server}/containers/default.nix (100%) rename {server => hosts/server}/containers/nixos-mailserver.nix (100%) rename {server => hosts/server}/default.nix (100%) rename {server => hosts/server}/home-manager/apps/fastfetch.nix (100%) rename {server => hosts/server}/home-manager/apps/fish.nix (100%) rename {server => hosts/server}/home-manager/apps/helix.nix (100%) rename {server => hosts/server}/home-manager/snow.nix (100%) rename {server => hosts/server}/services/caddy.nix (100%) rename {server => hosts/server}/services/default.nix (100%) rename {server => hosts/server}/services/garage.nix (100%) rename {server => hosts/server}/services/incus.nix (100%) create mode 100644 hosts/server/services/postgres.nix rename {server => hosts/server}/services/random.nix (100%) rename {server => hosts/server}/system/configuration.nix (100%) rename {server => hosts/server}/system/hardware-configuration.nix (100%) rename {server => hosts/server}/system/network.nix (100%) rename {server => hosts/server}/system/ports.nix (94%) diff --git a/default.nix b/default.nix index 9d5ca1b..c80d3e4 100644 --- a/default.nix +++ b/default.nix @@ -41,7 +41,7 @@ in }; modules = [ - ./desktop/default.nix + ./hosts/desktop/default.nix ]; }; @@ -59,7 +59,7 @@ in }; modules = [ - ./home-server/default.nix + ./hosts/home-server/default.nix ]; }; @@ -80,7 +80,7 @@ in }; modules = [ - ./server/default.nix + ./hosts/server/default.nix ]; }; }; diff --git a/desktop/default.nix b/hosts/desktop/default.nix similarity index 100% rename from desktop/default.nix rename to hosts/desktop/default.nix diff --git a/desktop/hjem-rum/snowy.nix b/hosts/desktop/hjem-rum/snowy.nix similarity index 100% rename from desktop/hjem-rum/snowy.nix rename to hosts/desktop/hjem-rum/snowy.nix diff --git a/desktop/hjem-rum/snowy/hypr/hyprland.conf b/hosts/desktop/hjem-rum/snowy/hypr/hyprland.conf similarity index 100% rename from desktop/hjem-rum/snowy/hypr/hyprland.conf rename to hosts/desktop/hjem-rum/snowy/hypr/hyprland.conf diff --git a/desktop/hjem-rum/snowy/mpv/mpv.conf b/hosts/desktop/hjem-rum/snowy/mpv/mpv.conf similarity index 100% rename from desktop/hjem-rum/snowy/mpv/mpv.conf rename to hosts/desktop/hjem-rum/snowy/mpv/mpv.conf diff --git a/desktop/hjem-rum/snowy/stow.sh b/hosts/desktop/hjem-rum/snowy/stow.sh similarity index 100% rename from desktop/hjem-rum/snowy/stow.sh rename to hosts/desktop/hjem-rum/snowy/stow.sh diff --git a/desktop/system/configuration.nix b/hosts/desktop/system/configuration.nix similarity index 100% rename from desktop/system/configuration.nix rename to hosts/desktop/system/configuration.nix diff --git a/desktop/system/hardware-configuration.nix b/hosts/desktop/system/hardware-configuration.nix similarity index 100% rename from desktop/system/hardware-configuration.nix rename to hosts/desktop/system/hardware-configuration.nix diff --git a/desktop/system/networking.nix b/hosts/desktop/system/networking.nix similarity index 100% rename from desktop/system/networking.nix rename to hosts/desktop/system/networking.nix diff --git a/desktop/system/services.nix b/hosts/desktop/system/services.nix similarity index 100% rename from desktop/system/services.nix rename to hosts/desktop/system/services.nix diff --git a/home-server/default.nix b/hosts/home-server/default.nix similarity index 100% rename from home-server/default.nix rename to hosts/home-server/default.nix diff --git a/home-server/home-manager/apps/fish.nix b/hosts/home-server/home-manager/apps/fish.nix similarity index 100% rename from home-server/home-manager/apps/fish.nix rename to hosts/home-server/home-manager/apps/fish.nix diff --git a/home-server/home-manager/user.nix b/hosts/home-server/home-manager/user.nix similarity index 100% rename from home-server/home-manager/user.nix rename to hosts/home-server/home-manager/user.nix diff --git a/home-server/justfile b/hosts/home-server/justfile similarity index 100% rename from home-server/justfile rename to hosts/home-server/justfile diff --git a/home-server/ports.nix b/hosts/home-server/ports.nix similarity index 100% rename from home-server/ports.nix rename to hosts/home-server/ports.nix diff --git a/home-server/system/configuration.nix b/hosts/home-server/system/configuration.nix similarity index 100% rename from home-server/system/configuration.nix rename to hosts/home-server/system/configuration.nix diff --git a/home-server/system/hardware-configuration.nix b/hosts/home-server/system/hardware-configuration.nix similarity index 100% rename from home-server/system/hardware-configuration.nix rename to hosts/home-server/system/hardware-configuration.nix diff --git a/home-server/system/network.nix b/hosts/home-server/system/network.nix similarity index 100% rename from home-server/system/network.nix rename to hosts/home-server/system/network.nix diff --git a/home-server/system/services.nix b/hosts/home-server/system/services.nix similarity index 100% rename from home-server/system/services.nix rename to hosts/home-server/system/services.nix diff --git a/server/containers/default.nix b/hosts/server/containers/default.nix similarity index 100% rename from server/containers/default.nix rename to hosts/server/containers/default.nix diff --git a/server/containers/nixos-mailserver.nix b/hosts/server/containers/nixos-mailserver.nix similarity index 100% rename from server/containers/nixos-mailserver.nix rename to hosts/server/containers/nixos-mailserver.nix diff --git a/server/default.nix b/hosts/server/default.nix similarity index 100% rename from server/default.nix rename to hosts/server/default.nix diff --git a/server/home-manager/apps/fastfetch.nix b/hosts/server/home-manager/apps/fastfetch.nix similarity index 100% rename from server/home-manager/apps/fastfetch.nix rename to hosts/server/home-manager/apps/fastfetch.nix diff --git a/server/home-manager/apps/fish.nix b/hosts/server/home-manager/apps/fish.nix similarity index 100% rename from server/home-manager/apps/fish.nix rename to hosts/server/home-manager/apps/fish.nix diff --git a/server/home-manager/apps/helix.nix b/hosts/server/home-manager/apps/helix.nix similarity index 100% rename from server/home-manager/apps/helix.nix rename to hosts/server/home-manager/apps/helix.nix diff --git a/server/home-manager/snow.nix b/hosts/server/home-manager/snow.nix similarity index 100% rename from server/home-manager/snow.nix rename to hosts/server/home-manager/snow.nix diff --git a/server/services/caddy.nix b/hosts/server/services/caddy.nix similarity index 100% rename from server/services/caddy.nix rename to hosts/server/services/caddy.nix diff --git a/server/services/default.nix b/hosts/server/services/default.nix similarity index 100% rename from server/services/default.nix rename to hosts/server/services/default.nix diff --git a/server/services/garage.nix b/hosts/server/services/garage.nix similarity index 100% rename from server/services/garage.nix rename to hosts/server/services/garage.nix diff --git a/server/services/incus.nix b/hosts/server/services/incus.nix similarity index 100% rename from server/services/incus.nix rename to hosts/server/services/incus.nix diff --git a/hosts/server/services/postgres.nix b/hosts/server/services/postgres.nix new file mode 100644 index 0000000..68eb9ad --- /dev/null +++ b/hosts/server/services/postgres.nix @@ -0,0 +1,50 @@ +{ + config, + pkgs, + ... +}: + +{ + services = { + postgresql = { + enable = true; + package = pkgs.postgresql_18; + enableTCPIP = false; + + settings = { + port = config.ports.postgres; + }; + + ensureDatabases = [ "ente_db" ]; + ensureUsers = [ + { + name = "ente"; + ensureClauses = { + login = true; + }; + } + ]; + + authentication = pkgs.lib.mkOverride 10 '' + #type database user auth-method [auth-options] + local all postgres trust + + #type database user address auth-method [auth-options] + host ente_db ente localhost scram-sha-256 + ''; + + initialScript = config.sops.secrets.postgres_sql.path; + }; + + postgresqlBackup = { + enable = true; + backupAll = true; + + location = "/var/backup/postgresql"; + + compression = "zstd"; + compressionLevel = 19; + }; + }; + +} diff --git a/server/services/random.nix b/hosts/server/services/random.nix similarity index 100% rename from server/services/random.nix rename to hosts/server/services/random.nix diff --git a/server/system/configuration.nix b/hosts/server/system/configuration.nix similarity index 100% rename from server/system/configuration.nix rename to hosts/server/system/configuration.nix diff --git a/server/system/hardware-configuration.nix b/hosts/server/system/hardware-configuration.nix similarity index 100% rename from server/system/hardware-configuration.nix rename to hosts/server/system/hardware-configuration.nix diff --git a/server/system/network.nix b/hosts/server/system/network.nix similarity index 100% rename from server/system/network.nix rename to hosts/server/system/network.nix diff --git a/server/system/ports.nix b/hosts/server/system/ports.nix similarity index 94% rename from server/system/ports.nix rename to hosts/server/system/ports.nix index 75ec966..958eebe 100644 --- a/server/system/ports.nix +++ b/hosts/server/system/ports.nix @@ -1,5 +1,5 @@ # All http ports -{ lib, config, ... }: +{ lib, ... }: { options.ports = lib.mkOption { @@ -34,6 +34,7 @@ syncthing = 3020; headscale = 3443; + postgres = 5432; incus = 8444; }; }; -- 2.51.2