From 69a397e6242eb75473a1701d538eb72b463cad40 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Wed, 20 Nov 2024 21:37:15 +0000
Subject: [PATCH] Move Nix files into a nix directory

Move everything from `config` to the root level.
---
 flake.nix                                           |   8 ++++----
 {home => nix/home}/opdavies/default.nix             |   4 ++--
 {home => nix/home}/opdavies/desktop.nix             |   0
 {hosts => nix/hosts}/lemp11/configuration.nix       |   0
 .../hosts}/lemp11/hardware-configuration.nix        |   0
 {lib => nix/lib}/nixos/configuration.nix            |   0
 {lib => nix/lib}/nixos/default.nix                  |   2 +-
 {lib => nix/lib}/nixos/hardware-configuration.nix   |   0
 {lib => nix/lib}/shared/home-manager-packages.nix   |   0
 {lib => nix/lib}/shared/home-manager.nix            |   0
 {lib => nix/lib}/shared/scripts/_timer.nix          |   0
 .../lib}/shared/scripts/create-zellij-session.nix   |   0
 {lib => nix/lib}/shared/scripts/deliver.nix         |   0
 .../lib}/shared/scripts/export-video-list.nix       |   0
 {lib => nix/lib}/shared/scripts/run.nix             |   0
 {lib => nix/lib}/shared/scripts/t.nix               |   0
 {lib => nix/lib}/shared/scripts/timer.nix           |   0
 {lib => nix/lib}/theme/default.nix                  |   0
 {lib => nix/lib}/wsl2/default.nix                   |   4 ++--
 {modules => nix/modules}/home-manager/alacritty.nix |   2 +-
 {modules => nix/modules}/home-manager/bat.nix       |   0
 {modules => nix/modules}/home-manager/bin.nix       |   2 +-
 {modules => nix/modules}/home-manager/bluetuith.nix |   0
 {modules => nix/modules}/home-manager/copyq.nix     |   0
 {modules => nix/modules}/home-manager/direnv.nix    |   0
 {modules => nix/modules}/home-manager/espanso.nix   |   0
 .../modules}/home-manager/espanso/matches/base.nix  |   0
 {modules => nix/modules}/home-manager/flameshot.nix |   0
 {modules => nix/modules}/home-manager/fzf.nix       |   0
 {modules => nix/modules}/home-manager/git.nix       |   0
 {modules => nix/modules}/home-manager/gtk.nix       |   0
 {modules => nix/modules}/home-manager/htop.nix      |   0
 {modules => nix/modules}/home-manager/lsd.nix       |   0
 {modules => nix/modules}/home-manager/mpv.nix       |   0
 {modules => nix/modules}/home-manager/neovim.nix    |   0
 {modules => nix/modules}/home-manager/pet.nix       |   0
 {modules => nix/modules}/home-manager/phpactor.nix  |   2 +-
 {modules => nix/modules}/home-manager/ripgrep.nix   |   0
 {modules => nix/modules}/home-manager/starship.nix  |   0
 {modules => nix/modules}/home-manager/syncthing.nix |   0
 {modules => nix/modules}/home-manager/tmux.nix      |   0
 {modules => nix/modules}/home-manager/zellij.nix    |   2 +-
 {modules => nix/modules}/home-manager/zsh.nix       |   0
 .../modules}/home-manager/zsh/abbreviations.zsh     |   0
 .../modules}/home-manager/zsh/aliases.nix           |   0
 {modules => nix/modules}/nixos/autorandr.nix        |   0
 {modules => nix/modules}/nixos/default.nix          |   0
 {modules => nix/modules}/nixos/desktop/default.nix  |   0
 {modules => nix/modules}/nixos/desktop/fonts.nix    |   0
 {modules => nix/modules}/nixos/desktop/gitea.nix    |   0
 {modules => nix/modules}/nixos/desktop/immich.nix   |   0
 {modules => nix/modules}/nixos/desktop/jellyfin.nix |   0
 {modules => nix/modules}/nixos/docker.nix           |   0
 {modules => nix/modules}/nixos/i3.nix               |   2 +-
 {modules => nix/modules}/nixos/kanata.nix           |   0
 {overlays => nix/overlays}/default.nix              |   0
 {pkgs => nix/pkgs}/default.nix                      |   0
 {pkgs => nix/pkgs}/vim-plugins/conf-vim.nix         |   0
 .../pkgs}/vim-plugins/edit-alternate-vim.nix        |   0
 .../pkgs}/vim-plugins/nvim-tmux-navigation.nix      |   0
 {pkgs => nix/pkgs}/vim-plugins/standard-vim.nix     |   0
 {pkgs => nix/pkgs}/vim-plugins/vim-autoread.nix     |   0
 {pkgs => nix/pkgs}/vim-plugins/vim-caser.nix        |   0
 {pkgs => nix/pkgs}/vim-plugins/vim-heritage.nix     |   0
 .../pkgs}/vim-plugins/vim-textobj-indent.nix        |   0
 .../pkgs}/vim-plugins/vim-textobj-xmlattr.nix       |   0
 {pkgs => nix/pkgs}/vim-plugins/vim-zoom.nix         |   0
 {config/neovim => nvim}/.gitignore                  |   0
 .../neovim => nvim}/after/ftplugin/gitcommit.lua    |   0
 {config/neovim => nvim}/after/ftplugin/markdown.lua |   0
 {config/neovim => nvim}/after/ftplugin/rst.lua      |   0
 {config/neovim => nvim}/after/ftplugin/term.vim     |   0
 {config/neovim => nvim}/autoload/opdavies.vim       |   0
 {config/neovim => nvim}/lua/opdavies/globals.lua    |   0
 {config/neovim => nvim}/lua/opdavies/init.lua       |   0
 {config/neovim => nvim}/lua/opdavies/keymaps.lua    |   0
 .../neovim => nvim}/lua/opdavies/lsp/handlers.lua   |   0
 {config/neovim => nvim}/lua/opdavies/lsp/init.lua   |   0
 {config/neovim => nvim}/lua/opdavies/options.lua    |   0
 .../lua/opdavies/snippets/ft/bash.lua               |   0
 .../lua/opdavies/snippets/ft/javascript.lua         |   0
 .../lua/opdavies/snippets/ft/lua.lua                |   0
 .../lua/opdavies/snippets/ft/markdown.lua           |   0
 .../lua/opdavies/snippets/ft/nix.lua                |   0
 .../lua/opdavies/snippets/ft/php.lua                |   0
 .../lua/opdavies/snippets/ft/rst.lua                |   0
 .../lua/opdavies/snippets/ft/scss.lua               |   0
 .../lua/opdavies/snippets/ft/twig.lua               |   0
 .../lua/opdavies/snippets/ft/yaml.lua               |   0
 {config/neovim => nvim}/plugin/colorscheme.lua      |   0
 {config/neovim => nvim}/plugin/comment.lua          |   0
 {config/neovim => nvim}/plugin/completion.lua       |   0
 {config/neovim => nvim}/plugin/conform.lua          |   0
 {config/neovim => nvim}/plugin/dap.lua              |   0
 {config/neovim => nvim}/plugin/dial.lua             |   0
 {config/neovim => nvim}/plugin/edit_alternate.lua   |   0
 {config/neovim => nvim}/plugin/fidget.lua           |   0
 {config/neovim => nvim}/plugin/filetype.lua         |   0
 {config/neovim => nvim}/plugin/fugitive.lua         |   0
 {config/neovim => nvim}/plugin/gitsigns.lua         |   0
 {config/neovim => nvim}/plugin/harpoon.lua          |   0
 {config/neovim => nvim}/plugin/lint.lua             |   0
 {config/neovim => nvim}/plugin/mini.lua             |   0
 {config/neovim => nvim}/plugin/netrw.lua            |   0
 .../neovim => nvim}/plugin/nvim-tmux-navigation.lua |   0
 {config/neovim => nvim}/plugin/oil.lua              |   0
 {config/neovim => nvim}/plugin/refactoring.lua      |   0
 {config/neovim => nvim}/plugin/sort.lua             |   0
 {config/neovim => nvim}/plugin/spectre.lua          |   0
 {config/neovim => nvim}/plugin/telescope.lua        |   0
 {config/neovim => nvim}/plugin/terminal.lua         |   0
 {config/neovim => nvim}/plugin/treesitter.lua       |   0
 {config/neovim => nvim}/plugin/treesj.lua           |   0
 {config/neovim => nvim}/plugin/undotree.lua         |   0
 {config/neovim => nvim}/plugin/vim-test.lua         |   0
 {config/neovim => nvim}/spell/en.utf-8.add          |   0
 stylua.toml => nvim/stylua.toml                     |   0
 {config/phpactor => phpactor}/phpactor.yml          |   0
 .../templates/default/SourceCode.php.twig           |   0
 .../drupal-functional-test/SourceCode.php.twig      |   0
 .../drupal-kernel-test/SourceCode.php.twig          |   0
 .../templates/drupal-unit-test/SourceCode.php.twig  |   0
 {config/wallpaper => wallpaper}/wallpaper.jpg       | Bin
 {config/zellij => zellij}/config.kdl                |   0
 124 files changed, 14 insertions(+), 14 deletions(-)
 rename {home => nix/home}/opdavies/default.nix (90%)
 rename {home => nix/home}/opdavies/desktop.nix (100%)
 rename {hosts => nix/hosts}/lemp11/configuration.nix (100%)
 rename {hosts => nix/hosts}/lemp11/hardware-configuration.nix (100%)
 rename {lib => nix/lib}/nixos/configuration.nix (100%)
 rename {lib => nix/lib}/nixos/default.nix (94%)
 rename {lib => nix/lib}/nixos/hardware-configuration.nix (100%)
 rename {lib => nix/lib}/shared/home-manager-packages.nix (100%)
 rename {lib => nix/lib}/shared/home-manager.nix (100%)
 rename {lib => nix/lib}/shared/scripts/_timer.nix (100%)
 rename {lib => nix/lib}/shared/scripts/create-zellij-session.nix (100%)
 rename {lib => nix/lib}/shared/scripts/deliver.nix (100%)
 rename {lib => nix/lib}/shared/scripts/export-video-list.nix (100%)
 rename {lib => nix/lib}/shared/scripts/run.nix (100%)
 rename {lib => nix/lib}/shared/scripts/t.nix (100%)
 rename {lib => nix/lib}/shared/scripts/timer.nix (100%)
 rename {lib => nix/lib}/theme/default.nix (100%)
 rename {lib => nix/lib}/wsl2/default.nix (87%)
 rename {modules => nix/modules}/home-manager/alacritty.nix (90%)
 rename {modules => nix/modules}/home-manager/bat.nix (100%)
 rename {modules => nix/modules}/home-manager/bin.nix (79%)
 rename {modules => nix/modules}/home-manager/bluetuith.nix (100%)
 rename {modules => nix/modules}/home-manager/copyq.nix (100%)
 rename {modules => nix/modules}/home-manager/direnv.nix (100%)
 rename {modules => nix/modules}/home-manager/espanso.nix (100%)
 rename {modules => nix/modules}/home-manager/espanso/matches/base.nix (100%)
 rename {modules => nix/modules}/home-manager/flameshot.nix (100%)
 rename {modules => nix/modules}/home-manager/fzf.nix (100%)
 rename {modules => nix/modules}/home-manager/git.nix (100%)
 rename {modules => nix/modules}/home-manager/gtk.nix (100%)
 rename {modules => nix/modules}/home-manager/htop.nix (100%)
 rename {modules => nix/modules}/home-manager/lsd.nix (100%)
 rename {modules => nix/modules}/home-manager/mpv.nix (100%)
 rename {modules => nix/modules}/home-manager/neovim.nix (100%)
 rename {modules => nix/modules}/home-manager/pet.nix (100%)
 rename {modules => nix/modules}/home-manager/phpactor.nix (65%)
 rename {modules => nix/modules}/home-manager/ripgrep.nix (100%)
 rename {modules => nix/modules}/home-manager/starship.nix (100%)
 rename {modules => nix/modules}/home-manager/syncthing.nix (100%)
 rename {modules => nix/modules}/home-manager/tmux.nix (100%)
 rename {modules => nix/modules}/home-manager/zellij.nix (76%)
 rename {modules => nix/modules}/home-manager/zsh.nix (100%)
 rename {modules => nix/modules}/home-manager/zsh/abbreviations.zsh (100%)
 rename {modules => nix/modules}/home-manager/zsh/aliases.nix (100%)
 rename {modules => nix/modules}/nixos/autorandr.nix (100%)
 rename {modules => nix/modules}/nixos/default.nix (100%)
 rename {modules => nix/modules}/nixos/desktop/default.nix (100%)
 rename {modules => nix/modules}/nixos/desktop/fonts.nix (100%)
 rename {modules => nix/modules}/nixos/desktop/gitea.nix (100%)
 rename {modules => nix/modules}/nixos/desktop/immich.nix (100%)
 rename {modules => nix/modules}/nixos/desktop/jellyfin.nix (100%)
 rename {modules => nix/modules}/nixos/docker.nix (100%)
 rename {modules => nix/modules}/nixos/i3.nix (98%)
 rename {modules => nix/modules}/nixos/kanata.nix (100%)
 rename {overlays => nix/overlays}/default.nix (100%)
 rename {pkgs => nix/pkgs}/default.nix (100%)
 rename {pkgs => nix/pkgs}/vim-plugins/conf-vim.nix (100%)
 rename {pkgs => nix/pkgs}/vim-plugins/edit-alternate-vim.nix (100%)
 rename {pkgs => nix/pkgs}/vim-plugins/nvim-tmux-navigation.nix (100%)
 rename {pkgs => nix/pkgs}/vim-plugins/standard-vim.nix (100%)
 rename {pkgs => nix/pkgs}/vim-plugins/vim-autoread.nix (100%)
 rename {pkgs => nix/pkgs}/vim-plugins/vim-caser.nix (100%)
 rename {pkgs => nix/pkgs}/vim-plugins/vim-heritage.nix (100%)
 rename {pkgs => nix/pkgs}/vim-plugins/vim-textobj-indent.nix (100%)
 rename {pkgs => nix/pkgs}/vim-plugins/vim-textobj-xmlattr.nix (100%)
 rename {pkgs => nix/pkgs}/vim-plugins/vim-zoom.nix (100%)
 rename {config/neovim => nvim}/.gitignore (100%)
 rename {config/neovim => nvim}/after/ftplugin/gitcommit.lua (100%)
 rename {config/neovim => nvim}/after/ftplugin/markdown.lua (100%)
 rename {config/neovim => nvim}/after/ftplugin/rst.lua (100%)
 rename {config/neovim => nvim}/after/ftplugin/term.vim (100%)
 rename {config/neovim => nvim}/autoload/opdavies.vim (100%)
 rename {config/neovim => nvim}/lua/opdavies/globals.lua (100%)
 rename {config/neovim => nvim}/lua/opdavies/init.lua (100%)
 rename {config/neovim => nvim}/lua/opdavies/keymaps.lua (100%)
 rename {config/neovim => nvim}/lua/opdavies/lsp/handlers.lua (100%)
 rename {config/neovim => nvim}/lua/opdavies/lsp/init.lua (100%)
 rename {config/neovim => nvim}/lua/opdavies/options.lua (100%)
 rename {config/neovim => nvim}/lua/opdavies/snippets/ft/bash.lua (100%)
 rename {config/neovim => nvim}/lua/opdavies/snippets/ft/javascript.lua (100%)
 rename {config/neovim => nvim}/lua/opdavies/snippets/ft/lua.lua (100%)
 rename {config/neovim => nvim}/lua/opdavies/snippets/ft/markdown.lua (100%)
 rename {config/neovim => nvim}/lua/opdavies/snippets/ft/nix.lua (100%)
 rename {config/neovim => nvim}/lua/opdavies/snippets/ft/php.lua (100%)
 rename {config/neovim => nvim}/lua/opdavies/snippets/ft/rst.lua (100%)
 rename {config/neovim => nvim}/lua/opdavies/snippets/ft/scss.lua (100%)
 rename {config/neovim => nvim}/lua/opdavies/snippets/ft/twig.lua (100%)
 rename {config/neovim => nvim}/lua/opdavies/snippets/ft/yaml.lua (100%)
 rename {config/neovim => nvim}/plugin/colorscheme.lua (100%)
 rename {config/neovim => nvim}/plugin/comment.lua (100%)
 rename {config/neovim => nvim}/plugin/completion.lua (100%)
 rename {config/neovim => nvim}/plugin/conform.lua (100%)
 rename {config/neovim => nvim}/plugin/dap.lua (100%)
 rename {config/neovim => nvim}/plugin/dial.lua (100%)
 rename {config/neovim => nvim}/plugin/edit_alternate.lua (100%)
 rename {config/neovim => nvim}/plugin/fidget.lua (100%)
 rename {config/neovim => nvim}/plugin/filetype.lua (100%)
 rename {config/neovim => nvim}/plugin/fugitive.lua (100%)
 rename {config/neovim => nvim}/plugin/gitsigns.lua (100%)
 rename {config/neovim => nvim}/plugin/harpoon.lua (100%)
 rename {config/neovim => nvim}/plugin/lint.lua (100%)
 rename {config/neovim => nvim}/plugin/mini.lua (100%)
 rename {config/neovim => nvim}/plugin/netrw.lua (100%)
 rename {config/neovim => nvim}/plugin/nvim-tmux-navigation.lua (100%)
 rename {config/neovim => nvim}/plugin/oil.lua (100%)
 rename {config/neovim => nvim}/plugin/refactoring.lua (100%)
 rename {config/neovim => nvim}/plugin/sort.lua (100%)
 rename {config/neovim => nvim}/plugin/spectre.lua (100%)
 rename {config/neovim => nvim}/plugin/telescope.lua (100%)
 rename {config/neovim => nvim}/plugin/terminal.lua (100%)
 rename {config/neovim => nvim}/plugin/treesitter.lua (100%)
 rename {config/neovim => nvim}/plugin/treesj.lua (100%)
 rename {config/neovim => nvim}/plugin/undotree.lua (100%)
 rename {config/neovim => nvim}/plugin/vim-test.lua (100%)
 rename {config/neovim => nvim}/spell/en.utf-8.add (100%)
 rename stylua.toml => nvim/stylua.toml (100%)
 rename {config/phpactor => phpactor}/phpactor.yml (100%)
 rename {config/phpactor => phpactor}/templates/default/SourceCode.php.twig (100%)
 rename {config/phpactor => phpactor}/templates/drupal-functional-test/SourceCode.php.twig (100%)
 rename {config/phpactor => phpactor}/templates/drupal-kernel-test/SourceCode.php.twig (100%)
 rename {config/phpactor => phpactor}/templates/drupal-unit-test/SourceCode.php.twig (100%)
 rename {config/wallpaper => wallpaper}/wallpaper.jpg (100%)
 rename {config/zellij => zellij}/config.kdl (100%)

