diff --git a/hosts/pi4/default.nix b/hosts/pi4/default.nix
index e482dc5..0427367 100644
--- a/hosts/pi4/default.nix
+++ b/hosts/pi4/default.nix
@@ -18,10 +18,6 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    vim
-  ];
-
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-label/NIXOS_SD";
diff --git a/hosts/pi4/home-manager/default.nix b/hosts/pi4/home-manager/default.nix
index c28e613..3ba4a47 100644
--- a/hosts/pi4/home-manager/default.nix
+++ b/hosts/pi4/home-manager/default.nix
@@ -1,17 +1,29 @@
-{ pkgs, lib, systemConfig, ... }:
+{
+  lib,
+  outputs,
+  systemConfig,
+  ...
+}:
 
 {
   imports = [
+    (lib.custom.relativeToRoot "shared/home-manager/btop.nix")
     (lib.custom.relativeToRoot "shared/home-manager/development/git.nix")
+    (lib.custom.relativeToRoot "shared/home-manager/development/nixvim.nix")
+    (lib.custom.relativeToRoot "shared/home-manager/fastfetch.nix")
+    (lib.custom.relativeToRoot "shared/home-manager/fish.nix")
+    (lib.custom.relativeToRoot "shared/home-manager/gpg.nix")
   ];
 
   home.stateVersion = systemConfig.version;
 
-  programs.git.signing.key = "E3FA0E995C0D0E5E";
+  # Adds pkgs.unstable in order to fetch packages from unstable repositories
+  nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
 
-  programs.gpg.enable = true;
-  services.gpg-agent = {
-    enable = true;
-    pinentryPackage = pkgs.pinentry-curses;
+  programs = {
+    git.signing.key = "E3FA0E995C0D0E5E";
+    # Let Home Manager install and manage itself.
+    home-manager.enable = true;
   };
+
 }
diff --git a/shared/home-manager/default-applications.nix b/shared/home-manager/default-applications.nix
index f144d00..fdb95c7 100644
--- a/shared/home-manager/default-applications.nix
+++ b/shared/home-manager/default-applications.nix
@@ -1,4 +1,3 @@
-# TODO more defaults
 {
   xdg.mimeApps = {
     enable = true;