diff --git a/flake.nix b/flake.nix
index d413b488..990846e4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,8 +17,8 @@
 
     pkgs = inputs.nixpkgs.legacyPackages.${system};
 
-    nixos-system = import ./system/nixos {inherit inputs pkgs self system username;};
-    wsl-system = import ./system/wsl2 {inherit inputs pkgs self system username;};
+    nixos-system = import ./lib/nixos {inherit inputs pkgs self system username;};
+    wsl-system = import ./lib/wsl2 {inherit inputs pkgs self system username;};
   in
     flake-parts.lib.mkFlake {inherit inputs;} {
       systems = ["x86_64-linux"];
diff --git a/system/nixos/configuration.nix b/lib/nixos/configuration.nix
similarity index 100%
rename from system/nixos/configuration.nix
rename to lib/nixos/configuration.nix
diff --git a/system/nixos/default.nix b/lib/nixos/default.nix
similarity index 100%
rename from system/nixos/default.nix
rename to lib/nixos/default.nix
diff --git a/system/nixos/hardware-configuration.nix b/lib/nixos/hardware-configuration.nix
similarity index 100%
rename from system/nixos/hardware-configuration.nix
rename to lib/nixos/hardware-configuration.nix
diff --git a/system/nixos/home-manager/default.nix b/lib/nixos/home-manager/default.nix
similarity index 100%
rename from system/nixos/home-manager/default.nix
rename to lib/nixos/home-manager/default.nix
diff --git a/system/nixos/home-manager/desktop.nix b/lib/nixos/home-manager/desktop.nix
similarity index 100%
rename from system/nixos/home-manager/desktop.nix
rename to lib/nixos/home-manager/desktop.nix
diff --git a/system/nixos/home-manager/modules/alacritty.nix b/lib/nixos/home-manager/modules/alacritty.nix
similarity index 100%
rename from system/nixos/home-manager/modules/alacritty.nix
rename to lib/nixos/home-manager/modules/alacritty.nix
diff --git a/system/nixos/home-manager/modules/autorandr.nix b/lib/nixos/home-manager/modules/autorandr.nix
similarity index 100%
rename from system/nixos/home-manager/modules/autorandr.nix
rename to lib/nixos/home-manager/modules/autorandr.nix
diff --git a/system/nixos/home-manager/modules/espanso.nix b/lib/nixos/home-manager/modules/espanso.nix
similarity index 100%
rename from system/nixos/home-manager/modules/espanso.nix
rename to lib/nixos/home-manager/modules/espanso.nix
diff --git a/system/nixos/home-manager/modules/i3.nix b/lib/nixos/home-manager/modules/i3.nix
similarity index 100%
rename from system/nixos/home-manager/modules/i3.nix
rename to lib/nixos/home-manager/modules/i3.nix
diff --git a/system/shared/home-manager-packages.nix b/lib/shared/home-manager-packages.nix
similarity index 100%
rename from system/shared/home-manager-packages.nix
rename to lib/shared/home-manager-packages.nix
diff --git a/system/shared/home-manager.nix b/lib/shared/home-manager.nix
similarity index 100%
rename from system/shared/home-manager.nix
rename to lib/shared/home-manager.nix
diff --git a/system/shared/modules/git.nix b/lib/shared/modules/git.nix
similarity index 100%
rename from system/shared/modules/git.nix
rename to lib/shared/modules/git.nix
diff --git a/system/shared/modules/neovim.nix b/lib/shared/modules/neovim.nix
similarity index 100%
rename from system/shared/modules/neovim.nix
rename to lib/shared/modules/neovim.nix
diff --git a/system/shared/modules/starship.nix b/lib/shared/modules/starship.nix
similarity index 100%
rename from system/shared/modules/starship.nix
rename to lib/shared/modules/starship.nix
diff --git a/system/shared/modules/tmux.nix b/lib/shared/modules/tmux.nix
similarity index 100%
rename from system/shared/modules/tmux.nix
rename to lib/shared/modules/tmux.nix
diff --git a/system/shared/modules/zsh.nix b/lib/shared/modules/zsh.nix
similarity index 100%
rename from system/shared/modules/zsh.nix
rename to lib/shared/modules/zsh.nix
diff --git a/system/wsl2/default.nix b/lib/wsl2/default.nix
similarity index 100%
rename from system/wsl2/default.nix
rename to lib/wsl2/default.nix