diff --git a/flake.nix b/flake.nix
index 161c6e01..728284f4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,11 +61,11 @@
formatter.${system} = pkgs.nixfmt-rfc-style;
- overlays = import ./nix/overlays { inherit inputs; };
+ overlays = import ./overlays { inherit inputs; };
- nixosModules.default = ./nix/modules/nixos;
+ nixosModules.default = ./modules/nixos;
- homeManagerModules.default = ./nix/modules/home-manager;
+ homeManagerModules.default = ./modules/home-manager;
nixosConfigurations = {
lemp11 = nixpkgs.lib.nixosSystem {
@@ -77,7 +77,7 @@
modules = [
agenix.nixosModules.default
- ./nix/hosts/lemp11/configuration.nix
+ ./hosts/lemp11/configuration.nix
];
};
@@ -91,7 +91,7 @@
modules = [
agenix.nixosModules.default
- ./nix/hosts/nixedo/configuration.nix
+ ./hosts/nixedo/configuration.nix
];
};
@@ -106,7 +106,7 @@
nixos-hardware.nixosModules.common-gpu-intel
nixos-hardware.nixosModules.lenovo-thinkpad-t480
- ./nix/hosts/t480/configuration.nix
+ ./hosts/t480/configuration.nix
];
};
@@ -121,7 +121,7 @@
nixos-hardware.nixosModules.common-gpu-intel
nixos-hardware.nixosModules.lenovo-thinkpad-t490
- ./nix/hosts/t490/configuration.nix
+ ./hosts/t490/configuration.nix
];
};
@@ -139,7 +139,7 @@
disko.nixosModules.disko
nixos-wsl.nixosModules.default
- ./nix/hosts/PW05CH3L/configuration.nix
+ ./hosts/PW05CH3L/configuration.nix
];
};
@@ -154,7 +154,7 @@
agenix.nixosModules.default
disko.nixosModules.disko
- ./nix/hosts/hetznix/configuration.nix
+ ./hosts/hetznix/configuration.nix
];
};
};
diff --git a/nix/home/common/default.nix b/home/common/default.nix
similarity index 100%
rename from nix/home/common/default.nix
rename to home/common/default.nix
diff --git a/nix/home/opdavies/default.nix b/home/opdavies/default.nix
similarity index 91%
rename from nix/home/opdavies/default.nix
rename to home/opdavies/default.nix
index 09b0a959..35d8caf4 100644
--- a/nix/home/opdavies/default.nix
+++ b/home/opdavies/default.nix
@@ -30,7 +30,7 @@ let
inherit (pkgs) lib;
- shared-config = import "${self}/nix/lib/shared/home-manager.nix" {
+ shared-config = import "${self}/lib/shared/home-manager.nix" {
inherit
config
hostname
@@ -42,7 +42,7 @@ let
;
};
- shared-packages = import "${self}/nix/lib/shared/home-manager-packages.nix" {
+ shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {
inherit
headless
inputs
diff --git a/nix/home/opdavies/desktop/default.nix b/home/opdavies/desktop/default.nix
similarity index 100%
rename from nix/home/opdavies/desktop/default.nix
rename to home/opdavies/desktop/default.nix
diff --git a/nix/home/opdavies/desktop/firefox.nix b/home/opdavies/desktop/firefox.nix
similarity index 100%
rename from nix/home/opdavies/desktop/firefox.nix
rename to home/opdavies/desktop/firefox.nix
diff --git a/nix/home/opdavies/desktop/qutebrowser.nix b/home/opdavies/desktop/qutebrowser.nix
similarity index 100%
rename from nix/home/opdavies/desktop/qutebrowser.nix
rename to home/opdavies/desktop/qutebrowser.nix
diff --git a/nix/home/opdavies/hosts/PW05CH3L.nix b/home/opdavies/hosts/PW05CH3L.nix
similarity index 100%
rename from nix/home/opdavies/hosts/PW05CH3L.nix
rename to home/opdavies/hosts/PW05CH3L.nix
diff --git a/nix/home/opdavies/hosts/lemp11.nix b/home/opdavies/hosts/lemp11.nix
similarity index 100%
rename from nix/home/opdavies/hosts/lemp11.nix
rename to home/opdavies/hosts/lemp11.nix
diff --git a/nix/home/opdavies/hosts/nixedo.nix b/home/opdavies/hosts/nixedo.nix
similarity index 100%
rename from nix/home/opdavies/hosts/nixedo.nix
rename to home/opdavies/hosts/nixedo.nix
diff --git a/nix/home/opdavies/hosts/t480.nix b/home/opdavies/hosts/t480.nix
similarity index 100%
rename from nix/home/opdavies/hosts/t480.nix
rename to home/opdavies/hosts/t480.nix
diff --git a/nix/home/opdavies/hosts/t490.nix b/home/opdavies/hosts/t490.nix
similarity index 100%
rename from nix/home/opdavies/hosts/t490.nix
rename to home/opdavies/hosts/t490.nix
diff --git a/nix/home/opdavies/modules/default.nix b/home/opdavies/modules/default.nix
similarity index 100%
rename from nix/home/opdavies/modules/default.nix
rename to home/opdavies/modules/default.nix
diff --git a/nix/home/opdavies/modules/node.nix b/home/opdavies/modules/node.nix
similarity index 100%
rename from nix/home/opdavies/modules/node.nix
rename to home/opdavies/modules/node.nix
diff --git a/nix/home/opdavies/modules/ranger.nix b/home/opdavies/modules/ranger.nix
similarity index 100%
rename from nix/home/opdavies/modules/ranger.nix
rename to home/opdavies/modules/ranger.nix
diff --git a/nix/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix
similarity index 100%
rename from nix/hosts/PW05CH3L/configuration.nix
rename to hosts/PW05CH3L/configuration.nix
diff --git a/nix/hosts/common/default.nix b/hosts/common/default.nix
similarity index 97%
rename from nix/hosts/common/default.nix
rename to hosts/common/default.nix
index 44999068..a4c8120a 100644
--- a/nix/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -84,7 +84,7 @@
useGlobalPkgs = true;
useUserPackages = true;
- users."${username}" = import "${self}/nix/home/${username}";
+ users."${username}" = import "${self}/home/${username}";
};
nixpkgs = {
diff --git a/nix/hosts/common/programs.nix b/hosts/common/programs.nix
similarity index 100%
rename from nix/hosts/common/programs.nix
rename to hosts/common/programs.nix
diff --git a/nix/hosts/common/users.nix b/hosts/common/users.nix
similarity index 100%
rename from nix/hosts/common/users.nix
rename to hosts/common/users.nix
diff --git a/nix/hosts/hetznix/configuration.nix b/hosts/hetznix/configuration.nix
similarity index 100%
rename from nix/hosts/hetznix/configuration.nix
rename to hosts/hetznix/configuration.nix
diff --git a/nix/hosts/hetznix/disks.nix b/hosts/hetznix/disks.nix
similarity index 100%
rename from nix/hosts/hetznix/disks.nix
rename to hosts/hetznix/disks.nix
diff --git a/nix/hosts/hetznix/hardware-configuration.nix b/hosts/hetznix/hardware-configuration.nix
similarity index 100%
rename from nix/hosts/hetznix/hardware-configuration.nix
rename to hosts/hetznix/hardware-configuration.nix
diff --git a/nix/hosts/hetznix/networking.nix b/hosts/hetznix/networking.nix
similarity index 100%
rename from nix/hosts/hetznix/networking.nix
rename to hosts/hetznix/networking.nix
diff --git a/nix/hosts/hetznix/secrets.nix b/hosts/hetznix/secrets.nix
similarity index 100%
rename from nix/hosts/hetznix/secrets.nix
rename to hosts/hetznix/secrets.nix
diff --git a/nix/hosts/hetznix/security/acme.nix b/hosts/hetznix/security/acme.nix
similarity index 100%
rename from nix/hosts/hetznix/security/acme.nix
rename to hosts/hetznix/security/acme.nix
diff --git a/nix/hosts/hetznix/security/default.nix b/hosts/hetznix/security/default.nix
similarity index 100%
rename from nix/hosts/hetznix/security/default.nix
rename to hosts/hetznix/security/default.nix
diff --git a/nix/hosts/hetznix/services/caddy/default.nix b/hosts/hetznix/services/caddy/default.nix
similarity index 100%
rename from nix/hosts/hetznix/services/caddy/default.nix
rename to hosts/hetznix/services/caddy/default.nix
diff --git a/nix/hosts/hetznix/services/caddy/vhosts/bootstrap-with-tailwind.oliverdavies.uk.nix b/hosts/hetznix/services/caddy/vhosts/bootstrap-with-tailwind.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/services/caddy/vhosts/bootstrap-with-tailwind.oliverdavies.uk.nix
rename to hosts/hetznix/services/caddy/vhosts/bootstrap-with-tailwind.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/services/caddy/vhosts/default.nix b/hosts/hetznix/services/caddy/vhosts/default.nix
similarity index 100%
rename from nix/hosts/hetznix/services/caddy/vhosts/default.nix
rename to hosts/hetznix/services/caddy/vhosts/default.nix
diff --git a/nix/hosts/hetznix/services/caddy/vhosts/eric.nix b/hosts/hetznix/services/caddy/vhosts/eric.nix
similarity index 100%
rename from nix/hosts/hetznix/services/caddy/vhosts/eric.nix
rename to hosts/hetznix/services/caddy/vhosts/eric.nix
diff --git a/nix/hosts/hetznix/services/caddy/vhosts/florida-drupalcamp-tailwind-css.oliverdavies.uk.nix b/hosts/hetznix/services/caddy/vhosts/florida-drupalcamp-tailwind-css.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/services/caddy/vhosts/florida-drupalcamp-tailwind-css.oliverdavies.uk.nix
rename to hosts/hetznix/services/caddy/vhosts/florida-drupalcamp-tailwind-css.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/services/caddy/vhosts/luke.oliverdavies.uk.nix b/hosts/hetznix/services/caddy/vhosts/luke.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/services/caddy/vhosts/luke.oliverdavies.uk.nix
rename to hosts/hetznix/services/caddy/vhosts/luke.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/services/caddy/vhosts/phpsw-sculpin-demo.oliverdavies.uk.nix b/hosts/hetznix/services/caddy/vhosts/phpsw-sculpin-demo.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/services/caddy/vhosts/phpsw-sculpin-demo.oliverdavies.uk.nix
rename to hosts/hetznix/services/caddy/vhosts/phpsw-sculpin-demo.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/services/caddy/vhosts/rebuilding-acquia.oliverdavies.uk.nix b/hosts/hetznix/services/caddy/vhosts/rebuilding-acquia.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/services/caddy/vhosts/rebuilding-acquia.oliverdavies.uk.nix
rename to hosts/hetznix/services/caddy/vhosts/rebuilding-acquia.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/services/caddy/vhosts/rebuilding-bartik.oliverdavies.uk.nix b/hosts/hetznix/services/caddy/vhosts/rebuilding-bartik.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/services/caddy/vhosts/rebuilding-bartik.oliverdavies.uk.nix
rename to hosts/hetznix/services/caddy/vhosts/rebuilding-bartik.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/services/caddy/vhosts/rebuilding-bristol-js.oliverdavies.uk.nix b/hosts/hetznix/services/caddy/vhosts/rebuilding-bristol-js.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/services/caddy/vhosts/rebuilding-bristol-js.oliverdavies.uk.nix
rename to hosts/hetznix/services/caddy/vhosts/rebuilding-bristol-js.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/services/caddy/vhosts/rebuilding-symfony.oliverdavies.uk.nix b/hosts/hetznix/services/caddy/vhosts/rebuilding-symfony.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/services/caddy/vhosts/rebuilding-symfony.oliverdavies.uk.nix
rename to hosts/hetznix/services/caddy/vhosts/rebuilding-symfony.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/services/caddy/vhosts/tailwindcss-demo.oliverdavies.uk.nix b/hosts/hetznix/services/caddy/vhosts/tailwindcss-demo.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/services/caddy/vhosts/tailwindcss-demo.oliverdavies.uk.nix
rename to hosts/hetznix/services/caddy/vhosts/tailwindcss-demo.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/services/caddy/vhosts/talking-drupal-tailwindcss.oliverdavies.uk.nix b/hosts/hetznix/services/caddy/vhosts/talking-drupal-tailwindcss.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/services/caddy/vhosts/talking-drupal-tailwindcss.oliverdavies.uk.nix
rename to hosts/hetznix/services/caddy/vhosts/talking-drupal-tailwindcss.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/services/caddy/vhosts/wp-tailwind.oliverdavies.uk.nix b/hosts/hetznix/services/caddy/vhosts/wp-tailwind.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/services/caddy/vhosts/wp-tailwind.oliverdavies.uk.nix
rename to hosts/hetznix/services/caddy/vhosts/wp-tailwind.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/services/caddy/vhosts/www.oliverdavies.uk.nix b/hosts/hetznix/services/caddy/vhosts/www.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/services/caddy/vhosts/www.oliverdavies.uk.nix
rename to hosts/hetznix/services/caddy/vhosts/www.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/services/caddy/vhosts/zet.oliverdavies.uk.nix b/hosts/hetznix/services/caddy/vhosts/zet.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/services/caddy/vhosts/zet.oliverdavies.uk.nix
rename to hosts/hetznix/services/caddy/vhosts/zet.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/services/default.nix b/hosts/hetznix/services/default.nix
similarity index 100%
rename from nix/hosts/hetznix/services/default.nix
rename to hosts/hetznix/services/default.nix
diff --git a/nix/hosts/hetznix/services/forgejo.nix b/hosts/hetznix/services/forgejo.nix
similarity index 100%
rename from nix/hosts/hetznix/services/forgejo.nix
rename to hosts/hetznix/services/forgejo.nix
diff --git a/nix/hosts/hetznix/services/jitsi.nix b/hosts/hetznix/services/jitsi.nix
similarity index 100%
rename from nix/hosts/hetznix/services/jitsi.nix
rename to hosts/hetznix/services/jitsi.nix
diff --git a/nix/hosts/hetznix/services/openssl.nix b/hosts/hetznix/services/openssl.nix
similarity index 100%
rename from nix/hosts/hetznix/services/openssl.nix
rename to hosts/hetznix/services/openssl.nix
diff --git a/nix/hosts/lemp11/configuration.nix b/hosts/lemp11/configuration.nix
similarity index 100%
rename from nix/hosts/lemp11/configuration.nix
rename to hosts/lemp11/configuration.nix
diff --git a/nix/hosts/lemp11/hardware-configuration.nix b/hosts/lemp11/hardware-configuration.nix
similarity index 100%
rename from nix/hosts/lemp11/hardware-configuration.nix
rename to hosts/lemp11/hardware-configuration.nix
diff --git a/nix/hosts/lemp11/hardware.nix b/hosts/lemp11/hardware.nix
similarity index 100%
rename from nix/hosts/lemp11/hardware.nix
rename to hosts/lemp11/hardware.nix
diff --git a/nix/hosts/lemp11/programs.nix b/hosts/lemp11/programs.nix
similarity index 100%
rename from nix/hosts/lemp11/programs.nix
rename to hosts/lemp11/programs.nix
diff --git a/nix/hosts/lemp11/services.nix b/hosts/lemp11/services.nix
similarity index 100%
rename from nix/hosts/lemp11/services.nix
rename to hosts/lemp11/services.nix
diff --git a/nix/hosts/nixedo/configuration.nix b/hosts/nixedo/configuration.nix
similarity index 100%
rename from nix/hosts/nixedo/configuration.nix
rename to hosts/nixedo/configuration.nix
diff --git a/nix/hosts/nixedo/hardware-configuration.nix b/hosts/nixedo/hardware-configuration.nix
similarity index 100%
rename from nix/hosts/nixedo/hardware-configuration.nix
rename to hosts/nixedo/hardware-configuration.nix
diff --git a/nix/hosts/nixedo/modules/acme.nix b/hosts/nixedo/modules/acme.nix
similarity index 100%
rename from nix/hosts/nixedo/modules/acme.nix
rename to hosts/nixedo/modules/acme.nix
diff --git a/nix/hosts/nixedo/secrets.nix b/hosts/nixedo/secrets.nix
similarity index 100%
rename from nix/hosts/nixedo/secrets.nix
rename to hosts/nixedo/secrets.nix
diff --git a/nix/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
similarity index 100%
rename from nix/hosts/t480/configuration.nix
rename to hosts/t480/configuration.nix
diff --git a/nix/hosts/t480/hardware-configuration.nix b/hosts/t480/hardware-configuration.nix
similarity index 100%
rename from nix/hosts/t480/hardware-configuration.nix
rename to hosts/t480/hardware-configuration.nix
diff --git a/nix/hosts/t480/hardware.nix b/hosts/t480/hardware.nix
similarity index 100%
rename from nix/hosts/t480/hardware.nix
rename to hosts/t480/hardware.nix
diff --git a/nix/hosts/t480/modules/docker.nix b/hosts/t480/modules/docker.nix
similarity index 100%
rename from nix/hosts/t480/modules/docker.nix
rename to hosts/t480/modules/docker.nix
diff --git a/nix/hosts/t480/programs.nix b/hosts/t480/programs.nix
similarity index 100%
rename from nix/hosts/t480/programs.nix
rename to hosts/t480/programs.nix
diff --git a/nix/hosts/t480/secrets.nix b/hosts/t480/secrets.nix
similarity index 100%
rename from nix/hosts/t480/secrets.nix
rename to hosts/t480/secrets.nix
diff --git a/nix/hosts/t480/services/cron.nix b/hosts/t480/services/cron.nix
similarity index 100%
rename from nix/hosts/t480/services/cron.nix
rename to hosts/t480/services/cron.nix
diff --git a/nix/hosts/t480/services/default.nix b/hosts/t480/services/default.nix
similarity index 100%
rename from nix/hosts/t480/services/default.nix
rename to hosts/t480/services/default.nix
diff --git a/nix/hosts/t480/services/interception-tools.nix b/hosts/t480/services/interception-tools.nix
similarity index 100%
rename from nix/hosts/t480/services/interception-tools.nix
rename to hosts/t480/services/interception-tools.nix
diff --git a/nix/hosts/t480/services/redshift.nix b/hosts/t480/services/redshift.nix
similarity index 100%
rename from nix/hosts/t480/services/redshift.nix
rename to hosts/t480/services/redshift.nix
diff --git a/nix/hosts/t480/services/sound.nix b/hosts/t480/services/sound.nix
similarity index 100%
rename from nix/hosts/t480/services/sound.nix
rename to hosts/t480/services/sound.nix
diff --git a/nix/hosts/t480/services/udev.nix b/hosts/t480/services/udev.nix
similarity index 100%
rename from nix/hosts/t480/services/udev.nix
rename to hosts/t480/services/udev.nix
diff --git a/nix/hosts/t480/services/xserver.nix b/hosts/t480/services/xserver.nix
similarity index 100%
rename from nix/hosts/t480/services/xserver.nix
rename to hosts/t480/services/xserver.nix
diff --git a/nix/hosts/t480/users.nix b/hosts/t480/users.nix
similarity index 100%
rename from nix/hosts/t480/users.nix
rename to hosts/t480/users.nix
diff --git a/nix/hosts/t490/configuration.nix b/hosts/t490/configuration.nix
similarity index 100%
rename from nix/hosts/t490/configuration.nix
rename to hosts/t490/configuration.nix
diff --git a/nix/hosts/t490/hardware-configuration.nix b/hosts/t490/hardware-configuration.nix
similarity index 100%
rename from nix/hosts/t490/hardware-configuration.nix
rename to hosts/t490/hardware-configuration.nix
diff --git a/nix/hosts/t490/hardware.nix b/hosts/t490/hardware.nix
similarity index 100%
rename from nix/hosts/t490/hardware.nix
rename to hosts/t490/hardware.nix
diff --git a/nix/hosts/t490/modules/docker.nix b/hosts/t490/modules/docker.nix
similarity index 100%
rename from nix/hosts/t490/modules/docker.nix
rename to hosts/t490/modules/docker.nix
diff --git a/nix/hosts/t490/programs.nix b/hosts/t490/programs.nix
similarity index 100%
rename from nix/hosts/t490/programs.nix
rename to hosts/t490/programs.nix
diff --git a/nix/hosts/t490/secrets.nix b/hosts/t490/secrets.nix
similarity index 100%
rename from nix/hosts/t490/secrets.nix
rename to hosts/t490/secrets.nix
diff --git a/nix/hosts/t490/services/cron.nix b/hosts/t490/services/cron.nix
similarity index 100%
rename from nix/hosts/t490/services/cron.nix
rename to hosts/t490/services/cron.nix
diff --git a/nix/hosts/t490/services/default.nix b/hosts/t490/services/default.nix
similarity index 100%
rename from nix/hosts/t490/services/default.nix
rename to hosts/t490/services/default.nix
diff --git a/nix/hosts/t490/services/interception-tools.nix b/hosts/t490/services/interception-tools.nix
similarity index 100%
rename from nix/hosts/t490/services/interception-tools.nix
rename to hosts/t490/services/interception-tools.nix
diff --git a/nix/hosts/t490/services/redshift.nix b/hosts/t490/services/redshift.nix
similarity index 100%
rename from nix/hosts/t490/services/redshift.nix
rename to hosts/t490/services/redshift.nix
diff --git a/nix/hosts/t490/services/sound.nix b/hosts/t490/services/sound.nix
similarity index 100%
rename from nix/hosts/t490/services/sound.nix
rename to hosts/t490/services/sound.nix
diff --git a/nix/hosts/t490/services/udev.nix b/hosts/t490/services/udev.nix
similarity index 100%
rename from nix/hosts/t490/services/udev.nix
rename to hosts/t490/services/udev.nix
diff --git a/nix/hosts/t490/services/xserver.nix b/hosts/t490/services/xserver.nix
similarity index 100%
rename from nix/hosts/t490/services/xserver.nix
rename to hosts/t490/services/xserver.nix
diff --git a/nix/hosts/t490/users.nix b/hosts/t490/users.nix
similarity index 100%
rename from nix/hosts/t490/users.nix
rename to hosts/t490/users.nix
diff --git a/nix/lib/shared/home-manager-packages.nix b/lib/shared/home-manager-packages.nix
similarity index 100%
rename from nix/lib/shared/home-manager-packages.nix
rename to lib/shared/home-manager-packages.nix
diff --git a/nix/lib/shared/home-manager.nix b/lib/shared/home-manager.nix
similarity index 100%
rename from nix/lib/shared/home-manager.nix
rename to lib/shared/home-manager.nix
diff --git a/nix/lib/theme/default.nix b/lib/theme/default.nix
similarity index 100%
rename from nix/lib/theme/default.nix
rename to lib/theme/default.nix
diff --git a/nix/modules/home-manager/cli/bin.nix b/modules/home-manager/cli/bin.nix
similarity index 100%
rename from nix/modules/home-manager/cli/bin.nix
rename to modules/home-manager/cli/bin.nix
diff --git a/nix/modules/home-manager/cli/bluetuith.nix b/modules/home-manager/cli/bluetuith.nix
similarity index 100%
rename from nix/modules/home-manager/cli/bluetuith.nix
rename to modules/home-manager/cli/bluetuith.nix
diff --git a/nix/modules/home-manager/cli/default.nix b/modules/home-manager/cli/default.nix
similarity index 100%
rename from nix/modules/home-manager/cli/default.nix
rename to modules/home-manager/cli/default.nix
diff --git a/nix/modules/home-manager/cli/direnv.nix b/modules/home-manager/cli/direnv.nix
similarity index 100%
rename from nix/modules/home-manager/cli/direnv.nix
rename to modules/home-manager/cli/direnv.nix
diff --git a/nix/modules/home-manager/cli/fzf.nix b/modules/home-manager/cli/fzf.nix
similarity index 100%
rename from nix/modules/home-manager/cli/fzf.nix
rename to modules/home-manager/cli/fzf.nix
diff --git a/nix/modules/home-manager/cli/git.nix b/modules/home-manager/cli/git.nix
similarity index 100%
rename from nix/modules/home-manager/cli/git.nix
rename to modules/home-manager/cli/git.nix
diff --git a/nix/modules/home-manager/cli/neovim/config/.gitignore b/modules/home-manager/cli/neovim/config/.gitignore
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/.gitignore
rename to modules/home-manager/cli/neovim/config/.gitignore
diff --git a/nix/modules/home-manager/cli/neovim/config/after/ftplugin/gitcommit.lua b/modules/home-manager/cli/neovim/config/after/ftplugin/gitcommit.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/after/ftplugin/gitcommit.lua
rename to modules/home-manager/cli/neovim/config/after/ftplugin/gitcommit.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/after/ftplugin/markdown.lua b/modules/home-manager/cli/neovim/config/after/ftplugin/markdown.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/after/ftplugin/markdown.lua
rename to modules/home-manager/cli/neovim/config/after/ftplugin/markdown.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/after/ftplugin/netrw.lua b/modules/home-manager/cli/neovim/config/after/ftplugin/netrw.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/after/ftplugin/netrw.lua
rename to modules/home-manager/cli/neovim/config/after/ftplugin/netrw.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/after/ftplugin/php.lua b/modules/home-manager/cli/neovim/config/after/ftplugin/php.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/after/ftplugin/php.lua
rename to modules/home-manager/cli/neovim/config/after/ftplugin/php.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/after/ftplugin/rst.lua b/modules/home-manager/cli/neovim/config/after/ftplugin/rst.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/after/ftplugin/rst.lua
rename to modules/home-manager/cli/neovim/config/after/ftplugin/rst.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/after/ftplugin/term.vim b/modules/home-manager/cli/neovim/config/after/ftplugin/term.vim
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/after/ftplugin/term.vim
rename to modules/home-manager/cli/neovim/config/after/ftplugin/term.vim
diff --git a/nix/modules/home-manager/cli/neovim/config/after/ftplugin/text.lua b/modules/home-manager/cli/neovim/config/after/ftplugin/text.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/after/ftplugin/text.lua
rename to modules/home-manager/cli/neovim/config/after/ftplugin/text.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/autoload/opdavies.vim b/modules/home-manager/cli/neovim/config/autoload/opdavies.vim
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/autoload/opdavies.vim
rename to modules/home-manager/cli/neovim/config/autoload/opdavies.vim
diff --git a/nix/modules/home-manager/cli/neovim/config/init.lua b/modules/home-manager/cli/neovim/config/init.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/init.lua
rename to modules/home-manager/cli/neovim/config/init.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/lua/opdavies/globals.lua b/modules/home-manager/cli/neovim/config/lua/opdavies/globals.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/lua/opdavies/globals.lua
rename to modules/home-manager/cli/neovim/config/lua/opdavies/globals.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/lua/opdavies/init.lua b/modules/home-manager/cli/neovim/config/lua/opdavies/init.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/lua/opdavies/init.lua
rename to modules/home-manager/cli/neovim/config/lua/opdavies/init.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/lua/opdavies/keymaps.lua b/modules/home-manager/cli/neovim/config/lua/opdavies/keymaps.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/lua/opdavies/keymaps.lua
rename to modules/home-manager/cli/neovim/config/lua/opdavies/keymaps.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/lua/opdavies/lsp/handlers.lua b/modules/home-manager/cli/neovim/config/lua/opdavies/lsp/handlers.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/lua/opdavies/lsp/handlers.lua
rename to modules/home-manager/cli/neovim/config/lua/opdavies/lsp/handlers.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/lua/opdavies/lsp/init.lua b/modules/home-manager/cli/neovim/config/lua/opdavies/lsp/init.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/lua/opdavies/lsp/init.lua
rename to modules/home-manager/cli/neovim/config/lua/opdavies/lsp/init.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/lua/opdavies/options.lua b/modules/home-manager/cli/neovim/config/lua/opdavies/options.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/lua/opdavies/options.lua
rename to modules/home-manager/cli/neovim/config/lua/opdavies/options.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/javascript.lua b/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/javascript.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/javascript.lua
rename to modules/home-manager/cli/neovim/config/lua/opdavies/snippets/javascript.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/lua.lua b/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/lua.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/lua.lua
rename to modules/home-manager/cli/neovim/config/lua/opdavies/snippets/lua.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/php.lua b/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/php.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/php.lua
rename to modules/home-manager/cli/neovim/config/lua/opdavies/snippets/php.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/rst.lua b/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/rst.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/rst.lua
rename to modules/home-manager/cli/neovim/config/lua/opdavies/snippets/rst.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/scss.lua b/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/scss.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/scss.lua
rename to modules/home-manager/cli/neovim/config/lua/opdavies/snippets/scss.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/twig.lua b/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/twig.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/twig.lua
rename to modules/home-manager/cli/neovim/config/lua/opdavies/snippets/twig.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/yaml.lua b/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/yaml.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/yaml.lua
rename to modules/home-manager/cli/neovim/config/lua/opdavies/snippets/yaml.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/lua/opdavies/telescope/multigrep.lua b/modules/home-manager/cli/neovim/config/lua/opdavies/telescope/multigrep.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/lua/opdavies/telescope/multigrep.lua
rename to modules/home-manager/cli/neovim/config/lua/opdavies/telescope/multigrep.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/autocommands.lua b/modules/home-manager/cli/neovim/config/plugin/autocommands.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/autocommands.lua
rename to modules/home-manager/cli/neovim/config/plugin/autocommands.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/colorscheme.lua b/modules/home-manager/cli/neovim/config/plugin/colorscheme.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/colorscheme.lua
rename to modules/home-manager/cli/neovim/config/plugin/colorscheme.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/comment.lua b/modules/home-manager/cli/neovim/config/plugin/comment.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/comment.lua
rename to modules/home-manager/cli/neovim/config/plugin/comment.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/completion.lua b/modules/home-manager/cli/neovim/config/plugin/completion.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/completion.lua
rename to modules/home-manager/cli/neovim/config/plugin/completion.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/conform.lua b/modules/home-manager/cli/neovim/config/plugin/conform.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/conform.lua
rename to modules/home-manager/cli/neovim/config/plugin/conform.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/dap.lua b/modules/home-manager/cli/neovim/config/plugin/dap.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/dap.lua
rename to modules/home-manager/cli/neovim/config/plugin/dap.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/edit_alternate.lua b/modules/home-manager/cli/neovim/config/plugin/edit_alternate.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/edit_alternate.lua
rename to modules/home-manager/cli/neovim/config/plugin/edit_alternate.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/filetype.lua b/modules/home-manager/cli/neovim/config/plugin/filetype.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/filetype.lua
rename to modules/home-manager/cli/neovim/config/plugin/filetype.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/fugitive.lua b/modules/home-manager/cli/neovim/config/plugin/fugitive.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/fugitive.lua
rename to modules/home-manager/cli/neovim/config/plugin/fugitive.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/gitsigns.lua b/modules/home-manager/cli/neovim/config/plugin/gitsigns.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/gitsigns.lua
rename to modules/home-manager/cli/neovim/config/plugin/gitsigns.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/harpoon.lua b/modules/home-manager/cli/neovim/config/plugin/harpoon.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/harpoon.lua
rename to modules/home-manager/cli/neovim/config/plugin/harpoon.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/lint.lua b/modules/home-manager/cli/neovim/config/plugin/lint.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/lint.lua
rename to modules/home-manager/cli/neovim/config/plugin/lint.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/mini.lua b/modules/home-manager/cli/neovim/config/plugin/mini.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/mini.lua
rename to modules/home-manager/cli/neovim/config/plugin/mini.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/netrw.lua b/modules/home-manager/cli/neovim/config/plugin/netrw.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/netrw.lua
rename to modules/home-manager/cli/neovim/config/plugin/netrw.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/phpactor.lua b/modules/home-manager/cli/neovim/config/plugin/phpactor.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/phpactor.lua
rename to modules/home-manager/cli/neovim/config/plugin/phpactor.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/refactoring.lua b/modules/home-manager/cli/neovim/config/plugin/refactoring.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/refactoring.lua
rename to modules/home-manager/cli/neovim/config/plugin/refactoring.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/snippets.lua b/modules/home-manager/cli/neovim/config/plugin/snippets.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/snippets.lua
rename to modules/home-manager/cli/neovim/config/plugin/snippets.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/telescope.lua b/modules/home-manager/cli/neovim/config/plugin/telescope.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/telescope.lua
rename to modules/home-manager/cli/neovim/config/plugin/telescope.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/treesitter.lua b/modules/home-manager/cli/neovim/config/plugin/treesitter.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/treesitter.lua
rename to modules/home-manager/cli/neovim/config/plugin/treesitter.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/undotree.lua b/modules/home-manager/cli/neovim/config/plugin/undotree.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/undotree.lua
rename to modules/home-manager/cli/neovim/config/plugin/undotree.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/plugin/vim-test.lua b/modules/home-manager/cli/neovim/config/plugin/vim-test.lua
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/plugin/vim-test.lua
rename to modules/home-manager/cli/neovim/config/plugin/vim-test.lua
diff --git a/nix/modules/home-manager/cli/neovim/config/spell/en.utf-8.add b/modules/home-manager/cli/neovim/config/spell/en.utf-8.add
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/spell/en.utf-8.add
rename to modules/home-manager/cli/neovim/config/spell/en.utf-8.add
diff --git a/nix/modules/home-manager/cli/neovim/config/stylua.toml b/modules/home-manager/cli/neovim/config/stylua.toml
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/config/stylua.toml
rename to modules/home-manager/cli/neovim/config/stylua.toml
diff --git a/nix/modules/home-manager/cli/neovim/default.nix b/modules/home-manager/cli/neovim/default.nix
similarity index 100%
rename from nix/modules/home-manager/cli/neovim/default.nix
rename to modules/home-manager/cli/neovim/default.nix
diff --git a/nix/modules/home-manager/cli/newsboat.nix b/modules/home-manager/cli/newsboat.nix
similarity index 100%
rename from nix/modules/home-manager/cli/newsboat.nix
rename to modules/home-manager/cli/newsboat.nix
diff --git a/nix/modules/home-manager/cli/notes.nix b/modules/home-manager/cli/notes.nix
similarity index 100%
rename from nix/modules/home-manager/cli/notes.nix
rename to modules/home-manager/cli/notes.nix
diff --git a/nix/modules/home-manager/cli/phpactor/config/phpactor.yml b/modules/home-manager/cli/phpactor/config/phpactor.yml
similarity index 100%
rename from nix/modules/home-manager/cli/phpactor/config/phpactor.yml
rename to modules/home-manager/cli/phpactor/config/phpactor.yml
diff --git a/nix/modules/home-manager/cli/phpactor/config/templates/collection/SourceCode.php.twig b/modules/home-manager/cli/phpactor/config/templates/collection/SourceCode.php.twig
similarity index 100%
rename from nix/modules/home-manager/cli/phpactor/config/templates/collection/SourceCode.php.twig
rename to modules/home-manager/cli/phpactor/config/templates/collection/SourceCode.php.twig
diff --git a/nix/modules/home-manager/cli/phpactor/config/templates/default/SourceCode.php.twig b/modules/home-manager/cli/phpactor/config/templates/default/SourceCode.php.twig
similarity index 100%
rename from nix/modules/home-manager/cli/phpactor/config/templates/default/SourceCode.php.twig
rename to modules/home-manager/cli/phpactor/config/templates/default/SourceCode.php.twig
diff --git a/nix/modules/home-manager/cli/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig b/modules/home-manager/cli/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
similarity index 100%
rename from nix/modules/home-manager/cli/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
rename to modules/home-manager/cli/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
diff --git a/nix/modules/home-manager/cli/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig b/modules/home-manager/cli/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
similarity index 100%
rename from nix/modules/home-manager/cli/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
rename to modules/home-manager/cli/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
diff --git a/nix/modules/home-manager/cli/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig b/modules/home-manager/cli/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
similarity index 100%
rename from nix/modules/home-manager/cli/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
rename to modules/home-manager/cli/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
diff --git a/nix/modules/home-manager/cli/phpactor/default.nix b/modules/home-manager/cli/phpactor/default.nix
similarity index 100%
rename from nix/modules/home-manager/cli/phpactor/default.nix
rename to modules/home-manager/cli/phpactor/default.nix
diff --git a/nix/modules/home-manager/cli/starship.nix b/modules/home-manager/cli/starship.nix
similarity index 100%
rename from nix/modules/home-manager/cli/starship.nix
rename to modules/home-manager/cli/starship.nix
diff --git a/nix/modules/home-manager/cli/tmux-sessionizer.nix b/modules/home-manager/cli/tmux-sessionizer.nix
similarity index 100%
rename from nix/modules/home-manager/cli/tmux-sessionizer.nix
rename to modules/home-manager/cli/tmux-sessionizer.nix
diff --git a/nix/modules/home-manager/cli/tmux.nix b/modules/home-manager/cli/tmux.nix
similarity index 100%
rename from nix/modules/home-manager/cli/tmux.nix
rename to modules/home-manager/cli/tmux.nix
diff --git a/nix/modules/home-manager/cli/zsh.nix b/modules/home-manager/cli/zsh.nix
similarity index 100%
rename from nix/modules/home-manager/cli/zsh.nix
rename to modules/home-manager/cli/zsh.nix
diff --git a/nix/modules/home-manager/cli/zsh/abbreviations.nix b/modules/home-manager/cli/zsh/abbreviations.nix
similarity index 100%
rename from nix/modules/home-manager/cli/zsh/abbreviations.nix
rename to modules/home-manager/cli/zsh/abbreviations.nix
diff --git a/nix/modules/home-manager/cli/zsh/aliases.nix b/modules/home-manager/cli/zsh/aliases.nix
similarity index 100%
rename from nix/modules/home-manager/cli/zsh/aliases.nix
rename to modules/home-manager/cli/zsh/aliases.nix
diff --git a/nix/modules/home-manager/default.nix b/modules/home-manager/default.nix
similarity index 100%
rename from nix/modules/home-manager/default.nix
rename to modules/home-manager/default.nix
diff --git a/nix/modules/home-manager/desktop/default.nix b/modules/home-manager/desktop/default.nix
similarity index 100%
rename from nix/modules/home-manager/desktop/default.nix
rename to modules/home-manager/desktop/default.nix
diff --git a/nix/modules/home-manager/desktop/discord.nix b/modules/home-manager/desktop/discord.nix
similarity index 100%
rename from nix/modules/home-manager/desktop/discord.nix
rename to modules/home-manager/desktop/discord.nix
diff --git a/nix/modules/home-manager/desktop/dwm.nix b/modules/home-manager/desktop/dwm.nix
similarity index 100%
rename from nix/modules/home-manager/desktop/dwm.nix
rename to modules/home-manager/desktop/dwm.nix
diff --git a/nix/modules/home-manager/desktop/espanso/matches/base.nix b/modules/home-manager/desktop/espanso/matches/base.nix
similarity index 100%
rename from nix/modules/home-manager/desktop/espanso/matches/base.nix
rename to modules/home-manager/desktop/espanso/matches/base.nix
diff --git a/nix/modules/home-manager/desktop/flameshot.nix b/modules/home-manager/desktop/flameshot.nix
similarity index 100%
rename from nix/modules/home-manager/desktop/flameshot.nix
rename to modules/home-manager/desktop/flameshot.nix
diff --git a/nix/modules/home-manager/desktop/gtk.nix b/modules/home-manager/desktop/gtk.nix
similarity index 100%
rename from nix/modules/home-manager/desktop/gtk.nix
rename to modules/home-manager/desktop/gtk.nix
diff --git a/nix/modules/home-manager/desktop/media/default.nix b/modules/home-manager/desktop/media/default.nix
similarity index 100%
rename from nix/modules/home-manager/desktop/media/default.nix
rename to modules/home-manager/desktop/media/default.nix
diff --git a/nix/modules/home-manager/desktop/media/gimp.nix b/modules/home-manager/desktop/media/gimp.nix
similarity index 100%
rename from nix/modules/home-manager/desktop/media/gimp.nix
rename to modules/home-manager/desktop/media/gimp.nix
diff --git a/nix/modules/home-manager/desktop/media/handbrake.nix b/modules/home-manager/desktop/media/handbrake.nix
similarity index 100%
rename from nix/modules/home-manager/desktop/media/handbrake.nix
rename to modules/home-manager/desktop/media/handbrake.nix
diff --git a/nix/modules/home-manager/desktop/media/kdenlive.nix b/modules/home-manager/desktop/media/kdenlive.nix
similarity index 100%
rename from nix/modules/home-manager/desktop/media/kdenlive.nix
rename to modules/home-manager/desktop/media/kdenlive.nix
diff --git a/nix/modules/home-manager/desktop/media/mpv.nix b/modules/home-manager/desktop/media/mpv.nix
similarity index 100%
rename from nix/modules/home-manager/desktop/media/mpv.nix
rename to modules/home-manager/desktop/media/mpv.nix
diff --git a/nix/modules/home-manager/desktop/media/pocket-casts.nix b/modules/home-manager/desktop/media/pocket-casts.nix
similarity index 100%
rename from nix/modules/home-manager/desktop/media/pocket-casts.nix
rename to modules/home-manager/desktop/media/pocket-casts.nix
diff --git a/nix/modules/home-manager/desktop/slack.nix b/modules/home-manager/desktop/slack.nix
similarity index 100%
rename from nix/modules/home-manager/desktop/slack.nix
rename to modules/home-manager/desktop/slack.nix
diff --git a/nix/modules/home-manager/desktop/zoom.nix b/modules/home-manager/desktop/zoom.nix
similarity index 100%
rename from nix/modules/home-manager/desktop/zoom.nix
rename to modules/home-manager/desktop/zoom.nix
diff --git a/nix/modules/nixos/cli/default.nix b/modules/nixos/cli/default.nix
similarity index 100%
rename from nix/modules/nixos/cli/default.nix
rename to modules/nixos/cli/default.nix
diff --git a/nix/modules/nixos/cli/docker.nix b/modules/nixos/cli/docker.nix
similarity index 100%
rename from nix/modules/nixos/cli/docker.nix
rename to modules/nixos/cli/docker.nix
diff --git a/nix/modules/nixos/default.nix b/modules/nixos/default.nix
similarity index 100%
rename from nix/modules/nixos/default.nix
rename to modules/nixos/default.nix
diff --git a/nix/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
similarity index 100%
rename from nix/modules/nixos/desktop/default.nix
rename to modules/nixos/desktop/default.nix
diff --git a/nix/modules/nixos/desktop/dwm.nix b/modules/nixos/desktop/dwm.nix
similarity index 100%
rename from nix/modules/nixos/desktop/dwm.nix
rename to modules/nixos/desktop/dwm.nix
diff --git a/nix/modules/nixos/desktop/peek.nix b/modules/nixos/desktop/peek.nix
similarity index 100%
rename from nix/modules/nixos/desktop/peek.nix
rename to modules/nixos/desktop/peek.nix
diff --git a/nix/modules/nixos/desktop/screenkey.nix b/modules/nixos/desktop/screenkey.nix
similarity index 100%
rename from nix/modules/nixos/desktop/screenkey.nix
rename to modules/nixos/desktop/screenkey.nix
diff --git a/nix/modules/nixos/desktop/st.nix b/modules/nixos/desktop/st.nix
similarity index 100%
rename from nix/modules/nixos/desktop/st.nix
rename to modules/nixos/desktop/st.nix
diff --git a/nix/modules/nixos/desktop/thunar.nix b/modules/nixos/desktop/thunar.nix
similarity index 100%
rename from nix/modules/nixos/desktop/thunar.nix
rename to modules/nixos/desktop/thunar.nix
diff --git a/nix/modules/nixos/fonts.nix b/modules/nixos/fonts.nix
similarity index 100%
rename from nix/modules/nixos/fonts.nix
rename to modules/nixos/fonts.nix
diff --git a/nix/modules/nixos/gaming.nix b/modules/nixos/gaming.nix
similarity index 100%
rename from nix/modules/nixos/gaming.nix
rename to modules/nixos/gaming.nix
diff --git a/nix/modules/nixos/homelab/audiobookshelf.nix b/modules/nixos/homelab/audiobookshelf.nix
similarity index 100%
rename from nix/modules/nixos/homelab/audiobookshelf.nix
rename to modules/nixos/homelab/audiobookshelf.nix
diff --git a/nix/modules/nixos/homelab/containers/beaverhabits.nix b/modules/nixos/homelab/containers/beaverhabits.nix
similarity index 100%
rename from nix/modules/nixos/homelab/containers/beaverhabits.nix
rename to modules/nixos/homelab/containers/beaverhabits.nix
diff --git a/nix/modules/nixos/homelab/containers/default.nix b/modules/nixos/homelab/containers/default.nix
similarity index 100%
rename from nix/modules/nixos/homelab/containers/default.nix
rename to modules/nixos/homelab/containers/default.nix
diff --git a/nix/modules/nixos/homelab/containers/freshrss.nix b/modules/nixos/homelab/containers/freshrss.nix
similarity index 100%
rename from nix/modules/nixos/homelab/containers/freshrss.nix
rename to modules/nixos/homelab/containers/freshrss.nix
diff --git a/nix/modules/nixos/homelab/containers/pi-hole.nix b/modules/nixos/homelab/containers/pi-hole.nix
similarity index 100%
rename from nix/modules/nixos/homelab/containers/pi-hole.nix
rename to modules/nixos/homelab/containers/pi-hole.nix
diff --git a/nix/modules/nixos/homelab/containers/tubearchivist.nix b/modules/nixos/homelab/containers/tubearchivist.nix
similarity index 100%
rename from nix/modules/nixos/homelab/containers/tubearchivist.nix
rename to modules/nixos/homelab/containers/tubearchivist.nix
diff --git a/nix/modules/nixos/homelab/default.nix b/modules/nixos/homelab/default.nix
similarity index 100%
rename from nix/modules/nixos/homelab/default.nix
rename to modules/nixos/homelab/default.nix
diff --git a/nix/modules/nixos/homelab/forgejo.nix b/modules/nixos/homelab/forgejo.nix
similarity index 100%
rename from nix/modules/nixos/homelab/forgejo.nix
rename to modules/nixos/homelab/forgejo.nix
diff --git a/nix/modules/nixos/homelab/gitea.nix b/modules/nixos/homelab/gitea.nix
similarity index 100%
rename from nix/modules/nixos/homelab/gitea.nix
rename to modules/nixos/homelab/gitea.nix
diff --git a/nix/modules/nixos/homelab/immich.nix b/modules/nixos/homelab/immich.nix
similarity index 100%
rename from nix/modules/nixos/homelab/immich.nix
rename to modules/nixos/homelab/immich.nix
diff --git a/nix/modules/nixos/homelab/jellyfin.nix b/modules/nixos/homelab/jellyfin.nix
similarity index 100%
rename from nix/modules/nixos/homelab/jellyfin.nix
rename to modules/nixos/homelab/jellyfin.nix
diff --git a/nix/modules/nixos/homelab/paperless.nix b/modules/nixos/homelab/paperless.nix
similarity index 100%
rename from nix/modules/nixos/homelab/paperless.nix
rename to modules/nixos/homelab/paperless.nix
diff --git a/nix/modules/nixos/homelab/vaultwarden.nix b/modules/nixos/homelab/vaultwarden.nix
similarity index 100%
rename from nix/modules/nixos/homelab/vaultwarden.nix
rename to modules/nixos/homelab/vaultwarden.nix
diff --git a/nix/modules/nixos/xbanish.nix b/modules/nixos/xbanish.nix
similarity index 100%
rename from nix/modules/nixos/xbanish.nix
rename to modules/nixos/xbanish.nix
diff --git a/nix/overlays/default.nix b/overlays/default.nix
similarity index 100%
rename from nix/overlays/default.nix
rename to overlays/default.nix
diff --git a/nix/overlays/mods/dwm/default.nix b/overlays/mods/dwm/default.nix
similarity index 100%
rename from nix/overlays/mods/dwm/default.nix
rename to overlays/mods/dwm/default.nix
diff --git a/nix/overlays/mods/dwm/patches/restartsig.patch b/overlays/mods/dwm/patches/restartsig.patch
similarity index 100%
rename from nix/overlays/mods/dwm/patches/restartsig.patch
rename to overlays/mods/dwm/patches/restartsig.patch
diff --git a/nix/pkgs/backup-websites.nix b/pkgs/backup-websites.nix
similarity index 100%
rename from nix/pkgs/backup-websites.nix
rename to pkgs/backup-websites.nix
diff --git a/nix/pkgs/build-glove80.nix b/pkgs/build-glove80.nix
similarity index 100%
rename from nix/pkgs/build-glove80.nix
rename to pkgs/build-glove80.nix
diff --git a/nix/pkgs/default.nix b/pkgs/default.nix
similarity index 100%
rename from nix/pkgs/default.nix
rename to pkgs/default.nix
diff --git a/nix/pkgs/displayselect/default.nix b/pkgs/displayselect/default.nix
similarity index 100%
rename from nix/pkgs/displayselect/default.nix
rename to pkgs/displayselect/default.nix
diff --git a/nix/pkgs/displayselect/scaling.patch b/pkgs/displayselect/scaling.patch
similarity index 100%
rename from nix/pkgs/displayselect/scaling.patch
rename to pkgs/displayselect/scaling.patch
diff --git a/nix/pkgs/notes/create-daily-notes.patch b/pkgs/notes/create-daily-notes.patch
similarity index 100%
rename from nix/pkgs/notes/create-daily-notes.patch
rename to pkgs/notes/create-daily-notes.patch
diff --git a/nix/pkgs/notes/default.nix b/pkgs/notes/default.nix
similarity index 100%
rename from nix/pkgs/notes/default.nix
rename to pkgs/notes/default.nix
diff --git a/nix/pkgs/passmenu-otp.nix b/pkgs/passmenu-otp.nix
similarity index 100%
rename from nix/pkgs/passmenu-otp.nix
rename to pkgs/passmenu-otp.nix
diff --git a/nix/pkgs/tmux-sessionizer/add-tmux-file.patch b/pkgs/tmux-sessionizer/add-tmux-file.patch
similarity index 100%
rename from nix/pkgs/tmux-sessionizer/add-tmux-file.patch
rename to pkgs/tmux-sessionizer/add-tmux-file.patch
diff --git a/nix/pkgs/tmux-sessionizer/configure-directories.patch b/pkgs/tmux-sessionizer/configure-directories.patch
similarity index 100%
rename from nix/pkgs/tmux-sessionizer/configure-directories.patch
rename to pkgs/tmux-sessionizer/configure-directories.patch
diff --git a/nix/pkgs/tmux-sessionizer/default.nix b/pkgs/tmux-sessionizer/default.nix
similarity index 100%
rename from nix/pkgs/tmux-sessionizer/default.nix
rename to pkgs/tmux-sessionizer/default.nix
diff --git a/nix/pkgs/tmux-sessionizer/move-default-script.patch b/pkgs/tmux-sessionizer/move-default-script.patch
similarity index 100%
rename from nix/pkgs/tmux-sessionizer/move-default-script.patch
rename to pkgs/tmux-sessionizer/move-default-script.patch
diff --git a/nix/pkgs/upload-to-files.nix b/pkgs/upload-to-files.nix
similarity index 100%
rename from nix/pkgs/upload-to-files.nix
rename to pkgs/upload-to-files.nix
diff --git a/nix/pkgs/vim-plugins/conf-vim.nix b/pkgs/vim-plugins/conf-vim.nix
similarity index 100%
rename from nix/pkgs/vim-plugins/conf-vim.nix
rename to pkgs/vim-plugins/conf-vim.nix
diff --git a/nix/pkgs/vim-plugins/default.nix b/pkgs/vim-plugins/default.nix
similarity index 100%
rename from nix/pkgs/vim-plugins/default.nix
rename to pkgs/vim-plugins/default.nix
diff --git a/nix/pkgs/vim-plugins/edit-alternate-vim.nix b/pkgs/vim-plugins/edit-alternate-vim.nix
similarity index 100%
rename from nix/pkgs/vim-plugins/edit-alternate-vim.nix
rename to pkgs/vim-plugins/edit-alternate-vim.nix
diff --git a/nix/pkgs/vim-plugins/standard-vim.nix b/pkgs/vim-plugins/standard-vim.nix
similarity index 100%
rename from nix/pkgs/vim-plugins/standard-vim.nix
rename to pkgs/vim-plugins/standard-vim.nix
diff --git a/nix/pkgs/vim-plugins/vim-caser.nix b/pkgs/vim-plugins/vim-caser.nix
similarity index 100%
rename from nix/pkgs/vim-plugins/vim-caser.nix
rename to pkgs/vim-plugins/vim-caser.nix
diff --git a/nix/pkgs/vim-plugins/vim-textobj-indent.nix b/pkgs/vim-plugins/vim-textobj-indent.nix
similarity index 100%
rename from nix/pkgs/vim-plugins/vim-textobj-indent.nix
rename to pkgs/vim-plugins/vim-textobj-indent.nix
diff --git a/nix/pkgs/vim-plugins/vim-textobj-xmlattr.nix b/pkgs/vim-plugins/vim-textobj-xmlattr.nix
similarity index 100%
rename from nix/pkgs/vim-plugins/vim-textobj-xmlattr.nix
rename to pkgs/vim-plugins/vim-textobj-xmlattr.nix
diff --git a/nix/secrets.nix b/secrets.nix
similarity index 100%
rename from nix/secrets.nix
rename to secrets.nix
diff --git a/nix/secrets/cloudflare.age b/secrets/cloudflare.age
similarity index 100%
rename from nix/secrets/cloudflare.age
rename to secrets/cloudflare.age
diff --git a/nix/secrets/tubearchivist.age b/secrets/tubearchivist.age
similarity index 100%
rename from nix/secrets/tubearchivist.age
rename to secrets/tubearchivist.age
diff --git a/nix/users/eric/default.nix b/users/eric/default.nix
similarity index 100%
rename from nix/users/eric/default.nix
rename to users/eric/default.nix
diff --git a/nix/users/luke/default.nix b/users/luke/default.nix
similarity index 100%
rename from nix/users/luke/default.nix
rename to users/luke/default.nix
diff --git a/nix/users/opdavies/default.nix b/users/opdavies/default.nix
similarity index 100%
rename from nix/users/opdavies/default.nix
rename to users/opdavies/default.nix