diff --git a/home/default.nix b/home/default.nix
index 0c2a5bf..91c4f5f 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,28 +1,23 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [
-      <home-manager/nixos>
-    ];
-  users.users.don.isNormalUser = true;
-  home-manager = {
-    users.don = {
-      home.username = "don";
-      home.homeDirectory = "/home/don";
-      home.stateVersion = "22.11";
-      programs.go.enable = true;
+  imports = [
+    ./programs.nix
+    ./services.nix
+    ./mpv.nix
+    ./neovim.nix
+  ];
+  home = {
+      username = "don";
+      homeDirectory = "/home/don";
+      stateVersion = "23.05";
+    };
+    programs.home-manager.enable = true;
+    programs.go.enable = true;
 #      services = {
 #        nextcloud-client = {
 #          enable = true;
 #          startInBackground = true;
 #        };
 #      };
-      imports = [
-        ./services.nix
-        ./mpv.nix
-        ./neovim.nix
-      ];
-    };
-  };
 }
diff --git a/home/programs.nix b/home/programs.nix
new file mode 100644
index 0000000..2ed57f9
--- /dev/null
+++ b/home/programs.nix
@@ -0,0 +1,61 @@
+{ config, pkgs, ... }:
+{
+  home.packages = [
+    pkgs.bc
+    pkgs.bitwarden-cli
+    pkgs.diff-so-fancy
+    pkgs.exiftool
+    pkgs.figlet
+    pkgs.file
+    pkgs.fzf
+    pkgs.git-crypt
+    pkgs.gitFull
+    pkgs.gnumake
+    pkgs.gnupg
+    pkgs.gping
+    pkgs.gtop
+    pkgs.hugo
+    pkgs.jq
+    pkgs.keychain
+    pkgs.keyutils
+    pkgs.khal
+    pkgs.khard
+    pkgs.lazygit
+    pkgs.links2
+    pkgs.mairix
+    pkgs.moreutils
+    pkgs.mosh
+    pkgs.mutt-ics
+    pkgs.ncdu
+    pkgs.neofetch
+    pkgs.neomutt
+    pkgs.newsboat
+    pkgs.nmap
+    pkgs.notmuch
+    pkgs.pandoc
+    pkgs.ps_mem
+    pkgs.psmisc
+    pkgs.ranger
+    pkgs.sqlite
+    pkgs.syncthing
+    pkgs.tailscale
+    pkgs.tasksh
+    pkgs.taskwarrior
+    pkgs.tig
+    pkgs.timewarrior
+    pkgs.tmux
+    pkgs.tmux-cssh
+    pkgs.tmuxp
+    pkgs.toot
+    pkgs.topgrade
+    pkgs.tut
+    pkgs.unzip
+    pkgs.urlview
+    pkgs.vdirsyncer
+    pkgs.vifm-full
+    pkgs.vit
+    pkgs.wget
+    pkgs.zip
+  ];
+
+}
diff --git a/hosts/loki/configuration.nix b/hosts/loki/configuration.nix
index a1f5741..0c176e9 100644
--- a/hosts/loki/configuration.nix
+++ b/hosts/loki/configuration.nix
@@ -6,7 +6,7 @@
       <nixos-hardware/dell/xps/13-9310>
       /etc/nixos/hardware-configuration.nix
       ../../workstation
-      ../../home
+      #../../home
       ../../wm/sway
     ];
   networking.hostName = "loki";
diff --git a/workstation/default.nix b/workstation/default.nix
index 87dd708..b32a766 100644
--- a/workstation/default.nix
+++ b/workstation/default.nix
@@ -140,9 +140,6 @@ in
     authy
     bash-completion
     nix-bash-completions
-    bc
-    #bitwarden
-    bitwarden-cli
     blueberry
     btop
     cantarell-fonts
@@ -150,72 +147,42 @@ in
     clipman
     cura
     darktable
-    diff-so-fancy
     dmenu-wayland
     espeak-classic
-    exiftool
-    feh
-    figlet
-    file
     firefox
     flameshot
     font-awesome
     fractal-next
     fuzzel
-    fzf
-    git-crypt
-    gitFull
     gnome.gnome-tweaks
     gnome.simple-scan
-    gnumake
     gnumeric
-    gnupg
-    gping
-    gtop
     headset-charge-indicator
     headsetcontrol
-    hugo
+    home-manager
     hunspell
     hunspellDicts.en_US
     imagemagick
     imv
     isync
     jellyfin-media-player
-    jq
     kanshi
-    keychain
-    keyutils
-    khal
-    khard
     kitty
     ktimer
     lapce
-    lazygit
     libappindicator
     libnotify
     libreoffice-fresh
     libsForQt5.kwallet
     libsForQt5.qtkeychain
-    links2
     lsb-release
-    mairix
-    moreutils
-    mosh
     #mpv
     #mutt
-    mutt-ics
-    ncdu
-    neofetch
-    neomutt
     neovim-qt
     nerdfonts
-    newsboat
     nextcloud-client
-    nmap
-    notmuch
     noto-fonts
     obsidian
-    pandoc
     pasystray
     pavucontrol
     pkg-config
@@ -223,54 +190,30 @@ in
     poppler_utils
     poweralertd
     powerline-fonts
-    ps_mem
-    psmisc
     pulseaudio
-    #python3
     qpwgraph
     qutebrowser-qt6
-    ranger
     rofi
     ruby
     signal-desktop
     sshuttle
     sonixd
     source-code-pro
-    sqlite
     steam
     stellarium
     #sublime-music
-    syncthing
-    tailscale
-    tasksh
-    taskwarrior
     tdesktop
     terminus-nerdfont
     texlive.combined.scheme-medium
-    tig
-    timewarrior
     thunderbird
-    tmux
-    tmux-cssh
-    tmuxp
-    toot
-    topgrade
-    tut
     ubuntu_font_family
     udiskie
-    unzip
-    urlview
-    vdirsyncer
-    vifm-full
-    vit
-    wget
     widevine-cdm
     wireplumber
     wlsunset
     xdg-utils
     xfce.thunar
     zathura
-    zip
     zoom-us
   ];