diff --git a/common/default.nix b/common/default.nix
new file mode 100644
index 0000000..ebb5304
--- /dev/null
+++ b/common/default.nix
@@ -0,0 +1,30 @@
+({ nixpkgs, ... }: {
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_CA.UTF-8";
+  console = {
+    keyMap = "ca";
+  };
+
+  nixpkgs.config.allowUnfree = true;
+
+  nix = {
+    # Edit nix.conf
+    settings = {
+      experimental-features = [ "nix-command" "flakes" ];
+      keep-outputs = true;
+      keep-derivations = true;
+      auto-optimise-store = true;
+      warn-dirty = false;
+    };
+
+    # Minimize dowloads of indirect nixpkgs flakes
+    registry.nixpkgs = {
+      flake = nixpkgs;
+      exact = false;
+    };
+  };
+
+  imports = [
+    ./overlays/list.nix
+  ];
+})
diff --git a/nixos/overlays/blueberry.nix b/common/overlays/blueberry.nix
similarity index 100%
rename from nixos/overlays/blueberry.nix
rename to common/overlays/blueberry.nix
diff --git a/nixos/overlays/dracula-theme.nix b/common/overlays/dracula-theme.nix
similarity index 100%
rename from nixos/overlays/dracula-theme.nix
rename to common/overlays/dracula-theme.nix
diff --git a/nixos/overlays/list.nix b/common/overlays/list.nix
similarity index 100%
rename from nixos/overlays/list.nix
rename to common/overlays/list.nix
diff --git a/nixos/overlays/patches/swayosd.patch b/common/overlays/patches/swayosd.patch
similarity index 100%
rename from nixos/overlays/patches/swayosd.patch
rename to common/overlays/patches/swayosd.patch
diff --git a/nixos/overlays/patches/wayland.patch b/common/overlays/patches/wayland.patch
similarity index 100%
rename from nixos/overlays/patches/wayland.patch
rename to common/overlays/patches/wayland.patch
diff --git a/nixos/overlays/pkgs/coloryou/LICENSE b/common/overlays/pkgs/coloryou/LICENSE
similarity index 100%
rename from nixos/overlays/pkgs/coloryou/LICENSE
rename to common/overlays/pkgs/coloryou/LICENSE
diff --git a/nixos/overlays/pkgs/coloryou/coloryou.py b/common/overlays/pkgs/coloryou/coloryou.py
similarity index 100%
rename from nixos/overlays/pkgs/coloryou/coloryou.py
rename to common/overlays/pkgs/coloryou/coloryou.py
diff --git a/nixos/overlays/pkgs/coloryou/default.nix b/common/overlays/pkgs/coloryou/default.nix
similarity index 100%
rename from nixos/overlays/pkgs/coloryou/default.nix
rename to common/overlays/pkgs/coloryou/default.nix
diff --git a/nixos/overlays/pkgs/coloryou/requirements.txt b/common/overlays/pkgs/coloryou/requirements.txt
similarity index 100%
rename from nixos/overlays/pkgs/coloryou/requirements.txt
rename to common/overlays/pkgs/coloryou/requirements.txt
diff --git a/nixos/overlays/pkgs/coloryou/setup.py b/common/overlays/pkgs/coloryou/setup.py
similarity index 100%
rename from nixos/overlays/pkgs/coloryou/setup.py
rename to common/overlays/pkgs/coloryou/setup.py
diff --git a/nixos/overlays/pkgs/coloryou/shell.nix b/common/overlays/pkgs/coloryou/shell.nix
similarity index 100%
rename from nixos/overlays/pkgs/coloryou/shell.nix
rename to common/overlays/pkgs/coloryou/shell.nix
diff --git a/nixos/overlays/pkgs/input-emulator.nix b/common/overlays/pkgs/input-emulator.nix
similarity index 100%
rename from nixos/overlays/pkgs/input-emulator.nix
rename to common/overlays/pkgs/input-emulator.nix
diff --git a/nixos/overlays/pkgs/pam-fprint-grosshack.nix b/common/overlays/pkgs/pam-fprint-grosshack.nix
similarity index 100%
rename from nixos/overlays/pkgs/pam-fprint-grosshack.nix
rename to common/overlays/pkgs/pam-fprint-grosshack.nix
diff --git a/nixos/overlays/swayosd.nix b/common/overlays/swayosd.nix
similarity index 100%
rename from nixos/overlays/swayosd.nix
rename to common/overlays/swayosd.nix
diff --git a/nixos/flake.lock b/flake.lock
similarity index 100%
rename from nixos/flake.lock
rename to flake.lock
diff --git a/nixos/flake.nix b/flake.nix
similarity index 57%
rename from nixos/flake.nix
rename to flake.nix
index 228dfe6..e0c12e4 100644
--- a/nixos/flake.nix
+++ b/flake.nix
@@ -44,40 +44,25 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, nur, ... }@attrs: {
+  outputs = { self, nixpkgs, home-manager, nur, ... }@attrs: let
+    defaultModules = [
+      nur.nixosModules.nur
+
+      home-manager.nixosModules.home-manager {
+        home-manager.extraSpecialArgs = attrs;
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+      }
+
+      ./common/default.nix
+    ];
+  in {
     nixosConfigurations.wim = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = attrs;
       modules = [
-        nur.nixosModules.nur
-
-        ({ ... }: {
-          nix = {
-            # Edit nix.conf
-            settings = {
-              experimental-features = [ "nix-command" "flakes" ];
-              keep-outputs = true;
-              keep-derivations = true;
-              auto-optimise-store = true;
-              warn-dirty = false;
-            };
-
-            # Minimize dowloads of indirect nixpkgs flakes
-            registry = {
-              nixpkgs.flake = self.inputs.nixpkgs;
-              nixpkgs.exact = false;
-            };
-          };
-        })
-
-        home-manager.nixosModules.home-manager {
-          home-manager.extraSpecialArgs = attrs;
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-        }
-
-        ./configuration.nix
-      ];
+        ./hosts/wim/configuration.nix
+      ] ++ defaultModules;
     };
   };
 }
