Some neovim and tmux changes

5 files changed, 35 insertions, 10 deletions

diff --git a/Common/alacritty/alacritty.yml b/Common/alacritty/alacritty.yml
index 570d8bc..2667788 100644
--- a/Common/alacritty/alacritty.yml
+++ b/Common/alacritty/alacritty.yml
@@ -13,7 +13,7 @@ font:
   normal:
     family: RobotoMono Nerd Font Mono
 
-  size: 5
+  size: 7
 
 window:
   padding:
diff --git a/Common/nvim/init.lua b/Common/nvim/init.lua
index ee75788..733bc02 100755
--- a/Common/nvim/init.lua
+++ b/Common/nvim/init.lua
@@ -1,3 +1,6 @@
+-- Use a mapleader
+vim.g.mapleader   = ","
+
 require("helper_functions")
 require("basic")
 require('plugins')
diff --git a/Common/nvim/lua/helper_functions.lua b/Common/nvim/lua/helper_functions.lua
index 7a17b78..cd84fc9 100755
--- a/Common/nvim/lua/helper_functions.lua
+++ b/Common/nvim/lua/helper_functions.lua
@@ -44,6 +44,28 @@ vim.api.nvim_create_user_command('JoinLinesBT', JoinLinesBT, {bang=false, desc='
 -- Strip trailing spaces
 vim.keymap.set('n', '<Leader>wt', [[:%s/\s\+$//e<cr>]])
 
+-- Quick json formatting using jq
+function FormatJson(start_line, end_line)
+    if start_line == nil or end_line == nil then
+        if vim.fn.mode() == 'v' then
+            start_line, _, end_line, _ = unpack(vim.fn.getpos("'<"), 2, 5)
+        else
+            start_line, end_line = 1, vim.api.nvim_buf_line_count(0)
+        end
+    end
+    local lines = vim.api.nvim_buf_get_lines(0, start_line - 1, end_line, false)
+    local json_string = table.concat(lines, "\n")
+    local handle = io.popen("echo '" .. json_string .. "' | jq .", "r")
+    local result = handle:read("*a")
+    handle:close()
+    vim.api.nvim_buf_set_lines(0, start_line - 1, end_line, false, vim.fn.split(result, "\n"))
+end
+vim.api.nvim_create_user_command('FormatJson', function(opts)
+    FormatJson(opts.line1, opts.line2)
+end, {range = true, desc = 'Format JSON'})
+vim.keymap.set('n', '<leader>jq', FormatJson, { noremap = true, silent = true })
+vim.keymap.set('v', '<leader>jq', ':FormatJson<CR>', { noremap = true, silent = true })
+
 -- Close buffer without closing window
 --[[
 vim.cmd [[
diff --git a/Common/zshrc b/Common/zshrc
index 4fb9aba..d3d8253 100644
--- a/Common/zshrc
+++ b/Common/zshrc
@@ -28,6 +28,8 @@ esac
 
 COMPLETION_WAITING_DOTS="true"
 
+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=7,bold"
+
 # Setup plugins
 plugins=(
   git
diff --git a/linux/tmux.conf b/linux/tmux.conf
index b1bb2cb..a9d6af5 100644
--- a/linux/tmux.conf
+++ b/linux/tmux.conf
@@ -20,18 +20,15 @@ set -g display-panes-time 800 # slightly longer pane indicators display time
 set -g display-time 1000      # slightly longer status messages display time
 
 set -g status-interval 10     # redraw status linebg every 10 seconds
+set-option -g history-limit 5000
 
 set-option -g default-shell /usr/bin/zsh
 
-# activity
-set -g monitor-activity on
-set -g visual-activity off
-
 # -- navigation ----------------------------------------------------------------
 
 # Set window notification
 setw -g monitor-activity on
-set -g visual-activity on
+set -g visual-activity off
 
 unbind C-b
 set -g prefix C-a
@@ -107,18 +104,19 @@ set -g status-position bottom
 set -g status-bg '#f8f8f8'
 set -g status-fg colour16
 
-set -g status-left '#[default] #[fg=colour0,bg=colour7,bold][#S]#[bg=colour15] '
+set -g status-left '#[fg=colour232,bg=colour3,bold]#{?client_prefix,C-a,}#[default] #[fg=colour0,bg=colour7,bold][#S]#[bg=colour15] '
 set -g status-left-length 20
 
-set -g status-right '#[fg=colour0,bg=colour7,bold] #(hostname) #[default] #[fg=colour0,bg=colour7,bold] %d/%m/%y #[default] #[fg=colour0,bg=colour7,bold] %H:%M:%S #[default] #[bg=colour7,bold] #(cat /sys/class/power_supply/BAT0/capacity)% #[default] #[fg=colour232,bg=colour202,bold]#{?client_prefix, <Prefix> ,}'
+set -g status-right '#[fg=colour0,bg=colour7,bold] #(hostname) #[default] #[fg=colour0,bg=colour7,bold] %d/%m/%y #[default] #[fg=colour0,bg=colour7,bold] %H:%M:%S #[default] #[bg=colour7,bold] #(cat /sys/class/power_supply/BAT0/capacity)% #[default] '
 set -g status-right-length 50
 
 setw -g window-status-format ' #I:#W#F '
 setw -g window-status-current-format ' #I:#W#F '
 
 setw -g window-status-current-style "bg=colour0,fg=colour15"
-setw -g window-status-style "bg=colour7,fg=colour15"
+setw -g window-status-style "bg=colour7,fg=colour0"
 setw -g window-status-bell-style "bg=colour23,fg=colour15"
-setw -g window-status-activity-style "bg=colour23,fg=colour15"
+#setw -g window-status-activity-style "bg=colour23,fg=colour15"
+setw -g window-status-activity-style "bg=colour243,fg=colour15"