diff --git a/nixos/hosts/main/cryptocurrency.nix b/hosts/main/cryptocurrency.nix
similarity index 100%
rename from nixos/hosts/main/cryptocurrency.nix
rename to hosts/main/cryptocurrency.nix
diff --git a/nixos/hosts/main/default.nix b/hosts/main/default.nix
similarity index 75%
rename from nixos/hosts/main/default.nix
rename to hosts/main/default.nix
index c035fd0..486c359 100644
--- a/nixos/hosts/main/default.nix
+++ b/hosts/main/default.nix
@@ -8,22 +8,22 @@
 
 {
   imports = [
-    ../../modules/core.nix
-    ../../modules/core-desktop.nix
-    ../../modules/nvidia.nix
-    ../../modules/docker.nix
-    ../../modules/razer.nix
-    ../../modules/desktopManagers/cosmic.nix
-    ../../modules/displayManagers/cosmic-greeter.nix
-    ../../modules/shell.nix
-    ../../modules/virtualization.nix
-    ../../modules/polkit/disable-shutdown.nix
-    ../../modules/locale.nix
-    ../../modules/adb.nix
-    ../../modules/account.nix
-    ../../modules/services/nix-binary-cache.nix
-    ../../modules/udev.nix
-    ../../modules/gnupg.nix
+    ../../nix-os/core.nix
+    ../../nix-os/core-desktop.nix
+    ../../nix-os/nvidia.nix
+    ../../nix-os/docker.nix
+    ../../nix-os/razer.nix
+    ../../nix-os/desktopManagers/cosmic.nix
+    ../../nix-os/displayManagers/cosmic-greeter.nix
+    ../../nix-os/shell.nix
+    ../../nix-os/virtualization.nix
+    ../../nix-os/polkit/disable-shutdown.nix
+    ../../nix-os/locale.nix
+    ../../nix-os/adb.nix
+    ../../nix-os/account.nix
+    ../../nix-os/services/nix-binary-cache.nix
+    ../../nix-os/udev.nix
+    ../../nix-os/gnupg.nix
 
     "${inputs.nixos-vscode-server}"
 
diff --git a/nixos/hosts/main/wireplumber/51-digital-output.conf b/hosts/main/wireplumber/51-digital-output.conf
similarity index 100%
rename from nixos/hosts/main/wireplumber/51-digital-output.conf
rename to hosts/main/wireplumber/51-digital-output.conf
diff --git a/nixos/hosts/main/wireplumber/51-hdmi-otuput.conf b/hosts/main/wireplumber/51-hdmi-otuput.conf
similarity index 100%
rename from nixos/hosts/main/wireplumber/51-hdmi-otuput.conf
rename to hosts/main/wireplumber/51-hdmi-otuput.conf
diff --git a/nixos/hosts/main/wireplumber/51-razerHeadphones-device.conf b/hosts/main/wireplumber/51-razerHeadphones-device.conf
similarity index 100%
rename from nixos/hosts/main/wireplumber/51-razerHeadphones-device.conf
rename to hosts/main/wireplumber/51-razerHeadphones-device.conf
diff --git a/nixos/hosts/main/wireplumber/51-razerHeadphones-input.conf b/hosts/main/wireplumber/51-razerHeadphones-input.conf
similarity index 100%
rename from nixos/hosts/main/wireplumber/51-razerHeadphones-input.conf
rename to hosts/main/wireplumber/51-razerHeadphones-input.conf
diff --git a/nixos/hosts/main/wireplumber/51-razerHeadphones-output.conf b/hosts/main/wireplumber/51-razerHeadphones-output.conf
similarity index 100%
rename from nixos/hosts/main/wireplumber/51-razerHeadphones-output.conf
rename to hosts/main/wireplumber/51-razerHeadphones-output.conf
diff --git a/nixos/hosts/tablet.nix b/hosts/tablet.nix
similarity index 74%
rename from nixos/hosts/tablet.nix
rename to hosts/tablet.nix
index a2f6de1..12b4780 100644
--- a/nixos/hosts/tablet.nix
+++ b/hosts/tablet.nix
@@ -5,18 +5,18 @@
 
 {
   imports = [
-    ../modules/core.nix
-    ../modules/core-desktop.nix
-    ../modules/account.nix
-    ../modules/adb.nix
-    ../modules/locale.nix
-    ../modules/shell.nix
-    ../modules/gnupg.nix
-    ../modules/polkit/network.nix
+    ../nix-os/core.nix
+    ../nix-os/core-desktop.nix
+    ../nix-os/account.nix
+    ../nix-os/adb.nix
+    ../nix-os/locale.nix
+    ../nix-os/shell.nix
+    ../nix-os/gnupg.nix
+    ../nix-os/polkit/network.nix
 
-    ../modules/desktopManagers/cosmic.nix
-    ../modules/displayManagers/cosmic-greeter.nix
-    ../modules/udev.nix
+    ../nix-os/desktopManagers/cosmic.nix
+    ../nix-os/displayManagers/cosmic-greeter.nix
+    ../nix-os/udev.nix
   ];
 
   config = {
diff --git a/nixos/hosts/vm-base.nix b/hosts/vm-base.nix
similarity index 64%
rename from nixos/hosts/vm-base.nix
rename to hosts/vm-base.nix
index d7bb7c3..8584fbd 100644
--- a/nixos/hosts/vm-base.nix
+++ b/hosts/vm-base.nix
@@ -3,13 +3,13 @@
 {
   imports = [
     "${modulesPath}/virtualisation/qemu-vm.nix"
-    ../modules/account.nix
-    ../modules/core.nix
-    ../modules/core-desktop.nix
-    ../modules/locale.nix
-    ../modules/polkit/disable-shutdown.nix
-    ../modules/shell.nix
-    ../modules/udev.nix
+    ../nix-os/account.nix
+    ../nix-os/core.nix
+    ../nix-os/core-desktop.nix
+    ../nix-os/locale.nix
+    ../nix-os/polkit/disable-shutdown.nix
+    ../nix-os/shell.nix
+    ../nix-os/udev.nix
   ];
 
   config = {
diff --git a/nixos/hosts/vm-cosmic.nix b/hosts/vm-cosmic.nix
similarity index 79%
rename from nixos/hosts/vm-cosmic.nix
rename to hosts/vm-cosmic.nix
index dc5e77c..c842604 100644
--- a/nixos/hosts/vm-cosmic.nix
+++ b/hosts/vm-cosmic.nix
@@ -3,8 +3,8 @@
 {
   imports = [
     ./vm-base.nix
-    ../modules/desktopManagers/cosmic.nix
-    ../modules/displayManagers/cosmic-greeter.nix
+    ../nix-os/desktopManagers/cosmic.nix
+    ../nix-os/displayManagers/cosmic-greeter.nix
   ];
 
   config = {
diff --git a/hosts/vm-gnome.nix b/hosts/vm-gnome.nix
new file mode 100644
index 0000000..2b54493
--- /dev/null
+++ b/hosts/vm-gnome.nix
@@ -0,0 +1,9 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ./vm-base.nix
+    ../nix-os/desktopManagers/gnome.nix
+    ../nix-os/displayManagers/gdm.nix
+  ];
+}
diff --git a/nixos/modules/account.nix b/nix-os/account.nix
similarity index 100%
rename from nixos/modules/account.nix
rename to nix-os/account.nix
diff --git a/nixos/modules/adb.nix b/nix-os/adb.nix
similarity index 100%
rename from nixos/modules/adb.nix
rename to nix-os/adb.nix
diff --git a/nixos/modules/core-desktop.nix b/nix-os/core-desktop.nix
similarity index 100%
rename from nixos/modules/core-desktop.nix
rename to nix-os/core-desktop.nix
diff --git a/nixos/modules/core.nix b/nix-os/core.nix
similarity index 95%
rename from nixos/modules/core.nix
rename to nix-os/core.nix
index 0fece8a..8d8c9b3 100644
--- a/nixos/modules/core.nix
+++ b/nix-os/core.nix
@@ -2,7 +2,6 @@
   inputs,
   lib,
   pkgs,
-  self,
   ...
 }:
 
@@ -65,7 +64,7 @@
       package = pkgs.nix-index.override {
         nix-index-unwrapped = pkgs.nix-index-unwrapped.overrideAttrs (oldAttrs: {
           patches = oldAttrs.patches or [] ++ [
-            ( builtins.path { path = "${self}/pkgs/by-name/ni/nix-index/cnfOutput.patch"; } )
+            ../pkgs/by-name/ni/nix-index/cnfOutput.patch
           ];
         });
 
diff --git a/nixos/modules/dconf-common.nix b/nix-os/dconf-common.nix
similarity index 100%
rename from nixos/modules/dconf-common.nix
rename to nix-os/dconf-common.nix
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/enable_drag_source b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/enable_drag_source
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/enable_drag_source
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/enable_drag_source
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/favorites b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/favorites
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/favorites
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/favorites
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/filter_top_levels b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/filter_top_levels
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/filter_top_levels
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/filter_top_levels
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppletTime/v1/military_time b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppletTime/v1/military_time
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppletTime/v1/military_time
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppletTime/v1/military_time
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppletTime/v1/show_seconds b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppletTime/v1/show_seconds
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppletTime/v1/show_seconds
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppletTime/v1/show_seconds
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicBackground/v1/all b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicBackground/v1/all
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicBackground/v1/all
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicBackground/v1/all
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicBackground/v1/same-on-all b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicBackground/v1/same-on-all
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicBackground/v1/same-on-all
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicBackground/v1/same-on-all
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/autotile b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/autotile
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/autotile
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/autotile
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/autotile_behavior b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/autotile_behavior
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/autotile_behavior
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/autotile_behavior
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor_delay b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor_delay
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor_delay
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor_delay
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/workspaces b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/workspaces
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/workspaces
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/workspaces
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicFiles/v1/desktop b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicFiles/v1/desktop
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicFiles/v1/desktop
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicFiles/v1/desktop
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/anchor b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/anchor
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/anchor
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/anchor
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/anchor_gap b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/anchor_gap
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/anchor_gap
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/anchor_gap
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/autohide b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/autohide
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/autohide
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/autohide
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/border_radius b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/border_radius
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/border_radius
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/border_radius
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/exclusive_zone b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/exclusive_zone
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/exclusive_zone
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/exclusive_zone
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/layer b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/layer
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/layer
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/layer
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/plugins_center b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/plugins_center
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/plugins_center
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/plugins_center
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/plugins_wings b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/plugins_wings
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/plugins_wings
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/plugins_wings
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/anchor b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/anchor
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/anchor
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/anchor
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/anchor_gap b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/anchor_gap
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/anchor_gap
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/anchor_gap
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/layer b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/layer
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/layer
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/layer
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_center b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_center
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_center
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_center
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_wings b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_wings
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_wings
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_wings
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicSettings.Shortcuts/v1/custom b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicSettings.Shortcuts/v1/custom
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicSettings.Shortcuts/v1/custom
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicSettings.Shortcuts/v1/custom
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/active_hint b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/active_hint
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/active_hint
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/active_hint
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/corner_radii b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/corner_radii
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/corner_radii
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/corner_radii
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/gaps b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/gaps
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/gaps
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/gaps
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/active_hint b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/active_hint
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/active_hint
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/active_hint
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/corner_radii b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/corner_radii
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/corner_radii
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/corner_radii
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/gaps b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/gaps
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/gaps
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/gaps
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Mode/v1/is_dark b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Mode/v1/is_dark
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Mode/v1/is_dark
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Mode/v1/is_dark
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTk/v1/show_maximize b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTk/v1/show_maximize
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTk/v1/show_maximize
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicTk/v1/show_maximize
diff --git a/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTk/v1/show_minimize b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTk/v1/show_minimize
similarity index 100%
rename from nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTk/v1/show_minimize
rename to nix-os/desktopManagers/cosmic-config/com.system76.CosmicTk/v1/show_minimize
diff --git a/nixos/modules/desktopManagers/cosmic.nix b/nix-os/desktopManagers/cosmic.nix
similarity index 91%
rename from nixos/modules/desktopManagers/cosmic.nix
rename to nix-os/desktopManagers/cosmic.nix
index 6dd7bbd..fd12dab 100644
--- a/nixos/modules/desktopManagers/cosmic.nix
+++ b/nix-os/desktopManagers/cosmic.nix
@@ -17,7 +17,7 @@ let
     '';
     outputs = [ "out" "share" ];
 
-    wallpaper = builtins.path { path = "${self}/media/wallpaper.png"; };
+    wallpaper = ../../media/wallpaper.png;
     corner_radii_theme = "2.0";
     corner_radii_panel = "2";
   };
@@ -26,7 +26,7 @@ in
 {
   imports = [
     "${inputs.cosmic-modules}/nixos/cosmic/module.nix"
-    "${self}/nixos/modules/generic/dconf.nix"
+    "${self}/nix-os/generic/dconf.nix"
   ];
   config = {
     services.desktopManager.cosmic.enable = true;
diff --git a/nixos/modules/desktopManagers/gnome.nix b/nix-os/desktopManagers/gnome.nix
similarity index 100%
rename from nixos/modules/desktopManagers/gnome.nix
rename to nix-os/desktopManagers/gnome.nix
diff --git a/nixos/modules/displayManagers/cosmic-greeter.nix b/nix-os/displayManagers/cosmic-greeter.nix
similarity index 100%
rename from nixos/modules/displayManagers/cosmic-greeter.nix
rename to nix-os/displayManagers/cosmic-greeter.nix
diff --git a/nixos/modules/displayManagers/gdm.nix b/nix-os/displayManagers/gdm.nix
similarity index 100%
rename from nixos/modules/displayManagers/gdm.nix
rename to nix-os/displayManagers/gdm.nix
diff --git a/nixos/modules/docker.nix b/nix-os/docker.nix
similarity index 100%
rename from nixos/modules/docker.nix
rename to nix-os/docker.nix
diff --git a/nixos/modules/generic/dconf.nix b/nix-os/generic/dconf.nix
similarity index 100%
rename from nixos/modules/generic/dconf.nix
rename to nix-os/generic/dconf.nix
diff --git a/nixos/modules/generic/mpv.nix b/nix-os/generic/mpv.nix
similarity index 100%
rename from nixos/modules/generic/mpv.nix
rename to nix-os/generic/mpv.nix
diff --git a/nixos/modules/gnupg.nix b/nix-os/gnupg.nix
similarity index 100%
rename from nixos/modules/gnupg.nix
rename to nix-os/gnupg.nix
diff --git a/nixos/modules/locale.nix b/nix-os/locale.nix
similarity index 100%
rename from nixos/modules/locale.nix
rename to nix-os/locale.nix
diff --git a/nixos/modules/module-overrides.nix b/nix-os/module-overrides.nix
similarity index 100%
rename from nixos/modules/module-overrides.nix
rename to nix-os/module-overrides.nix
diff --git a/nixos/modules/nix.nix b/nix-os/nix.nix
similarity index 100%
rename from nixos/modules/nix.nix
rename to nix-os/nix.nix
diff --git a/nixos/modules/nvidia.nix b/nix-os/nvidia.nix
similarity index 100%
rename from nixos/modules/nvidia.nix
rename to nix-os/nvidia.nix
diff --git a/nixos/modules/polkit/disable-shutdown.nix b/nix-os/polkit/disable-shutdown.nix
similarity index 100%
rename from nixos/modules/polkit/disable-shutdown.nix
rename to nix-os/polkit/disable-shutdown.nix
diff --git a/nixos/modules/polkit/network.nix b/nix-os/polkit/network.nix
similarity index 100%
rename from nixos/modules/polkit/network.nix
rename to nix-os/polkit/network.nix
diff --git a/nixos/modules/razer.nix b/nix-os/razer.nix
similarity index 100%
rename from nixos/modules/razer.nix
rename to nix-os/razer.nix
diff --git a/nixos/modules/services/nix-binary-cache.nix b/nix-os/services/nix-binary-cache.nix
similarity index 100%
rename from nixos/modules/services/nix-binary-cache.nix
rename to nix-os/services/nix-binary-cache.nix
diff --git a/nixos/modules/shell.nix b/nix-os/shell.nix
similarity index 100%
rename from nixos/modules/shell.nix
rename to nix-os/shell.nix
diff --git a/nixos/modules/udev.nix b/nix-os/udev.nix
similarity index 100%
rename from nixos/modules/udev.nix
rename to nix-os/udev.nix
diff --git a/nixos/modules/unstable-packages.nix b/nix-os/unstable-packages.nix
similarity index 100%
rename from nixos/modules/unstable-packages.nix
rename to nix-os/unstable-packages.nix
diff --git a/nixos/modules/virtualization.nix b/nix-os/virtualization.nix
similarity index 100%
rename from nixos/modules/virtualization.nix
rename to nix-os/virtualization.nix
diff --git a/nixos/modules/xdg-default-apps.nix b/nix-os/xdg-default-apps.nix
similarity index 100%
rename from nixos/modules/xdg-default-apps.nix
rename to nix-os/xdg-default-apps.nix
diff --git a/nixos/hosts/vm-gnome.nix b/nixos/hosts/vm-gnome.nix
deleted file mode 100644
index ff6a41e..0000000
--- a/nixos/hosts/vm-gnome.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ lib, ... }:
-
-{
-  imports = [
-    ./vm-base.nix
-    ../modules/desktopManagers/gnome.nix
-    ../modules/displayManagers/gdm.nix
-  ];
-}
diff --git a/outputs.nix b/outputs.nix
index d5d7bbe..b95e04b 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -54,17 +54,16 @@ self = {
       ];
       specialArgs = { inherit self inputs; };
     };
-    baseHostsDir = ./nixos/hosts;
   in
     # mapped attrset of nix file paths to attrSet with initialized NixOS configurations,
     # whose names are derived from file names
-    lib.pipe baseHostsDir [
+    lib.pipe ./hosts [
       builtins.readDir
       # filter out files that are not .nix files, directories with default.nix or starting with . (dot, hidden files)
       ( lib.filterAttrs (name: type:
         (
           (type == "regular" && lib.hasSuffix ".nix" name)
-          || (type == "directory" && builtins.pathExists (baseHostsDir + "/${name}/default.nix"))
+          || (type == "directory" && builtins.pathExists "${builtins.toString ./.}/hosts/${name}/default.nix")
         )
         && !lib.hasPrefix "." name
       ))
@@ -72,7 +71,7 @@ self = {
         # remove .nix extension
         name = if type == "directory" then name else builtins.substring 0 (builtins.stringLength name - 4) name;
         # initialize NixOS configuration
-        value = mkNixosSystem (baseHostsDir + "/${name}");
+        value = mkNixosSystem ./hosts/${name};
       }))
       builtins.attrValues
       builtins.listToAttrs
diff --git a/pkgs/by-name/de/den-http-get-updater/package.nix b/pkgs/by-name/de/den-http-get-updater/package.nix
index 3293811..91d8581 100644
--- a/pkgs/by-name/de/den-http-get-updater/package.nix
+++ b/pkgs/by-name/de/den-http-get-updater/package.nix
@@ -44,16 +44,7 @@
 }:
 
 let
-  assertNoStorePathPrefix = path:
-    assert lib.assertMsg (!lib.hasPrefix builtins.storeDir path) ''
-      The path '${path}' is a store path.
-
-      den-http-get-updater must be evaluated in impure mode,
-      in order to modify target files, and this cannot be done
-      with files in the store.
-    ''; path;
-
-  realFileLocation = assertNoStorePathPrefix (builtins.toString fileLocation);
+  realFileLocation = builtins.toString fileLocation;
 
   prefetchList' = lib.map (x:
     assert builtins.isNull x.prefetchUrlLocation || lib.isAttrs x.prefetchUrlLocation;
@@ -67,7 +58,7 @@ let
       name = if x.unpack or unpack then "source" else null;
       mark = builtins.hashString "sha256" x.previousHash;
       markRegexEscape = lib.escapeRegex mark;
-      realFileLocation = assertNoStorePathPrefix (builtins.toString x.realFileLocation or fileLocation);
+      realFileLocation = builtins.toString x.fileLocation or fileLocation;
       realFileLocationShellEscape = lib.escapeShellArg realFileLocation;
       prefetchUrlLocationShellEscape = lib.mapAttrs (_: lib.escapeShellArg) x.prefetchUrlLocation;
       previousHashRegexEscape = lib.escapeRegex x.previousHash;
diff --git a/update-list.nix b/update-list.nix
index 012b930..ce8c49b 100644
--- a/update-list.nix
+++ b/update-list.nix
@@ -30,7 +30,7 @@ in self.lib.concatMapAttrs (name: value: {
     };
   in lib.getAttrFromPath ( [ "config" ] ++ attrpath ) system;
 in {
-  "NixOS/nvidia" = mkUpdater ./nixos/modules/nvidia.nix [ "hardware" "nvidia" "package" ] {};
+  "NixOS/nvidia" = mkUpdater ./nix-os/nvidia.nix [ "hardware" "nvidia" "package" ] {};
 })
 
 # MARK: packages