diff --git a/hosts/writter-deck/home.nix b/hosts/writter-deck/home.nix
index 5e6bf84..9c1110f 100644
--- a/hosts/writter-deck/home.nix
+++ b/hosts/writter-deck/home.nix
@@ -12,21 +12,10 @@ in
 {
   imports = [
     # Shared home-manager modules
-    ../../modules/home-manager/arch-packages
     ../../modules/home-manager/oh-my-posh
     ../../modules/home-manager/zshrc
-    ../../modules/home-manager/alacritty
     ../../modules/home-manager/bat
-    ../../modules/home-manager/fastfetch
-    ../../modules/home-manager/hyprland
-    ../../modules/home-manager/hyprlock
-    ../../modules/home-manager/hyprpaper
-    ../../modules/home-manager/awww
-    ../../modules/home-manager/hyprsunset
-    ../../modules/home-manager/darkman
-    ../../modules/home-manager/wlogout
     ../../modules/home-manager/opencode
-    ../../modules/home-manager/swaync
     ../../modules/home-manager/nvim
     ../../modules/home-manager/pi
     ../../modules/home-manager/tmux
@@ -41,6 +30,8 @@ in
     };
   };
 
+  nixpkgs.config.allowUnfree = true;
+
   custom = {
     zsh = {
       enable = true;
@@ -50,19 +41,6 @@ in
     oh-my-posh.enable = true;
     pi.enable = true;
     nvim.enable = true;
-
-    hyprland.enable = true;
-    hyprlock.enable = true;
-    hyprpaper.enable = false;
-    hyprsunset.enable = true;
-    wlogout.enable = true;
-    darkman.enable = true;
-    awww.enable = true;
-    opencode.enable = true;
-    alacritty.enable = true;
-    bat.enable = true;
-    fastfetch.enable = true;
-    swaync.enable = true;
   };
 
   home.packages = with pkgs; [
diff --git a/modules/home-manager/hyprland/default.nix b/modules/home-manager/hyprland/default.nix
index 7bd115a..07c9965 100644
--- a/modules/home-manager/hyprland/default.nix
+++ b/modules/home-manager/hyprland/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  dotfiles = "${config.home.homeDirectory}/nixos-config/modules/home-manager/hyprland/hypr";
+  dotfiles = "${config.home.homeDirectory}/ndots/modules/home-manager/hyprland/hypr";
 in
 {
   options.custom.hyprland.enable = lib.mkEnableOption "Hyprland user config";
diff --git a/modules/home-manager/hyprlock/default.nix b/modules/home-manager/hyprlock/default.nix
index f30ecc8..f04a02e 100644
--- a/modules/home-manager/hyprlock/default.nix
+++ b/modules/home-manager/hyprlock/default.nix
@@ -36,7 +36,7 @@ in
           monitor = "${monitor}";
           color = "${bg}";
           # Prefer a wallpaper? drop `color` above and use:
-          # path        = ~/nixos-config/wallpapers/lock.png
+          # path        = ~/ndots/wallpapers/lock.png
           # blur_passes = 3
           # blur_size   = 6
         };
diff --git a/modules/home-manager/nvim/default.nix b/modules/home-manager/nvim/default.nix
index d2cb8fc..263275e 100644
--- a/modules/home-manager/nvim/default.nix
+++ b/modules/home-manager/nvim/default.nix
@@ -11,6 +11,6 @@
       fzf
 	  ];
 
-  	xdg.configFile."nvim".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos-config/modules/home-manager/nvim/nvim";
+  	xdg.configFile."nvim".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/ndots/modules/home-manager/nvim/nvim";
   };
 }
diff --git a/modules/home-manager/tmux/default.nix b/modules/home-manager/tmux/default.nix
index ce0141f..941b014 100644
--- a/modules/home-manager/tmux/default.nix
+++ b/modules/home-manager/tmux/default.nix
@@ -11,6 +11,6 @@
 	    tmux
 	  ];
 
-  	xdg.configFile."tmux/tmux.conf".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos-config/modules/home-manager/tmux/tmux.conf";
+  	xdg.configFile."tmux/tmux.conf".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/ndots/modules/home-manager/tmux/tmux.conf";
   };
 }
diff --git a/modules/home-manager/zshrc/default.nix b/modules/home-manager/zshrc/default.nix
index 4e1b825..1d0c07b 100644
--- a/modules/home-manager/zshrc/default.nix
+++ b/modules/home-manager/zshrc/default.nix
@@ -44,11 +44,11 @@
         enc = "openssl enc -aes-256-cbc -md sha512 -pbkdf2 -iter 1000000 -salt";
         backup = "packup && rm ~/Documents/packup* && mv ~/packup* ~/Documents/ && rsync --archive --update --copy-links ~/Documents 192.168.3.200:/home/jpporta/ --info=progress2";
         gn = "git commit -m \"$(date)\"";
-        nixs = "cd ~/nixos-config && git add . && sudo nixos-rebuild switch --flake ~/nixos-config#jpporta-nixos";
+        nixs = "cd ~/ndots && git add . && sudo nixos-rebuild switch --flake ~/ndots#jpporta-nixos";
         nix-search = "nix --extra-experimental-features \"nix-command flakes\" search nixpkgs";
         nix-garbage = "sudo nix-collect-garbage -d && sudo nixos-rebuild switch";
         nix-update = "sudo nix-channel --update && sudo nixos-rebuild switch";
-        hms = "cd ~/nixos-config && git add . && home-manager switch --flake . ";
+        hms = "cd ~/ndots && git add . && home-manager switch --flake .#jpporta-deck";
         s = "sesh connect $(sesh list | fzf)";
       };