diff --git a/modules/home/fish.nix b/modules/home/fish.nix
index bbe4ec9..6b100f6 100644
--- a/modules/home/fish.nix
+++ b/modules/home/fish.nix
@@ -42,6 +42,10 @@
 
       set -gx LS_COLORS "$(vivid generate catppuccin-mocha)"
 
+      set -gx COLORTERM truecolor
+      set -gx COLORFGBG "15;0"
+      set -gx TERM_BACKGROUND dark
+
       for mode in default insert
         bind --mode $mode \cp open_project
       end
diff --git a/modules/home/fzf.nix b/modules/home/fzf.nix
index a9763b1..268ad77 100644
--- a/modules/home/fzf.nix
+++ b/modules/home/fzf.nix
@@ -14,11 +14,11 @@
       --preview-window='border-rounded' --prompt='  ' --marker=' ' --pointer=' '
       --separator='─' --scrollbar='┃' --layout='reverse'
 
-      --color=bg+:#CCD0DA,bg:#EFF1F5,spinner:#DC8A78,hl:#D20F39
-      --color=fg:#4C4F69,header:#D20F39,info:#8839EF,pointer:#DC8A78
-      --color=marker:#7287FD,fg+:#4C4F69,prompt:#8839EF,hl+:#D20F39
-      --color=selected-bg:#BCC0CC
-      --color=border:#9CA0B0,label:#4C4F69
+      --color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8
+      --color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc
+      --color=marker:#b4befe,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8
+      --color=selected-bg:#45475a
+      --color=border:#6c7086,label:#cdd6f4
     '';
   };
 }
diff --git a/modules/home/neovim/mappings.nix b/modules/home/neovim/mappings.nix
index 458bfd4..adae210 100644
--- a/modules/home/neovim/mappings.nix
+++ b/modules/home/neovim/mappings.nix
@@ -1,5 +1,24 @@
 {
   programs.nixvim.keymaps = [
+    # clipboard - OSC52 yank and paste
+    {
+      mode = ["n" "v"];
+      key = "y";
+      action = ''"+y'';
+      options.desc = "Yank to system clipboard (OSC52)";
+    }
+    {
+      mode = ["n" "v"];
+      key = "p";
+      action = ''"+p'';
+      options.desc = "Paste from system clipboard (OSC52)";
+    }
+    {
+      mode = ["n" "v"];
+      key = "P";
+      action = ''"+P'';
+      options.desc = "Paste before from system clipboard (OSC52)";
+    }
     # e - explore/edit
     {
       mode = "n";
diff --git a/modules/home/neovim/options.nix b/modules/home/neovim/options.nix
index 5f8c5bc..72e1848 100644
--- a/modules/home/neovim/options.nix
+++ b/modules/home/neovim/options.nix
@@ -1,6 +1,7 @@
 {
   programs.nixvim = {
     globals = {
+      clipboard = "osc52";
     };
     opts = {
       expandtab = true;
diff --git a/modules/home/opencode.nix b/modules/home/opencode.nix
index 952d6e7..02697f2 100644
--- a/modules/home/opencode.nix
+++ b/modules/home/opencode.nix
@@ -2,7 +2,7 @@
   programs.opencode = {
     enable = true;
     settings = {
-      theme = "catppuccin";
+      theme = "catppuccin-mocha";
       instructions = [
         "CLAUDE.md"
         "AGENT.md"
diff --git a/modules/packages.nix b/modules/packages.nix
index 83f7a27..7236c1f 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -2,7 +2,6 @@
 with pkgs; [
   (callPackage ./bin/open-project.nix {})
   age
-  rclone
   alejandra
   ast-grep
   delta
@@ -14,6 +13,7 @@ with pkgs; [
   fd
   fira-code
   gh
+  ghostty.terminfo
   git
   gnumake
   gnupg