diff --git a/flake.nix b/flake.nix
index dcf46d7..e2eae1c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -64,8 +64,7 @@
                 imports = [
                   impermanence.nixosModules.home-manager.impermanence
                   nixneovim.nixosModules.default
-                  ./home/common
-                  ./home/desktop
+                  ./home
                 ];
               };
             };
@@ -80,24 +79,8 @@
             nixpkgs.hostPlatform = nixpkgs.lib.mkDefault "aarch64-linux";
             system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
           }
-
-          home-manager.nixosModules.home-manager
-
           ./common
           ./hosts/rico2
-
-          {
-            home-manager = {
-              useUserPackages = true;
-              useGlobalPkgs = true;
-              users.${user.primary.userName} = {pkgs, ...}: {
-                imports = [
-                  ./home/common
-                  ./home/server
-                ];
-              };
-            };
-          }
         ];
       };
     };
diff --git a/home/common/default.nix b/home/common/default.nix
deleted file mode 100644
index 3050d23..0000000
--- a/home/common/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{...}: {
-  imports = [./programs ./services];
-  home.stateVersion = "23.05";
-}
diff --git a/home/common/programs/default.nix b/home/common/programs/default.nix
deleted file mode 100644
index a8870c1..0000000
--- a/home/common/programs/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    ./bat.nix
-    ./btop.nix
-    ./direnv.nix
-    ./exa.nix
-    ./git.nix
-    ./starship.nix
-    ./zsh.nix
-  ];
-
-  home.packages = with pkgs; [
-    lazydocker
-    ripgrep
-  ];
-
-  programs = {
-    fzf.enable = true;
-    lazygit.enable = true;
-    ssh.enable = true;
-    zoxide.enable = true;
-  };
-}
diff --git a/home/common/services/default.nix b/home/common/services/default.nix
deleted file mode 100644
index 6462967..0000000
--- a/home/common/services/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{...}: {}
diff --git a/home/desktop/default.nix b/home/default.nix
similarity index 100%
rename from home/desktop/default.nix
rename to home/default.nix
diff --git a/home/desktop/gtk.nix b/home/gtk.nix
similarity index 100%
rename from home/desktop/gtk.nix
rename to home/gtk.nix
diff --git a/home/desktop/persistence.nix b/home/persistence.nix
similarity index 100%
rename from home/desktop/persistence.nix
rename to home/persistence.nix
diff --git a/home/desktop/programs/aria2.nix b/home/programs/aria2.nix
similarity index 100%
rename from home/desktop/programs/aria2.nix
rename to home/programs/aria2.nix
diff --git a/home/common/programs/bat.nix b/home/programs/bat.nix
similarity index 100%
rename from home/common/programs/bat.nix
rename to home/programs/bat.nix
diff --git a/home/common/programs/btop.nix b/home/programs/btop.nix
similarity index 100%
rename from home/common/programs/btop.nix
rename to home/programs/btop.nix
diff --git a/home/desktop/programs/default.nix b/home/programs/default.nix
similarity index 64%
rename from home/desktop/programs/default.nix
rename to home/programs/default.nix
index 192a7e4..0d408b3 100644
--- a/home/desktop/programs/default.nix
+++ b/home/programs/default.nix
@@ -1,6 +1,11 @@
 {pkgs, ...}: {
   imports = [
     ./aria2.nix
+    ./bat.nix
+    ./btop.nix
+    ./direnv.nix
+    ./exa.nix
+    ./git.nix
     ./files.nix
     ./firefox.nix
     ./github-cli.nix
@@ -8,11 +13,15 @@
     ./kitty.nix
     ./mpv.nix
     ./neovim.nix
+    ./starship.nix
     ./tmux.nix
     ./virt-manager.nix
     ./yt-dlp.nix
+    ./zsh.nix
   ];
 
+  home.stateVersion = "23.05";
+
   home.packages = with pkgs; [
     _1password-gui
     discord
@@ -21,14 +30,23 @@
     gnome.eog
     gnome.gnome-system-monitor
     gnome3.gnome-disk-utility
+    lazydocker
     pavucontrol
+    ripgrep
     spotify-tui
     wl-clipboard
     xdg-utils
-    #    yubioath-flutter
+    yubioath-flutter
     yubikey-manager
     yubikey-manager-qt
     yubikey-personalization
     yubikey-personalization-gui
   ];
+
+  programs = {
+    fzf.enable = true;
+    lazygit.enable = true;
+    ssh.enable = true;
+    zoxide.enable = true;
+  };
 }
