bunch of updates

home/profiles/cli/default.nix

@@ -10,6 +10,7 @@
     git-machete
     bottom
     gptfdisk
+    difftastic
     starship
     jq
     manix
@@ -55,6 +56,8 @@
     gnupg
     syncthing
     dijo
+    nixfmt-rfc-style
+    nix-tree
     #ssb-patchwork
     fontconfig
     pandoc
@@ -159,6 +162,7 @@
     initContent = ''
       bindkey -v
       autopair-init
+      export PATH="$PATH:/Users/anishlakhwara/go/bin"
     '';
     sessionVariables = {
       EDITOR = "nvim";

home/profiles/git/default.nix

@@ -1,3 +1,4 @@
+{ pkgs, ... }:
 {
   #xdg.configFile = {
   #  "git/config".source = ./config;
@@ -7,6 +8,10 @@
 
   programs.lazygit.enable = true;
 
+  home.packages = with pkgs; [
+    unstable.git-spice
+  ];
+
   programs.git = {
     enable = true;
     userName = "Anish Lakhwara";

home/profiles/nvim/default.nix

@@ -1023,7 +1023,7 @@ in
       vim.keymap.set({'n', 't'}, '<M-l>', '<CMD>NavigatorRight<CR>')
 
       -- Disable Ctrl+V in nvim so Kitty can handle paste
-      vim.keymap.set({'v', 'i'}, '<C-v>', '<Nop>', {noremap = true, silent = true})
+      vim.keymap.set('i', '<C-v>', '<C-r>+', {noremap = true, silent = true})
 
       -- Pane resizing with Alt+Shift+hjkl (to match tmux)
       vim.keymap.set('n', '<M-S-h>', '<Cmd>vertical resize -2<CR>', {silent = true})

home/profiles/tmux/tmux.conf

@@ -2,10 +2,37 @@ set -g base-index 1
 setw -g pane-base-index 1
 
 # https://old.reddit.com/r/tmux/comments/mesrci/tmux_2_doesnt_seem_to_use_256_colors/
-set -g default-terminal "xterm-256color"
+# colors
+set -g default-terminal "tmux-256color"
 set -ga terminal-overrides ",*256col*:Tc"
 set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q'
 set-environment -g COLORTERM "truecolor"
+set -sa terminal-features ",tmux-256color:RGB:Nobr"
+set -g allow-passthrough on
+
+set -g set-clipboard on
+
+# shift enter for amp
+set -s extended-keys on
+set -as terminal-features 'tmux*:extkeys'
+
+# pane colors for amp diff view
+# set-option -g pane-colours[0] "#4D5566"
+# set-option -g pane-colours[1] "#F27983"
+# set-option -g pane-colours[2] "#A6CC70"
+# set-option -g pane-colours[3] "#F29E74"
+# set-option -g pane-colours[4] "#77A8D9"
+# set-option -g pane-colours[5] "#A37ACC"
+# set-option -g pane-colours[6] "#4CBF99"
+# set-option -g pane-colours[7] "#F0F0F0"
+# set-option -g pane-colours[8] "#000000"
+# set-option -g pane-colours[9] "#FF3333"
+# set-option -g pane-colours[10] "#BAE67E"
+# set-option -g pane-colours[11] "#FFA759"
+# set-option -g pane-colours[12] "#73D0FF"
+# set-option -g pane-colours[13] "#D4BFFF"
+# set-option -g pane-colours[14] "#95E6CB"
+# set-option -g pane-colours[15] "#ffffff"
 
 # Mouse works as expected
 set-option -g mouse on
@@ -16,6 +43,10 @@ set -g focus-events on
 bind | split-window -h -c "#{pane_current_path}"
 bind - split-window -v -c "#{pane_current_path}"
 
+# amp commands
+set -g @amp/fork-thread-command 'new-window -n forked-thread $SHELL -c "amp threads fork; amp threads continue"'
+bind -N 'Fork Amp thread' f "#{@amp/fork-thread-command}"
+
 # don't rename windows automatically
 set-option -g allow-rename off
 
@@ -63,6 +94,7 @@ set -g message-style 'fg=yellow bg=green bold'
 
 # Unbind Ctrl+V so it passes through to Kitty for paste
 unbind C-v
+set -g set-clipboard on
 
 # Vim-aware pane navigation with Alt+hjkl
 is_vim="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"