diff --git a/nixos/cfg/boot.nix b/hosts/wim/cfg/boot.nix
similarity index 100%
rename from nixos/cfg/boot.nix
rename to hosts/wim/cfg/boot.nix
diff --git a/nixos/cfg/extra-hardware.nix b/hosts/wim/cfg/extra-hardware.nix
similarity index 100%
rename from nixos/cfg/extra-hardware.nix
rename to hosts/wim/cfg/extra-hardware.nix
diff --git a/nixos/cfg/main.nix b/hosts/wim/cfg/main.nix
similarity index 100%
rename from nixos/cfg/main.nix
rename to hosts/wim/cfg/main.nix
diff --git a/nixos/cfg/packages.nix b/hosts/wim/cfg/packages.nix
similarity index 100%
rename from nixos/cfg/packages.nix
rename to hosts/wim/cfg/packages.nix
diff --git a/nixos/cfg/security.nix b/hosts/wim/cfg/security.nix
similarity index 100%
rename from nixos/cfg/security.nix
rename to hosts/wim/cfg/security.nix
diff --git a/config/ags/bin/heart.sh b/hosts/wim/config/ags/bin/heart.sh
similarity index 100%
rename from config/ags/bin/heart.sh
rename to hosts/wim/config/ags/bin/heart.sh
diff --git a/config/ags/bin/launch-app.sh b/hosts/wim/config/ags/bin/launch-app.sh
similarity index 100%
rename from config/ags/bin/launch-app.sh
rename to hosts/wim/config/ags/bin/launch-app.sh
diff --git a/config/ags/bin/osk-toggle.sh b/hosts/wim/config/ags/bin/osk-toggle.sh
similarity index 100%
rename from config/ags/bin/osk-toggle.sh
rename to hosts/wim/config/ags/bin/osk-toggle.sh
diff --git a/config/ags/bin/qs-toggles.sh b/hosts/wim/config/ags/bin/qs-toggles.sh
similarity index 100%
rename from config/ags/bin/qs-toggles.sh
rename to hosts/wim/config/ags/bin/qs-toggles.sh
diff --git a/config/ags/bin/startup.sh b/hosts/wim/config/ags/bin/startup.sh
similarity index 100%
rename from config/ags/bin/startup.sh
rename to hosts/wim/config/ags/bin/startup.sh
diff --git a/config/ags/bin/tablet-toggle.sh b/hosts/wim/config/ags/bin/tablet-toggle.sh
similarity index 100%
rename from config/ags/bin/tablet-toggle.sh
rename to hosts/wim/config/ags/bin/tablet-toggle.sh
diff --git a/config/ags/config.js b/hosts/wim/config/ags/config.js
similarity index 100%
rename from config/ags/config.js
rename to hosts/wim/config/ags/config.js
diff --git a/config/ags/imports.js b/hosts/wim/config/ags/imports.js
similarity index 100%
rename from config/ags/imports.js
rename to hosts/wim/config/ags/imports.js
diff --git a/config/ags/js/applauncher/main.js b/hosts/wim/config/ags/js/applauncher/main.js
similarity index 100%
rename from config/ags/js/applauncher/main.js
rename to hosts/wim/config/ags/js/applauncher/main.js
diff --git a/config/ags/js/bar/audio.js b/hosts/wim/config/ags/js/bar/audio.js
similarity index 100%
rename from config/ags/js/bar/audio.js
rename to hosts/wim/config/ags/js/bar/audio.js
diff --git a/config/ags/js/bar/battery.js b/hosts/wim/config/ags/js/bar/battery.js
similarity index 100%
rename from config/ags/js/bar/battery.js
rename to hosts/wim/config/ags/js/bar/battery.js
diff --git a/config/ags/js/bar/brightness.js b/hosts/wim/config/ags/js/bar/brightness.js
similarity index 100%
rename from config/ags/js/bar/brightness.js
rename to hosts/wim/config/ags/js/bar/brightness.js
diff --git a/config/ags/js/bar/clock.js b/hosts/wim/config/ags/js/bar/clock.js
similarity index 100%
rename from config/ags/js/bar/clock.js
rename to hosts/wim/config/ags/js/bar/clock.js
diff --git a/config/ags/js/bar/current-window.js b/hosts/wim/config/ags/js/bar/current-window.js
similarity index 100%
rename from config/ags/js/bar/current-window.js
rename to hosts/wim/config/ags/js/bar/current-window.js
diff --git a/config/ags/js/bar/fullscreen.js b/hosts/wim/config/ags/js/bar/fullscreen.js
similarity index 100%
rename from config/ags/js/bar/fullscreen.js
rename to hosts/wim/config/ags/js/bar/fullscreen.js
diff --git a/config/ags/js/bar/gesture.js b/hosts/wim/config/ags/js/bar/gesture.js
similarity index 100%
rename from config/ags/js/bar/gesture.js
rename to hosts/wim/config/ags/js/bar/gesture.js
diff --git a/config/ags/js/bar/heart.js b/hosts/wim/config/ags/js/bar/heart.js
similarity index 100%
rename from config/ags/js/bar/heart.js
rename to hosts/wim/config/ags/js/bar/heart.js
diff --git a/config/ags/js/bar/keyboard-layout.js b/hosts/wim/config/ags/js/bar/keyboard-layout.js
similarity index 100%
rename from config/ags/js/bar/keyboard-layout.js
rename to hosts/wim/config/ags/js/bar/keyboard-layout.js
diff --git a/config/ags/js/bar/main.js b/hosts/wim/config/ags/js/bar/main.js
similarity index 100%
rename from config/ags/js/bar/main.js
rename to hosts/wim/config/ags/js/bar/main.js
diff --git a/config/ags/js/bar/notif-button.js b/hosts/wim/config/ags/js/bar/notif-button.js
similarity index 100%
rename from config/ags/js/bar/notif-button.js
rename to hosts/wim/config/ags/js/bar/notif-button.js
diff --git a/config/ags/js/bar/osk-toggle.js b/hosts/wim/config/ags/js/bar/osk-toggle.js
similarity index 100%
rename from config/ags/js/bar/osk-toggle.js
rename to hosts/wim/config/ags/js/bar/osk-toggle.js
diff --git a/config/ags/js/bar/quick-settings.js b/hosts/wim/config/ags/js/bar/quick-settings.js
similarity index 100%
rename from config/ags/js/bar/quick-settings.js
rename to hosts/wim/config/ags/js/bar/quick-settings.js
diff --git a/config/ags/js/bar/systray.js b/hosts/wim/config/ags/js/bar/systray.js
similarity index 100%
rename from config/ags/js/bar/systray.js
rename to hosts/wim/config/ags/js/bar/systray.js
diff --git a/config/ags/js/bar/tablet-toggle.js b/hosts/wim/config/ags/js/bar/tablet-toggle.js
similarity index 100%
rename from config/ags/js/bar/tablet-toggle.js
rename to hosts/wim/config/ags/js/bar/tablet-toggle.js
diff --git a/config/ags/js/bar/workspaces.js b/hosts/wim/config/ags/js/bar/workspaces.js
similarity index 100%
rename from config/ags/js/bar/workspaces.js
rename to hosts/wim/config/ags/js/bar/workspaces.js
diff --git a/config/ags/js/date.js b/hosts/wim/config/ags/js/date.js
similarity index 100%
rename from config/ags/js/date.js
rename to hosts/wim/config/ags/js/date.js
diff --git a/config/ags/js/media-player/gesture.js b/hosts/wim/config/ags/js/media-player/gesture.js
similarity index 100%
rename from config/ags/js/media-player/gesture.js
rename to hosts/wim/config/ags/js/media-player/gesture.js
diff --git a/config/ags/js/media-player/mpris.js b/hosts/wim/config/ags/js/media-player/mpris.js
similarity index 100%
rename from config/ags/js/media-player/mpris.js
rename to hosts/wim/config/ags/js/media-player/mpris.js
diff --git a/config/ags/js/media-player/player.js b/hosts/wim/config/ags/js/media-player/player.js
similarity index 100%
rename from config/ags/js/media-player/player.js
rename to hosts/wim/config/ags/js/media-player/player.js
diff --git a/config/ags/js/misc/closer.js b/hosts/wim/config/ags/js/misc/closer.js
similarity index 100%
rename from config/ags/js/misc/closer.js
rename to hosts/wim/config/ags/js/misc/closer.js
diff --git a/config/ags/js/misc/cursorbox.js b/hosts/wim/config/ags/js/misc/cursorbox.js
similarity index 100%
rename from config/ags/js/misc/cursorbox.js
rename to hosts/wim/config/ags/js/misc/cursorbox.js
diff --git a/config/ags/js/misc/drag.js b/hosts/wim/config/ags/js/misc/drag.js
similarity index 100%
rename from config/ags/js/misc/drag.js
rename to hosts/wim/config/ags/js/misc/drag.js
diff --git a/config/ags/js/misc/popup.js b/hosts/wim/config/ags/js/misc/popup.js
similarity index 100%
rename from config/ags/js/misc/popup.js
rename to hosts/wim/config/ags/js/misc/popup.js
diff --git a/config/ags/js/misc/separator.js b/hosts/wim/config/ags/js/misc/separator.js
similarity index 100%
rename from config/ags/js/misc/separator.js
rename to hosts/wim/config/ags/js/misc/separator.js
diff --git a/config/ags/js/notifications/base.js b/hosts/wim/config/ags/js/notifications/base.js
similarity index 100%
rename from config/ags/js/notifications/base.js
rename to hosts/wim/config/ags/js/notifications/base.js
diff --git a/config/ags/js/notifications/center.js b/hosts/wim/config/ags/js/notifications/center.js
similarity index 100%
rename from config/ags/js/notifications/center.js
rename to hosts/wim/config/ags/js/notifications/center.js
diff --git a/config/ags/js/notifications/popup.js b/hosts/wim/config/ags/js/notifications/popup.js
similarity index 100%
rename from config/ags/js/notifications/popup.js
rename to hosts/wim/config/ags/js/notifications/popup.js
diff --git a/config/ags/js/overview/clients.js b/hosts/wim/config/ags/js/overview/clients.js
similarity index 100%
rename from config/ags/js/overview/clients.js
rename to hosts/wim/config/ags/js/overview/clients.js
diff --git a/config/ags/js/overview/dragndrop.js b/hosts/wim/config/ags/js/overview/dragndrop.js
similarity index 100%
rename from config/ags/js/overview/dragndrop.js
rename to hosts/wim/config/ags/js/overview/dragndrop.js
diff --git a/config/ags/js/overview/main.js b/hosts/wim/config/ags/js/overview/main.js
similarity index 100%
rename from config/ags/js/overview/main.js
rename to hosts/wim/config/ags/js/overview/main.js
diff --git a/config/ags/js/overview/variables.js b/hosts/wim/config/ags/js/overview/variables.js
similarity index 100%
rename from config/ags/js/overview/variables.js
rename to hosts/wim/config/ags/js/overview/variables.js
diff --git a/config/ags/js/overview/workspaces.js b/hosts/wim/config/ags/js/overview/workspaces.js
similarity index 100%
rename from config/ags/js/overview/workspaces.js
rename to hosts/wim/config/ags/js/overview/workspaces.js
diff --git a/config/ags/js/powermenu.js b/hosts/wim/config/ags/js/powermenu.js
similarity index 100%
rename from config/ags/js/powermenu.js
rename to hosts/wim/config/ags/js/powermenu.js
diff --git a/config/ags/js/quick-settings/button-grid.js b/hosts/wim/config/ags/js/quick-settings/button-grid.js
similarity index 100%
rename from config/ags/js/quick-settings/button-grid.js
rename to hosts/wim/config/ags/js/quick-settings/button-grid.js
diff --git a/config/ags/js/quick-settings/main.js b/hosts/wim/config/ags/js/quick-settings/main.js
similarity index 100%
rename from config/ags/js/quick-settings/main.js
rename to hosts/wim/config/ags/js/quick-settings/main.js
diff --git a/config/ags/js/quick-settings/slider-box.js b/hosts/wim/config/ags/js/quick-settings/slider-box.js
similarity index 100%
rename from config/ags/js/quick-settings/slider-box.js
rename to hosts/wim/config/ags/js/quick-settings/slider-box.js
diff --git a/config/ags/scss/common.scss b/hosts/wim/config/ags/scss/common.scss
similarity index 100%
rename from config/ags/scss/common.scss
rename to hosts/wim/config/ags/scss/common.scss
diff --git a/config/ags/scss/main.scss b/hosts/wim/config/ags/scss/main.scss
similarity index 100%
rename from config/ags/scss/main.scss
rename to hosts/wim/config/ags/scss/main.scss
diff --git a/config/ags/scss/widgets/applauncher.scss b/hosts/wim/config/ags/scss/widgets/applauncher.scss
similarity index 100%
rename from config/ags/scss/widgets/applauncher.scss
rename to hosts/wim/config/ags/scss/widgets/applauncher.scss
diff --git a/config/ags/scss/widgets/date.scss b/hosts/wim/config/ags/scss/widgets/date.scss
similarity index 100%
rename from config/ags/scss/widgets/date.scss
rename to hosts/wim/config/ags/scss/widgets/date.scss
diff --git a/config/ags/scss/widgets/notification-center.scss b/hosts/wim/config/ags/scss/widgets/notification-center.scss
similarity index 100%
rename from config/ags/scss/widgets/notification-center.scss
rename to hosts/wim/config/ags/scss/widgets/notification-center.scss
diff --git a/config/ags/scss/widgets/notification.scss b/hosts/wim/config/ags/scss/widgets/notification.scss
similarity index 100%
rename from config/ags/scss/widgets/notification.scss
rename to hosts/wim/config/ags/scss/widgets/notification.scss
diff --git a/config/ags/scss/widgets/overview.scss b/hosts/wim/config/ags/scss/widgets/overview.scss
similarity index 100%
rename from config/ags/scss/widgets/overview.scss
rename to hosts/wim/config/ags/scss/widgets/overview.scss
diff --git a/config/ags/scss/widgets/player.scss b/hosts/wim/config/ags/scss/widgets/player.scss
similarity index 100%
rename from config/ags/scss/widgets/player.scss
rename to hosts/wim/config/ags/scss/widgets/player.scss
diff --git a/config/ags/scss/widgets/powermenu.scss b/hosts/wim/config/ags/scss/widgets/powermenu.scss
similarity index 100%
rename from config/ags/scss/widgets/powermenu.scss
rename to hosts/wim/config/ags/scss/widgets/powermenu.scss
diff --git a/config/ags/scss/widgets/quick-settings.scss b/hosts/wim/config/ags/scss/widgets/quick-settings.scss
similarity index 100%
rename from config/ags/scss/widgets/quick-settings.scss
rename to hosts/wim/config/ags/scss/widgets/quick-settings.scss
diff --git a/config/ags/scss/widgets/systray.scss b/hosts/wim/config/ags/scss/widgets/systray.scss
similarity index 100%
rename from config/ags/scss/widgets/systray.scss
rename to hosts/wim/config/ags/scss/widgets/systray.scss
diff --git a/config/ags/scss/widgets/traybuttons.scss b/hosts/wim/config/ags/scss/widgets/traybuttons.scss
similarity index 100%
rename from config/ags/scss/widgets/traybuttons.scss
rename to hosts/wim/config/ags/scss/widgets/traybuttons.scss
diff --git a/config/ags/scss/widgets/workspaces.scss b/hosts/wim/config/ags/scss/widgets/workspaces.scss
similarity index 100%
rename from config/ags/scss/widgets/workspaces.scss
rename to hosts/wim/config/ags/scss/widgets/workspaces.scss
diff --git a/config/ags/services_wip/pointers.js b/hosts/wim/config/ags/services_wip/pointers.js
similarity index 100%
rename from config/ags/services_wip/pointers.js
rename to hosts/wim/config/ags/services_wip/pointers.js
diff --git a/config/ags/style.css b/hosts/wim/config/ags/style.css
similarity index 100%
rename from config/ags/style.css
rename to hosts/wim/config/ags/style.css
diff --git a/config/bash/bashrc b/hosts/wim/config/bash/bashrc
similarity index 100%
rename from config/bash/bashrc
rename to hosts/wim/config/bash/bashrc
diff --git a/config/bash/colorgrid.sh b/hosts/wim/config/bash/colorgrid.sh
similarity index 100%
rename from config/bash/colorgrid.sh
rename to hosts/wim/config/bash/colorgrid.sh
diff --git a/config/bash/dracula/fzf.sh b/hosts/wim/config/bash/dracula/fzf.sh
similarity index 100%
rename from config/bash/dracula/fzf.sh
rename to hosts/wim/config/bash/dracula/fzf.sh
diff --git a/config/bash/dracula/less.sh b/hosts/wim/config/bash/dracula/less.sh
similarity index 100%
rename from config/bash/dracula/less.sh
rename to hosts/wim/config/bash/dracula/less.sh
diff --git a/config/discord/settings.json b/hosts/wim/config/discord/settings.json
similarity index 100%
rename from config/discord/settings.json
rename to hosts/wim/config/discord/settings.json
diff --git a/config/dolphinrc b/hosts/wim/config/dolphinrc
similarity index 100%
rename from config/dolphinrc
rename to hosts/wim/config/dolphinrc
diff --git a/config/gtklock/scripts/blur.sh b/hosts/wim/config/gtklock/scripts/blur.sh
similarity index 100%
rename from config/gtklock/scripts/blur.sh
rename to hosts/wim/config/gtklock/scripts/blur.sh
diff --git a/config/gtklock/scripts/lock.sh b/hosts/wim/config/gtklock/scripts/lock.sh
similarity index 100%
rename from config/gtklock/scripts/lock.sh
rename to hosts/wim/config/gtklock/scripts/lock.sh
diff --git a/config/gtklock/style.css b/hosts/wim/config/gtklock/style.css
similarity index 100%
rename from config/gtklock/style.css
rename to hosts/wim/config/gtklock/style.css
diff --git a/config/hypr/hyprpaper.conf b/hosts/wim/config/hypr/hyprpaper.conf
similarity index 100%
rename from config/hypr/hyprpaper.conf
rename to hosts/wim/config/hypr/hyprpaper.conf
diff --git a/config/hypr/main.conf b/hosts/wim/config/hypr/main.conf
similarity index 100%
rename from config/hypr/main.conf
rename to hosts/wim/config/hypr/main.conf
diff --git a/config/hypr/scripts/autorotate.sh b/hosts/wim/config/hypr/scripts/autorotate.sh
similarity index 100%
rename from config/hypr/scripts/autorotate.sh
rename to hosts/wim/config/hypr/scripts/autorotate.sh
diff --git a/config/hypr/scripts/lisgd.sh b/hosts/wim/config/hypr/scripts/lisgd.sh
similarity index 100%
rename from config/hypr/scripts/lisgd.sh
rename to hosts/wim/config/hypr/scripts/lisgd.sh
diff --git a/config/kdeglobals b/hosts/wim/config/kdeglobals
similarity index 100%
rename from config/kdeglobals
rename to hosts/wim/config/kdeglobals
diff --git a/config/kiorc b/hosts/wim/config/kiorc
similarity index 100%
rename from config/kiorc
rename to hosts/wim/config/kiorc
diff --git a/config/mimeapps.list b/hosts/wim/config/mimeapps.list
similarity index 100%
rename from config/mimeapps.list
rename to hosts/wim/config/mimeapps.list
diff --git a/config/neofetch/config.conf b/hosts/wim/config/neofetch/config.conf
similarity index 100%
rename from config/neofetch/config.conf
rename to hosts/wim/config/neofetch/config.conf
diff --git a/config/nvim/base.vim b/hosts/wim/config/nvim/base.vim
similarity index 100%
rename from config/nvim/base.vim
rename to hosts/wim/config/nvim/base.vim
diff --git a/config/nvim/config.lua b/hosts/wim/config/nvim/config.lua
similarity index 100%
rename from config/nvim/config.lua
rename to hosts/wim/config/nvim/config.lua
diff --git a/config/ripgrep/README.md b/hosts/wim/config/ripgrep/README.md
similarity index 100%
rename from config/ripgrep/README.md
rename to hosts/wim/config/ripgrep/README.md
diff --git a/config/ripgrep/ripgreprc b/hosts/wim/config/ripgrep/ripgreprc
similarity index 100%
rename from config/ripgrep/ripgreprc
rename to hosts/wim/config/ripgrep/ripgreprc
diff --git a/config/swappy/config b/hosts/wim/config/swappy/config
similarity index 100%
rename from config/swappy/config
rename to hosts/wim/config/swappy/config
diff --git a/config/swayosd/style.css b/hosts/wim/config/swayosd/style.css
similarity index 100%
rename from config/swayosd/style.css
rename to hosts/wim/config/swayosd/style.css
diff --git a/config/wofi/style.css b/hosts/wim/config/wofi/style.css
similarity index 100%
rename from config/wofi/style.css
rename to hosts/wim/config/wofi/style.css
diff --git a/nixos/configuration.nix b/hosts/wim/configuration.nix
similarity index 79%
rename from nixos/configuration.nix
rename to hosts/wim/configuration.nix
index 720c5f3..fd7603f 100644
--- a/nixos/configuration.nix
+++ b/hosts/wim/configuration.nix
@@ -3,25 +3,21 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ./overlays/list.nix
     ./cfg/main.nix
     ./home/main.nix
   ];
 
   networking = {
     hostName = "wim";
-    networkmanager.enable = true;
-    networkmanager.wifi.backend = "wpa_supplicant";
+    networkmanager = {
+      enable = true;
+      wifi.backend = "wpa_supplicant";
+    };
   };
 
   # Set your time zone.
   time.timeZone = "America/Montreal";
 
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_CA.UTF-8";
-  console = {
-    keyMap = "ca";
-  };
   services.kmscon = {
     enable = true;
     hwRender = true;
@@ -30,8 +26,6 @@
     extraOptions = "--font-size 12.5 --font-dpi 170 --font-name 'JetBrainsMono Nerd Font'";
   };
 
