diff --git a/users/pbsds/home/default.nix b/users/pbsds/home/default.nix
index 0748afb..a6f7210 100644
--- a/users/pbsds/home/default.nix
+++ b/users/pbsds/home/default.nix
@@ -35,8 +35,8 @@
 
   home.packages = with pkgs; [
     xclip
-    #rmate-sh # TODO: add to nixpkgs, add to ssh config
-    #remote-exec # TODO: add to nixpkgs
+    #rmate-sh # TODO: add to ssh config
+    #remote-exec # TODO
 
     zip
     unrar
@@ -117,25 +117,24 @@
 
     #TODO: vpn
 
-    # TODO: wayland
-    clip = "( if command -v wl-copy >/dev/null; then wl-copy --trim-newline --type text/plain; else xclip -sel clip -t text/plain -rmlastnl -i; fi )";
+    # TODO: fix both wayland, and x-forwarding
+    #clip = "( if command -v wl-copy >/dev/null; then wl-copy --trim-newline --type text/plain; else xclip -sel clip -t text/plain -rmlastnl -i; fi )";
+    clip = "xclip -sel clip -i -rmlastnl -t text/plain";
 
     # TODO: ps1?
     pwd-fqdn = ''echo "$(whoami)@$(hostname -f):$(printf "%q" "$(realpath .)/")"'';
 
-    http-server = "${pkgs.python3}/bin/python -m http.server";
     manix-fzf = ''manix "" 2>/dev/null | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview="manix '{}'" | xargs manix'';
 
     # TODO: move to /run/user/...
-    # TODO: add --nom once released - https://github.com/Mic92/nixpkgs-review/pull/303
     nixpkgs-review = ''mkdir -p /dev/shm/nixpkgs-review && ln -sfn /dev/shm/nixpkgs-review $HOME/.cache/nixpkgs-review && nixpkgs-review'';
 
     killall = "killall -v";
-    #bin = "perl -pe 'chomp' | curl -is -X POST https://i.kuklef.se/upload -F content=@- -F expiration=10d | grep '^location:' | cut -d' ' -f2-";
-    bin = "python -c 'import sys; sys.stdout.write(sys.stdin.read().strip())' | curl -is -X POST https://i.kuklef.se/upload -F content=@- -F expiration=10d | grep '^location:' | cut -d' ' -f2-";
 
+    bin = "python -c 'import sys; sys.stdout.write(sys.stdin.read().strip())' | curl -is -X POST https://i.kuklef.se/upload -F content=@- -F expiration=10d | grep '^location:' | cut -d' ' -f2-";
   };
 
+  # TODO: auto-update db
   programs.nix-index.enable = true;
 
   xdg.enable = true;