fix(zsh): macos history retention

nvimrc

@@ -9,6 +9,9 @@ filetype plugin indent on
 
 let mapleader=','
 
+" mise setup
+lua vim.env.PATH = vim.env.HOME .. "/.local/share/mise/shims:" .. vim.env.PATH
+
 " netrw
 let g:netrw_banner = 0
 let g:netrw_liststyle = 1
@@ -272,6 +275,7 @@ packadd! rust.vim          " https://github.com/rust-lang/rust.vim.git
 packadd! vim-commentary    " https://github.com/tpope/vim-commentary.git
 packadd! vim-rails         " https://github.com/tpope/vim-rails.git
 packadd! vim-jsx-pretty    " https://github.com/MaxMEllon/vim-jsx-pretty.git
+packadd! plenary.nvim      " https://github.com/nvim-lua/plenary.nvim.git
 
 " Requires both fzf.vim plugin to be manually installed:
 " https://github.com/junegunn/fzf/blob/master/plugin/fzf.vim

script/jira

@@ -2,7 +2,7 @@
 #
 # jira - jump to a Jira ticket in the browser, based on Git branch name convention.
 
-set -e
+set -e -o pipefail
 
 if [ -z "$JIRADOMAIN" ]; then
   # shellcheck disable=SC2016

vim/lua/lsp_config.lua

@@ -105,6 +105,12 @@ nvim_lsp.rust_analyzer.setup({
 
 nvim_lsp.solargraph.setup({
 	on_attach = on_attach,
+	settings = {
+		solargraph = {
+			autoformat = false,
+			formatting = false,
+		},
+	},
 })
 
 -- Typescript

vim/lua/treesitter_config.lua

@@ -40,10 +40,11 @@ require("nvim-treesitter.configs").setup({
 				["ak"] = "@keyed_element.outer",
 				["iv"] = "@keyed_element.inner",
 				["av"] = "@keyed_element.inner",
+				["at"] = "@composite_literal",
 				["ia"] = "@parameter.inner",
 				["aa"] = "@parameter.outer",
 				["ac"] = "@comment.outer",
-				["at"] = "@statement.outer",
+				["as"] = "@statement.outer",
 				["ar"] = "@return",
 				["af"] = "@function.outer",
 				["if"] = "@function.inner",

vim/queries/go/textobjects.scm

@@ -7,3 +7,5 @@
 (keyed_element (_) . (_) @keyed_element.inner) @keyed_element.outer
 (field_declaration type: (_) @keyed_element.inner) @keyed_element.outer
 (parameter_declaration type: (_) @keyed_element.inner) @keyed_element.outer
+
+(composite_literal (_)) @composite_literal

zshenv

@@ -10,10 +10,6 @@ export BROWSER=firefox
 
 # ZSH:
 export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
-export HISTFILE="$ZDOTDIR/.zsh_history"
-export HISTSIZE=100000
-export SAVEHIST=100000
-export HISTTIMEFORMAT="[%F %T] "
 
 # UI
 # `vivid generate molokai`

zshrc

@@ -1,6 +1,13 @@
 # $HOME/.config/zsh/.zshrc
 # Note: Install zsh-completions package
 
+# Moved from zshenv because they were being inexplicably overwritten or ignored
+# on Macos:
+export HISTFILE="$ZDOTDIR/.zsh_history"
+export HISTSIZE=100000
+export SAVEHIST=100000
+export HISTTIMEFORMAT="[%F %T] "
+
 setopt hist_find_no_dups
 setopt extended_history
 setopt share_history