diff --git a/nixos/boxes/foureighty/default.nix b/nixos/boxes/foureighty/default.nix
index f559640d..f7190fe1 100644
--- a/nixos/boxes/foureighty/default.nix
+++ b/nixos/boxes/foureighty/default.nix
@@ -49,9 +49,9 @@
   fonts.fontconfig.enable = true;
   home-manager.users.cyryl = {...}: {
     imports = [
-      ../../home-common.nix
-      ../../programs/git.nix
-      ../../gui.nix
+      ../../home-manager
+      ../../home-manager/gui.nix
+      ../../home-manager/programs/git.nix
     ];
     home.stateVersion = config.system.stateVersion;
 
diff --git a/nixos/cli.nix b/nixos/home-manager/cli.nix
similarity index 100%
rename from nixos/cli.nix
rename to nixos/home-manager/cli.nix
diff --git a/nixos/home-common.nix b/nixos/home-manager/default.nix
similarity index 100%
rename from nixos/home-common.nix
rename to nixos/home-manager/default.nix
diff --git a/nixos/gui.nix b/nixos/home-manager/gui.nix
similarity index 100%
rename from nixos/gui.nix
rename to nixos/home-manager/gui.nix
diff --git a/nixos/links.nix b/nixos/home-manager/links.nix
similarity index 74%
rename from nixos/links.nix
rename to nixos/home-manager/links.nix
index acc6761a..46bc9b6a 100644
--- a/nixos/links.nix
+++ b/nixos/home-manager/links.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  home.file.".config/nixpkgs/config.nix".source = ./shell-config.nix;
+  home.file.".config/nixpkgs/config.nix".source = ../shell-config.nix;
   home.file.".gdbinit".text = ''
     set auto-load python-scripts on
     add-auto-load-safe-path /home/cyryl/dev/dotfiles/.gdbinit
diff --git a/nixos/programs.nix b/nixos/home-manager/programs.nix
similarity index 100%
rename from nixos/programs.nix
rename to nixos/home-manager/programs.nix
diff --git a/nixos/programs/alacritty.nix b/nixos/home-manager/programs/alacritty.nix
similarity index 100%
rename from nixos/programs/alacritty.nix
rename to nixos/home-manager/programs/alacritty.nix
diff --git a/nixos/programs/genpass.nix b/nixos/home-manager/programs/genpass.nix
similarity index 100%
rename from nixos/programs/genpass.nix
rename to nixos/home-manager/programs/genpass.nix
diff --git a/nixos/programs/git.nix b/nixos/home-manager/programs/git.nix
similarity index 100%
rename from nixos/programs/git.nix
rename to nixos/home-manager/programs/git.nix
diff --git a/nixos/programs/newsboat.nix b/nixos/home-manager/programs/newsboat.nix
similarity index 100%
rename from nixos/programs/newsboat.nix
rename to nixos/home-manager/programs/newsboat.nix
diff --git a/nixos/programs/termite.nix b/nixos/home-manager/programs/termite.nix
similarity index 100%
rename from nixos/programs/termite.nix
rename to nixos/home-manager/programs/termite.nix
diff --git a/nixos/programs/tmux.nix b/nixos/home-manager/programs/tmux.nix
similarity index 100%
rename from nixos/programs/tmux.nix
rename to nixos/home-manager/programs/tmux.nix
diff --git a/nixos/programs/vim.nix b/nixos/home-manager/programs/vim.nix
similarity index 100%
rename from nixos/programs/vim.nix
rename to nixos/home-manager/programs/vim.nix
diff --git a/nixos/programs/zsh.nix b/nixos/home-manager/programs/zsh.nix
similarity index 100%
rename from nixos/programs/zsh.nix
rename to nixos/home-manager/programs/zsh.nix
diff --git a/nixos/vscode.nix b/nixos/home-manager/vscode.nix
similarity index 100%
rename from nixos/vscode.nix
rename to nixos/home-manager/vscode.nix