diff --git a/.vimrc b/.vimrc
index bc2ceed..dc9e6ab 100644
--- a/.vimrc
+++ b/.vimrc
@@ -42,7 +42,6 @@ set undofile
 " ----------------------------
 " Line numbers and cursor line
 set number
-set cursorline
 
 " Highlight search matches
 set hlsearch
@@ -72,6 +71,23 @@ set smartcase
 " Enable mouse support
 set mouse=a
 
+" ---------------------------
+"  Clipboard settings
+" ---------------------------
+" Use system clipboard
+set clipboard=unnamedplus
+nnoremap x "+x
+nnoremap dd "_dd
+nnoremap D "_D
+nnoremap C "_C
+" Paste clipboard below as new line
+nnoremap <leader>p :put +<CR>
+" Paste clipboard above as new line
+nnoremap <leader>P :put! +<CR>
+
+
+
+
 " ----------------------------
 " Filetype-specific settings
 " ----------------------------
diff --git a/setup.sh b/setup.sh
index 8426315..92c3149 100644
--- a/setup.sh
+++ b/setup.sh
@@ -22,7 +22,9 @@ echo ">>> Bootstrapping new Debian-like machine..."
 # 1. Update package list and install essentials
 echo ">>> Installing bash, tmux, and vim..."
 sudo apt update
-sudo apt install -y bash tmux vim git curl
+# Remove minimal vim if installed, then install clipboard-enabled version
+sudo apt remove -y vim || true
+sudo apt install -y bash tmux vim-gtk3 git curl
 
 # 2. Clone your dotfiles (bare repo style)
 if [ ! -d "$HOME/.dotfiles" ]; then