From d402b1c80661df2864f168d913afee09bc0256ab Mon Sep 17 00:00:00 2001 From: jimjam4real Date: Mon, 23 Sep 2024 11:41:28 -0400 Subject: [PATCH] Update references and folder names --- flake.lock | 150 +++++++++--------- flake.nix | 24 +-- {nixos => system}/base.nix | 2 +- {nixos => system}/desktop.nix | 0 {nixos => system}/desktop/bluetooth.nix | 0 {nixos => system}/desktop/firewall.nix | 0 {nixos => system}/desktop/fonts.nix | 0 {nixos => system}/desktop/gaming.nix | 0 {nixos => system}/desktop/greetd-sway.nix | 0 {nixos => system}/desktop/misc.nix | 0 {nixos => system}/desktop/pipewire.nix | 0 {nixos => system}/desktop/printing.nix | 0 {nixos => system}/desktop/qt.nix | 0 {nixos => system}/desktop/school.nix | 0 {nixos => system}/desktop/sway.nix | 0 {nixos => system}/desktop/wayland.nix | 0 {nixos => system}/hardware/extlinux.nix | 0 .../hardware/machines/desktop.nix | 0 .../hardware/machines/lenovo.nix | 0 .../hardware/machines/pinebook.nix | 0 .../hardware/machines/server.nix | 0 {nixos => system}/hardware/mackeys.nix | 0 {nixos => system}/hardware/nouveau.nix | 0 {nixos => system}/hardware/nvidia.nix | 0 {nixos => system}/hardware/opengl.nix | 0 {nixos => system}/hardware/systemdboot.nix | 0 {nixos => system}/hardware/wireless.nix | 0 {nixos => system}/lenovo.nix | 0 {nixos => system}/modules/gpg.nix | 0 {nixos => system}/modules/ips.nix | 0 {nixos => system}/modules/legacy.nix | 0 {nixos => system}/modules/networking.nix | 0 {nixos => system}/modules/security.nix | 0 {nixos => system}/pinebook.nix | 0 {nixos => system}/server.nix | 0 {nixos => system}/server/acme.nix | 0 {nixos => system}/server/archived/adguard.nix | 0 {nixos => system}/server/archived/gitea.nix | 0 .../server/archived/pufferpanel.nix | 0 {nixos => system}/server/coturn.nix | 0 {nixos => system}/server/ddclient.nix | 0 {nixos => system}/server/element.nix | 0 {nixos => system}/server/firewall.nix | 0 {nixos => system}/server/forgejo.nix | 0 {nixos => system}/server/icecast.nix | 0 {nixos => system}/server/lemmy.nix | 0 {nixos => system}/server/mailserver.nix | 0 {nixos => system}/server/mariadb.nix | 0 {nixos => system}/server/mastodon.nix | 0 {nixos => system}/server/matrix-discord.nix | 0 {nixos => system}/server/minecraft/common.nix | 0 .../server/minecraft/default.nix | 0 .../server/minecraft/essentialsconfig.yml | 0 .../server/minecraft/servers/blockworld.nix | 0 .../minecraft/servers/dewdemolisher.nix | 0 .../server/minecraft/servers/johnside.nix | 0 .../server/minecraft/servers/uberbeta.nix | 0 .../server/minecraft/servers/velocity.nix | 0 .../server/minecraft/vcserver.properties | 0 {nixos => system}/server/misc.nix | 0 {nixos => system}/server/nextcloud.nix | 0 {nixos => system}/server/nfs.nix | 0 {nixos => system}/server/nginx.nix | 0 {nixos => system}/server/owncast.nix | 0 {nixos => system}/server/photoprism.nix | 0 {nixos => system}/server/pixelfed.nix | 0 {nixos => system}/server/samba.nix | 0 {nixos => system}/server/synapse.nix | 0 {nixos => system}/server/transmission.nix | 0 {nixos => system}/server/vaultwarden.nix | 0 {nixos => system}/server/wireguard.nix | 0 {nixos => system}/services/globalprotect.nix | 0 {nixos => system}/services/mpd.nix | 0 {nixos => system}/services/openssh.nix | 0 {nixos => system}/services/sunshine.nix | 0 {nixos => system}/services/udev.nix | 0 {nixos => system}/services/virtualisation.nix | 0 {nixos => system}/users/groups.nix | 0 {nixos => system}/users/jimbo.nix | 0 {nixos => system}/users/liquidsoap.nix | 0 {nixos => system}/users/nextcloud.nix | 0 {nixos => system}/users/nginx.nix | 0 82 files changed, 88 insertions(+), 88 deletions(-) rename {nixos => system}/base.nix (97%) rename {nixos => system}/desktop.nix (100%) rename {nixos => system}/desktop/bluetooth.nix (100%) rename {nixos => system}/desktop/firewall.nix (100%) rename {nixos => system}/desktop/fonts.nix (100%) rename {nixos => system}/desktop/gaming.nix (100%) rename {nixos => system}/desktop/greetd-sway.nix (100%) rename {nixos => system}/desktop/misc.nix (100%) rename {nixos => system}/desktop/pipewire.nix (100%) rename {nixos => system}/desktop/printing.nix (100%) rename {nixos => system}/desktop/qt.nix (100%) rename {nixos => system}/desktop/school.nix (100%) rename {nixos => system}/desktop/sway.nix (100%) rename {nixos => system}/desktop/wayland.nix (100%) rename {nixos => system}/hardware/extlinux.nix (100%) rename {nixos => system}/hardware/machines/desktop.nix (100%) rename {nixos => system}/hardware/machines/lenovo.nix (100%) rename {nixos => system}/hardware/machines/pinebook.nix (100%) rename {nixos => system}/hardware/machines/server.nix (100%) rename {nixos => system}/hardware/mackeys.nix (100%) rename {nixos => system}/hardware/nouveau.nix (100%) rename {nixos => system}/hardware/nvidia.nix (100%) rename {nixos => system}/hardware/opengl.nix (100%) rename {nixos => system}/hardware/systemdboot.nix (100%) rename {nixos => system}/hardware/wireless.nix (100%) rename {nixos => system}/lenovo.nix (100%) rename {nixos => system}/modules/gpg.nix (100%) rename {nixos => system}/modules/ips.nix (100%) rename {nixos => system}/modules/legacy.nix (100%) rename {nixos => system}/modules/networking.nix (100%) rename {nixos => system}/modules/security.nix (100%) rename {nixos => system}/pinebook.nix (100%) rename {nixos => system}/server.nix (100%) rename {nixos => system}/server/acme.nix (100%) rename {nixos => system}/server/archived/adguard.nix (100%) rename {nixos => system}/server/archived/gitea.nix (100%) rename {nixos => system}/server/archived/pufferpanel.nix (100%) rename {nixos => system}/server/coturn.nix (100%) rename {nixos => system}/server/ddclient.nix (100%) rename {nixos => system}/server/element.nix (100%) rename {nixos => system}/server/firewall.nix (100%) rename {nixos => system}/server/forgejo.nix (100%) rename {nixos => system}/server/icecast.nix (100%) rename {nixos => system}/server/lemmy.nix (100%) rename {nixos => system}/server/mailserver.nix (100%) rename {nixos => system}/server/mariadb.nix (100%) rename {nixos => system}/server/mastodon.nix (100%) rename {nixos => system}/server/matrix-discord.nix (100%) rename {nixos => system}/server/minecraft/common.nix (100%) rename {nixos => system}/server/minecraft/default.nix (100%) rename {nixos => system}/server/minecraft/essentialsconfig.yml (100%) rename {nixos => system}/server/minecraft/servers/blockworld.nix (100%) rename {nixos => system}/server/minecraft/servers/dewdemolisher.nix (100%) rename {nixos => system}/server/minecraft/servers/johnside.nix (100%) rename {nixos => system}/server/minecraft/servers/uberbeta.nix (100%) rename {nixos => system}/server/minecraft/servers/velocity.nix (100%) rename {nixos => system}/server/minecraft/vcserver.properties (100%) rename {nixos => system}/server/misc.nix (100%) rename {nixos => system}/server/nextcloud.nix (100%) rename {nixos => system}/server/nfs.nix (100%) rename {nixos => system}/server/nginx.nix (100%) rename {nixos => system}/server/owncast.nix (100%) rename {nixos => system}/server/photoprism.nix (100%) rename {nixos => system}/server/pixelfed.nix (100%) rename {nixos => system}/server/samba.nix (100%) rename {nixos => system}/server/synapse.nix (100%) rename {nixos => system}/server/transmission.nix (100%) rename {nixos => system}/server/vaultwarden.nix (100%) rename {nixos => system}/server/wireguard.nix (100%) rename {nixos => system}/services/globalprotect.nix (100%) rename {nixos => system}/services/mpd.nix (100%) rename {nixos => system}/services/openssh.nix (100%) rename {nixos => system}/services/sunshine.nix (100%) rename {nixos => system}/services/udev.nix (100%) rename {nixos => system}/services/virtualisation.nix (100%) rename {nixos => system}/users/groups.nix (100%) rename {nixos => system}/users/jimbo.nix (100%) rename {nixos => system}/users/liquidsoap.nix (100%) rename {nixos => system}/users/nextcloud.nix (100%) rename {nixos => system}/users/nginx.nix (100%) diff --git a/flake.lock b/flake.lock index 40bcd57..a9dd01e 100644 --- a/flake.lock +++ b/flake.lock @@ -34,22 +34,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -65,9 +49,25 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1681202837, @@ -83,6 +83,22 @@ "type": "github" } }, + "hardware": { + "locked": { + "lastModified": 1727040444, + "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", + "owner": "nixos", + "repo": "nixos-hardware", + "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -104,47 +120,11 @@ "type": "github" } }, - "nix-minecraft": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1726018847, - "narHash": "sha256-SlpqtkR14V/i7CHtUDjyehAhgveWsKxrCE5YljMN/To=", - "owner": "Infinidoge", - "repo": "nix-minecraft", - "rev": "783231eb68665c0174f6bc12d4554a05fbb9f149", - "type": "github" - }, - "original": { - "owner": "Infinidoge", - "repo": "nix-minecraft", - "type": "github" - } - }, - "nixos-hardware": { - "locked": { - "lastModified": 1725885300, - "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", - "owner": "nixos", - "repo": "nixos-hardware", - "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixos-hardware", - "type": "github" - } - }, - "nixos-mailserver": { + "mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_3", + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs_2", "nixpkgs-24_05": "nixpkgs-24_05", "utils": "utils" }, @@ -163,6 +143,26 @@ "type": "gitlab" } }, + "minecraft": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1727055965, + "narHash": "sha256-AwuP8GjQzN25rXCYaTd+oVmHw//ZcQrNB0ecg6EkM+c=", + "owner": "Infinidoge", + "repo": "nix-minecraft", + "rev": "854f1325faccc24f37c8e791b34937f99b7fec39", + "type": "github" + }, + "original": { + "owner": "Infinidoge", + "repo": "nix-minecraft", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1722221733, @@ -209,6 +209,21 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1715266358, "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", @@ -224,21 +239,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1717602782, - "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "nixpkgs_4": { "locked": { "lastModified": 1725930920, @@ -273,10 +273,10 @@ "root": { "inputs": { "blender-bin": "blender-bin", + "hardware": "hardware", "home-manager": "home-manager", - "nix-minecraft": "nix-minecraft", - "nixos-hardware": "nixos-hardware", - "nixos-mailserver": "nixos-mailserver", + "mailserver": "mailserver", + "minecraft": "minecraft", "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur" @@ -314,7 +314,7 @@ }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1709126324, diff --git a/flake.nix b/flake.nix index d8554d3..c1361de 100644 --- a/flake.nix +++ b/flake.nix @@ -6,10 +6,10 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nur.url = "github:nix-community/NUR"; - nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; + mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.8.tar.gz"; - nix-minecraft.url = "github:Infinidoge/nix-minecraft"; - nixos-hardware.url = "github:nixos/nixos-hardware/master"; + minecraft.url = "github:Infinidoge/nix-minecraft"; + hardware.url = "github:nixos/nixos-hardware/master"; # Home manager home-manager = { @@ -23,9 +23,9 @@ nixpkgs, nixpkgs-unstable, nur, - nixos-mailserver, + mailserver, blender-bin, - nixos-hardware, + hardware, home-manager, ... } @inputs: let @@ -45,32 +45,32 @@ # Secrets defined so they can be accessed globally secrets = import ./secrets.nix; - # NixOS configuration entrypoint, use 'nixos-rebuild --flake .#your-hostname' + # NixOS configuration entrypointm use 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { JimDesktop = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [ - ./nixos/desktop.nix + ./system/desktop.nix ]; }; JimServer = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [ - ./nixos/server.nix - nixos-mailserver.nixosModule + ./system/server.nix + mailserver.nixosModule ]; }; JimPine = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [ - ./nixos/pinebook.nix - nixos-hardware.nixosModules.pine64-pinebook-pro + ./system/pinebook.nix + hardware.nixosModules.pine64-pinebook-pro ]; }; JimLenovo = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [ - ./nixos/lenovo.nix + ./system/lenovo.nix ]; }; }; diff --git a/nixos/base.nix b/system/base.nix similarity index 97% rename from nixos/base.nix rename to system/base.nix index 64494f9..bf85d16 100644 --- a/nixos/base.nix +++ b/system/base.nix @@ -13,7 +13,7 @@ outputs.overlays.selfsuper outputs.overlays.finalprev outputs.overlays.unstable-packages - inputs.nix-minecraft.overlay + inputs.minecraft.overlay ]; # Configure your nixpkgs instance diff --git a/nixos/desktop.nix b/system/desktop.nix similarity index 100% rename from nixos/desktop.nix rename to system/desktop.nix diff --git a/nixos/desktop/bluetooth.nix b/system/desktop/bluetooth.nix similarity index 100% rename from nixos/desktop/bluetooth.nix rename to system/desktop/bluetooth.nix diff --git a/nixos/desktop/firewall.nix b/system/desktop/firewall.nix similarity index 100% rename from nixos/desktop/firewall.nix rename to system/desktop/firewall.nix diff --git a/nixos/desktop/fonts.nix b/system/desktop/fonts.nix similarity index 100% rename from nixos/desktop/fonts.nix rename to system/desktop/fonts.nix diff --git a/nixos/desktop/gaming.nix b/system/desktop/gaming.nix similarity index 100% rename from nixos/desktop/gaming.nix rename to system/desktop/gaming.nix diff --git a/nixos/desktop/greetd-sway.nix b/system/desktop/greetd-sway.nix similarity index 100% rename from nixos/desktop/greetd-sway.nix rename to system/desktop/greetd-sway.nix diff --git a/nixos/desktop/misc.nix b/system/desktop/misc.nix similarity index 100% rename from nixos/desktop/misc.nix rename to system/desktop/misc.nix diff --git a/nixos/desktop/pipewire.nix b/system/desktop/pipewire.nix similarity index 100% rename from nixos/desktop/pipewire.nix rename to system/desktop/pipewire.nix diff --git a/nixos/desktop/printing.nix b/system/desktop/printing.nix similarity index 100% rename from nixos/desktop/printing.nix rename to system/desktop/printing.nix diff --git a/nixos/desktop/qt.nix b/system/desktop/qt.nix similarity index 100% rename from nixos/desktop/qt.nix rename to system/desktop/qt.nix diff --git a/nixos/desktop/school.nix b/system/desktop/school.nix similarity index 100% rename from nixos/desktop/school.nix rename to system/desktop/school.nix diff --git a/nixos/desktop/sway.nix b/system/desktop/sway.nix similarity index 100% rename from nixos/desktop/sway.nix rename to system/desktop/sway.nix diff --git a/nixos/desktop/wayland.nix b/system/desktop/wayland.nix similarity index 100% rename from nixos/desktop/wayland.nix rename to system/desktop/wayland.nix diff --git a/nixos/hardware/extlinux.nix b/system/hardware/extlinux.nix similarity index 100% rename from nixos/hardware/extlinux.nix rename to system/hardware/extlinux.nix diff --git a/nixos/hardware/machines/desktop.nix b/system/hardware/machines/desktop.nix similarity index 100% rename from nixos/hardware/machines/desktop.nix rename to system/hardware/machines/desktop.nix diff --git a/nixos/hardware/machines/lenovo.nix b/system/hardware/machines/lenovo.nix similarity index 100% rename from nixos/hardware/machines/lenovo.nix rename to system/hardware/machines/lenovo.nix diff --git a/nixos/hardware/machines/pinebook.nix b/system/hardware/machines/pinebook.nix similarity index 100% rename from nixos/hardware/machines/pinebook.nix rename to system/hardware/machines/pinebook.nix diff --git a/nixos/hardware/machines/server.nix b/system/hardware/machines/server.nix similarity index 100% rename from nixos/hardware/machines/server.nix rename to system/hardware/machines/server.nix diff --git a/nixos/hardware/mackeys.nix b/system/hardware/mackeys.nix similarity index 100% rename from nixos/hardware/mackeys.nix rename to system/hardware/mackeys.nix diff --git a/nixos/hardware/nouveau.nix b/system/hardware/nouveau.nix similarity index 100% rename from nixos/hardware/nouveau.nix rename to system/hardware/nouveau.nix diff --git a/nixos/hardware/nvidia.nix b/system/hardware/nvidia.nix similarity index 100% rename from nixos/hardware/nvidia.nix rename to system/hardware/nvidia.nix diff --git a/nixos/hardware/opengl.nix b/system/hardware/opengl.nix similarity index 100% rename from nixos/hardware/opengl.nix rename to system/hardware/opengl.nix diff --git a/nixos/hardware/systemdboot.nix b/system/hardware/systemdboot.nix similarity index 100% rename from nixos/hardware/systemdboot.nix rename to system/hardware/systemdboot.nix diff --git a/nixos/hardware/wireless.nix b/system/hardware/wireless.nix similarity index 100% rename from nixos/hardware/wireless.nix rename to system/hardware/wireless.nix diff --git a/nixos/lenovo.nix b/system/lenovo.nix similarity index 100% rename from nixos/lenovo.nix rename to system/lenovo.nix diff --git a/nixos/modules/gpg.nix b/system/modules/gpg.nix similarity index 100% rename from nixos/modules/gpg.nix rename to system/modules/gpg.nix diff --git a/nixos/modules/ips.nix b/system/modules/ips.nix similarity index 100% rename from nixos/modules/ips.nix rename to system/modules/ips.nix diff --git a/nixos/modules/legacy.nix b/system/modules/legacy.nix similarity index 100% rename from nixos/modules/legacy.nix rename to system/modules/legacy.nix diff --git a/nixos/modules/networking.nix b/system/modules/networking.nix similarity index 100% rename from nixos/modules/networking.nix rename to system/modules/networking.nix diff --git a/nixos/modules/security.nix b/system/modules/security.nix similarity index 100% rename from nixos/modules/security.nix rename to system/modules/security.nix diff --git a/nixos/pinebook.nix b/system/pinebook.nix similarity index 100% rename from nixos/pinebook.nix rename to system/pinebook.nix diff --git a/nixos/server.nix b/system/server.nix similarity index 100% rename from nixos/server.nix rename to system/server.nix diff --git a/nixos/server/acme.nix b/system/server/acme.nix similarity index 100% rename from nixos/server/acme.nix rename to system/server/acme.nix diff --git a/nixos/server/archived/adguard.nix b/system/server/archived/adguard.nix similarity index 100% rename from nixos/server/archived/adguard.nix rename to system/server/archived/adguard.nix diff --git a/nixos/server/archived/gitea.nix b/system/server/archived/gitea.nix similarity index 100% rename from nixos/server/archived/gitea.nix rename to system/server/archived/gitea.nix diff --git a/nixos/server/archived/pufferpanel.nix b/system/server/archived/pufferpanel.nix similarity index 100% rename from nixos/server/archived/pufferpanel.nix rename to system/server/archived/pufferpanel.nix diff --git a/nixos/server/coturn.nix b/system/server/coturn.nix similarity index 100% rename from nixos/server/coturn.nix rename to system/server/coturn.nix diff --git a/nixos/server/ddclient.nix b/system/server/ddclient.nix similarity index 100% rename from nixos/server/ddclient.nix rename to system/server/ddclient.nix diff --git a/nixos/server/element.nix b/system/server/element.nix similarity index 100% rename from nixos/server/element.nix rename to system/server/element.nix diff --git a/nixos/server/firewall.nix b/system/server/firewall.nix similarity index 100% rename from nixos/server/firewall.nix rename to system/server/firewall.nix diff --git a/nixos/server/forgejo.nix b/system/server/forgejo.nix similarity index 100% rename from nixos/server/forgejo.nix rename to system/server/forgejo.nix diff --git a/nixos/server/icecast.nix b/system/server/icecast.nix similarity index 100% rename from nixos/server/icecast.nix rename to system/server/icecast.nix diff --git a/nixos/server/lemmy.nix b/system/server/lemmy.nix similarity index 100% rename from nixos/server/lemmy.nix rename to system/server/lemmy.nix diff --git a/nixos/server/mailserver.nix b/system/server/mailserver.nix similarity index 100% rename from nixos/server/mailserver.nix rename to system/server/mailserver.nix diff --git a/nixos/server/mariadb.nix b/system/server/mariadb.nix similarity index 100% rename from nixos/server/mariadb.nix rename to system/server/mariadb.nix diff --git a/nixos/server/mastodon.nix b/system/server/mastodon.nix similarity index 100% rename from nixos/server/mastodon.nix rename to system/server/mastodon.nix diff --git a/nixos/server/matrix-discord.nix b/system/server/matrix-discord.nix similarity index 100% rename from nixos/server/matrix-discord.nix rename to system/server/matrix-discord.nix diff --git a/nixos/server/minecraft/common.nix b/system/server/minecraft/common.nix similarity index 100% rename from nixos/server/minecraft/common.nix rename to system/server/minecraft/common.nix diff --git a/nixos/server/minecraft/default.nix b/system/server/minecraft/default.nix similarity index 100% rename from nixos/server/minecraft/default.nix rename to system/server/minecraft/default.nix diff --git a/nixos/server/minecraft/essentialsconfig.yml b/system/server/minecraft/essentialsconfig.yml similarity index 100% rename from nixos/server/minecraft/essentialsconfig.yml rename to system/server/minecraft/essentialsconfig.yml diff --git a/nixos/server/minecraft/servers/blockworld.nix b/system/server/minecraft/servers/blockworld.nix similarity index 100% rename from nixos/server/minecraft/servers/blockworld.nix rename to system/server/minecraft/servers/blockworld.nix diff --git a/nixos/server/minecraft/servers/dewdemolisher.nix b/system/server/minecraft/servers/dewdemolisher.nix similarity index 100% rename from nixos/server/minecraft/servers/dewdemolisher.nix rename to system/server/minecraft/servers/dewdemolisher.nix diff --git a/nixos/server/minecraft/servers/johnside.nix b/system/server/minecraft/servers/johnside.nix similarity index 100% rename from nixos/server/minecraft/servers/johnside.nix rename to system/server/minecraft/servers/johnside.nix diff --git a/nixos/server/minecraft/servers/uberbeta.nix b/system/server/minecraft/servers/uberbeta.nix similarity index 100% rename from nixos/server/minecraft/servers/uberbeta.nix rename to system/server/minecraft/servers/uberbeta.nix diff --git a/nixos/server/minecraft/servers/velocity.nix b/system/server/minecraft/servers/velocity.nix similarity index 100% rename from nixos/server/minecraft/servers/velocity.nix rename to system/server/minecraft/servers/velocity.nix diff --git a/nixos/server/minecraft/vcserver.properties b/system/server/minecraft/vcserver.properties similarity index 100% rename from nixos/server/minecraft/vcserver.properties rename to system/server/minecraft/vcserver.properties diff --git a/nixos/server/misc.nix b/system/server/misc.nix similarity index 100% rename from nixos/server/misc.nix rename to system/server/misc.nix diff --git a/nixos/server/nextcloud.nix b/system/server/nextcloud.nix similarity index 100% rename from nixos/server/nextcloud.nix rename to system/server/nextcloud.nix diff --git a/nixos/server/nfs.nix b/system/server/nfs.nix similarity index 100% rename from nixos/server/nfs.nix rename to system/server/nfs.nix diff --git a/nixos/server/nginx.nix b/system/server/nginx.nix similarity index 100% rename from nixos/server/nginx.nix rename to system/server/nginx.nix diff --git a/nixos/server/owncast.nix b/system/server/owncast.nix similarity index 100% rename from nixos/server/owncast.nix rename to system/server/owncast.nix diff --git a/nixos/server/photoprism.nix b/system/server/photoprism.nix similarity index 100% rename from nixos/server/photoprism.nix rename to system/server/photoprism.nix diff --git a/nixos/server/pixelfed.nix b/system/server/pixelfed.nix similarity index 100% rename from nixos/server/pixelfed.nix rename to system/server/pixelfed.nix diff --git a/nixos/server/samba.nix b/system/server/samba.nix similarity index 100% rename from nixos/server/samba.nix rename to system/server/samba.nix diff --git a/nixos/server/synapse.nix b/system/server/synapse.nix similarity index 100% rename from nixos/server/synapse.nix rename to system/server/synapse.nix diff --git a/nixos/server/transmission.nix b/system/server/transmission.nix similarity index 100% rename from nixos/server/transmission.nix rename to system/server/transmission.nix diff --git a/nixos/server/vaultwarden.nix b/system/server/vaultwarden.nix similarity index 100% rename from nixos/server/vaultwarden.nix rename to system/server/vaultwarden.nix diff --git a/nixos/server/wireguard.nix b/system/server/wireguard.nix similarity index 100% rename from nixos/server/wireguard.nix rename to system/server/wireguard.nix diff --git a/nixos/services/globalprotect.nix b/system/services/globalprotect.nix similarity index 100% rename from nixos/services/globalprotect.nix rename to system/services/globalprotect.nix diff --git a/nixos/services/mpd.nix b/system/services/mpd.nix similarity index 100% rename from nixos/services/mpd.nix rename to system/services/mpd.nix diff --git a/nixos/services/openssh.nix b/system/services/openssh.nix similarity index 100% rename from nixos/services/openssh.nix rename to system/services/openssh.nix diff --git a/nixos/services/sunshine.nix b/system/services/sunshine.nix similarity index 100% rename from nixos/services/sunshine.nix rename to system/services/sunshine.nix diff --git a/nixos/services/udev.nix b/system/services/udev.nix similarity index 100% rename from nixos/services/udev.nix rename to system/services/udev.nix diff --git a/nixos/services/virtualisation.nix b/system/services/virtualisation.nix similarity index 100% rename from nixos/services/virtualisation.nix rename to system/services/virtualisation.nix diff --git a/nixos/users/groups.nix b/system/users/groups.nix similarity index 100% rename from nixos/users/groups.nix rename to system/users/groups.nix diff --git a/nixos/users/jimbo.nix b/system/users/jimbo.nix similarity index 100% rename from nixos/users/jimbo.nix rename to system/users/jimbo.nix diff --git a/nixos/users/liquidsoap.nix b/system/users/liquidsoap.nix similarity index 100% rename from nixos/users/liquidsoap.nix rename to system/users/liquidsoap.nix diff --git a/nixos/users/nextcloud.nix b/system/users/nextcloud.nix similarity index 100% rename from nixos/users/nextcloud.nix rename to system/users/nextcloud.nix diff --git a/nixos/users/nginx.nix b/system/users/nginx.nix similarity index 100% rename from nixos/users/nginx.nix rename to system/users/nginx.nix