From f277c78ac1825ebbc6977e7dea27bee0974a0084 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Fri, 1 Mar 2024 18:20:15 -0500
Subject: [PATCH] refactor: rename nas to nos

---
 common/default.nix                                            | 1 +
 devices/README.md                                             | 4 ++--
 devices/{nas => nos}/default.nix                              | 2 --
 devices/{nas => nos}/modules/arion/default.nix                | 0
 devices/{nas => nos}/modules/arion/forgejo/compose.nix        | 0
 .../{nas => nos}/modules/arion/forgejo/images/act_runner.nix  | 0
 devices/{nas => nos}/modules/arion/forgejo/images/forgejo.nix | 0
 .../{nas => nos}/modules/arion/forgejo/images/postgres.nix    | 0
 devices/{nas => nos}/modules/arion/freshrss/compose.nix       | 0
 .../modules/arion/freshrss/images/docker-hub-rss.nix          | 0
 .../{nas => nos}/modules/arion/freshrss/images/freshrss.nix   | 0
 .../{nas => nos}/modules/arion/freshrss/images/postgres.nix   | 0
 devices/{nas => nos}/modules/arion/gameyfin/compose.nix       | 0
 .../{nas => nos}/modules/arion/gameyfin/images/gameyfin.nix   | 0
 devices/{nas => nos}/modules/arion/hauk/compose.nix           | 0
 devices/{nas => nos}/modules/arion/hauk/config.php            | 0
 devices/{nas => nos}/modules/arion/hauk/images/hauk.nix       | 0
 devices/{nas => nos}/modules/arion/homepage/compose.nix       | 0
 .../{nas => nos}/modules/arion/homepage/images/homepage.nix   | 0
 devices/{nas => nos}/modules/arion/homepage/services.nix      | 0
 devices/{nas => nos}/modules/arion/immich/.env                | 0
 devices/{nas => nos}/modules/arion/immich/compose.nix         | 0
 .../modules/arion/immich/images/machine-learning.nix          | 0
 devices/{nas => nos}/modules/arion/immich/images/postgres.nix | 0
 devices/{nas => nos}/modules/arion/immich/images/redis.nix    | 0
 devices/{nas => nos}/modules/arion/immich/images/server.nix   | 0
 devices/{nas => nos}/modules/arion/lineageos/Caddyfile        | 0
 devices/{nas => nos}/modules/arion/lineageos/compose.nix      | 0
 .../modules/arion/lineageos/manifests/manifests.xml           | 0
 .../modules/arion/lineageos/manifests/roomservice.xml         | 0
 .../{nas => nos}/modules/arion/lineageos/scripts/before.sh    | 0
 devices/{nas => nos}/modules/arion/media/bazarr/compose.nix   | 0
 .../{nas => nos}/modules/arion/media/bazarr/images/bazarr.nix | 0
 devices/{nas => nos}/modules/arion/media/calibre/compose.nix  | 0
 .../modules/arion/media/calibre/images/calibre-web.nix        | 0
 .../modules/arion/media/calibre/images/calibre.nix            | 0
 devices/{nas => nos}/modules/arion/media/joal/compose.nix     | 0
 devices/{nas => nos}/modules/arion/media/joal/images/joal.nix | 0
 devices/{nas => nos}/modules/arion/media/prowlarr/compose.nix | 0
 .../modules/arion/media/prowlarr/images/flaresolverr.nix      | 0
 .../modules/arion/media/prowlarr/images/prowlarr.nix          | 0
 devices/{nas => nos}/modules/arion/media/radarr/compose.nix   | 0
 .../{nas => nos}/modules/arion/media/radarr/images/radarr.nix | 0
 devices/{nas => nos}/modules/arion/media/sabnzbd/compose.nix  | 0
 .../modules/arion/media/sabnzbd/images/sabnzbd.nix            | 0
 devices/{nas => nos}/modules/arion/media/seerr/compose.nix    | 0
 .../modules/arion/media/seerr/images/jellyseerr.nix           | 0
 devices/{nas => nos}/modules/arion/media/sonarr/compose.nix   | 0
 .../{nas => nos}/modules/arion/media/sonarr/images/sonarr.nix | 0
 devices/{nas => nos}/modules/arion/music/jbots/compose.nix    | 0
 .../modules/arion/music/jbots/images/jmusicbot.nix            | 0
 devices/{nas => nos}/modules/arion/nextcloud/compose.nix      | 0
 .../{nas => nos}/modules/arion/nextcloud/images/nextcloud.nix | 0
 devices/{nas => nos}/modules/arion/nextcloud/images/nginx.nix | 0
 .../modules/arion/nextcloud/images/onlyoffice.nix             | 0
 .../{nas => nos}/modules/arion/nextcloud/images/postgres.nix  | 0
 devices/{nas => nos}/modules/arion/nextcloud/images/redis.nix | 0
 devices/{nas => nos}/modules/arion/nextcloud/nginx.conf       | 0
 devices/{nas => nos}/modules/arion/resume/compose.nix         | 0
 devices/{nas => nos}/modules/arion/resume/images/postgres.nix | 0
 .../modules/arion/resume/images/resume-client.nix             | 0
 .../modules/arion/resume/images/resume-server.nix             | 0
 devices/{nas => nos}/modules/arion/vaultwarden/compose.nix    | 0
 .../modules/arion/vaultwarden/images/vaultwarden.nix          | 0
 devices/{nas => nos}/modules/arion/wg-easy/compose.nix        | 0
 devices/{nas => nos}/modules/arion/wg-easy/images/wg-easy.nix | 0
 devices/{nas => nos}/modules/mergerfs.nix                     | 0
 devices/{nas => nos}/modules/qbittorrent/default.nix          | 0
 devices/{nas => nos}/modules/qbittorrent/qbittorrent.nix      | 0
 devices/{nas => nos}/modules/qbittorrent/wireguard.nix        | 0
 devices/{nas => nos}/modules/snapraid.nix                     | 0
 devices/servivi/default.nix                                   | 3 ++-
 devices/{nas => servivi}/modules/nfs.nix                      | 1 -
 {devices/nas/modules => modules}/borgbackup.nix               | 2 ++
 74 files changed, 7 insertions(+), 6 deletions(-)
 rename devices/{nas => nos}/default.nix (68%)
 rename devices/{nas => nos}/modules/arion/default.nix (100%)
 rename devices/{nas => nos}/modules/arion/forgejo/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/forgejo/images/act_runner.nix (100%)
 rename devices/{nas => nos}/modules/arion/forgejo/images/forgejo.nix (100%)
 rename devices/{nas => nos}/modules/arion/forgejo/images/postgres.nix (100%)
 rename devices/{nas => nos}/modules/arion/freshrss/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/freshrss/images/docker-hub-rss.nix (100%)
 rename devices/{nas => nos}/modules/arion/freshrss/images/freshrss.nix (100%)
 rename devices/{nas => nos}/modules/arion/freshrss/images/postgres.nix (100%)
 rename devices/{nas => nos}/modules/arion/gameyfin/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/gameyfin/images/gameyfin.nix (100%)
 rename devices/{nas => nos}/modules/arion/hauk/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/hauk/config.php (100%)
 rename devices/{nas => nos}/modules/arion/hauk/images/hauk.nix (100%)
 rename devices/{nas => nos}/modules/arion/homepage/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/homepage/images/homepage.nix (100%)
 rename devices/{nas => nos}/modules/arion/homepage/services.nix (100%)
 rename devices/{nas => nos}/modules/arion/immich/.env (100%)
 rename devices/{nas => nos}/modules/arion/immich/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/immich/images/machine-learning.nix (100%)
 rename devices/{nas => nos}/modules/arion/immich/images/postgres.nix (100%)
 rename devices/{nas => nos}/modules/arion/immich/images/redis.nix (100%)
 rename devices/{nas => nos}/modules/arion/immich/images/server.nix (100%)
 rename devices/{nas => nos}/modules/arion/lineageos/Caddyfile (100%)
 rename devices/{nas => nos}/modules/arion/lineageos/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/lineageos/manifests/manifests.xml (100%)
 rename devices/{nas => nos}/modules/arion/lineageos/manifests/roomservice.xml (100%)
 rename devices/{nas => nos}/modules/arion/lineageos/scripts/before.sh (100%)
 rename devices/{nas => nos}/modules/arion/media/bazarr/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/bazarr/images/bazarr.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/calibre/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/calibre/images/calibre-web.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/calibre/images/calibre.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/joal/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/joal/images/joal.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/prowlarr/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/prowlarr/images/flaresolverr.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/prowlarr/images/prowlarr.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/radarr/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/radarr/images/radarr.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/sabnzbd/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/sabnzbd/images/sabnzbd.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/seerr/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/seerr/images/jellyseerr.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/sonarr/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/media/sonarr/images/sonarr.nix (100%)
 rename devices/{nas => nos}/modules/arion/music/jbots/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/music/jbots/images/jmusicbot.nix (100%)
 rename devices/{nas => nos}/modules/arion/nextcloud/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/nextcloud/images/nextcloud.nix (100%)
 rename devices/{nas => nos}/modules/arion/nextcloud/images/nginx.nix (100%)
 rename devices/{nas => nos}/modules/arion/nextcloud/images/onlyoffice.nix (100%)
 rename devices/{nas => nos}/modules/arion/nextcloud/images/postgres.nix (100%)
 rename devices/{nas => nos}/modules/arion/nextcloud/images/redis.nix (100%)
 rename devices/{nas => nos}/modules/arion/nextcloud/nginx.conf (100%)
 rename devices/{nas => nos}/modules/arion/resume/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/resume/images/postgres.nix (100%)
 rename devices/{nas => nos}/modules/arion/resume/images/resume-client.nix (100%)
 rename devices/{nas => nos}/modules/arion/resume/images/resume-server.nix (100%)
 rename devices/{nas => nos}/modules/arion/vaultwarden/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/vaultwarden/images/vaultwarden.nix (100%)
 rename devices/{nas => nos}/modules/arion/wg-easy/compose.nix (100%)
 rename devices/{nas => nos}/modules/arion/wg-easy/images/wg-easy.nix (100%)
 rename devices/{nas => nos}/modules/mergerfs.nix (100%)
 rename devices/{nas => nos}/modules/qbittorrent/default.nix (100%)
 rename devices/{nas => nos}/modules/qbittorrent/qbittorrent.nix (100%)
 rename devices/{nas => nos}/modules/qbittorrent/wireguard.nix (100%)
 rename devices/{nas => nos}/modules/snapraid.nix (100%)
 rename devices/{nas => servivi}/modules/nfs.nix (96%)
 rename {devices/nas/modules => modules}/borgbackup.nix (96%)