diff --git a/home/common/programs/direnv.nix b/home/programs/direnv.nix
similarity index 100%
rename from home/common/programs/direnv.nix
rename to home/programs/direnv.nix
diff --git a/home/common/programs/exa.nix b/home/programs/exa.nix
similarity index 100%
rename from home/common/programs/exa.nix
rename to home/programs/exa.nix
diff --git a/home/desktop/programs/files.nix b/home/programs/files.nix
similarity index 100%
rename from home/desktop/programs/files.nix
rename to home/programs/files.nix
diff --git a/home/desktop/programs/firefox.nix b/home/programs/firefox.nix
similarity index 100%
rename from home/desktop/programs/firefox.nix
rename to home/programs/firefox.nix
diff --git a/home/common/programs/git.nix b/home/programs/git.nix
similarity index 89%
rename from home/common/programs/git.nix
rename to home/programs/git.nix
index 4a2f5fe..d3b8513 100644
--- a/home/common/programs/git.nix
+++ b/home/programs/git.nix
@@ -1,5 +1,5 @@
 {...}: let
-  user = (import ../../../secrets.nix).users;
+  user = (import ../../secrets.nix).users;
 in {
   programs.git = {
     enable = true;
diff --git a/home/desktop/programs/github-cli.nix b/home/programs/github-cli.nix
similarity index 100%
rename from home/desktop/programs/github-cli.nix
rename to home/programs/github-cli.nix
diff --git a/home/desktop/programs/gnupg.nix b/home/programs/gnupg.nix
similarity index 100%
rename from home/desktop/programs/gnupg.nix
rename to home/programs/gnupg.nix
diff --git a/home/desktop/programs/kitty.nix b/home/programs/kitty.nix
similarity index 100%
rename from home/desktop/programs/kitty.nix
rename to home/programs/kitty.nix
diff --git a/home/desktop/programs/mpv.nix b/home/programs/mpv.nix
similarity index 100%
rename from home/desktop/programs/mpv.nix
rename to home/programs/mpv.nix
diff --git a/home/desktop/programs/neovim.nix b/home/programs/neovim.nix
similarity index 100%
rename from home/desktop/programs/neovim.nix
rename to home/programs/neovim.nix
diff --git a/home/common/programs/starship.nix b/home/programs/starship.nix
similarity index 100%
rename from home/common/programs/starship.nix
rename to home/programs/starship.nix
diff --git a/home/desktop/programs/tmux.nix b/home/programs/tmux.nix
similarity index 100%
rename from home/desktop/programs/tmux.nix
rename to home/programs/tmux.nix
diff --git a/home/desktop/programs/virt-manager.nix b/home/programs/virt-manager.nix
similarity index 100%
rename from home/desktop/programs/virt-manager.nix
rename to home/programs/virt-manager.nix
diff --git a/home/desktop/programs/yt-dlp.nix b/home/programs/yt-dlp.nix
similarity index 100%
rename from home/desktop/programs/yt-dlp.nix
rename to home/programs/yt-dlp.nix
diff --git a/home/common/programs/zsh.nix b/home/programs/zsh.nix
similarity index 100%
rename from home/common/programs/zsh.nix
rename to home/programs/zsh.nix
diff --git a/home/server/default.nix b/home/server/default.nix
deleted file mode 100644
index 5635b43..0000000
--- a/home/server/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{...}: {
-  imports = [./programs ./services];
-}
diff --git a/home/server/programs/default.nix b/home/server/programs/default.nix
deleted file mode 100644
index 6462967..0000000
--- a/home/server/programs/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{...}: {}
diff --git a/home/server/services/default.nix b/home/server/services/default.nix
deleted file mode 100644
index 6462967..0000000
--- a/home/server/services/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{...}: {}
diff --git a/home/desktop/services/aria2c.nix b/home/services/aria2c.nix
similarity index 100%
rename from home/desktop/services/aria2c.nix
rename to home/services/aria2c.nix
diff --git a/home/desktop/services/default.nix b/home/services/default.nix
similarity index 100%
rename from home/desktop/services/default.nix
rename to home/services/default.nix
diff --git a/home/desktop/services/gpg-agent.nix b/home/services/gpg-agent.nix
similarity index 100%
rename from home/desktop/services/gpg-agent.nix
rename to home/services/gpg-agent.nix
diff --git a/home/desktop/services/spotifyd.nix b/home/services/spotifyd.nix
similarity index 100%
rename from home/desktop/services/spotifyd.nix
rename to home/services/spotifyd.nix
diff --git a/home/desktop/wm/addon/default.nix b/home/wm/addon/default.nix
similarity index 100%
rename from home/desktop/wm/addon/default.nix
rename to home/wm/addon/default.nix
diff --git a/home/desktop/wm/addon/dunst.nix b/home/wm/addon/dunst.nix
similarity index 100%
rename from home/desktop/wm/addon/dunst.nix
rename to home/wm/addon/dunst.nix
diff --git a/home/desktop/wm/addon/kanshi.nix b/home/wm/addon/kanshi.nix
similarity index 100%
rename from home/desktop/wm/addon/kanshi.nix
rename to home/wm/addon/kanshi.nix
diff --git a/home/desktop/wm/addon/rofi/default.nix b/home/wm/addon/rofi/default.nix
similarity index 100%
rename from home/desktop/wm/addon/rofi/default.nix
rename to home/wm/addon/rofi/default.nix
diff --git a/home/desktop/wm/addon/rofi/theme.rasi b/home/wm/addon/rofi/theme.rasi
similarity index 100%
rename from home/desktop/wm/addon/rofi/theme.rasi
rename to home/wm/addon/rofi/theme.rasi
diff --git a/home/desktop/wm/addon/swayidle.nix b/home/wm/addon/swayidle.nix
similarity index 100%
rename from home/desktop/wm/addon/swayidle.nix
rename to home/wm/addon/swayidle.nix
diff --git a/home/desktop/wm/addon/waybar/default.nix b/home/wm/addon/waybar/default.nix
similarity index 100%
rename from home/desktop/wm/addon/waybar/default.nix
rename to home/wm/addon/waybar/default.nix
diff --git a/home/desktop/wm/addon/waybar/style.css b/home/wm/addon/waybar/style.css
similarity index 100%
rename from home/desktop/wm/addon/waybar/style.css
rename to home/wm/addon/waybar/style.css
diff --git a/home/desktop/wm/default.nix b/home/wm/default.nix
similarity index 100%
rename from home/desktop/wm/default.nix
rename to home/wm/default.nix
diff --git a/home/desktop/wm/hyprland/default.nix b/home/wm/hyprland/default.nix
similarity index 100%
rename from home/desktop/wm/hyprland/default.nix
rename to home/wm/hyprland/default.nix
diff --git a/home/desktop/wm/sway/default.nix b/home/wm/sway/default.nix
similarity index 100%
rename from home/desktop/wm/sway/default.nix
rename to home/wm/sway/default.nix
diff --git a/hosts/rico2/programs/default.nix b/hosts/rico2/programs/default.nix
index 4e9a606..d5ca2d0 100644
--- a/hosts/rico2/programs/default.nix
+++ b/hosts/rico2/programs/default.nix
@@ -1,6 +1,7 @@
 {...}: {
   imports = [
     ./neovim.nix
+    ./starship.nix
   ];
 
   programs = {
diff --git a/hosts/rico2/programs/starship.nix b/hosts/rico2/programs/starship.nix
new file mode 100644
index 0000000..2f49806
--- /dev/null
+++ b/hosts/rico2/programs/starship.nix
@@ -0,0 +1,8 @@
+{ ... }: {
+  programs.starship = {
+    enable = true;
+    settings = {
+      add_newline = false;
+    };
+  };
+}