diff --git a/nixos/assets/0001-make-atuin-on-zfs-fast-again.patch b/assets/0001-make-atuin-on-zfs-fast-again.patch
similarity index 100%
rename from nixos/assets/0001-make-atuin-on-zfs-fast-again.patch
rename to assets/0001-make-atuin-on-zfs-fast-again.patch
diff --git a/nixos/assets/mrvandalo.gpg b/assets/mrvandalo.gpg
similarity index 100%
rename from nixos/assets/mrvandalo.gpg
rename to assets/mrvandalo.gpg
diff --git a/nixos/assets/mrvandalo_rsa.pub b/assets/mrvandalo_rsa.pub
similarity index 100%
rename from nixos/assets/mrvandalo_rsa.pub
rename to assets/mrvandalo_rsa.pub
diff --git a/nixos/assets/nginx-show-config.py b/assets/nginx-show-config.py
similarity index 100%
rename from nixos/assets/nginx-show-config.py
rename to assets/nginx-show-config.py
diff --git a/nixos/assets/wallpaper.png b/assets/wallpaper.png
similarity index 100%
rename from nixos/assets/wallpaper.png
rename to assets/wallpaper.png
diff --git a/nixos/components/README.md b/components/README.md
similarity index 100%
rename from nixos/components/README.md
rename to components/README.md
diff --git a/nixos/components/default.nix b/components/default.nix
similarity index 100%
rename from nixos/components/default.nix
rename to components/default.nix
diff --git a/nixos/components/gui/audio.nix b/components/gui/audio.nix
similarity index 100%
rename from nixos/components/gui/audio.nix
rename to components/gui/audio.nix
diff --git a/nixos/components/gui/browser.nix b/components/gui/browser.nix
similarity index 100%
rename from nixos/components/gui/browser.nix
rename to components/gui/browser.nix
diff --git a/nixos/components/gui/cups.nix b/components/gui/cups.nix
similarity index 100%
rename from nixos/components/gui/cups.nix
rename to components/gui/cups.nix
diff --git a/nixos/components/gui/default.nix b/components/gui/default.nix
similarity index 100%
rename from nixos/components/gui/default.nix
rename to components/gui/default.nix
diff --git a/nixos/components/gui/fonts.nix b/components/gui/fonts.nix
similarity index 100%
rename from nixos/components/gui/fonts.nix
rename to components/gui/fonts.nix
diff --git a/nixos/components/gui/home-manager/default.nix b/components/gui/home-manager/default.nix
similarity index 100%
rename from nixos/components/gui/home-manager/default.nix
rename to components/gui/home-manager/default.nix
diff --git a/nixos/components/gui/kmonad.nix b/components/gui/kmonad.nix
similarity index 100%
rename from nixos/components/gui/kmonad.nix
rename to components/gui/kmonad.nix
diff --git a/nixos/components/gui/noti.nix b/components/gui/noti.nix
similarity index 100%
rename from nixos/components/gui/noti.nix
rename to components/gui/noti.nix
diff --git a/nixos/components/gui/pass.nix b/components/gui/pass.nix
similarity index 100%
rename from nixos/components/gui/pass.nix
rename to components/gui/pass.nix
diff --git a/nixos/components/gui/steam.nix b/components/gui/steam.nix
similarity index 100%
rename from nixos/components/gui/steam.nix
rename to components/gui/steam.nix
diff --git a/nixos/components/gui/suspend.nix b/components/gui/suspend.nix
similarity index 100%
rename from nixos/components/gui/suspend.nix
rename to components/gui/suspend.nix
diff --git a/nixos/components/gui/vscode.nix b/components/gui/vscode.nix
similarity index 100%
rename from nixos/components/gui/vscode.nix
rename to components/gui/vscode.nix
diff --git a/nixos/components/gui/wayland.nix b/components/gui/wayland.nix
similarity index 100%
rename from nixos/components/gui/wayland.nix
rename to components/gui/wayland.nix
diff --git a/nixos/components/gui/xorg/default.nix b/components/gui/xorg/default.nix
similarity index 100%
rename from nixos/components/gui/xorg/default.nix
rename to components/gui/xorg/default.nix
diff --git a/nixos/components/gui/xorg/xlock.nix b/components/gui/xorg/xlock.nix
similarity index 100%
rename from nixos/components/gui/xorg/xlock.nix
rename to components/gui/xorg/xlock.nix
diff --git a/nixos/components/mainUser.nix b/components/mainUser.nix
similarity index 100%
rename from nixos/components/mainUser.nix
rename to components/mainUser.nix
diff --git a/nixos/components/media/default.nix b/components/media/default.nix
similarity index 100%
rename from nixos/components/media/default.nix
rename to components/media/default.nix
diff --git a/nixos/components/media/icecast.nix b/components/media/icecast.nix
similarity index 100%
rename from nixos/components/media/icecast.nix
rename to components/media/icecast.nix
diff --git a/nixos/components/media/sanitize_folder.sh b/components/media/sanitize_folder.sh
similarity index 100%
rename from nixos/components/media/sanitize_folder.sh
rename to components/media/sanitize_folder.sh
diff --git a/nixos/components/media/tts.nix b/components/media/tts.nix
similarity index 100%
rename from nixos/components/media/tts.nix
rename to components/media/tts.nix
diff --git a/nixos/components/media/video.nix b/components/media/video.nix
similarity index 100%
rename from nixos/components/media/video.nix
rename to components/media/video.nix
diff --git a/nixos/components/monitor/container.nix b/components/monitor/container.nix
similarity index 100%
rename from nixos/components/monitor/container.nix
rename to components/monitor/container.nix
diff --git a/nixos/components/monitor/default.nix b/components/monitor/default.nix
similarity index 100%
rename from nixos/components/monitor/default.nix
rename to components/monitor/default.nix
diff --git a/nixos/components/monitor/logs-promtail.nix b/components/monitor/logs-promtail.nix
similarity index 100%
rename from nixos/components/monitor/logs-promtail.nix
rename to components/monitor/logs-promtail.nix
diff --git a/nixos/components/monitor/metrics-export-zfs.nix b/components/monitor/metrics-export-zfs.nix
similarity index 100%
rename from nixos/components/monitor/metrics-export-zfs.nix
rename to components/monitor/metrics-export-zfs.nix
diff --git a/nixos/components/monitor/metrics-netdata.nix b/components/monitor/metrics-netdata.nix
similarity index 100%
rename from nixos/components/monitor/metrics-netdata.nix
rename to components/monitor/metrics-netdata.nix
diff --git a/nixos/components/monitor/metrics-prometheus.nix b/components/monitor/metrics-prometheus.nix
similarity index 100%
rename from nixos/components/monitor/metrics-prometheus.nix
rename to components/monitor/metrics-prometheus.nix
diff --git a/nixos/components/monitor/metrics-telegraf.nix b/components/monitor/metrics-telegraf.nix
similarity index 100%
rename from nixos/components/monitor/metrics-telegraf.nix
rename to components/monitor/metrics-telegraf.nix
diff --git a/nixos/components/monitor/opentelemetry.nix b/components/monitor/opentelemetry.nix
similarity index 100%
rename from nixos/components/monitor/opentelemetry.nix
rename to components/monitor/opentelemetry.nix
diff --git a/nixos/components/network/avahi.nix b/components/network/avahi.nix
similarity index 100%
rename from nixos/components/network/avahi.nix
rename to components/network/avahi.nix
diff --git a/nixos/components/network/default.nix b/components/network/default.nix
similarity index 100%
rename from nixos/components/network/default.nix
rename to components/network/default.nix
diff --git a/nixos/components/network/hosts.nix b/components/network/hosts.nix
similarity index 100%
rename from nixos/components/network/hosts.nix
rename to components/network/hosts.nix
diff --git a/nixos/components/network/nginx.nix b/components/network/nginx.nix
similarity index 100%
rename from nixos/components/network/nginx.nix
rename to components/network/nginx.nix
diff --git a/nixos/components/network/sshd/default.nix b/components/network/sshd/default.nix
similarity index 100%
rename from nixos/components/network/sshd/default.nix
rename to components/network/sshd/default.nix
diff --git a/nixos/components/network/sshd/known-hosts-bootup.nix b/components/network/sshd/known-hosts-bootup.nix
similarity index 100%
rename from nixos/components/network/sshd/known-hosts-bootup.nix
rename to components/network/sshd/known-hosts-bootup.nix
diff --git a/nixos/components/network/sshd/known-hosts-public.nix b/components/network/sshd/known-hosts-public.nix
similarity index 100%
rename from nixos/components/network/sshd/known-hosts-public.nix
rename to components/network/sshd/known-hosts-public.nix
diff --git a/nixos/components/network/syncthing.nix b/components/network/syncthing.nix
similarity index 100%
rename from nixos/components/network/syncthing.nix
rename to components/network/syncthing.nix
diff --git a/nixos/components/network/tinc/default.nix b/components/network/tinc/default.nix
similarity index 100%
rename from nixos/components/network/tinc/default.nix
rename to components/network/tinc/default.nix
diff --git a/nixos/components/network/tinc/private.nix b/components/network/tinc/private.nix
similarity index 100%
rename from nixos/components/network/tinc/private.nix
rename to components/network/tinc/private.nix
diff --git a/nixos/components/network/tinc/secret.nix b/components/network/tinc/secret.nix
similarity index 100%
rename from nixos/components/network/tinc/secret.nix
rename to components/network/tinc/secret.nix
diff --git a/nixos/components/network/wifi.nix b/components/network/wifi.nix
similarity index 100%
rename from nixos/components/network/wifi.nix
rename to components/network/wifi.nix
diff --git a/nixos/components/network/wireguard.nix b/components/network/wireguard.nix
similarity index 100%
rename from nixos/components/network/wireguard.nix
rename to components/network/wireguard.nix
diff --git a/nixos/components/network/zerotier.nix b/components/network/zerotier.nix
similarity index 100%
rename from nixos/components/network/zerotier.nix
rename to components/network/zerotier.nix
diff --git a/nixos/components/nixos/default.nix b/components/nixos/default.nix
similarity index 100%
rename from nixos/components/nixos/default.nix
rename to components/nixos/default.nix
diff --git a/nixos/components/nixos/upgrade-diff.nix b/components/nixos/upgrade-diff.nix
similarity index 100%
rename from nixos/components/nixos/upgrade-diff.nix
rename to components/nixos/upgrade-diff.nix
diff --git a/nixos/components/terminal/bash.nix b/components/terminal/bash.nix
similarity index 100%
rename from nixos/components/terminal/bash.nix
rename to components/terminal/bash.nix
diff --git a/nixos/components/terminal/default.nix b/components/terminal/default.nix
similarity index 100%
rename from nixos/components/terminal/default.nix
rename to components/terminal/default.nix
diff --git a/nixos/components/terminal/direnv.nix b/components/terminal/direnv.nix
similarity index 100%
rename from nixos/components/terminal/direnv.nix
rename to components/terminal/direnv.nix
diff --git a/nixos/components/terminal/git.nix b/components/terminal/git.nix
similarity index 100%
rename from nixos/components/terminal/git.nix
rename to components/terminal/git.nix
diff --git a/nixos/components/terminal/heygpt.nix b/components/terminal/heygpt.nix
similarity index 100%
rename from nixos/components/terminal/heygpt.nix
rename to components/terminal/heygpt.nix
diff --git a/nixos/components/terminal/hoard.nix b/components/terminal/hoard.nix
similarity index 100%
rename from nixos/components/terminal/hoard.nix
rename to components/terminal/hoard.nix
diff --git a/nixos/components/terminal/oh-my-posh/default.nix b/components/terminal/oh-my-posh/default.nix
similarity index 100%
rename from nixos/components/terminal/oh-my-posh/default.nix
rename to components/terminal/oh-my-posh/default.nix
diff --git a/nixos/components/terminal/oh-my-posh/gruvbox.json b/components/terminal/oh-my-posh/gruvbox.json
similarity index 100%
rename from nixos/components/terminal/oh-my-posh/gruvbox.json
rename to components/terminal/oh-my-posh/gruvbox.json
diff --git a/nixos/components/terminal/remote-install.nix b/components/terminal/remote-install.nix
similarity index 100%
rename from nixos/components/terminal/remote-install.nix
rename to components/terminal/remote-install.nix
diff --git a/nixos/components/terminal/wtf.nix b/components/terminal/wtf.nix
similarity index 100%
rename from nixos/components/terminal/wtf.nix
rename to components/terminal/wtf.nix
diff --git a/nixos/components/terminal/zsh.nix b/components/terminal/zsh.nix
similarity index 100%
rename from nixos/components/terminal/zsh.nix
rename to components/terminal/zsh.nix
diff --git a/nixos/components/yubikey.nix b/components/yubikey.nix
similarity index 100%
rename from nixos/components/yubikey.nix
rename to components/yubikey.nix
diff --git a/flake.nix b/flake.nix
index 696a6e8..68bd490 100644
--- a/flake.nix
+++ b/flake.nix
@@ -155,14 +155,14 @@
               tasksh = taskshell.packages.${system}.tasksh;
               overviewer = overviewer.packages.${system}.overviewer;
             })
