diff --git a/home/users/adam/imports.nix b/home/users/adam/default.nix
similarity index 50%
rename from home/users/adam/imports.nix
rename to home/users/adam/default.nix
index 0027fb5f..7b6fe14b 100644
--- a/home/users/adam/imports.nix
+++ b/home/users/adam/default.nix
@@ -1,39 +1,21 @@
 {pkgs, ...}: {
-  imports = [
-    # core.gui
-    ../../core/gui/gtk
-    ../../core/gui/waybar
-    # ../../core/gui/ags
-    ../../core/gui/browsers
-    ../../core/gui/xdg
-    ../../core/gui/discord
-    ../../core/gui/hypr/cnst.nix
-    ../../core/gui/utility
-    # core.tui
-    ../../core/tui/git/cnst.nix
-    ../../core/tui/shell/adam.nix
-    ../../core/tui/wezterm
-    ../../core/tui/alacritty
-    ../../core/tui/neovim
-    # ../../core/tui/yazi
-    # core.services
-    ../../core/services/mako
-    ../../core/services/polkit
-    ../../core/services/hypr
-    # ../../core/services/power-monitor
-  ];
   home = {
+    username = "adam";
+    homeDirectory = "/home/adam";
+    stateVersion = "23.11";
+    extraOutputsToInstall = ["doc" "devdoc"];
+
     packages = with pkgs; [
       # misc.gui
       virt-manager
       xfce.thunar
-      nautilus
 
       # misc.tui
       ranger
       xcur2png
 
       # misc.system
+      brightnessctl
       bun
       adwaita-icon-theme
       qt5.qtwayland
@@ -49,9 +31,19 @@
       BROWSER = "firefox";
       EDITOR = "nvim";
       TERM = "foot";
+
       QT_QPA_PLATFORM = "wayland";
       SDL_VIDEODRIVER = "wayland";
       XDG_SESSION_TYPE = "wayland";
     };
   };
+  # disable manuals as nmd fails to build often
+  manual = {
+    html.enable = false;
+    json.enable = false;
+    manpages.enable = false;
+  };
+
+  # let HM manage itself when in standalone mode
+  programs.home-manager.enable = true;
 }
diff --git a/home/users/adam/home.nix b/home/users/adam/home.nix
deleted file mode 100644
index 01e0dbdb..00000000
--- a/home/users/adam/home.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  inputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
-  imports = [
-    ./imports.nix
-  ];
-
-  nix = {
-    package = lib.mkDefault pkgs.nix;
-    settings = {
-      experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
-      warn-dirty = false;
-    };
-  };
-
-  # TODO: Set your username
-  home = {
-    username = "adam";
-    homeDirectory = "/home/adam";
-  };
-
-  programs.home-manager.enable = true;
-
-  # Nicely reload system units when changing configs
-  systemd.user.startServices = "sd-switch";
-
-  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = "24.05";
-}
diff --git a/nixos/hosts/default.nix b/nixos/hosts/default.nix
index 1d6defe1..6e0a4172 100644
--- a/nixos/hosts/default.nix
+++ b/nixos/hosts/default.nix
@@ -76,6 +76,7 @@
           ./adampad
           "${mod}/core/boot.nix"
           "${mod}/core/network/adampad.nix"
+          "${mod}/core/boot.nix"
 
           "${mod}/hardware/adampad.nix"
 
diff --git a/nixos/services/greetd/default.nix b/nixos/services/greetd/default.nix
index f2a52519..2a6d3c71 100644
--- a/nixos/services/greetd/default.nix
+++ b/nixos/services/greetd/default.nix
@@ -5,11 +5,11 @@
       # AUTOLOGIN
       # initial_session = {
       #   command = "${pkgs.hyprland}/bin/Hyprland";
-      #   user = "cnst";
+      #   user = "adam";
       # };
       default_session = {
         command = "${pkgs.greetd.tuigreet}/bin/tuigreet -r --remember-session --asterisks";
-        user = "cnst";
+        user = "adam";
       };
     };
   };