-  nixpkgs.config.allowUnfree = true;
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It's perfectly fine and recommended to leave
diff --git a/nixos/hardware-configuration.nix b/hosts/wim/hardware-configuration.nix
similarity index 100%
rename from nixos/hardware-configuration.nix
rename to hosts/wim/hardware-configuration.nix
diff --git a/nixos/home/bashdots.nix b/hosts/wim/home/bashdots.nix
similarity index 93%
rename from nixos/home/bashdots.nix
rename to hosts/wim/home/bashdots.nix
index 5563585..7ece97d 100644
--- a/nixos/home/bashdots.nix
+++ b/hosts/wim/home/bashdots.nix
@@ -146,11 +146,11 @@
       [[ -f ~/.bashrc ]] && . ~/.bashrc
     '';
     bashrcExtra = ''
-      ${lib.strings.fileContents ../../config/bash/dracula/less.sh}
-      ${lib.strings.fileContents ../../config/bash/dracula/fzf.sh}
+      ${lib.strings.fileContents ../config/bash/dracula/less.sh}
+      ${lib.strings.fileContents ../config/bash/dracula/fzf.sh}
 
-      ${lib.strings.fileContents ../../config/bash/colorgrid.sh}
-      ${lib.strings.fileContents ../../config/bash/bashrc}
+      ${lib.strings.fileContents ../config/bash/colorgrid.sh}
+      ${lib.strings.fileContents ../config/bash/bashrc}
     '';
     #initExtra = ''
     #'';