diff --git a/flake.nix b/flake.nix
index 898b9a9..2c9f9e8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,7 +26,7 @@
 
       username = "opdavies";
 
-      mkNixos = import ./lib/nixos {
+      mkNixos = import ./nix/lib/nixos {
         inherit
           inputs
           outputs
@@ -36,7 +36,7 @@
           username
           ;
       };
-      mkWsl = import ./lib/wsl2 {
+      mkWsl = import ./nix/lib/wsl2 {
         inherit
           inputs
           outputs
@@ -54,13 +54,13 @@
 
         opdavies-nvim = buildVimPlugin {
           name = "opdavies-nvim";
-          src = ./config/neovim;
+          src = ./nvim;
         };
       };
 
       formatter.${system} = pkgs.nixfmt-rfc-style;
 
-      overlays = import ./overlays { inherit inputs; };
+      overlays = import ./nix/overlays { inherit inputs; };
 
       nixosConfigurations = {
         lemp11 = mkNixos {
diff --git a/home/opdavies/default.nix b/nix/home/opdavies/default.nix
similarity index 90%
rename from home/opdavies/default.nix
rename to nix/home/opdavies/default.nix
index a3c3ae6..1ef9542 100644
--- a/home/opdavies/default.nix
+++ b/nix/home/opdavies/default.nix
@@ -18,7 +18,7 @@ let
       username
       ;
   };
-  shared-config = import "${self}/lib/shared/home-manager.nix" {
+  shared-config = import "${self}/nix/lib/shared/home-manager.nix" {
     inherit
       inputs
       pkgs
@@ -26,7 +26,7 @@ let
       username
       ;
   };
-  shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {
+  shared-packages = import "${self}/nix/lib/shared/home-manager-packages.nix" {
     inherit
       desktop
       inputs
diff --git a/home/opdavies/desktop.nix b/nix/home/opdavies/desktop.nix
similarity index 100%
rename from home/opdavies/desktop.nix
rename to nix/home/opdavies/desktop.nix
diff --git a/hosts/lemp11/configuration.nix b/nix/hosts/lemp11/configuration.nix
similarity index 100%
rename from hosts/lemp11/configuration.nix
rename to nix/hosts/lemp11/configuration.nix
diff --git a/hosts/lemp11/hardware-configuration.nix b/nix/hosts/lemp11/hardware-configuration.nix
similarity index 100%
rename from hosts/lemp11/hardware-configuration.nix
rename to nix/hosts/lemp11/hardware-configuration.nix
diff --git a/lib/nixos/configuration.nix b/nix/lib/nixos/configuration.nix
similarity index 100%
rename from lib/nixos/configuration.nix
rename to nix/lib/nixos/configuration.nix
diff --git a/lib/nixos/default.nix b/nix/lib/nixos/default.nix
similarity index 94%
rename from lib/nixos/default.nix
rename to nix/lib/nixos/default.nix
index 711dc7d..ad7060d 100644
--- a/lib/nixos/default.nix
+++ b/nix/lib/nixos/default.nix
@@ -37,7 +37,7 @@ inputs.nixpkgs.lib.nixosSystem {
         };
         useGlobalPkgs = true;
         useUserPackages = true;
-        users."${username}" = import "${self}/home/${username}";
+        users."${username}" = import "${self}/nix/home/${username}";
       };
     }
 
diff --git a/lib/nixos/hardware-configuration.nix b/nix/lib/nixos/hardware-configuration.nix
similarity index 100%
rename from lib/nixos/hardware-configuration.nix
rename to nix/lib/nixos/hardware-configuration.nix
diff --git a/lib/shared/home-manager-packages.nix b/nix/lib/shared/home-manager-packages.nix
similarity index 100%
rename from lib/shared/home-manager-packages.nix
rename to nix/lib/shared/home-manager-packages.nix
diff --git a/lib/shared/home-manager.nix b/nix/lib/shared/home-manager.nix
similarity index 100%
rename from lib/shared/home-manager.nix
rename to nix/lib/shared/home-manager.nix
diff --git a/lib/shared/scripts/_timer.nix b/nix/lib/shared/scripts/_timer.nix
similarity index 100%
rename from lib/shared/scripts/_timer.nix
rename to nix/lib/shared/scripts/_timer.nix
diff --git a/lib/shared/scripts/create-zellij-session.nix b/nix/lib/shared/scripts/create-zellij-session.nix
similarity index 100%
rename from lib/shared/scripts/create-zellij-session.nix
rename to nix/lib/shared/scripts/create-zellij-session.nix
diff --git a/lib/shared/scripts/deliver.nix b/nix/lib/shared/scripts/deliver.nix
similarity index 100%
rename from lib/shared/scripts/deliver.nix
rename to nix/lib/shared/scripts/deliver.nix
diff --git a/lib/shared/scripts/export-video-list.nix b/nix/lib/shared/scripts/export-video-list.nix
similarity index 100%
rename from lib/shared/scripts/export-video-list.nix
rename to nix/lib/shared/scripts/export-video-list.nix
diff --git a/lib/shared/scripts/run.nix b/nix/lib/shared/scripts/run.nix
similarity index 100%
rename from lib/shared/scripts/run.nix
rename to nix/lib/shared/scripts/run.nix
diff --git a/lib/shared/scripts/t.nix b/nix/lib/shared/scripts/t.nix
similarity index 100%
rename from lib/shared/scripts/t.nix
rename to nix/lib/shared/scripts/t.nix
diff --git a/lib/shared/scripts/timer.nix b/nix/lib/shared/scripts/timer.nix
similarity index 100%
rename from lib/shared/scripts/timer.nix
rename to nix/lib/shared/scripts/timer.nix
diff --git a/lib/theme/default.nix b/nix/lib/theme/default.nix
similarity index 100%
rename from lib/theme/default.nix
rename to nix/lib/theme/default.nix
diff --git a/lib/wsl2/default.nix b/nix/lib/wsl2/default.nix
similarity index 87%
rename from lib/wsl2/default.nix
rename to nix/lib/wsl2/default.nix
index 0b4224f..b69dcfc 100644
--- a/lib/wsl2/default.nix
+++ b/nix/lib/wsl2/default.nix
@@ -17,7 +17,7 @@ let
     ];
   };
 
-  shared-config = import "${self}/lib/shared/home-manager.nix" {
+  shared-config = import "${self}/nix/lib/shared/home-manager.nix" {
     inherit
       inputs
       pkgs
@@ -26,7 +26,7 @@ let
       ;
   };
 
-  shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {
+  shared-packages = import "${self}/nix/lib/shared/home-manager-packages.nix" {
     inherit inputs pkgs username;
     desktop = false;
   };
diff --git a/modules/home-manager/alacritty.nix b/nix/modules/home-manager/alacritty.nix
similarity index 90%
rename from modules/home-manager/alacritty.nix
rename to nix/modules/home-manager/alacritty.nix
index 8741ed8..9e54ef5 100644
--- a/modules/home-manager/alacritty.nix
+++ b/nix/modules/home-manager/alacritty.nix
@@ -8,7 +8,7 @@ let
   inherit (lib) strings;
   inherit (strings) toInt;
 
-  theme = import "${self}/lib/theme" { inherit pkgs; };
+  theme = import "${self}/nix/lib/theme" { inherit pkgs; };
 in
 {
   programs.alacritty = {
diff --git a/modules/home-manager/bat.nix b/nix/modules/home-manager/bat.nix
similarity index 100%
rename from modules/home-manager/bat.nix
rename to nix/modules/home-manager/bat.nix
diff --git a/modules/home-manager/bin.nix b/nix/modules/home-manager/bin.nix
similarity index 79%
rename from modules/home-manager/bin.nix
rename to nix/modules/home-manager/bin.nix
index bd4ed85..11519c2 100644
--- a/modules/home-manager/bin.nix
+++ b/nix/modules/home-manager/bin.nix
@@ -3,7 +3,7 @@
   home.sessionPath = [ "$HOME/.local/bin" ];
 
   home.file.".local/bin" = {
-    source = "${self}/bin";
+    source = "${self}/nix/bin";
     recursive = true;
   };
 }
diff --git a/modules/home-manager/bluetuith.nix b/nix/modules/home-manager/bluetuith.nix
similarity index 100%
rename from modules/home-manager/bluetuith.nix
rename to nix/modules/home-manager/bluetuith.nix
diff --git a/modules/home-manager/copyq.nix b/nix/modules/home-manager/copyq.nix
similarity index 100%
rename from modules/home-manager/copyq.nix
rename to nix/modules/home-manager/copyq.nix
diff --git a/modules/home-manager/direnv.nix b/nix/modules/home-manager/direnv.nix
similarity index 100%
rename from modules/home-manager/direnv.nix
rename to nix/modules/home-manager/direnv.nix
diff --git a/modules/home-manager/espanso.nix b/nix/modules/home-manager/espanso.nix
similarity index 100%
rename from modules/home-manager/espanso.nix
rename to nix/modules/home-manager/espanso.nix
diff --git a/modules/home-manager/espanso/matches/base.nix b/nix/modules/home-manager/espanso/matches/base.nix
similarity index 100%
rename from modules/home-manager/espanso/matches/base.nix
rename to nix/modules/home-manager/espanso/matches/base.nix
diff --git a/modules/home-manager/flameshot.nix b/nix/modules/home-manager/flameshot.nix
similarity index 100%
rename from modules/home-manager/flameshot.nix
rename to nix/modules/home-manager/flameshot.nix
diff --git a/modules/home-manager/fzf.nix b/nix/modules/home-manager/fzf.nix
similarity index 100%
rename from modules/home-manager/fzf.nix
rename to nix/modules/home-manager/fzf.nix
diff --git a/modules/home-manager/git.nix b/nix/modules/home-manager/git.nix
similarity index 100%
rename from modules/home-manager/git.nix
rename to nix/modules/home-manager/git.nix
diff --git a/modules/home-manager/gtk.nix b/nix/modules/home-manager/gtk.nix
similarity index 100%
rename from modules/home-manager/gtk.nix
rename to nix/modules/home-manager/gtk.nix
diff --git a/modules/home-manager/htop.nix b/nix/modules/home-manager/htop.nix
similarity index 100%
rename from modules/home-manager/htop.nix
rename to nix/modules/home-manager/htop.nix
diff --git a/modules/home-manager/lsd.nix b/nix/modules/home-manager/lsd.nix
similarity index 100%
rename from modules/home-manager/lsd.nix
rename to nix/modules/home-manager/lsd.nix
diff --git a/modules/home-manager/mpv.nix b/nix/modules/home-manager/mpv.nix
similarity index 100%
rename from modules/home-manager/mpv.nix
rename to nix/modules/home-manager/mpv.nix
diff --git a/modules/home-manager/neovim.nix b/nix/modules/home-manager/neovim.nix
similarity index 100%
rename from modules/home-manager/neovim.nix
rename to nix/modules/home-manager/neovim.nix
diff --git a/modules/home-manager/pet.nix b/nix/modules/home-manager/pet.nix
similarity index 100%
rename from modules/home-manager/pet.nix
rename to nix/modules/home-manager/pet.nix
diff --git a/modules/home-manager/phpactor.nix b/nix/modules/home-manager/phpactor.nix
similarity index 65%
rename from modules/home-manager/phpactor.nix
rename to nix/modules/home-manager/phpactor.nix
index ba4c1dd..98bc31b 100644
--- a/modules/home-manager/phpactor.nix
+++ b/nix/modules/home-manager/phpactor.nix
@@ -1,7 +1,7 @@
 { self, ... }:
 {
   xdg.configFile.phpactor = {
-    source = "${self}/config/phpactor";
+    source = "${self}/phpactor";
     recursive = true;
   };
 }
diff --git a/modules/home-manager/ripgrep.nix b/nix/modules/home-manager/ripgrep.nix
similarity index 100%
rename from modules/home-manager/ripgrep.nix
rename to nix/modules/home-manager/ripgrep.nix
diff --git a/modules/home-manager/starship.nix b/nix/modules/home-manager/starship.nix
similarity index 100%
rename from modules/home-manager/starship.nix
rename to nix/modules/home-manager/starship.nix
diff --git a/modules/home-manager/syncthing.nix b/nix/modules/home-manager/syncthing.nix
similarity index 100%
rename from modules/home-manager/syncthing.nix
rename to nix/modules/home-manager/syncthing.nix
diff --git a/modules/home-manager/tmux.nix b/nix/modules/home-manager/tmux.nix
similarity index 100%
rename from modules/home-manager/tmux.nix
rename to nix/modules/home-manager/tmux.nix
diff --git a/modules/home-manager/zellij.nix b/nix/modules/home-manager/zellij.nix
similarity index 76%
rename from modules/home-manager/zellij.nix
rename to nix/modules/home-manager/zellij.nix
index 7eebe03..d746d2b 100644
--- a/modules/home-manager/zellij.nix
+++ b/nix/modules/home-manager/zellij.nix
@@ -5,7 +5,7 @@
   };
 
   xdg.configFile."zellij" = {
-    source = "${self}/config/zellij";
+    source = "${self}/zellij";
     recursive = true;
   };
 }
diff --git a/modules/home-manager/zsh.nix b/nix/modules/home-manager/zsh.nix
similarity index 100%
rename from modules/home-manager/zsh.nix
rename to nix/modules/home-manager/zsh.nix
diff --git a/modules/home-manager/zsh/abbreviations.zsh b/nix/modules/home-manager/zsh/abbreviations.zsh
similarity index 100%
rename from modules/home-manager/zsh/abbreviations.zsh
rename to nix/modules/home-manager/zsh/abbreviations.zsh
diff --git a/modules/home-manager/zsh/aliases.nix b/nix/modules/home-manager/zsh/aliases.nix
similarity index 100%
rename from modules/home-manager/zsh/aliases.nix
rename to nix/modules/home-manager/zsh/aliases.nix
diff --git a/modules/nixos/autorandr.nix b/nix/modules/nixos/autorandr.nix
similarity index 100%
rename from modules/nixos/autorandr.nix
rename to nix/modules/nixos/autorandr.nix
diff --git a/modules/nixos/default.nix b/nix/modules/nixos/default.nix
similarity index 100%
rename from modules/nixos/default.nix
rename to nix/modules/nixos/default.nix
diff --git a/modules/nixos/desktop/default.nix b/nix/modules/nixos/desktop/default.nix
similarity index 100%
rename from modules/nixos/desktop/default.nix
rename to nix/modules/nixos/desktop/default.nix
diff --git a/modules/nixos/desktop/fonts.nix b/nix/modules/nixos/desktop/fonts.nix
similarity index 100%
rename from modules/nixos/desktop/fonts.nix
rename to nix/modules/nixos/desktop/fonts.nix
diff --git a/modules/nixos/desktop/gitea.nix b/nix/modules/nixos/desktop/gitea.nix
similarity index 100%
rename from modules/nixos/desktop/gitea.nix
rename to nix/modules/nixos/desktop/gitea.nix
diff --git a/modules/nixos/desktop/immich.nix b/nix/modules/nixos/desktop/immich.nix
similarity index 100%
rename from modules/nixos/desktop/immich.nix
rename to nix/modules/nixos/desktop/immich.nix
diff --git a/modules/nixos/desktop/jellyfin.nix b/nix/modules/nixos/desktop/jellyfin.nix
similarity index 100%
rename from modules/nixos/desktop/jellyfin.nix
rename to nix/modules/nixos/desktop/jellyfin.nix
diff --git a/modules/nixos/docker.nix b/nix/modules/nixos/docker.nix
similarity index 100%
rename from modules/nixos/docker.nix
rename to nix/modules/nixos/docker.nix
diff --git a/modules/nixos/i3.nix b/nix/modules/nixos/i3.nix
similarity index 98%
rename from modules/nixos/i3.nix
rename to nix/modules/nixos/i3.nix
index 4cd16e2..8f06dda 100644
--- a/modules/nixos/i3.nix
+++ b/nix/modules/nixos/i3.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  theme = import "${self}/lib/theme" { inherit pkgs; };
+  theme = import "${self}/nix/lib/theme" { inherit pkgs; };
 
   modifier = "Mod4";
 in
diff --git a/modules/nixos/kanata.nix b/nix/modules/nixos/kanata.nix
similarity index 100%
rename from modules/nixos/kanata.nix
rename to nix/modules/nixos/kanata.nix
diff --git a/overlays/default.nix b/nix/overlays/default.nix
similarity index 100%
rename from overlays/default.nix
rename to nix/overlays/default.nix
diff --git a/pkgs/default.nix b/nix/pkgs/default.nix
similarity index 100%
rename from pkgs/default.nix
rename to nix/pkgs/default.nix
diff --git a/pkgs/vim-plugins/conf-vim.nix b/nix/pkgs/vim-plugins/conf-vim.nix
similarity index 100%
rename from pkgs/vim-plugins/conf-vim.nix
rename to nix/pkgs/vim-plugins/conf-vim.nix
diff --git a/pkgs/vim-plugins/edit-alternate-vim.nix b/nix/pkgs/vim-plugins/edit-alternate-vim.nix
similarity index 100%
rename from pkgs/vim-plugins/edit-alternate-vim.nix
rename to nix/pkgs/vim-plugins/edit-alternate-vim.nix
diff --git a/pkgs/vim-plugins/nvim-tmux-navigation.nix b/nix/pkgs/vim-plugins/nvim-tmux-navigation.nix
similarity index 100%
rename from pkgs/vim-plugins/nvim-tmux-navigation.nix
rename to nix/pkgs/vim-plugins/nvim-tmux-navigation.nix
diff --git a/pkgs/vim-plugins/standard-vim.nix b/nix/pkgs/vim-plugins/standard-vim.nix
similarity index 100%
rename from pkgs/vim-plugins/standard-vim.nix
rename to nix/pkgs/vim-plugins/standard-vim.nix
diff --git a/pkgs/vim-plugins/vim-autoread.nix b/nix/pkgs/vim-plugins/vim-autoread.nix
similarity index 100%
rename from pkgs/vim-plugins/vim-autoread.nix
rename to nix/pkgs/vim-plugins/vim-autoread.nix
diff --git a/pkgs/vim-plugins/vim-caser.nix b/nix/pkgs/vim-plugins/vim-caser.nix
similarity index 100%
rename from pkgs/vim-plugins/vim-caser.nix
rename to nix/pkgs/vim-plugins/vim-caser.nix
diff --git a/pkgs/vim-plugins/vim-heritage.nix b/nix/pkgs/vim-plugins/vim-heritage.nix
similarity index 100%
rename from pkgs/vim-plugins/vim-heritage.nix
rename to nix/pkgs/vim-plugins/vim-heritage.nix
diff --git a/pkgs/vim-plugins/vim-textobj-indent.nix b/nix/pkgs/vim-plugins/vim-textobj-indent.nix
similarity index 100%
rename from pkgs/vim-plugins/vim-textobj-indent.nix
rename to nix/pkgs/vim-plugins/vim-textobj-indent.nix
diff --git a/pkgs/vim-plugins/vim-textobj-xmlattr.nix b/nix/pkgs/vim-plugins/vim-textobj-xmlattr.nix
similarity index 100%
rename from pkgs/vim-plugins/vim-textobj-xmlattr.nix
rename to nix/pkgs/vim-plugins/vim-textobj-xmlattr.nix
diff --git a/pkgs/vim-plugins/vim-zoom.nix b/nix/pkgs/vim-plugins/vim-zoom.nix
similarity index 100%
rename from pkgs/vim-plugins/vim-zoom.nix
rename to nix/pkgs/vim-plugins/vim-zoom.nix
diff --git a/config/neovim/.gitignore b/nvim/.gitignore
similarity index 100%
rename from config/neovim/.gitignore
rename to nvim/.gitignore
diff --git a/config/neovim/after/ftplugin/gitcommit.lua b/nvim/after/ftplugin/gitcommit.lua
similarity index 100%
rename from config/neovim/after/ftplugin/gitcommit.lua
rename to nvim/after/ftplugin/gitcommit.lua
diff --git a/config/neovim/after/ftplugin/markdown.lua b/nvim/after/ftplugin/markdown.lua
similarity index 100%
rename from config/neovim/after/ftplugin/markdown.lua
rename to nvim/after/ftplugin/markdown.lua
diff --git a/config/neovim/after/ftplugin/rst.lua b/nvim/after/ftplugin/rst.lua
similarity index 100%
rename from config/neovim/after/ftplugin/rst.lua
rename to nvim/after/ftplugin/rst.lua
diff --git a/config/neovim/after/ftplugin/term.vim b/nvim/after/ftplugin/term.vim
similarity index 100%
rename from config/neovim/after/ftplugin/term.vim
rename to nvim/after/ftplugin/term.vim
diff --git a/config/neovim/autoload/opdavies.vim b/nvim/autoload/opdavies.vim
similarity index 100%
rename from config/neovim/autoload/opdavies.vim
rename to nvim/autoload/opdavies.vim
diff --git a/config/neovim/lua/opdavies/globals.lua b/nvim/lua/opdavies/globals.lua
similarity index 100%
rename from config/neovim/lua/opdavies/globals.lua
rename to nvim/lua/opdavies/globals.lua
diff --git a/config/neovim/lua/opdavies/init.lua b/nvim/lua/opdavies/init.lua
similarity index 100%
rename from config/neovim/lua/opdavies/init.lua
rename to nvim/lua/opdavies/init.lua
diff --git a/config/neovim/lua/opdavies/keymaps.lua b/nvim/lua/opdavies/keymaps.lua
similarity index 100%
rename from config/neovim/lua/opdavies/keymaps.lua
rename to nvim/lua/opdavies/keymaps.lua
diff --git a/config/neovim/lua/opdavies/lsp/handlers.lua b/nvim/lua/opdavies/lsp/handlers.lua
similarity index 100%
rename from config/neovim/lua/opdavies/lsp/handlers.lua
rename to nvim/lua/opdavies/lsp/handlers.lua
diff --git a/config/neovim/lua/opdavies/lsp/init.lua b/nvim/lua/opdavies/lsp/init.lua
similarity index 100%
rename from config/neovim/lua/opdavies/lsp/init.lua
rename to nvim/lua/opdavies/lsp/init.lua
diff --git a/config/neovim/lua/opdavies/options.lua b/nvim/lua/opdavies/options.lua
similarity index 100%
rename from config/neovim/lua/opdavies/options.lua
rename to nvim/lua/opdavies/options.lua
diff --git a/config/neovim/lua/opdavies/snippets/ft/bash.lua b/nvim/lua/opdavies/snippets/ft/bash.lua
similarity index 100%
rename from config/neovim/lua/opdavies/snippets/ft/bash.lua
rename to nvim/lua/opdavies/snippets/ft/bash.lua
diff --git a/config/neovim/lua/opdavies/snippets/ft/javascript.lua b/nvim/lua/opdavies/snippets/ft/javascript.lua
similarity index 100%
rename from config/neovim/lua/opdavies/snippets/ft/javascript.lua
rename to nvim/lua/opdavies/snippets/ft/javascript.lua
diff --git a/config/neovim/lua/opdavies/snippets/ft/lua.lua b/nvim/lua/opdavies/snippets/ft/lua.lua
similarity index 100%
rename from config/neovim/lua/opdavies/snippets/ft/lua.lua
rename to nvim/lua/opdavies/snippets/ft/lua.lua
diff --git a/config/neovim/lua/opdavies/snippets/ft/markdown.lua b/nvim/lua/opdavies/snippets/ft/markdown.lua
similarity index 100%
rename from config/neovim/lua/opdavies/snippets/ft/markdown.lua
rename to nvim/lua/opdavies/snippets/ft/markdown.lua
diff --git a/config/neovim/lua/opdavies/snippets/ft/nix.lua b/nvim/lua/opdavies/snippets/ft/nix.lua
similarity index 100%
rename from config/neovim/lua/opdavies/snippets/ft/nix.lua
rename to nvim/lua/opdavies/snippets/ft/nix.lua
diff --git a/config/neovim/lua/opdavies/snippets/ft/php.lua b/nvim/lua/opdavies/snippets/ft/php.lua
similarity index 100%
rename from config/neovim/lua/opdavies/snippets/ft/php.lua
rename to nvim/lua/opdavies/snippets/ft/php.lua
diff --git a/config/neovim/lua/opdavies/snippets/ft/rst.lua b/nvim/lua/opdavies/snippets/ft/rst.lua
similarity index 100%
rename from config/neovim/lua/opdavies/snippets/ft/rst.lua
rename to nvim/lua/opdavies/snippets/ft/rst.lua
diff --git a/config/neovim/lua/opdavies/snippets/ft/scss.lua b/nvim/lua/opdavies/snippets/ft/scss.lua
similarity index 100%
rename from config/neovim/lua/opdavies/snippets/ft/scss.lua
rename to nvim/lua/opdavies/snippets/ft/scss.lua
diff --git a/config/neovim/lua/opdavies/snippets/ft/twig.lua b/nvim/lua/opdavies/snippets/ft/twig.lua
similarity index 100%
rename from config/neovim/lua/opdavies/snippets/ft/twig.lua
rename to nvim/lua/opdavies/snippets/ft/twig.lua
diff --git a/config/neovim/lua/opdavies/snippets/ft/yaml.lua b/nvim/lua/opdavies/snippets/ft/yaml.lua
similarity index 100%
rename from config/neovim/lua/opdavies/snippets/ft/yaml.lua
rename to nvim/lua/opdavies/snippets/ft/yaml.lua
diff --git a/config/neovim/plugin/colorscheme.lua b/nvim/plugin/colorscheme.lua
similarity index 100%
rename from config/neovim/plugin/colorscheme.lua
rename to nvim/plugin/colorscheme.lua
diff --git a/config/neovim/plugin/comment.lua b/nvim/plugin/comment.lua
similarity index 100%
rename from config/neovim/plugin/comment.lua
rename to nvim/plugin/comment.lua
diff --git a/config/neovim/plugin/completion.lua b/nvim/plugin/completion.lua
similarity index 100%
rename from config/neovim/plugin/completion.lua
rename to nvim/plugin/completion.lua
diff --git a/config/neovim/plugin/conform.lua b/nvim/plugin/conform.lua
similarity index 100%
rename from config/neovim/plugin/conform.lua
rename to nvim/plugin/conform.lua
diff --git a/config/neovim/plugin/dap.lua b/nvim/plugin/dap.lua
similarity index 100%
rename from config/neovim/plugin/dap.lua
rename to nvim/plugin/dap.lua
diff --git a/config/neovim/plugin/dial.lua b/nvim/plugin/dial.lua
similarity index 100%
rename from config/neovim/plugin/dial.lua
rename to nvim/plugin/dial.lua
diff --git a/config/neovim/plugin/edit_alternate.lua b/nvim/plugin/edit_alternate.lua
similarity index 100%
rename from config/neovim/plugin/edit_alternate.lua
rename to nvim/plugin/edit_alternate.lua
diff --git a/config/neovim/plugin/fidget.lua b/nvim/plugin/fidget.lua
similarity index 100%
rename from config/neovim/plugin/fidget.lua
rename to nvim/plugin/fidget.lua
diff --git a/config/neovim/plugin/filetype.lua b/nvim/plugin/filetype.lua
similarity index 100%
rename from config/neovim/plugin/filetype.lua
rename to nvim/plugin/filetype.lua
diff --git a/config/neovim/plugin/fugitive.lua b/nvim/plugin/fugitive.lua
similarity index 100%
rename from config/neovim/plugin/fugitive.lua
rename to nvim/plugin/fugitive.lua
diff --git a/config/neovim/plugin/gitsigns.lua b/nvim/plugin/gitsigns.lua
similarity index 100%
rename from config/neovim/plugin/gitsigns.lua
rename to nvim/plugin/gitsigns.lua
diff --git a/config/neovim/plugin/harpoon.lua b/nvim/plugin/harpoon.lua
similarity index 100%
rename from config/neovim/plugin/harpoon.lua
rename to nvim/plugin/harpoon.lua
diff --git a/config/neovim/plugin/lint.lua b/nvim/plugin/lint.lua
similarity index 100%
rename from config/neovim/plugin/lint.lua
rename to nvim/plugin/lint.lua
diff --git a/config/neovim/plugin/mini.lua b/nvim/plugin/mini.lua
similarity index 100%
rename from config/neovim/plugin/mini.lua
rename to nvim/plugin/mini.lua
diff --git a/config/neovim/plugin/netrw.lua b/nvim/plugin/netrw.lua
similarity index 100%
rename from config/neovim/plugin/netrw.lua
rename to nvim/plugin/netrw.lua
diff --git a/config/neovim/plugin/nvim-tmux-navigation.lua b/nvim/plugin/nvim-tmux-navigation.lua
similarity index 100%
rename from config/neovim/plugin/nvim-tmux-navigation.lua
rename to nvim/plugin/nvim-tmux-navigation.lua
diff --git a/config/neovim/plugin/oil.lua b/nvim/plugin/oil.lua
similarity index 100%
rename from config/neovim/plugin/oil.lua
rename to nvim/plugin/oil.lua
diff --git a/config/neovim/plugin/refactoring.lua b/nvim/plugin/refactoring.lua
similarity index 100%
rename from config/neovim/plugin/refactoring.lua
rename to nvim/plugin/refactoring.lua
diff --git a/config/neovim/plugin/sort.lua b/nvim/plugin/sort.lua
similarity index 100%
rename from config/neovim/plugin/sort.lua
rename to nvim/plugin/sort.lua
diff --git a/config/neovim/plugin/spectre.lua b/nvim/plugin/spectre.lua
similarity index 100%
rename from config/neovim/plugin/spectre.lua
rename to nvim/plugin/spectre.lua
diff --git a/config/neovim/plugin/telescope.lua b/nvim/plugin/telescope.lua
similarity index 100%
rename from config/neovim/plugin/telescope.lua
rename to nvim/plugin/telescope.lua
diff --git a/config/neovim/plugin/terminal.lua b/nvim/plugin/terminal.lua
similarity index 100%
rename from config/neovim/plugin/terminal.lua
rename to nvim/plugin/terminal.lua
diff --git a/config/neovim/plugin/treesitter.lua b/nvim/plugin/treesitter.lua
similarity index 100%
rename from config/neovim/plugin/treesitter.lua
rename to nvim/plugin/treesitter.lua
diff --git a/config/neovim/plugin/treesj.lua b/nvim/plugin/treesj.lua
similarity index 100%
rename from config/neovim/plugin/treesj.lua
rename to nvim/plugin/treesj.lua
diff --git a/config/neovim/plugin/undotree.lua b/nvim/plugin/undotree.lua
similarity index 100%
rename from config/neovim/plugin/undotree.lua
rename to nvim/plugin/undotree.lua
diff --git a/config/neovim/plugin/vim-test.lua b/nvim/plugin/vim-test.lua
similarity index 100%
rename from config/neovim/plugin/vim-test.lua
rename to nvim/plugin/vim-test.lua
diff --git a/config/neovim/spell/en.utf-8.add b/nvim/spell/en.utf-8.add
similarity index 100%
rename from config/neovim/spell/en.utf-8.add
rename to nvim/spell/en.utf-8.add
diff --git a/stylua.toml b/nvim/stylua.toml
similarity index 100%
rename from stylua.toml
rename to nvim/stylua.toml
diff --git a/config/phpactor/phpactor.yml b/phpactor/phpactor.yml
similarity index 100%
rename from config/phpactor/phpactor.yml
rename to phpactor/phpactor.yml
diff --git a/config/phpactor/templates/default/SourceCode.php.twig b/phpactor/templates/default/SourceCode.php.twig
similarity index 100%
rename from config/phpactor/templates/default/SourceCode.php.twig
rename to phpactor/templates/default/SourceCode.php.twig
diff --git a/config/phpactor/templates/drupal-functional-test/SourceCode.php.twig b/phpactor/templates/drupal-functional-test/SourceCode.php.twig
similarity index 100%
rename from config/phpactor/templates/drupal-functional-test/SourceCode.php.twig
rename to phpactor/templates/drupal-functional-test/SourceCode.php.twig
diff --git a/config/phpactor/templates/drupal-kernel-test/SourceCode.php.twig b/phpactor/templates/drupal-kernel-test/SourceCode.php.twig
similarity index 100%
rename from config/phpactor/templates/drupal-kernel-test/SourceCode.php.twig
rename to phpactor/templates/drupal-kernel-test/SourceCode.php.twig
diff --git a/config/phpactor/templates/drupal-unit-test/SourceCode.php.twig b/phpactor/templates/drupal-unit-test/SourceCode.php.twig
similarity index 100%
rename from config/phpactor/templates/drupal-unit-test/SourceCode.php.twig
rename to phpactor/templates/drupal-unit-test/SourceCode.php.twig
diff --git a/config/wallpaper/wallpaper.jpg b/wallpaper/wallpaper.jpg
similarity index 100%
rename from config/wallpaper/wallpaper.jpg
rename to wallpaper/wallpaper.jpg
diff --git a/config/zellij/config.kdl b/zellij/config.kdl
similarity index 100%
rename from config/zellij/config.kdl
rename to zellij/config.kdl