diff --git a/users/richie/home.nix b/users/richie/home.nix
index ab66375..8e967a1 100644
--- a/users/richie/home.nix
+++ b/users/richie/home.nix
@@ -1,9 +1,8 @@
-{ pkgs, ... }:
-# home manager
 {
   imports = [
-    ./home/sshconfig.nix
     ./home/git.nix
+    ./home/programs.nix
+    ./home/sshconfig.nix
     ./home/vscode
   ];
 
@@ -17,17 +16,6 @@
   home = {
     username = "richie";
     homeDirectory = "/home/richie";
-    packages = with pkgs; [
-      firefox
-      # Rust packages
-      topgrade
-      trunk
-      wasm-pack
-      cargo-watch
-      cargo-generate
-      cargo-audit
-      cargo-update
-    ];
   };
 
   home.stateVersion = "23.11";
diff --git a/users/richie/home/programs.nix b/users/richie/home/programs.nix
new file mode 100644
index 0000000..4b8f634
--- /dev/null
+++ b/users/richie/home/programs.nix
@@ -0,0 +1,51 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    # cli
+    bat
+    btop
+    git
+    gnupg
+    ncdu
+    neofetch
+    ripgrep
+    sops
+    starship
+    zoxide
+    zsh-nix-shell
+    # system info
+    hwloc
+    lynis
+    pciutils
+    smartmontools
+    usbutils
+    # netowking
+    iperf3
+    nmap
+    wget
+    # GUI
+    beeper
+    candy-icons
+    discord-canary
+    firefox
+    obsidian
+    sweet-nova
+    # python
+    python3
+    ruff
+    # Rust packages
+    topgrade
+    trunk
+    wasm-pack
+    cargo-watch
+    cargo-generate
+    cargo-audit
+    cargo-update
+    # nix
+    nix-init
+    nix-output-monitor
+    nix-prefetch
+    nix-tree
+    nixpkgs-fmt
+  ];
+}
diff --git a/users/richie/systems/programs.nix b/users/richie/systems/programs.nix
index b3aec7a..83f5d49 100644
--- a/users/richie/systems/programs.nix
+++ b/users/richie/systems/programs.nix
@@ -1,37 +1,7 @@
 { pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
-    bat
-    beeper
-    btop
-    candy-icons
-    discord-canary
     git
-    gnupg
-    htop
-    hwloc
-    iperf3
-    lynis
-    ncdu
-    neofetch
-    nix-init
-    nix-output-monitor
-    nix-prefetch
-    nix-tree
-    nixpkgs-fmt
-    nmap
-    pciutils
     python3
-    ripgrep
-    smartmontools
-    sops
-    starship
-    sweet-nova
-    usbutils
-    vscode
-    wget
-    yubioath-flutter
-    zoxide
-    zsh-nix-shell
   ];
 }
diff --git a/users/richie/systems/rhapsody-in-green/configuration.nix b/users/richie/systems/rhapsody-in-green/configuration.nix
index 81240db..9e4d97f 100644
--- a/users/richie/systems/rhapsody-in-green/configuration.nix
+++ b/users/richie/systems/rhapsody-in-green/configuration.nix
@@ -80,7 +80,7 @@
         ];
         "projects" = {
           id = "vyma6-lqqrz";
-          path = "/ZFS/Storage/Syncthing/projects";
+          path = "/home/richie/projects";
           devices = [ "jeeves" ];
           fsWatcherEnabled = true;
         };