diff --git a/nix-conf/home/common.nix b/nix-conf/home/common.nix
index 28f1251..da161a6 100644
--- a/nix-conf/home/common.nix
+++ b/nix-conf/home/common.nix
@@ -27,16 +27,12 @@
     gnupg
     gopass
     gopass-jsonapi
-    heroku
     ispell
     isync
     jq
     lscolors
     lsd
     lynx
-    mopidy
-    mopidy-ytmusic
-    mopidy-scrobbler
     mpv
     mu
     neovim
@@ -45,6 +41,7 @@
     nix-prefetch-git
     nix-prefetch-github
     pinentry
+    pass
     #procs
     libqalculate
     ripgrep
diff --git a/nix-conf/home/linux-server.nix b/nix-conf/home/linux-server.nix
index cf0b652..e8136a8 100644
--- a/nix-conf/home/linux-server.nix
+++ b/nix-conf/home/linux-server.nix
@@ -1,13 +1,10 @@
 { config, pkgs, ... }:
 {
 
-  #services.emacs.package = pkgs.emacsUnstable;
-
   home.packages = with pkgs; [
     bitlbee
     bitlbee-discord
     emacs-nox
-    heroku
     irssi
   ];