diff --git a/flake.nix b/flake.nix
index e9506d0..1a86582 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,6 +65,12 @@
           modules = [ ./hosts/echidna/home.nix ];
         };
 
+        "ricard@coder-workspace" = home-manager.lib.homeManagerConfiguration {
+          pkgs = nixpkgs.legacyPackages.x86_64-linux;
+          extraSpecialArgs = { inherit inputs outputs; };
+          modules = [ ./hosts/coder-workspac/home.nix ];
+        };
+
       };
     };
 }
diff --git a/hosts/coder-workspace/home.nix b/hosts/coder-workspace/home.nix
new file mode 100644
index 0000000..c9c0489
--- /dev/null
+++ b/hosts/coder-workspace/home.nix
@@ -0,0 +1,18 @@
+{ inputs, outputs, config, pkgs, ... }:
+
+{
+  nixpkgs = {
+    overlays = [
+      outputs.overlays.additions
+      outputs.overlays.modifications
+    ];
+    config = {
+      allowUnfree = true;
+      allowUnfreePredicate = (_: true);
+    };
+  };
+
+  imports = [ outputs.homeManagerModules.common ];
+
+  home.stateVersion = "23.05";
+}
diff --git a/hosts/echidna/home.nix b/hosts/echidna/home.nix
index c9c0489..4cac951 100644
--- a/hosts/echidna/home.nix
+++ b/hosts/echidna/home.nix
@@ -12,7 +12,16 @@
     };
   };
 
-  imports = [ outputs.homeManagerModules.common ];
+  imports = [
+    outputs.homeManagerModules.common
+    outputs.homeManagerModules.dav
+    outputs.homeManagerModules.mpd
+    outputs.homeManagerModules.foot
+    outputs.homeManagerModules.mail
+    outputs.homeManagerModules.rss
+  ];
+
+  home.packages = with pkgs; [ wl-clipboard libnotify ];
 
   home.stateVersion = "23.05";
 }
diff --git a/modules/home-manager/common/default.nix b/modules/home-manager/common/default.nix
index 67de866..6de25cc 100644
--- a/modules/home-manager/common/default.nix
+++ b/modules/home-manager/common/default.nix
@@ -12,16 +12,12 @@
 
   imports = [
     ../cheat
-    ../dav
     ../fonts
-    ../foot
     ../git
     ../gpg
     ../lf
-    ../mail
     ../neovim
     ../pass
-    ../rss
     ../ssh
     ../tmux
     ../vitetris
@@ -35,16 +31,15 @@
     bind.dnsutils
     docker-compose
     file
-    just
     gnumake
     html-tidy
     htop
     inetutils # telnet
     j2cli
     jq
+    just
     killall
     kubectl
-    libnotify
     mosh
     neofetch
     pandoc
@@ -57,8 +52,6 @@
     signify
     unzip
     wget
-    inputs.agenix.packages.x86_64-linux.default
-    age-plugin-yubikey
   ];
 
   programs.bat = {
diff --git a/modules/home-manager/extra/default.nix b/modules/home-manager/extra/default.nix
index 9040feb..73891e8 100644
--- a/modules/home-manager/extra/default.nix
+++ b/modules/home-manager/extra/default.nix
@@ -7,14 +7,19 @@
     # ./minidisc
     ../arduino
     ../browsers
+    ../dav
     ../desktop-river
     ../drawterm
+    ../foot
     ../gotify
     ../idasen
+    ../mail
     ../maker
     ../mpd
+    ../mpd
     ../msg
     ../music
+    ../rss
     ../snapcast
     ../sound
     ../syncthing
@@ -25,20 +30,24 @@
 
   home.packages = with pkgs; [
     # calibre
+    # pyenv
+    # pynitrokey
+    inputs.agenix.packages.x86_64-linux.default
+    age-plugin-yubikey
     acpi
     android-tools
-    # pyenv
     gimp
     john
+    libnotify
     libreoffice
     lxqt.pcmanfm-qt
     mpv
-    # pynitrokey
     networkmanagerapplet
     nextcloud-client
     vagrant
     virt-manager
     virtiofsd
+    wl-clipboard
   ];
 
   # services.kdeconnect = {
diff --git a/modules/home-manager/mpd/default.nix b/modules/home-manager/mpd/default.nix
index 432bac4..8a84132 100644
--- a/modules/home-manager/mpd/default.nix
+++ b/modules/home-manager/mpd/default.nix
@@ -5,7 +5,7 @@ let
   master-host = "music.monotremata.xyz";
 in
 {
-  home.packages = [ pkgs.mpc_cli pkgs.mpdris2 ];
+  home.packages = with pkgs; [ mpc_cli mpdris2 playerctl ];
 
   services.mpd = {
     enable = true;