diff --git a/config/vm.nix b/config/headless.nix
similarity index 100%
rename from config/vm.nix
rename to config/headless.nix
diff --git a/flake.nix b/flake.nix
index 9d7e6e9..ca4e222 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,19 +18,30 @@
     nixosConfigurations.randomctf = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = { inherit inputs; };
-      modules = [ ./config/shared.nix ./config/omen.nix ];
+      modules = [
+        ./config/shared.nix
+        ./config/omen.nix
+        home-manager.lib.homeManagerConfiguration {
+          pkgs = nixpkgs.legacyPackages."x86_64-linux";
+          modules = [
+            ./home/headful-nixos.nix
+          ];
+        }
+      ];
     };
 
-    nixosConfigurations.nixos-dev = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.default = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = { inherit inputs; };
-      modules = [ ./config/shared.nix ./config/vm.nix ];
-    };
-
-    homeConfigurations.random = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages."x86_64-linux";
       modules = [
-        ./home/nixos.nix
+        ./config/shared.nix
+        ./config/headless.nix
+        home-manager.lib.homeManagerConfiguration {
+          pkgs = nixpkgs.legacyPackages."x86_64-linux";
+          modules = [
+            ./home/headless-nixos.nix
+          ];
+        }
       ];
     };
 
diff --git a/home/hacking.nix b/home/hacking.nix
new file mode 100644
index 0000000..c777f2d
--- /dev/null
+++ b/home/hacking.nix
@@ -0,0 +1,22 @@
+{ inputs, config, pkgs, ... }: {
+
+  # Hacking specific packages.
+  home.packages = with pkgs; [
+    yara
+    nmap
+    john
+    ffuf
+    nikto
+    sqlmap
+    thc-hydra
+    exploitdb
+    feroxbuster
+    (wordlists.override {
+      lists = with pkgs; [
+        rockyou
+        seclists
+      ];
+    })
+  ];
+
+}
diff --git a/home/nixos.nix b/home/headful-nixos.nix
similarity index 98%
rename from home/nixos.nix
rename to home/headful-nixos.nix
index c575e49..711f046 100644
--- a/home/nixos.nix
+++ b/home/headful-nixos.nix
@@ -7,6 +7,7 @@
 
   imports = [
     ./shared.nix
+    ./hacking.nix
     ./emacs.nix
     ./zsh.nix
   ];
diff --git a/home/headless-nixos.nix b/home/headless-nixos.nix
new file mode 100644
index 0000000..35191b5
--- /dev/null
+++ b/home/headless-nixos.nix
@@ -0,0 +1,27 @@
+{ inputs, config, pkgs, ... }: {
+
+  home = {
+    username = "random";
+    homeDirectory = "/home/random";
+  };
+
+  imports = [
+    ./shared.nix
+    ./emacs.nix
+    ./zsh.nix
+  ];
+
+  home.packages = with pkgs; [];
+
+  home.file = {
+    ".Xresources".source = ../dotfiles/.Xresources;
+    ".scripts/brightness.sh".source = ../dotfiles/.scripts/brightness.sh;
+    ".scripts/autostart_desktop.sh".source = ../dotfiles/.scripts/autostart_desktop.sh;
+    ".screenlayout/launch.sh".source = ../dotfiles/.screenlayout/launch.sh;
+    ".screenlayout/wallpapers.sh".source = ../dotfiles/.screenlayout/wallpapers.sh;
+    ".config/i3/config".source = ../dotfiles/.config/i3/config;
+    ".config/rofi/config.rasi".source = ../dotfiles/.config/rofi/config.rasi;
+    ".config/polybar/config.ini".source = ../dotfiles/.config/polybar/config.ini;
+
+  };
+}
diff --git a/home/shared.nix b/home/shared.nix
index cafabe2..35d27d9 100644
--- a/home/shared.nix
+++ b/home/shared.nix
@@ -1,5 +1,5 @@
-{ inputs, config, pkgs, ... }:
-{
+{ inputs, config, pkgs, ... }: {
+
   nixpkgs.config.allowUnfree = true;
   fonts.fontconfig.enable = true;
 
@@ -29,23 +29,6 @@
     cargo
     python3
     gnumake
-
-    # Hacking
-    yara
-    nmap
-    john
-    ffuf
-    nikto
-    sqlmap
-    thc-hydra
-    exploitdb
-    feroxbuster
-    (wordlists.override {
-      lists = with pkgs; [
-        rockyou
-        seclists
-      ];
-    })
   ];
 
   programs = {