diff --git a/nixos/home/dconf.nix b/hosts/wim/home/dconf.nix
similarity index 100%
rename from nixos/home/dconf.nix
rename to hosts/wim/home/dconf.nix
diff --git a/nixos/home/dotfiles.nix b/hosts/wim/home/dotfiles.nix
similarity index 98%
rename from nixos/home/dotfiles.nix
rename to hosts/wim/home/dotfiles.nix
index b51099f..498d92d 100644
--- a/nixos/home/dotfiles.nix
+++ b/hosts/wim/home/dotfiles.nix
@@ -47,7 +47,7 @@ in
         insensitive = true;
         no_actions = true;
       };
-      style = builtins.readFile ../../config/wofi/style.css;
+      style = builtins.readFile ../config/wofi/style.css;
     };
 
     alacritty = {
diff --git a/nixos/home/firefox/addons/addons.json b/hosts/wim/home/firefox/addons/addons.json
similarity index 100%
rename from nixos/home/firefox/addons/addons.json
rename to hosts/wim/home/firefox/addons/addons.json
diff --git a/nixos/home/firefox/addons/default.nix b/hosts/wim/home/firefox/addons/default.nix
similarity index 100%
rename from nixos/home/firefox/addons/default.nix
rename to hosts/wim/home/firefox/addons/default.nix
diff --git a/nixos/home/firefox/addons/generated-firefox-addons.nix b/hosts/wim/home/firefox/addons/generated-firefox-addons.nix
similarity index 100%
rename from nixos/home/firefox/addons/generated-firefox-addons.nix
rename to hosts/wim/home/firefox/addons/generated-firefox-addons.nix
diff --git a/nixos/home/firefox/custom.css b/hosts/wim/home/firefox/custom.css
similarity index 100%
rename from nixos/home/firefox/custom.css
rename to hosts/wim/home/firefox/custom.css
diff --git a/nixos/home/firefox/firefox-gx.nix b/hosts/wim/home/firefox/firefox-gx.nix
similarity index 100%
rename from nixos/home/firefox/firefox-gx.nix
rename to hosts/wim/home/firefox/firefox-gx.nix
diff --git a/nixos/home/firefox/main.nix b/hosts/wim/home/firefox/main.nix
similarity index 100%
rename from nixos/home/firefox/main.nix
rename to hosts/wim/home/firefox/main.nix
diff --git a/nixos/home/hyprland.nix b/hosts/wim/home/hyprland.nix
similarity index 100%
rename from nixos/home/hyprland.nix
rename to hosts/wim/home/hyprland.nix
diff --git a/nixos/home/main.nix b/hosts/wim/home/main.nix
similarity index 100%
rename from nixos/home/main.nix
rename to hosts/wim/home/main.nix
diff --git a/nixos/home/nvim.nix b/hosts/wim/home/nvim.nix
similarity index 95%
rename from nixos/home/nvim.nix
rename to hosts/wim/home/nvim.nix
index 515536d..7a865d6 100644
--- a/nixos/home/nvim.nix
+++ b/hosts/wim/home/nvim.nix
@@ -23,10 +23,10 @@ in
     package = pkgs.neovim-nightly;
 
     extraConfig = builtins.concatStringsSep "\n" [
-      (lib.strings.fileContents ../../config/nvim/base.vim)
+      (lib.strings.fileContents ../config/nvim/base.vim)
       ''
         lua << EOF
-        ${lib.strings.fileContents ../../config/nvim/config.lua}
+        ${lib.strings.fileContents ../config/nvim/config.lua}
         EOF
       ''
     ];
diff --git a/nixos/home/packages.nix b/hosts/wim/home/packages.nix
similarity index 100%
rename from nixos/home/packages.nix
rename to hosts/wim/home/packages.nix
diff --git a/nixos/home/theme.nix b/hosts/wim/home/theme.nix
similarity index 100%
rename from nixos/home/theme.nix
rename to hosts/wim/home/theme.nix
diff --git a/hosts/wim/vars.nix b/hosts/wim/vars.nix
new file mode 100644
index 0000000..627cd36
--- /dev/null
+++ b/hosts/wim/vars.nix
@@ -0,0 +1,3 @@
+{
+  configDir = "/home/matt/.nix/hosts/wim/config";
+}
diff --git a/nixos/vars.nix b/nixos/vars.nix
deleted file mode 100644
index ae22435..0000000
--- a/nixos/vars.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  configDir = "/home/matt/.nix/config";
-}
diff --git a/nixos/updateSha.sh b/updateSha.sh
similarity index 100%
rename from nixos/updateSha.sh
rename to updateSha.sh