diff --git a/flake.lock b/flake.lock
index bbc2d4e..97da0fa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -154,11 +154,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711261295,
-        "narHash": "sha256-5DUNQl9BSmLxgGLbF05G7hi/UTk9DyZq8AuEszhQA7Q=",
+        "lastModified": 1711462743,
+        "narHash": "sha256-3wKGpHy9Kyh98DrziqC/s//60Q0pE17NgbY93L0uWng=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "5d2d3e421ade554b19b4dbb0d11a04023378a330",
+        "rev": "a6717b1afee7ae955c61eefdf0ce8f864ef78115",
         "type": "github"
       },
       "original": {
@@ -260,11 +260,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1711163522,
-        "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
+        "lastModified": 1711333969,
+        "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
+        "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 0790c0b..6a6a40a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -40,7 +40,7 @@
         wmType = "x11";               # x11 or wayland
         browser = "vivaldi";          # Default browser
         term = "kitty";               # Default terminal command
-        editor = "emacsclient";       # Default editor
+        editor = "vim";               # Default editor
         spawnEditor =
           if (editor == "emacsclient") then
             "emacsclient -c -a 'emacs'"
diff --git a/profiles/personal/configuration.nix b/profiles/personal/configuration.nix
index ab7aa87..55d6a87 100644
--- a/profiles/personal/configuration.nix
+++ b/profiles/personal/configuration.nix
@@ -72,7 +72,6 @@
   };
 
   environment.systemPackages = with pkgs; [
-    vim
     wget
     zsh
     git
diff --git a/profiles/personal/home.nix b/profiles/personal/home.nix
new file mode 100644
index 0000000..0cb58df
--- /dev/null
+++ b/profiles/personal/home.nix
@@ -0,0 +1,72 @@
+{ config, lib, pkgs, userSettings, ... }:
+
+{
+  # Home Manager needs a bit of information about you and the paths it should manage
+  home.username = userSettings.username;
+  home.homeDirectory = "/home/" + userSettings.username;
+
+  programs.home-manager.enable = true;
+
+  home.stateVersion = "23.11";
+
+  home.packages = (with pkgs; [
+    # Shell / Terminal
+    zsh
+    kitty
+    vim
+
+    # Browser
+    vivaldi
+
+    # Launcher
+    dmenu
+    rofi
+
+    # Development
+    git
+
+    # Utilities
+    syncthing
+
+    # Office
+    xournalpp
+
+    # Gaming
+    wine
+    bottles
+    lutris
+    protonup-qt
+
+    # Media
+    gimp
+    mpv
+    blender
+    obs-studio
+    ffmpeg
+  ]);
+
+  services.syncthing.enable = true;
+
+  xdg.enable = true;
+  xdg.userDirs = {
+    enable = true;
+    createDirectories = true;
+    music = "${config.home.homeDirectory}/Media/Music";
+    videos = "${config.home.homeDirectory}/Media/Videos";
+    pictures = "${config.home.homeDirectory}/Media/Pictures";
+    templates = "${config.home.homeDirectory}/Templates";
+    download = "${config.home.homeDirectory}/Downloads";
+    documents = "${config.home.homeDirectory}/Documents";
+    desktop = null;
+    publicShare = null;
+  };
+  xdg.mime.enable = true;
+  xdg.mimeApps.enable = true;
+
+  home.sessionVariables = {
+    EDITOR = userSettings.editor;
+    SPAWNEDITOR = userSettings.spawnEditor;
+    TERM = userSettings.term;
+    BROWSER = userSettings.browser;
+  };
+}
diff --git a/system/app/launcher/dmenu.nix b/system/app/launcher/dmenu.nix
deleted file mode 100644
index bff3c66..0000000
--- a/system/app/launcher/dmenu.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = [ pkgs.dmenu ];
-}
diff --git a/system/app/launcher/rofi.nix b/system/app/launcher/rofi.nix
deleted file mode 100644
index 918d22f..0000000
--- a/system/app/launcher/rofi.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = [ pkgs.rofi ];
-}
diff --git a/system/app/terminal/kitty.nix b/system/app/terminal/kitty.nix
deleted file mode 100644
index 37db612..0000000
--- a/system/app/terminal/kitty.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = [ pkgs.kitty ];
-}