diff --git a/hosts/x201/nixpkgs/colorschemes/nord.theme b/hosts/x201/home-manager/colorschemes/nord.theme
similarity index 100%
rename from hosts/x201/nixpkgs/colorschemes/nord.theme
rename to hosts/x201/home-manager/colorschemes/nord.theme
diff --git a/hosts/x201/nixpkgs/configs/i3config b/hosts/x201/home-manager/configs/i3config
similarity index 100%
rename from hosts/x201/nixpkgs/configs/i3config
rename to hosts/x201/home-manager/configs/i3config
diff --git a/hosts/x201/nixpkgs/configs/init.el b/hosts/x201/home-manager/configs/init.el
similarity index 100%
rename from hosts/x201/nixpkgs/configs/init.el
rename to hosts/x201/home-manager/configs/init.el
diff --git a/hosts/x201/nixpkgs/configs/starship.toml b/hosts/x201/home-manager/configs/starship.toml
similarity index 100%
rename from hosts/x201/nixpkgs/configs/starship.toml
rename to hosts/x201/home-manager/configs/starship.toml
diff --git a/hosts/x201/nixpkgs/emacs.nix b/hosts/x201/home-manager/emacs.nix
similarity index 100%
rename from hosts/x201/nixpkgs/emacs.nix
rename to hosts/x201/home-manager/emacs.nix
diff --git a/hosts/x201/nixpkgs/git.nix b/hosts/x201/home-manager/git.nix
similarity index 100%
rename from hosts/x201/nixpkgs/git.nix
rename to hosts/x201/home-manager/git.nix
diff --git a/hosts/x201/nixpkgs/gnupg.nix b/hosts/x201/home-manager/gnupg.nix
similarity index 100%
rename from hosts/x201/nixpkgs/gnupg.nix
rename to hosts/x201/home-manager/gnupg.nix
diff --git a/hosts/x201/nixpkgs/himalaya.nix b/hosts/x201/home-manager/himalaya.nix
similarity index 100%
rename from hosts/x201/nixpkgs/himalaya.nix
rename to hosts/x201/home-manager/himalaya.nix
diff --git a/hosts/x201/nixpkgs/home.nix b/hosts/x201/home-manager/home.nix
similarity index 100%
rename from hosts/x201/nixpkgs/home.nix
rename to hosts/x201/home-manager/home.nix
diff --git a/hosts/x201/nixpkgs/i3status.nix b/hosts/x201/home-manager/i3status.nix
similarity index 100%
rename from hosts/x201/nixpkgs/i3status.nix
rename to hosts/x201/home-manager/i3status.nix
diff --git a/hosts/x201/nixpkgs/mails.nix b/hosts/x201/home-manager/mails.nix
similarity index 100%
rename from hosts/x201/nixpkgs/mails.nix
rename to hosts/x201/home-manager/mails.nix
diff --git a/hosts/x201/nixpkgs/mpd.nix b/hosts/x201/home-manager/mpd.nix
similarity index 100%
rename from hosts/x201/nixpkgs/mpd.nix
rename to hosts/x201/home-manager/mpd.nix
diff --git a/hosts/x201/nixpkgs/nixpkgs b/hosts/x201/home-manager/nixpkgs
similarity index 100%
rename from hosts/x201/nixpkgs/nixpkgs
rename to hosts/x201/home-manager/nixpkgs
diff --git a/hosts/x201/nixpkgs/packages.nix b/hosts/x201/home-manager/packages.nix
similarity index 100%
rename from hosts/x201/nixpkgs/packages.nix
rename to hosts/x201/home-manager/packages.nix
diff --git a/hosts/x201/nixpkgs/polybar.nix b/hosts/x201/home-manager/polybar.nix
similarity index 100%
rename from hosts/x201/nixpkgs/polybar.nix
rename to hosts/x201/home-manager/polybar.nix
diff --git a/hosts/x201/nixpkgs/starship.nix b/hosts/x201/home-manager/starship.nix
similarity index 100%
rename from hosts/x201/nixpkgs/starship.nix
rename to hosts/x201/home-manager/starship.nix
diff --git a/hosts/x201/nixpkgs/terminalrc b/hosts/x201/home-manager/terminalrc
similarity index 100%
rename from hosts/x201/nixpkgs/terminalrc
rename to hosts/x201/home-manager/terminalrc
diff --git a/hosts/x201/nixpkgs/variables.nix b/hosts/x201/home-manager/variables.nix
similarity index 100%
rename from hosts/x201/nixpkgs/variables.nix
rename to hosts/x201/home-manager/variables.nix
diff --git a/hosts/x201/nixos/configuration.nix b/hosts/x201/nixos/configuration.nix
index 275e638..8df7b48 100644
--- a/hosts/x201/nixos/configuration.nix
+++ b/hosts/x201/nixos/configuration.nix
@@ -19,7 +19,6 @@
   # Use the GRUB 2 boot loader.
   boot.loader.grub.devices = [ "/dev/sda" ];
   boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
   boot.loader.grub.enableCryptodisk = true;
   boot.loader.supportsInitrdSecrets = true;
 #  boot.loader.grub.efiSupport = true;
@@ -35,7 +34,7 @@
   boot.plymouth.enable = true;
 
   # Clear /tmp during boot
-  boot.cleanTmpDir = true;
+ boot.tmp.cleanOnBoot = true;
  boot.initrd.kernelModules = [ "i915" ];
  boot.kernelParams = [ "i915.enable_fbc=1" ];
  # Enable microcode updates for Intel CPU
@@ -181,7 +180,7 @@ fonts = {
 
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
-  services.openssh.permitRootLogin = "no";
+  services.openssh.settings.PermitRootLogin = "no";
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
    networking.firewall.allowedTCPPorts = [ 24800 6600 ];