diff --git a/common/default.nix b/common/default.nix
index b8e753f..58aef8d 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -19,6 +19,7 @@
     home-manager.nixosModules.home-manager
 
     ../modules/arion
+    ../modules/borgbackup.nix
   ];
 
   nixpkgs = {
diff --git a/devices/README.md b/devices/README.md
index 6db85b3..cec72a8 100644
--- a/devices/README.md
+++ b/devices/README.md
@@ -8,8 +8,8 @@ This directory encompasses every device's main configuration file.
 | ---------- | ------------------------------------------------------------------------------------------------------- |
 | `android`  | My [Nix-On-Droid](https://github.com/nix-community/nix-on-droid) configuration for my OnePlus 9 Pro |
 | `binto`    | My desktop PC with a multi-monitor setup and an NVIDIA (cringe) 3070 |
-| `cluster`  | Two Lenovo mini pcs that make use of [NixOS-pcsd](https://github.com/matt1432/nixos-pcsd) to form a cluster |
-| `nas`      | My current custom built server running Proxmox. Conversion to NixOS wip |
+| `cluster`  | Two Lenovo mini PCs that make use of [NixOS-pcsd](https://github.com/matt1432/nixos-pcsd) to form a cluster |
+| `nos`      | My current custom built server running Proxmox. Conversion to NixOS wip |
 | `oksys`    | A very old Acer laptop that went from sailing the seas for years to becoming my web server and VPN host. It is now retired indefinitely. |
 | `servivi`  | A gaming PC in a previous life, it is now used to slowly convert my Proxmox server to NixOS |
 | `wim`      | My 2-1 Lenovo Laptop that I use for uni |
diff --git a/devices/nas/default.nix b/devices/nos/default.nix
similarity index 68%
rename from devices/nas/default.nix
rename to devices/nos/default.nix
index 7f415df..b3b7bf8 100644
--- a/devices/nas/default.nix
+++ b/devices/nos/default.nix
@@ -2,9 +2,7 @@
 {...}: {
   imports = [
     ./modules/arion
-    ./modules/borgbackup.nix
     ./modules/mergerfs.nix
-    ./modules/nfs.nix
     ./modules/qbittorrent
   ];
 }
diff --git a/devices/nas/modules/arion/default.nix b/devices/nos/modules/arion/default.nix
similarity index 100%
rename from devices/nas/modules/arion/default.nix
rename to devices/nos/modules/arion/default.nix
diff --git a/devices/nas/modules/arion/forgejo/compose.nix b/devices/nos/modules/arion/forgejo/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/forgejo/compose.nix
rename to devices/nos/modules/arion/forgejo/compose.nix
diff --git a/devices/nas/modules/arion/forgejo/images/act_runner.nix b/devices/nos/modules/arion/forgejo/images/act_runner.nix
similarity index 100%
rename from devices/nas/modules/arion/forgejo/images/act_runner.nix
rename to devices/nos/modules/arion/forgejo/images/act_runner.nix
diff --git a/devices/nas/modules/arion/forgejo/images/forgejo.nix b/devices/nos/modules/arion/forgejo/images/forgejo.nix
similarity index 100%
rename from devices/nas/modules/arion/forgejo/images/forgejo.nix
rename to devices/nos/modules/arion/forgejo/images/forgejo.nix
diff --git a/devices/nas/modules/arion/forgejo/images/postgres.nix b/devices/nos/modules/arion/forgejo/images/postgres.nix
similarity index 100%
rename from devices/nas/modules/arion/forgejo/images/postgres.nix
rename to devices/nos/modules/arion/forgejo/images/postgres.nix
diff --git a/devices/nas/modules/arion/freshrss/compose.nix b/devices/nos/modules/arion/freshrss/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/freshrss/compose.nix
rename to devices/nos/modules/arion/freshrss/compose.nix
diff --git a/devices/nas/modules/arion/freshrss/images/docker-hub-rss.nix b/devices/nos/modules/arion/freshrss/images/docker-hub-rss.nix
similarity index 100%
rename from devices/nas/modules/arion/freshrss/images/docker-hub-rss.nix
rename to devices/nos/modules/arion/freshrss/images/docker-hub-rss.nix
diff --git a/devices/nas/modules/arion/freshrss/images/freshrss.nix b/devices/nos/modules/arion/freshrss/images/freshrss.nix
similarity index 100%
rename from devices/nas/modules/arion/freshrss/images/freshrss.nix
rename to devices/nos/modules/arion/freshrss/images/freshrss.nix
diff --git a/devices/nas/modules/arion/freshrss/images/postgres.nix b/devices/nos/modules/arion/freshrss/images/postgres.nix
similarity index 100%
rename from devices/nas/modules/arion/freshrss/images/postgres.nix
rename to devices/nos/modules/arion/freshrss/images/postgres.nix
diff --git a/devices/nas/modules/arion/gameyfin/compose.nix b/devices/nos/modules/arion/gameyfin/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/gameyfin/compose.nix
rename to devices/nos/modules/arion/gameyfin/compose.nix
diff --git a/devices/nas/modules/arion/gameyfin/images/gameyfin.nix b/devices/nos/modules/arion/gameyfin/images/gameyfin.nix
similarity index 100%
rename from devices/nas/modules/arion/gameyfin/images/gameyfin.nix
rename to devices/nos/modules/arion/gameyfin/images/gameyfin.nix
diff --git a/devices/nas/modules/arion/hauk/compose.nix b/devices/nos/modules/arion/hauk/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/hauk/compose.nix
rename to devices/nos/modules/arion/hauk/compose.nix
diff --git a/devices/nas/modules/arion/hauk/config.php b/devices/nos/modules/arion/hauk/config.php
similarity index 100%
rename from devices/nas/modules/arion/hauk/config.php
rename to devices/nos/modules/arion/hauk/config.php
diff --git a/devices/nas/modules/arion/hauk/images/hauk.nix b/devices/nos/modules/arion/hauk/images/hauk.nix
similarity index 100%
rename from devices/nas/modules/arion/hauk/images/hauk.nix
rename to devices/nos/modules/arion/hauk/images/hauk.nix
diff --git a/devices/nas/modules/arion/homepage/compose.nix b/devices/nos/modules/arion/homepage/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/homepage/compose.nix
rename to devices/nos/modules/arion/homepage/compose.nix
diff --git a/devices/nas/modules/arion/homepage/images/homepage.nix b/devices/nos/modules/arion/homepage/images/homepage.nix
similarity index 100%
rename from devices/nas/modules/arion/homepage/images/homepage.nix
rename to devices/nos/modules/arion/homepage/images/homepage.nix
diff --git a/devices/nas/modules/arion/homepage/services.nix b/devices/nos/modules/arion/homepage/services.nix
similarity index 100%
rename from devices/nas/modules/arion/homepage/services.nix
rename to devices/nos/modules/arion/homepage/services.nix
diff --git a/devices/nas/modules/arion/immich/.env b/devices/nos/modules/arion/immich/.env
similarity index 100%
rename from devices/nas/modules/arion/immich/.env
rename to devices/nos/modules/arion/immich/.env
diff --git a/devices/nas/modules/arion/immich/compose.nix b/devices/nos/modules/arion/immich/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/immich/compose.nix
rename to devices/nos/modules/arion/immich/compose.nix
diff --git a/devices/nas/modules/arion/immich/images/machine-learning.nix b/devices/nos/modules/arion/immich/images/machine-learning.nix
similarity index 100%
rename from devices/nas/modules/arion/immich/images/machine-learning.nix
rename to devices/nos/modules/arion/immich/images/machine-learning.nix
diff --git a/devices/nas/modules/arion/immich/images/postgres.nix b/devices/nos/modules/arion/immich/images/postgres.nix
similarity index 100%
rename from devices/nas/modules/arion/immich/images/postgres.nix
rename to devices/nos/modules/arion/immich/images/postgres.nix
diff --git a/devices/nas/modules/arion/immich/images/redis.nix b/devices/nos/modules/arion/immich/images/redis.nix
similarity index 100%
rename from devices/nas/modules/arion/immich/images/redis.nix
rename to devices/nos/modules/arion/immich/images/redis.nix
diff --git a/devices/nas/modules/arion/immich/images/server.nix b/devices/nos/modules/arion/immich/images/server.nix
similarity index 100%
rename from devices/nas/modules/arion/immich/images/server.nix
rename to devices/nos/modules/arion/immich/images/server.nix
diff --git a/devices/nas/modules/arion/lineageos/Caddyfile b/devices/nos/modules/arion/lineageos/Caddyfile
similarity index 100%
rename from devices/nas/modules/arion/lineageos/Caddyfile
rename to devices/nos/modules/arion/lineageos/Caddyfile
diff --git a/devices/nas/modules/arion/lineageos/compose.nix b/devices/nos/modules/arion/lineageos/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/lineageos/compose.nix
rename to devices/nos/modules/arion/lineageos/compose.nix
diff --git a/devices/nas/modules/arion/lineageos/manifests/manifests.xml b/devices/nos/modules/arion/lineageos/manifests/manifests.xml
similarity index 100%
rename from devices/nas/modules/arion/lineageos/manifests/manifests.xml
rename to devices/nos/modules/arion/lineageos/manifests/manifests.xml
diff --git a/devices/nas/modules/arion/lineageos/manifests/roomservice.xml b/devices/nos/modules/arion/lineageos/manifests/roomservice.xml
similarity index 100%
rename from devices/nas/modules/arion/lineageos/manifests/roomservice.xml
rename to devices/nos/modules/arion/lineageos/manifests/roomservice.xml
diff --git a/devices/nas/modules/arion/lineageos/scripts/before.sh b/devices/nos/modules/arion/lineageos/scripts/before.sh
similarity index 100%
rename from devices/nas/modules/arion/lineageos/scripts/before.sh
rename to devices/nos/modules/arion/lineageos/scripts/before.sh
diff --git a/devices/nas/modules/arion/media/bazarr/compose.nix b/devices/nos/modules/arion/media/bazarr/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/media/bazarr/compose.nix
rename to devices/nos/modules/arion/media/bazarr/compose.nix
diff --git a/devices/nas/modules/arion/media/bazarr/images/bazarr.nix b/devices/nos/modules/arion/media/bazarr/images/bazarr.nix
similarity index 100%
rename from devices/nas/modules/arion/media/bazarr/images/bazarr.nix
rename to devices/nos/modules/arion/media/bazarr/images/bazarr.nix
diff --git a/devices/nas/modules/arion/media/calibre/compose.nix b/devices/nos/modules/arion/media/calibre/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/media/calibre/compose.nix
rename to devices/nos/modules/arion/media/calibre/compose.nix
diff --git a/devices/nas/modules/arion/media/calibre/images/calibre-web.nix b/devices/nos/modules/arion/media/calibre/images/calibre-web.nix
similarity index 100%
rename from devices/nas/modules/arion/media/calibre/images/calibre-web.nix
rename to devices/nos/modules/arion/media/calibre/images/calibre-web.nix
diff --git a/devices/nas/modules/arion/media/calibre/images/calibre.nix b/devices/nos/modules/arion/media/calibre/images/calibre.nix
similarity index 100%
rename from devices/nas/modules/arion/media/calibre/images/calibre.nix
rename to devices/nos/modules/arion/media/calibre/images/calibre.nix
diff --git a/devices/nas/modules/arion/media/joal/compose.nix b/devices/nos/modules/arion/media/joal/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/media/joal/compose.nix
rename to devices/nos/modules/arion/media/joal/compose.nix
diff --git a/devices/nas/modules/arion/media/joal/images/joal.nix b/devices/nos/modules/arion/media/joal/images/joal.nix
similarity index 100%
rename from devices/nas/modules/arion/media/joal/images/joal.nix
rename to devices/nos/modules/arion/media/joal/images/joal.nix
diff --git a/devices/nas/modules/arion/media/prowlarr/compose.nix b/devices/nos/modules/arion/media/prowlarr/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/media/prowlarr/compose.nix
rename to devices/nos/modules/arion/media/prowlarr/compose.nix
diff --git a/devices/nas/modules/arion/media/prowlarr/images/flaresolverr.nix b/devices/nos/modules/arion/media/prowlarr/images/flaresolverr.nix
similarity index 100%
rename from devices/nas/modules/arion/media/prowlarr/images/flaresolverr.nix
rename to devices/nos/modules/arion/media/prowlarr/images/flaresolverr.nix
diff --git a/devices/nas/modules/arion/media/prowlarr/images/prowlarr.nix b/devices/nos/modules/arion/media/prowlarr/images/prowlarr.nix
similarity index 100%
rename from devices/nas/modules/arion/media/prowlarr/images/prowlarr.nix
rename to devices/nos/modules/arion/media/prowlarr/images/prowlarr.nix
diff --git a/devices/nas/modules/arion/media/radarr/compose.nix b/devices/nos/modules/arion/media/radarr/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/media/radarr/compose.nix
rename to devices/nos/modules/arion/media/radarr/compose.nix
diff --git a/devices/nas/modules/arion/media/radarr/images/radarr.nix b/devices/nos/modules/arion/media/radarr/images/radarr.nix
similarity index 100%
rename from devices/nas/modules/arion/media/radarr/images/radarr.nix
rename to devices/nos/modules/arion/media/radarr/images/radarr.nix
diff --git a/devices/nas/modules/arion/media/sabnzbd/compose.nix b/devices/nos/modules/arion/media/sabnzbd/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/media/sabnzbd/compose.nix
rename to devices/nos/modules/arion/media/sabnzbd/compose.nix
diff --git a/devices/nas/modules/arion/media/sabnzbd/images/sabnzbd.nix b/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix
similarity index 100%
rename from devices/nas/modules/arion/media/sabnzbd/images/sabnzbd.nix
rename to devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix
diff --git a/devices/nas/modules/arion/media/seerr/compose.nix b/devices/nos/modules/arion/media/seerr/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/media/seerr/compose.nix
rename to devices/nos/modules/arion/media/seerr/compose.nix
diff --git a/devices/nas/modules/arion/media/seerr/images/jellyseerr.nix b/devices/nos/modules/arion/media/seerr/images/jellyseerr.nix
similarity index 100%
rename from devices/nas/modules/arion/media/seerr/images/jellyseerr.nix
rename to devices/nos/modules/arion/media/seerr/images/jellyseerr.nix
diff --git a/devices/nas/modules/arion/media/sonarr/compose.nix b/devices/nos/modules/arion/media/sonarr/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/media/sonarr/compose.nix
rename to devices/nos/modules/arion/media/sonarr/compose.nix
diff --git a/devices/nas/modules/arion/media/sonarr/images/sonarr.nix b/devices/nos/modules/arion/media/sonarr/images/sonarr.nix
similarity index 100%
rename from devices/nas/modules/arion/media/sonarr/images/sonarr.nix
rename to devices/nos/modules/arion/media/sonarr/images/sonarr.nix
diff --git a/devices/nas/modules/arion/music/jbots/compose.nix b/devices/nos/modules/arion/music/jbots/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/music/jbots/compose.nix
rename to devices/nos/modules/arion/music/jbots/compose.nix
diff --git a/devices/nas/modules/arion/music/jbots/images/jmusicbot.nix b/devices/nos/modules/arion/music/jbots/images/jmusicbot.nix
similarity index 100%
rename from devices/nas/modules/arion/music/jbots/images/jmusicbot.nix
rename to devices/nos/modules/arion/music/jbots/images/jmusicbot.nix
diff --git a/devices/nas/modules/arion/nextcloud/compose.nix b/devices/nos/modules/arion/nextcloud/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/nextcloud/compose.nix
rename to devices/nos/modules/arion/nextcloud/compose.nix
diff --git a/devices/nas/modules/arion/nextcloud/images/nextcloud.nix b/devices/nos/modules/arion/nextcloud/images/nextcloud.nix
similarity index 100%
rename from devices/nas/modules/arion/nextcloud/images/nextcloud.nix
rename to devices/nos/modules/arion/nextcloud/images/nextcloud.nix
diff --git a/devices/nas/modules/arion/nextcloud/images/nginx.nix b/devices/nos/modules/arion/nextcloud/images/nginx.nix
similarity index 100%
rename from devices/nas/modules/arion/nextcloud/images/nginx.nix
rename to devices/nos/modules/arion/nextcloud/images/nginx.nix
diff --git a/devices/nas/modules/arion/nextcloud/images/onlyoffice.nix b/devices/nos/modules/arion/nextcloud/images/onlyoffice.nix
similarity index 100%
rename from devices/nas/modules/arion/nextcloud/images/onlyoffice.nix
rename to devices/nos/modules/arion/nextcloud/images/onlyoffice.nix
diff --git a/devices/nas/modules/arion/nextcloud/images/postgres.nix b/devices/nos/modules/arion/nextcloud/images/postgres.nix
similarity index 100%
rename from devices/nas/modules/arion/nextcloud/images/postgres.nix
rename to devices/nos/modules/arion/nextcloud/images/postgres.nix
diff --git a/devices/nas/modules/arion/nextcloud/images/redis.nix b/devices/nos/modules/arion/nextcloud/images/redis.nix
similarity index 100%
rename from devices/nas/modules/arion/nextcloud/images/redis.nix
rename to devices/nos/modules/arion/nextcloud/images/redis.nix
diff --git a/devices/nas/modules/arion/nextcloud/nginx.conf b/devices/nos/modules/arion/nextcloud/nginx.conf
similarity index 100%
rename from devices/nas/modules/arion/nextcloud/nginx.conf
rename to devices/nos/modules/arion/nextcloud/nginx.conf
diff --git a/devices/nas/modules/arion/resume/compose.nix b/devices/nos/modules/arion/resume/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/resume/compose.nix
rename to devices/nos/modules/arion/resume/compose.nix
diff --git a/devices/nas/modules/arion/resume/images/postgres.nix b/devices/nos/modules/arion/resume/images/postgres.nix
similarity index 100%
rename from devices/nas/modules/arion/resume/images/postgres.nix
rename to devices/nos/modules/arion/resume/images/postgres.nix
diff --git a/devices/nas/modules/arion/resume/images/resume-client.nix b/devices/nos/modules/arion/resume/images/resume-client.nix
similarity index 100%
rename from devices/nas/modules/arion/resume/images/resume-client.nix
rename to devices/nos/modules/arion/resume/images/resume-client.nix
diff --git a/devices/nas/modules/arion/resume/images/resume-server.nix b/devices/nos/modules/arion/resume/images/resume-server.nix
similarity index 100%
rename from devices/nas/modules/arion/resume/images/resume-server.nix
rename to devices/nos/modules/arion/resume/images/resume-server.nix
diff --git a/devices/nas/modules/arion/vaultwarden/compose.nix b/devices/nos/modules/arion/vaultwarden/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/vaultwarden/compose.nix
rename to devices/nos/modules/arion/vaultwarden/compose.nix
diff --git a/devices/nas/modules/arion/vaultwarden/images/vaultwarden.nix b/devices/nos/modules/arion/vaultwarden/images/vaultwarden.nix
similarity index 100%
rename from devices/nas/modules/arion/vaultwarden/images/vaultwarden.nix
rename to devices/nos/modules/arion/vaultwarden/images/vaultwarden.nix
diff --git a/devices/nas/modules/arion/wg-easy/compose.nix b/devices/nos/modules/arion/wg-easy/compose.nix
similarity index 100%
rename from devices/nas/modules/arion/wg-easy/compose.nix
rename to devices/nos/modules/arion/wg-easy/compose.nix
diff --git a/devices/nas/modules/arion/wg-easy/images/wg-easy.nix b/devices/nos/modules/arion/wg-easy/images/wg-easy.nix
similarity index 100%
rename from devices/nas/modules/arion/wg-easy/images/wg-easy.nix
rename to devices/nos/modules/arion/wg-easy/images/wg-easy.nix
diff --git a/devices/nas/modules/mergerfs.nix b/devices/nos/modules/mergerfs.nix
similarity index 100%
rename from devices/nas/modules/mergerfs.nix
rename to devices/nos/modules/mergerfs.nix
diff --git a/devices/nas/modules/qbittorrent/default.nix b/devices/nos/modules/qbittorrent/default.nix
similarity index 100%
rename from devices/nas/modules/qbittorrent/default.nix
rename to devices/nos/modules/qbittorrent/default.nix
diff --git a/devices/nas/modules/qbittorrent/qbittorrent.nix b/devices/nos/modules/qbittorrent/qbittorrent.nix
similarity index 100%
rename from devices/nas/modules/qbittorrent/qbittorrent.nix
rename to devices/nos/modules/qbittorrent/qbittorrent.nix
diff --git a/devices/nas/modules/qbittorrent/wireguard.nix b/devices/nos/modules/qbittorrent/wireguard.nix
similarity index 100%
rename from devices/nas/modules/qbittorrent/wireguard.nix
rename to devices/nos/modules/qbittorrent/wireguard.nix
diff --git a/devices/nas/modules/snapraid.nix b/devices/nos/modules/snapraid.nix
similarity index 100%
rename from devices/nas/modules/snapraid.nix
rename to devices/nos/modules/snapraid.nix
diff --git a/devices/servivi/default.nix b/devices/servivi/default.nix
index 297b8e7..d7a253c 100644
--- a/devices/servivi/default.nix
+++ b/devices/servivi/default.nix
@@ -10,9 +10,10 @@ in {
 
     ./modules/binary-cache.nix
     ./modules/minecraft.nix
+    ./modules/nfs.nix
 
     # WIP
-    ../nas
+    ../nos
   ];
 
   vars = {
diff --git a/devices/nas/modules/nfs.nix b/devices/servivi/modules/nfs.nix
similarity index 96%
rename from devices/nas/modules/nfs.nix
rename to devices/servivi/modules/nfs.nix
index 31edad7..ed2b2ac 100644
--- a/devices/nas/modules/nfs.nix
+++ b/devices/servivi/modules/nfs.nix
@@ -1,4 +1,3 @@
-# TODO: move this to NAS?
 {lib, ...}: let
   inherit (lib) concatMapStringsSep concatStringsSep;
 in {
diff --git a/devices/nas/modules/borgbackup.nix b/modules/borgbackup.nix
similarity index 96%
rename from devices/nas/modules/borgbackup.nix
rename to modules/borgbackup.nix
index 47a6162..f1fa767 100644
--- a/devices/nas/modules/borgbackup.nix
+++ b/modules/borgbackup.nix
@@ -20,6 +20,7 @@ in {
   };
 
   config = {
+    # TODO: change this to nos
     programs.ssh.knownHosts = {
       pve.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG/4mrp8E4Ittwg8feRmPtDHSDR2+Pq4uZHeF5MweVcW";
     };
@@ -28,6 +29,7 @@ in {
       defaults = {
         environment = mkDefault {BORG_RSH = "ssh -i ${secrets.borg-ssh.path}";};
 
+        # TODO: change this to nos
         repo = mkDefault "ssh://matt@pve/data/backups/borg";
         encryption = mkDefault {
           mode = "repokey";