-            (import ./nixos/pkgs)
+            (import ./pkgs)
           ];
         };
         specialArgs = {
           inherit private_assets;
-          assets = ./nixos/assets;
+          assets = ./assets;
           factsGenerator = clan-fact-generators.lib { inherit pkgs; };
-          clanLib = import ./nixos/lib/clanlib.nix { inherit (pkgs) lib; machineDir = ./machines; };
+          clanLib = import ./lib/clanlib.nix { inherit (pkgs) lib; machineDir = ./machines; };
         };
       };
 
@@ -178,7 +178,7 @@
           clanCore.facts.secretStore = "password-store";
 
           imports = modules ++ defaultModules ++ [
-            ./nixos/machines/${name}/configuration.nix
+            ./machines/${name}/configuration.nix
             # clan core configuration
             ({ pkgs, lib, ... }: {
               imports = [
@@ -210,7 +210,7 @@
         ({ config, ... }: {
           users.users.root.openssh.authorizedKeys.keyFiles = [
             # master key
-            ./nixos/assets/mrvandalo_rsa.pub
+            ./assets/mrvandalo_rsa.pub
             # backup key
             "${config.clanCore.clanDir}/machines/chungus/facts/ssh.syncoid.id_ed25519.pub"
             "${config.clanCore.clanDir}/machines/chungus/facts/ssh.rbackup.id_ed25519.pub"
@@ -245,7 +245,7 @@
       stylixModules = { pkgs, config, ... }: {
         imports = [ stylix.nixosModules.stylix ];
         stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml";
-        stylix.image = ./nixos/assets/wallpaper.png;
+        stylix.image = ./assets/wallpaper.png;
         stylix.fonts = {
           serif = {
             package = pkgs.ubuntu_font_family;
@@ -278,7 +278,7 @@
         ];
         home-manager.extraSpecialArgs = {
           inherit private_assets;
-          assets = ./nixos/assets;
+          assets = ./assets;
         };
         home-manager.useGlobalPkgs = true;
         home-manager.useUserPackages = true;
@@ -318,8 +318,8 @@
               stylixModules
               { home-manager.users.mainUser.gui.enable = true; }
               {
-                home-manager.users.mainUser = import ./nixos/homes/tina;
-                home-manager.users.root = import ./nixos/homes/root;
+                home-manager.users.mainUser = import ./homes/tina;
+                home-manager.users.root = import ./homes/root;
               }
               # todo : strange overrides, this should be an option kinda an be changed on another level (the homes/<name> folders or something)
               ({ lib, ... }: {
@@ -347,8 +347,8 @@
               stylixModules
               { home-manager.users.mainUser.gui.enable = true; }
               {
-                home-manager.users.mainUser = import ./nixos/homes/palo;
-                home-manager.users.root = import ./nixos/homes/root;
+                home-manager.users.mainUser = import ./homes/palo;
+                home-manager.users.root = import ./homes/root;
               }
               {
                 clanCore.machineDescription = "Laptop";
@@ -366,8 +366,8 @@
               private_assets.nixosModules.yubikey
               { home-manager.users.mainUser.gui.enable = true; }
               {
-                home-manager.users.mainUser = import ./nixos/homes/palo;
-                home-manager.users.root = import ./nixos/homes/root;
+                home-manager.users.mainUser = import ./homes/palo;
+                home-manager.users.root = import ./homes/root;
               }
               {
                 clanCore.machineDescription = "Laptop";
@@ -390,8 +390,8 @@
               retiolum.nixosModules.retiolum
               private_assets.nixosModules.chungus
               {
-                home-manager.users.mainUser = import ./nixos/homes/palo;
-                home-manager.users.root = import ./nixos/homes/root;
+                home-manager.users.mainUser = import ./homes/palo;
+                home-manager.users.root = import ./homes/root;
               }
               {
                 clanCore.machineDescription = "Home Server";
@@ -415,8 +415,8 @@
                 systemd.enableEmergencyMode = false;
               }
               {
-                home-manager.users.mainUser = import ./nixos/homes/palo;
-                home-manager.users.root = import ./nixos/homes/root;
+                home-manager.users.mainUser = import ./homes/palo;
+                home-manager.users.root = import ./homes/root;
               }
               {
                 clanCore.machineDescription = "Internet Server";
diff --git a/nixos/homes/common/default.nix b/homes/common/default.nix
similarity index 100%
rename from nixos/homes/common/default.nix
rename to homes/common/default.nix
diff --git a/nixos/homes/common/packages.nix b/homes/common/packages.nix
similarity index 100%
rename from nixos/homes/common/packages.nix
rename to homes/common/packages.nix
diff --git a/nixos/homes/common/terminal.nix b/homes/common/terminal.nix
similarity index 100%
rename from nixos/homes/common/terminal.nix
rename to homes/common/terminal.nix
diff --git a/nixos/homes/common/zfs.nix b/homes/common/zfs.nix
similarity index 100%
rename from nixos/homes/common/zfs.nix
rename to homes/common/zfs.nix
diff --git a/nixos/homes/palo/default.nix b/homes/palo/default.nix
similarity index 100%
rename from nixos/homes/palo/default.nix
rename to homes/palo/default.nix
diff --git a/nixos/homes/palo/doom-emacs.nix b/homes/palo/doom-emacs.nix
similarity index 100%
rename from nixos/homes/palo/doom-emacs.nix
rename to homes/palo/doom-emacs.nix
diff --git a/nixos/homes/palo/doom.d/config.el b/homes/palo/doom.d/config.el
similarity index 100%
rename from nixos/homes/palo/doom.d/config.el
rename to homes/palo/doom.d/config.el
diff --git a/nixos/homes/palo/doom.d/init.el b/homes/palo/doom.d/init.el
similarity index 100%
rename from nixos/homes/palo/doom.d/init.el
rename to homes/palo/doom.d/init.el
diff --git a/nixos/homes/palo/doom.d/packages.el b/homes/palo/doom.d/packages.el
similarity index 100%
rename from nixos/homes/palo/doom.d/packages.el
rename to homes/palo/doom.d/packages.el
diff --git a/nixos/homes/palo/editor.nix b/homes/palo/editor.nix
similarity index 100%
rename from nixos/homes/palo/editor.nix
rename to homes/palo/editor.nix
diff --git a/nixos/homes/palo/git.nix b/homes/palo/git.nix
similarity index 100%
rename from nixos/homes/palo/git.nix
rename to homes/palo/git.nix
diff --git a/nixos/homes/palo/gpg.nix b/homes/palo/gpg.nix
similarity index 100%
rename from nixos/homes/palo/gpg.nix
rename to homes/palo/gpg.nix
diff --git a/nixos/homes/palo/hyperland.nix b/homes/palo/hyperland.nix
similarity index 100%
rename from nixos/homes/palo/hyperland.nix
rename to homes/palo/hyperland.nix
diff --git a/nixos/homes/palo/i3.nix b/homes/palo/i3.nix
similarity index 100%
rename from nixos/homes/palo/i3.nix
rename to homes/palo/i3.nix
diff --git a/nixos/homes/palo/packages/default.nix b/homes/palo/packages/default.nix
similarity index 100%
rename from nixos/homes/palo/packages/default.nix
rename to homes/palo/packages/default.nix
diff --git a/nixos/homes/palo/packages/development.nix b/homes/palo/packages/development.nix
similarity index 100%
rename from nixos/homes/palo/packages/development.nix
rename to homes/palo/packages/development.nix
diff --git a/nixos/homes/palo/packages/graphics.nix b/homes/palo/packages/graphics.nix
similarity index 100%
rename from nixos/homes/palo/packages/graphics.nix
rename to homes/palo/packages/graphics.nix
diff --git a/nixos/homes/palo/packages/logseq.nix b/homes/palo/packages/logseq.nix
similarity index 100%
rename from nixos/homes/palo/packages/logseq.nix
rename to homes/palo/packages/logseq.nix
diff --git a/nixos/homes/palo/packages/nextcloud.nix b/homes/palo/packages/nextcloud.nix
similarity index 100%
rename from nixos/homes/palo/packages/nextcloud.nix
rename to homes/palo/packages/nextcloud.nix
diff --git a/nixos/homes/palo/packages/packages.nix b/homes/palo/packages/packages.nix
similarity index 100%
rename from nixos/homes/palo/packages/packages.nix
rename to homes/palo/packages/packages.nix
diff --git a/nixos/homes/palo/packages/social.nix b/homes/palo/packages/social.nix
similarity index 100%
rename from nixos/homes/palo/packages/social.nix
rename to homes/palo/packages/social.nix
diff --git a/nixos/homes/palo/ssh.nix b/homes/palo/ssh.nix
similarity index 100%
rename from nixos/homes/palo/ssh.nix
rename to homes/palo/ssh.nix
diff --git a/nixos/homes/palo/stylix.nix b/homes/palo/stylix.nix
similarity index 100%
rename from nixos/homes/palo/stylix.nix
rename to homes/palo/stylix.nix
diff --git a/nixos/homes/palo/taskwarrior.nix b/homes/palo/taskwarrior.nix
similarity index 100%
rename from nixos/homes/palo/taskwarrior.nix
rename to homes/palo/taskwarrior.nix
diff --git a/nixos/homes/palo/tmux.nix b/homes/palo/tmux.nix
similarity index 100%
rename from nixos/homes/palo/tmux.nix
rename to homes/palo/tmux.nix
diff --git a/nixos/homes/palo/zellij.nix b/homes/palo/zellij.nix
similarity index 100%
rename from nixos/homes/palo/zellij.nix
rename to homes/palo/zellij.nix
diff --git a/nixos/homes/root/default.nix b/homes/root/default.nix
similarity index 100%
rename from nixos/homes/root/default.nix
rename to homes/root/default.nix
diff --git a/nixos/homes/tina/default.nix b/homes/tina/default.nix
similarity index 100%
rename from nixos/homes/tina/default.nix
rename to homes/tina/default.nix
diff --git a/nixos/homes/tina/kde.nix b/homes/tina/kde.nix
similarity index 100%
rename from nixos/homes/tina/kde.nix
rename to homes/tina/kde.nix
diff --git a/nixos/homes/tina/logseq.nix b/homes/tina/logseq.nix
similarity index 100%
rename from nixos/homes/tina/logseq.nix
rename to homes/tina/logseq.nix
diff --git a/nixos/homes/tina/packages.nix b/homes/tina/packages.nix
similarity index 100%
rename from nixos/homes/tina/packages.nix
rename to homes/tina/packages.nix
diff --git a/nixos/homes/tina/stylix.nix b/homes/tina/stylix.nix
similarity index 100%
rename from nixos/homes/tina/stylix.nix
rename to homes/tina/stylix.nix
diff --git a/nixos/machines/bobi/configuration.nix b/legacy/bobi/configuration.nix
similarity index 100%
rename from nixos/machines/bobi/configuration.nix
rename to legacy/bobi/configuration.nix
diff --git a/nixos/machines/bobi/hardware-configuration.nix b/legacy/bobi/hardware-configuration.nix
similarity index 100%
rename from nixos/machines/bobi/hardware-configuration.nix
rename to legacy/bobi/hardware-configuration.nix
diff --git a/nixos/machines/bobi/syncthing.nix b/legacy/bobi/syncthing.nix
similarity index 100%
rename from nixos/machines/bobi/syncthing.nix
rename to legacy/bobi/syncthing.nix
diff --git a/nixos/machines/bobi/tinc.nix b/legacy/bobi/tinc.nix
similarity index 100%
rename from nixos/machines/bobi/tinc.nix
rename to legacy/bobi/tinc.nix
diff --git a/nixos/legacy/borg-jobs.nix b/legacy/borg-jobs.nix
similarity index 100%
rename from nixos/legacy/borg-jobs.nix
rename to legacy/borg-jobs.nix
diff --git a/nixos/legacy/borg-scripts.nix b/legacy/borg-scripts.nix
similarity index 100%
rename from nixos/legacy/borg-scripts.nix
rename to legacy/borg-scripts.nix
diff --git a/nixos/legacy/borg.nix b/legacy/borg.nix
similarity index 100%
rename from nixos/legacy/borg.nix
rename to legacy/borg.nix
diff --git a/nixos/legacy/dms.nix b/legacy/dms.nix
similarity index 100%
rename from nixos/legacy/dms.nix
rename to legacy/dms.nix
diff --git a/nixos/legacy/finance.nix b/legacy/finance.nix
similarity index 100%
rename from nixos/legacy/finance.nix
rename to legacy/finance.nix
diff --git a/nixos/legacy/graylog.nix b/legacy/graylog.nix
similarity index 100%
rename from nixos/legacy/graylog.nix
rename to legacy/graylog.nix
diff --git a/nixos/legacy/grocy.nix b/legacy/grocy.nix
similarity index 100%
rename from nixos/legacy/grocy.nix
rename to legacy/grocy.nix
diff --git a/nixos/legacy/hass-wifi.nix b/legacy/hass-wifi.nix
similarity index 100%
rename from nixos/legacy/hass-wifi.nix
rename to legacy/hass-wifi.nix
diff --git a/nixos/legacy/kibana.nix b/legacy/kibana.nix
similarity index 100%
rename from nixos/legacy/kibana.nix
rename to legacy/kibana.nix
diff --git a/nixos/legacy/kiosk.nix b/legacy/kiosk.nix
similarity index 100%
rename from nixos/legacy/kiosk.nix
rename to legacy/kiosk.nix
diff --git a/nixos/legacy/mail-fetcher.nix b/legacy/mail-fetcher.nix
similarity index 100%
rename from nixos/legacy/mail-fetcher.nix
rename to legacy/mail-fetcher.nix
diff --git a/nixos/legacy/mail-stuff.nix b/legacy/mail-stuff.nix
similarity index 100%
rename from nixos/legacy/mail-stuff.nix
rename to legacy/mail-stuff.nix
diff --git a/nixos/legacy/media-tdarr.nix b/legacy/media-tdarr.nix
similarity index 100%
rename from nixos/legacy/media-tdarr.nix
rename to legacy/media-tdarr.nix
diff --git a/nixos/legacy/media-transmission.nix b/legacy/media-transmission.nix
similarity index 100%
rename from nixos/legacy/media-transmission.nix
rename to legacy/media-transmission.nix
diff --git a/nixos/legacy/media-unmanic.nix b/legacy/media-unmanic.nix
similarity index 100%
rename from nixos/legacy/media-unmanic.nix
rename to legacy/media-unmanic.nix
diff --git a/nixos/machines/mobi/configuration.nix b/legacy/mobi/configuration.nix
similarity index 100%
rename from nixos/machines/mobi/configuration.nix
rename to legacy/mobi/configuration.nix
diff --git a/nixos/machines/mobi/hardware-configuration.nix b/legacy/mobi/hardware-configuration.nix
similarity index 100%
rename from nixos/machines/mobi/hardware-configuration.nix
rename to legacy/mobi/hardware-configuration.nix
diff --git a/nixos/machines/mobi/syncthing.nix b/legacy/mobi/syncthing.nix
similarity index 100%
rename from nixos/machines/mobi/syncthing.nix
rename to legacy/mobi/syncthing.nix
diff --git a/nixos/machines/mobi/tinc.nix b/legacy/mobi/tinc.nix
similarity index 100%
rename from nixos/machines/mobi/tinc.nix
rename to legacy/mobi/tinc.nix
diff --git a/nixos/legacy/mpd.nix b/legacy/mpd.nix
similarity index 100%
rename from nixos/legacy/mpd.nix
rename to legacy/mpd.nix
diff --git a/nixos/legacy/mysql.nix b/legacy/mysql.nix
similarity index 100%
rename from nixos/legacy/mysql.nix
rename to legacy/mysql.nix
diff --git a/nixos/legacy/nginx-logging.nix b/legacy/nginx-logging.nix
similarity index 100%
rename from nixos/legacy/nginx-logging.nix
rename to legacy/nginx-logging.nix
diff --git a/nixos/legacy/property.nix b/legacy/property.nix
similarity index 100%
rename from nixos/legacy/property.nix
rename to legacy/property.nix
diff --git a/nixos/legacy/robi/borg.nix b/legacy/robi/borg.nix
similarity index 100%
rename from nixos/legacy/robi/borg.nix
rename to legacy/robi/borg.nix
diff --git a/nixos/legacy/robi/cache.nix b/legacy/robi/cache.nix
similarity index 100%
rename from nixos/legacy/robi/cache.nix
rename to legacy/robi/cache.nix
diff --git a/nixos/legacy/robi/codimd.nix b/legacy/robi/codimd.nix
similarity index 100%
rename from nixos/legacy/robi/codimd.nix
rename to legacy/robi/codimd.nix
diff --git a/nixos/legacy/robi/configuration.nix b/legacy/robi/configuration.nix
similarity index 100%
rename from nixos/legacy/robi/configuration.nix
rename to legacy/robi/configuration.nix
diff --git a/nixos/legacy/robi/gitea.nix b/legacy/robi/gitea.nix
similarity index 100%
rename from nixos/legacy/robi/gitea.nix
rename to legacy/robi/gitea.nix
diff --git a/nixos/legacy/robi/grafana.nix b/legacy/robi/grafana.nix
similarity index 100%
rename from nixos/legacy/robi/grafana.nix
rename to legacy/robi/grafana.nix
diff --git a/nixos/legacy/robi/grocy.nix b/legacy/robi/grocy.nix
similarity index 100%
rename from nixos/legacy/robi/grocy.nix
rename to legacy/robi/grocy.nix
diff --git a/nixos/legacy/robi/hardware-configuration.nix b/legacy/robi/hardware-configuration.nix
similarity index 100%
rename from nixos/legacy/robi/hardware-configuration.nix
rename to legacy/robi/hardware-configuration.nix
diff --git a/nixos/legacy/robi/hetzner.nix b/legacy/robi/hetzner.nix
similarity index 100%
rename from nixos/legacy/robi/hetzner.nix
rename to legacy/robi/hetzner.nix
diff --git a/nixos/legacy/robi/loki-promtail.nix b/legacy/robi/loki-promtail.nix
similarity index 100%
rename from nixos/legacy/robi/loki-promtail.nix
rename to legacy/robi/loki-promtail.nix
diff --git a/nixos/legacy/robi/loki.nix b/legacy/robi/loki.nix
similarity index 100%
rename from nixos/legacy/robi/loki.nix
rename to legacy/robi/loki.nix
diff --git a/nixos/legacy/robi/media-arr.nix b/legacy/robi/media-arr.nix
similarity index 100%
rename from nixos/legacy/robi/media-arr.nix
rename to legacy/robi/media-arr.nix
diff --git a/nixos/legacy/robi/media-jellyfin.nix b/legacy/robi/media-jellyfin.nix
similarity index 100%
rename from nixos/legacy/robi/media-jellyfin.nix
rename to legacy/robi/media-jellyfin.nix
diff --git a/nixos/legacy/robi/media-share.nix b/legacy/robi/media-share.nix
similarity index 100%
rename from nixos/legacy/robi/media-share.nix
rename to legacy/robi/media-share.nix
diff --git a/nixos/legacy/robi/media-syncthing.nix b/legacy/robi/media-syncthing.nix
similarity index 100%
rename from nixos/legacy/robi/media-syncthing.nix
rename to legacy/robi/media-syncthing.nix
diff --git a/nixos/legacy/robi/media-tdarr.nix b/legacy/robi/media-tdarr.nix
similarity index 100%
rename from nixos/legacy/robi/media-tdarr.nix
rename to legacy/robi/media-tdarr.nix
diff --git a/nixos/legacy/robi/media-transmission.nix b/legacy/robi/media-transmission.nix
similarity index 100%
rename from nixos/legacy/robi/media-transmission.nix
rename to legacy/robi/media-transmission.nix
diff --git a/nixos/legacy/robi/media-transmission2.nix b/legacy/robi/media-transmission2.nix
similarity index 100%
rename from nixos/legacy/robi/media-transmission2.nix
rename to legacy/robi/media-transmission2.nix
diff --git a/nixos/legacy/robi/network-tinc.nix b/legacy/robi/network-tinc.nix
similarity index 100%
rename from nixos/legacy/robi/network-tinc.nix
rename to legacy/robi/network-tinc.nix
diff --git a/nixos/legacy/robi/network-wireguard.nix b/legacy/robi/network-wireguard.nix
similarity index 100%
rename from nixos/legacy/robi/network-wireguard.nix
rename to legacy/robi/network-wireguard.nix
diff --git a/nixos/legacy/robi/nextcloud.nix b/legacy/robi/nextcloud.nix
similarity index 100%
rename from nixos/legacy/robi/nextcloud.nix
rename to legacy/robi/nextcloud.nix
diff --git a/nixos/legacy/robi/nginx-wkd.nix b/legacy/robi/nginx-wkd.nix
similarity index 100%
rename from nixos/legacy/robi/nginx-wkd.nix
rename to legacy/robi/nginx-wkd.nix
diff --git a/nixos/legacy/robi/nginx.nix b/legacy/robi/nginx.nix
similarity index 100%
rename from nixos/legacy/robi/nginx.nix
rename to legacy/robi/nginx.nix
diff --git a/nixos/legacy/robi/packages.nix b/legacy/robi/packages.nix
similarity index 100%
rename from nixos/legacy/robi/packages.nix
rename to legacy/robi/packages.nix
diff --git a/nixos/legacy/robi/prometheus.nix b/legacy/robi/prometheus.nix
similarity index 100%
rename from nixos/legacy/robi/prometheus.nix
rename to legacy/robi/prometheus.nix
diff --git a/nixos/legacy/robi/social-jitsi.nix b/legacy/robi/social-jitsi.nix
similarity index 100%
rename from nixos/legacy/robi/social-jitsi.nix
rename to legacy/robi/social-jitsi.nix
diff --git a/nixos/legacy/robi/social-matrix.nix b/legacy/robi/social-matrix.nix
similarity index 100%
rename from nixos/legacy/robi/social-matrix.nix
rename to legacy/robi/social-matrix.nix
diff --git a/nixos/legacy/robi/sync-opentracker.nix b/legacy/robi/sync-opentracker.nix
similarity index 100%
rename from nixos/legacy/robi/sync-opentracker.nix
rename to legacy/robi/sync-opentracker.nix
diff --git a/nixos/legacy/robi/sync-torrent.nix b/legacy/robi/sync-torrent.nix
similarity index 100%
rename from nixos/legacy/robi/sync-torrent.nix
rename to legacy/robi/sync-torrent.nix
diff --git a/nixos/legacy/robi/taskserver.nix b/legacy/robi/taskserver.nix
similarity index 100%
rename from nixos/legacy/robi/taskserver.nix
rename to legacy/robi/taskserver.nix
diff --git a/nixos/legacy/robi/telegraf.nix b/legacy/robi/telegraf.nix
similarity index 100%
rename from nixos/legacy/robi/telegraf.nix
rename to legacy/robi/telegraf.nix
diff --git a/nixos/legacy/robi/vaultwarden.nix b/legacy/robi/vaultwarden.nix
similarity index 100%
rename from nixos/legacy/robi/vaultwarden.nix
rename to legacy/robi/vaultwarden.nix
diff --git a/nixos/legacy/scanner.nix b/legacy/scanner.nix
similarity index 100%
rename from nixos/legacy/scanner.nix
rename to legacy/scanner.nix
diff --git a/nixos/legacy/screeps.nix b/legacy/screeps.nix
similarity index 100%
rename from nixos/legacy/screeps.nix
rename to legacy/screeps.nix
diff --git a/nixos/legacy/shell-bash.nix b/legacy/shell-bash.nix
similarity index 100%
rename from nixos/legacy/shell-bash.nix
rename to legacy/shell-bash.nix
diff --git a/nixos/legacy/shell-tools.nix b/legacy/shell-tools.nix
similarity index 100%
rename from nixos/legacy/shell-tools.nix
rename to legacy/shell-tools.nix
diff --git a/nixos/legacy/shell-zsh.nix b/legacy/shell-zsh.nix
similarity index 100%
rename from nixos/legacy/shell-zsh.nix
rename to legacy/shell-zsh.nix
diff --git a/nixos/legacy/sterni/configuration.nix b/legacy/sterni/configuration.nix
similarity index 100%
rename from nixos/legacy/sterni/configuration.nix
rename to legacy/sterni/configuration.nix
diff --git a/nixos/legacy/sterni/hardware-configuration.nix b/legacy/sterni/hardware-configuration.nix
similarity index 100%
rename from nixos/legacy/sterni/hardware-configuration.nix
rename to legacy/sterni/hardware-configuration.nix
diff --git a/nixos/legacy/sterni/packages.nix b/legacy/sterni/packages.nix
similarity index 100%
rename from nixos/legacy/sterni/packages.nix
rename to legacy/sterni/packages.nix
diff --git a/nixos/legacy/sterni/qemu.nix b/legacy/sterni/qemu.nix
similarity index 100%
rename from nixos/legacy/sterni/qemu.nix
rename to legacy/sterni/qemu.nix
diff --git a/nixos/legacy/sterni/scanner.nix b/legacy/sterni/scanner.nix
similarity index 100%
rename from nixos/legacy/sterni/scanner.nix
rename to legacy/sterni/scanner.nix
diff --git a/nixos/legacy/sterni/syncthing.nix b/legacy/sterni/syncthing.nix
similarity index 100%
rename from nixos/legacy/sterni/syncthing.nix
rename to legacy/sterni/syncthing.nix
diff --git a/nixos/legacy/sterni/tinc.nix b/legacy/sterni/tinc.nix
similarity index 100%
rename from nixos/legacy/sterni/tinc.nix
rename to legacy/sterni/tinc.nix
diff --git a/nixos/legacy/sterni/wireguard.nix b/legacy/sterni/wireguard.nix
similarity index 100%
rename from nixos/legacy/sterni/wireguard.nix
rename to legacy/sterni/wireguard.nix
diff --git a/nixos/legacy/sync-script.nix b/legacy/sync-script.nix
similarity index 100%
rename from nixos/legacy/sync-script.nix
rename to legacy/sync-script.nix
diff --git a/nixos/legacy/sync-torrent.nix b/legacy/sync-torrent.nix
similarity index 100%
rename from nixos/legacy/sync-torrent.nix
rename to legacy/sync-torrent.nix
diff --git a/nixos/legacy/terranix-dendrite.nix b/legacy/terranix-dendrite.nix
similarity index 100%
rename from nixos/legacy/terranix-dendrite.nix
rename to legacy/terranix-dendrite.nix
diff --git a/nixos/legacy/trilium.nix b/legacy/trilium.nix
similarity index 100%
rename from nixos/legacy/trilium.nix
rename to legacy/trilium.nix
diff --git a/nixos/legacy/vim.nix b/legacy/vim.nix
similarity index 100%
rename from nixos/legacy/vim.nix
rename to legacy/vim.nix
diff --git a/nixos/legacy/webhook-ring.nix b/legacy/webhook-ring.nix
similarity index 100%
rename from nixos/legacy/webhook-ring.nix
rename to legacy/webhook-ring.nix
diff --git a/nixos/legacy/weechat.nix b/legacy/weechat.nix
similarity index 100%
rename from nixos/legacy/weechat.nix
rename to legacy/weechat.nix
diff --git a/nixos/legacy/wifi-access-point.nix b/legacy/wifi-access-point.nix
similarity index 100%
rename from nixos/legacy/wifi-access-point.nix
rename to legacy/wifi-access-point.nix
diff --git a/nixos/legacy/wireshark.nix b/legacy/wireshark.nix
similarity index 100%
rename from nixos/legacy/wireshark.nix
rename to legacy/wireshark.nix
diff --git a/nixos/lib/clanlib.nix b/lib/clanlib.nix
similarity index 100%
rename from nixos/lib/clanlib.nix
rename to lib/clanlib.nix
diff --git a/nixos/machines/cherry/37c3.nix b/machines/cherry/37c3.nix
similarity index 100%
rename from nixos/machines/cherry/37c3.nix
rename to machines/cherry/37c3.nix
diff --git a/nixos/machines/cherry/configuration.nix b/machines/cherry/configuration.nix
similarity index 100%
rename from nixos/machines/cherry/configuration.nix
rename to machines/cherry/configuration.nix
diff --git a/nixos/machines/cherry/hardware-configuration/default.nix b/machines/cherry/hardware-configuration/default.nix
similarity index 100%
rename from nixos/machines/cherry/hardware-configuration/default.nix
rename to machines/cherry/hardware-configuration/default.nix
diff --git a/nixos/machines/cherry/hardware-configuration/disko-config.nix b/machines/cherry/hardware-configuration/disko-config.nix
similarity index 100%
rename from nixos/machines/cherry/hardware-configuration/disko-config.nix
rename to machines/cherry/hardware-configuration/disko-config.nix
diff --git a/nixos/machines/cherry/hardware-configuration/hardware-configuration.nix b/machines/cherry/hardware-configuration/hardware-configuration.nix
similarity index 100%
rename from nixos/machines/cherry/hardware-configuration/hardware-configuration.nix
rename to machines/cherry/hardware-configuration/hardware-configuration.nix
diff --git a/nixos/machines/cherry/network-tinc.nix b/machines/cherry/network-tinc.nix
similarity index 100%
rename from nixos/machines/cherry/network-tinc.nix
rename to machines/cherry/network-tinc.nix
diff --git a/nixos/machines/cherry/network-wireguard.nix b/machines/cherry/network-wireguard.nix
similarity index 100%
rename from nixos/machines/cherry/network-wireguard.nix
rename to machines/cherry/network-wireguard.nix
diff --git a/nixos/machines/cherry/qemu.nix b/machines/cherry/qemu.nix
similarity index 100%
rename from nixos/machines/cherry/qemu.nix
rename to machines/cherry/qemu.nix
diff --git a/nixos/machines/cherry/syncthing.nix b/machines/cherry/syncthing.nix
similarity index 100%
rename from nixos/machines/cherry/syncthing.nix
rename to machines/cherry/syncthing.nix
diff --git a/nixos/machines/chungus/configuration.nix b/machines/chungus/configuration.nix
similarity index 100%
rename from nixos/machines/chungus/configuration.nix
rename to machines/chungus/configuration.nix
diff --git a/nixos/machines/chungus/hardware-configuration/default.nix b/machines/chungus/hardware-configuration/default.nix
similarity index 100%
rename from nixos/machines/chungus/hardware-configuration/default.nix
rename to machines/chungus/hardware-configuration/default.nix
diff --git a/nixos/machines/chungus/hardware-configuration/disko-config.nix b/machines/chungus/hardware-configuration/disko-config.nix
similarity index 100%
rename from nixos/machines/chungus/hardware-configuration/disko-config.nix
rename to machines/chungus/hardware-configuration/disko-config.nix
diff --git a/nixos/machines/chungus/hardware-configuration/hardware-configuration.nix b/machines/chungus/hardware-configuration/hardware-configuration.nix
similarity index 100%
rename from nixos/machines/chungus/hardware-configuration/hardware-configuration.nix
rename to machines/chungus/hardware-configuration/hardware-configuration.nix
diff --git a/nixos/machines/chungus/hass-mqtt.nix b/machines/chungus/hass-mqtt.nix
similarity index 100%
rename from nixos/machines/chungus/hass-mqtt.nix
rename to machines/chungus/hass-mqtt.nix
diff --git a/nixos/machines/chungus/hass-zigbee2mqtt.nix b/machines/chungus/hass-zigbee2mqtt.nix
similarity index 100%
rename from nixos/machines/chungus/hass-zigbee2mqtt.nix
rename to machines/chungus/hass-zigbee2mqtt.nix
diff --git a/nixos/machines/chungus/hass.nix b/machines/chungus/hass.nix
similarity index 100%
rename from nixos/machines/chungus/hass.nix
rename to machines/chungus/hass.nix
diff --git a/nixos/machines/chungus/media-audiobookshelf.nix b/machines/chungus/media-audiobookshelf.nix
similarity index 100%
rename from nixos/machines/chungus/media-audiobookshelf.nix
rename to machines/chungus/media-audiobookshelf.nix
diff --git a/nixos/machines/chungus/media-castget.nix b/machines/chungus/media-castget.nix
similarity index 100%
rename from nixos/machines/chungus/media-castget.nix
rename to machines/chungus/media-castget.nix
diff --git a/nixos/machines/chungus/media-curl.nix b/machines/chungus/media-curl.nix
similarity index 100%
rename from nixos/machines/chungus/media-curl.nix
rename to machines/chungus/media-curl.nix
diff --git a/nixos/machines/chungus/media-jellyfin.nix b/machines/chungus/media-jellyfin.nix
similarity index 100%
rename from nixos/machines/chungus/media-jellyfin.nix
rename to machines/chungus/media-jellyfin.nix
diff --git a/nixos/machines/chungus/media-share.nix b/machines/chungus/media-share.nix
similarity index 100%
rename from nixos/machines/chungus/media-share.nix
rename to machines/chungus/media-share.nix
diff --git a/nixos/machines/chungus/media-syncthing.nix b/machines/chungus/media-syncthing.nix
similarity index 100%
rename from nixos/machines/chungus/media-syncthing.nix
rename to machines/chungus/media-syncthing.nix
diff --git a/nixos/machines/chungus/media-youtube.nix b/machines/chungus/media-youtube.nix
similarity index 100%
rename from nixos/machines/chungus/media-youtube.nix
rename to machines/chungus/media-youtube.nix
diff --git a/nixos/machines/chungus/network-tinc-retiolum.nix b/machines/chungus/network-tinc-retiolum.nix
similarity index 100%
rename from nixos/machines/chungus/network-tinc-retiolum.nix
rename to machines/chungus/network-tinc-retiolum.nix
diff --git a/nixos/machines/chungus/network-tinc.nix b/machines/chungus/network-tinc.nix
similarity index 100%
rename from nixos/machines/chungus/network-tinc.nix
rename to machines/chungus/network-tinc.nix
diff --git a/nixos/machines/chungus/network-wireguard.nix b/machines/chungus/network-wireguard.nix
similarity index 100%
rename from nixos/machines/chungus/network-wireguard.nix
rename to machines/chungus/network-wireguard.nix
diff --git a/nixos/machines/chungus/packages.nix b/machines/chungus/packages.nix
similarity index 100%
rename from nixos/machines/chungus/packages.nix
rename to machines/chungus/packages.nix
diff --git a/nixos/machines/chungus/service-atuin.nix b/machines/chungus/service-atuin.nix
similarity index 100%
rename from nixos/machines/chungus/service-atuin.nix
rename to machines/chungus/service-atuin.nix
diff --git a/nixos/machines/chungus/service-paperless.nix b/machines/chungus/service-paperless.nix
similarity index 100%
rename from nixos/machines/chungus/service-paperless.nix
rename to machines/chungus/service-paperless.nix
diff --git a/nixos/machines/chungus/services-forgejo.nix b/machines/chungus/services-forgejo.nix
similarity index 100%
rename from nixos/machines/chungus/services-forgejo.nix
rename to machines/chungus/services-forgejo.nix
diff --git a/nixos/machines/chungus/services-s3.nix b/machines/chungus/services-s3.nix
similarity index 100%
rename from nixos/machines/chungus/services-s3.nix
rename to machines/chungus/services-s3.nix
diff --git a/nixos/machines/chungus/services-vault.nix b/machines/chungus/services-vault.nix
similarity index 100%
rename from nixos/machines/chungus/services-vault.nix
rename to machines/chungus/services-vault.nix
diff --git a/nixos/machines/chungus/sync-rbackup.nix b/machines/chungus/sync-rbackup.nix
similarity index 100%
rename from nixos/machines/chungus/sync-rbackup.nix
rename to machines/chungus/sync-rbackup.nix
diff --git a/nixos/machines/chungus/sync-syncoid.nix b/machines/chungus/sync-syncoid.nix
similarity index 100%
rename from nixos/machines/chungus/sync-syncoid.nix
rename to machines/chungus/sync-syncoid.nix
diff --git a/nixos/machines/chungus/taskwarrior-autotag.nix b/machines/chungus/taskwarrior-autotag.nix
similarity index 100%
rename from nixos/machines/chungus/taskwarrior-autotag.nix
rename to machines/chungus/taskwarrior-autotag.nix
diff --git a/nixos/machines/chungus/telemetry/grafana.nix b/machines/chungus/telemetry/grafana.nix
similarity index 100%
rename from nixos/machines/chungus/telemetry/grafana.nix
rename to machines/chungus/telemetry/grafana.nix
diff --git a/nixos/machines/chungus/telemetry/loki.nix b/machines/chungus/telemetry/loki.nix
similarity index 100%
rename from nixos/machines/chungus/telemetry/loki.nix
rename to machines/chungus/telemetry/loki.nix
diff --git a/nixos/machines/chungus/telemetry/prometheus.nix b/machines/chungus/telemetry/prometheus.nix
similarity index 100%
rename from nixos/machines/chungus/telemetry/prometheus.nix
rename to machines/chungus/telemetry/prometheus.nix
diff --git a/nixos/machines/chungus/telemetry/telegraf-smart.nix b/machines/chungus/telemetry/telegraf-smart.nix
similarity index 100%
rename from nixos/machines/chungus/telemetry/telegraf-smart.nix
rename to machines/chungus/telemetry/telegraf-smart.nix
diff --git a/nixos/machines/chungus/telemetry/telegraf.nix b/machines/chungus/telemetry/telegraf.nix
similarity index 100%
rename from nixos/machines/chungus/telemetry/telegraf.nix
rename to machines/chungus/telemetry/telegraf.nix
diff --git a/nixos/machines/cream/configuration.nix b/machines/cream/configuration.nix
similarity index 100%
rename from nixos/machines/cream/configuration.nix
rename to machines/cream/configuration.nix
diff --git a/nixos/machines/cream/hardware-configuration.nix b/machines/cream/hardware-configuration.nix
similarity index 100%
rename from nixos/machines/cream/hardware-configuration.nix
rename to machines/cream/hardware-configuration.nix
diff --git a/nixos/machines/cream/network-tinc.nix b/machines/cream/network-tinc.nix
similarity index 100%
rename from nixos/machines/cream/network-tinc.nix
rename to machines/cream/network-tinc.nix
diff --git a/nixos/machines/cream/network-tinc_retiolum.nix b/machines/cream/network-tinc_retiolum.nix
similarity index 100%
rename from nixos/machines/cream/network-tinc_retiolum.nix
rename to machines/cream/network-tinc_retiolum.nix
diff --git a/nixos/machines/cream/network-wireguard.nix b/machines/cream/network-wireguard.nix
similarity index 100%
rename from nixos/machines/cream/network-wireguard.nix
rename to machines/cream/network-wireguard.nix
diff --git a/nixos/machines/cream/proxy.nix b/machines/cream/proxy.nix
similarity index 100%
rename from nixos/machines/cream/proxy.nix
rename to machines/cream/proxy.nix
diff --git a/nixos/machines/cream/qemu.nix b/machines/cream/qemu.nix
similarity index 100%
rename from nixos/machines/cream/qemu.nix
rename to machines/cream/qemu.nix
diff --git a/nixos/machines/cream/syncthing.nix b/machines/cream/syncthing.nix
similarity index 100%
rename from nixos/machines/cream/syncthing.nix
rename to machines/cream/syncthing.nix
diff --git a/nixos/machines/orbi/configuration.nix b/machines/orbi/configuration.nix
similarity index 100%
rename from nixos/machines/orbi/configuration.nix
rename to machines/orbi/configuration.nix
diff --git a/nixos/machines/orbi/hardware-configuration/default.nix b/machines/orbi/hardware-configuration/default.nix
similarity index 100%
rename from nixos/machines/orbi/hardware-configuration/default.nix
rename to machines/orbi/hardware-configuration/default.nix
diff --git a/nixos/machines/orbi/hardware-configuration/disko-config.nix b/machines/orbi/hardware-configuration/disko-config.nix
similarity index 100%
rename from nixos/machines/orbi/hardware-configuration/disko-config.nix
rename to machines/orbi/hardware-configuration/disko-config.nix
diff --git a/nixos/machines/orbi/hardware-configuration/hardware-configuration.nix b/machines/orbi/hardware-configuration/hardware-configuration.nix
similarity index 100%
rename from nixos/machines/orbi/hardware-configuration/hardware-configuration.nix
rename to machines/orbi/hardware-configuration/hardware-configuration.nix
diff --git a/nixos/machines/orbi/media-arr.nix b/machines/orbi/media-arr.nix
similarity index 100%
rename from nixos/machines/orbi/media-arr.nix
rename to machines/orbi/media-arr.nix
diff --git a/nixos/machines/orbi/media-jellyfin.nix b/machines/orbi/media-jellyfin.nix
similarity index 100%
rename from nixos/machines/orbi/media-jellyfin.nix
rename to machines/orbi/media-jellyfin.nix
diff --git a/nixos/machines/orbi/media-nextcloud.nix b/machines/orbi/media-nextcloud.nix
similarity index 100%
rename from nixos/machines/orbi/media-nextcloud.nix
rename to machines/orbi/media-nextcloud.nix
diff --git a/nixos/machines/orbi/media-share.nix b/machines/orbi/media-share.nix
similarity index 100%
rename from nixos/machines/orbi/media-share.nix
rename to machines/orbi/media-share.nix
diff --git a/nixos/machines/orbi/media-syncthing.nix b/machines/orbi/media-syncthing.nix
similarity index 100%
rename from nixos/machines/orbi/media-syncthing.nix
rename to machines/orbi/media-syncthing.nix
diff --git a/nixos/machines/orbi/media-transmission2.nix b/machines/orbi/media-transmission2.nix
similarity index 100%
rename from nixos/machines/orbi/media-transmission2.nix
rename to machines/orbi/media-transmission2.nix
diff --git a/nixos/machines/orbi/network-tinc.nix b/machines/orbi/network-tinc.nix
similarity index 100%
rename from nixos/machines/orbi/network-tinc.nix
rename to machines/orbi/network-tinc.nix
diff --git a/nixos/machines/orbi/network-wireguard.nix b/machines/orbi/network-wireguard.nix
similarity index 100%
rename from nixos/machines/orbi/network-wireguard.nix
rename to machines/orbi/network-wireguard.nix
diff --git a/nixos/machines/orbi/nginx-ingolf-wagner-de.nix b/machines/orbi/nginx-ingolf-wagner-de.nix
similarity index 100%
rename from nixos/machines/orbi/nginx-ingolf-wagner-de.nix
rename to machines/orbi/nginx-ingolf-wagner-de.nix
diff --git a/nixos/machines/orbi/nginx-wkd.nix b/machines/orbi/nginx-wkd.nix
similarity index 100%
rename from nixos/machines/orbi/nginx-wkd.nix
rename to machines/orbi/nginx-wkd.nix
diff --git a/nixos/machines/orbi/service-forgejo.nix b/machines/orbi/service-forgejo.nix
similarity index 100%
rename from nixos/machines/orbi/service-forgejo.nix
rename to machines/orbi/service-forgejo.nix
diff --git a/nixos/machines/orbi/service-hedgedoc.nix b/machines/orbi/service-hedgedoc.nix
similarity index 100%
rename from nixos/machines/orbi/service-hedgedoc.nix
rename to machines/orbi/service-hedgedoc.nix
diff --git a/nixos/machines/orbi/service-photoprism.nix b/machines/orbi/service-photoprism.nix
similarity index 100%
rename from nixos/machines/orbi/service-photoprism.nix
rename to machines/orbi/service-photoprism.nix
diff --git a/nixos/machines/orbi/service-taskserver.nix b/machines/orbi/service-taskserver.nix
similarity index 100%
rename from nixos/machines/orbi/service-taskserver.nix
rename to machines/orbi/service-taskserver.nix
diff --git a/nixos/machines/orbi/service-vaultwarden.nix b/machines/orbi/service-vaultwarden.nix
similarity index 100%
rename from nixos/machines/orbi/service-vaultwarden.nix
rename to machines/orbi/service-vaultwarden.nix
diff --git a/nixos/machines/orbi/social-jitsi.nix b/machines/orbi/social-jitsi.nix
similarity index 100%
rename from nixos/machines/orbi/social-jitsi.nix
rename to machines/orbi/social-jitsi.nix
diff --git a/nixos/machines/orbi/social-matrix-terranix.nix b/machines/orbi/social-matrix-terranix.nix
similarity index 100%
rename from nixos/machines/orbi/social-matrix-terranix.nix
rename to machines/orbi/social-matrix-terranix.nix
diff --git a/nixos/machines/sternchen/configuration.nix b/machines/sternchen/configuration.nix
similarity index 100%
rename from nixos/machines/sternchen/configuration.nix
rename to machines/sternchen/configuration.nix
diff --git a/nixos/machines/sternchen/hardware-configuration.nix b/machines/sternchen/hardware-configuration.nix
similarity index 100%
rename from nixos/machines/sternchen/hardware-configuration.nix
rename to machines/sternchen/hardware-configuration.nix
diff --git a/nixos/machines/sternchen/packages.nix b/machines/sternchen/packages.nix
similarity index 100%
rename from nixos/machines/sternchen/packages.nix
rename to machines/sternchen/packages.nix
diff --git a/nixos/machines/sternchen/syncthing.nix b/machines/sternchen/syncthing.nix
similarity index 100%
rename from nixos/machines/sternchen/syncthing.nix
rename to machines/sternchen/syncthing.nix
diff --git a/nixos/machines/sternchen/tinc.nix b/machines/sternchen/tinc.nix
similarity index 100%
rename from nixos/machines/sternchen/tinc.nix
rename to machines/sternchen/tinc.nix
diff --git a/nixos/modules/browser.nix b/modules/browser.nix
similarity index 100%
rename from nixos/modules/browser.nix
rename to modules/browser.nix
diff --git a/nixos/modules/castget.nix b/modules/castget.nix
similarity index 100%
rename from nixos/modules/castget.nix
rename to modules/castget.nix
diff --git a/nixos/modules/default.nix b/modules/default.nix
similarity index 100%
rename from nixos/modules/default.nix
rename to modules/default.nix
diff --git a/nixos/modules/init-ssh.nix b/modules/init-ssh.nix
similarity index 100%
rename from nixos/modules/init-ssh.nix
rename to modules/init-ssh.nix
diff --git a/nixos/modules/rbackup.nix b/modules/rbackup.nix
similarity index 100%
rename from nixos/modules/rbackup.nix
rename to modules/rbackup.nix
diff --git a/nixos/modules/samba-share.nix b/modules/samba-share.nix
similarity index 100%
rename from nixos/modules/samba-share.nix
rename to modules/samba-share.nix
diff --git a/nixos/modules/taskwarrior-autotag.nix b/modules/taskwarrior-autotag.nix
similarity index 100%
rename from nixos/modules/taskwarrior-autotag.nix
rename to modules/taskwarrior-autotag.nix
diff --git a/nixos/modules/taskwarrior-pushover.nix b/modules/taskwarrior-pushover.nix
similarity index 100%
rename from nixos/modules/taskwarrior-pushover.nix
rename to modules/taskwarrior-pushover.nix
diff --git a/nixos/pkgs/default.nix b/pkgs/default.nix
similarity index 100%
rename from nixos/pkgs/default.nix
rename to pkgs/default.nix
diff --git a/nixos/pkgs/otpmenu/default.nix b/pkgs/otpmenu/default.nix
similarity index 100%
rename from nixos/pkgs/otpmenu/default.nix
rename to pkgs/otpmenu/default.nix
diff --git a/nixos/pkgs/sononym-crawler/default.nix b/pkgs/sononym-crawler/default.nix
similarity index 100%
rename from nixos/pkgs/sononym-crawler/default.nix
rename to pkgs/sononym-crawler/default.nix
diff --git a/nixos/pkgs/sononym/default.nix b/pkgs/sononym/default.nix
similarity index 100%
rename from nixos/pkgs/sononym/default.nix
rename to pkgs/sononym/default.nix
diff --git a/nixos/pkgs/taskwarrior-hooks/default.nix b/pkgs/taskwarrior-hooks/default.nix
similarity index 100%
rename from nixos/pkgs/taskwarrior-hooks/default.nix
rename to pkgs/taskwarrior-hooks/default.nix
diff --git a/nixos/system/all/default.nix b/system/all/default.nix
similarity index 100%
rename from nixos/system/all/default.nix
rename to system/all/default.nix
diff --git a/nixos/system/all/defaults.nix b/system/all/defaults.nix
similarity index 100%
rename from nixos/system/all/defaults.nix
rename to system/all/defaults.nix
diff --git a/nixos/system/all/grub.nix b/system/all/grub.nix
similarity index 100%
rename from nixos/system/all/grub.nix
rename to system/all/grub.nix
diff --git a/nixos/system/all/networking-qos.nix b/system/all/networking-qos.nix
similarity index 100%
rename from nixos/system/all/networking-qos.nix
rename to system/all/networking-qos.nix
diff --git a/nixos/system/all/nginx-landingpage.nix b/system/all/nginx-landingpage.nix
similarity index 100%
rename from nixos/system/all/nginx-landingpage.nix
rename to system/all/nginx-landingpage.nix
diff --git a/nixos/system/all/nginx.nix b/system/all/nginx.nix
similarity index 100%
rename from nixos/system/all/nginx.nix
rename to system/all/nginx.nix
diff --git a/nixos/system/all/on-failure.nix b/system/all/on-failure.nix
similarity index 100%
rename from nixos/system/all/on-failure.nix
rename to system/all/on-failure.nix
diff --git a/nixos/system/all/packages.nix b/system/all/packages.nix
similarity index 100%
rename from nixos/system/all/packages.nix
rename to system/all/packages.nix