From 124ea84991d094189eaabae198b83825a6cf4e6d Mon Sep 17 00:00:00 2001
From: mitchell <m@mjfs.us>
Date: Fri, 14 Jul 2023 16:24:37 -0400
Subject: [PATCH] Minor changes to nvim cfg, fish key binds, and
 provision_linux

---
 .../functions/fish_user_key_bindings.fish     |  3 +--
 .config/fish/functions/n.fish                 | 20 +++++++++----------
 .config/nvim/init.lua                         |  5 +++++
 .vimrc                                        |  1 +
 provision_linux                               |  1 -
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.config/fish/functions/fish_user_key_bindings.fish b/.config/fish/functions/fish_user_key_bindings.fish
index 0895b51..de9df86 100644
--- a/.config/fish/functions/fish_user_key_bindings.fish
+++ b/.config/fish/functions/fish_user_key_bindings.fish
@@ -4,8 +4,7 @@ function fish_user_key_bindings
     bind --mode insert ,j 'joplin; commandline -f repaint'
     bind --mode insert ,p 'nvim +"Telescope git_files"; commandline -f repaint'
     bind --mode insert ,f 'nvim +"Telescope find_files"; commandline -f repaint'
-    bind --mode insert ,m 'nvim +Neotree; commandline -f repaint'
+    bind --mode insert ,n 'nvim +Neotree; commandline -f repaint'
     bind --mode insert ,v 'neovide; commandline -f repaint'
-    bind --mode insert ,n 'n; commandline -f repaint'
     bind --mode insert ,s 'sysz; commandline -f repaint'
 end
diff --git a/.config/fish/functions/n.fish b/.config/fish/functions/n.fish
index 758fcf0..a8c3dc4 100644
--- a/.config/fish/functions/n.fish
+++ b/.config/fish/functions/n.fish
@@ -4,17 +4,15 @@
 
 function n --wraps nnn --description 'support nnn quit and change directory'
     # Block nesting of nnn in subshells
-    if test -n "$NNNLVL"
-        if [ (expr $NNNLVL + 0) -ge 1 ]
-            echo "nnn is already running"
-            return
-        end
+    if test -n "$NNNLVL" -a "$NNNLVL" -ge 1
+        echo "nnn is already running"
+        return
     end
 
-    # The default behaviour is to cd on quit (nnn checks if NNN_TMPFILE is set)
-    # To cd on quit only on ^G, remove the "-x" as in:
-    #    set NNN_TMPFILE "$XDG_CONFIG_HOME/nnn/.lastd"
-    # NOTE: NNN_TMPFILE is fixed, should not be modified
+    # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set)
+    # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to
+    # see. To cd on quit only on ^G, remove the "-x" from both lines below,
+    # without changing the paths.
     if test -n "$XDG_CONFIG_HOME"
         set -x NNN_TMPFILE "$XDG_CONFIG_HOME/nnn/.lastd"
     else
@@ -27,7 +25,9 @@ function n --wraps nnn --description 'support nnn quit and change directory'
     # stty lwrap undef
     # stty lnext undef
 
-    nnn -de $argv
+    # The command function allows one to alias this function to `nnn` without
+    # making an infinitely recursive alias
+    command nnn $argv
 
     if test -e $NNN_TMPFILE
         source $NNN_TMPFILE
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index de4c2e6..53e3aad 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -2,6 +2,8 @@ vim.cmd("set runtimepath^=~/.vim runtimepath+=~/.vim/after")
 vim.cmd("let &packpath = &runtimepath")
 vim.cmd("source ~/.vimrc")
 
+vim.g.coq_settings = { auto_start = true }
+
 vim.g.neovide_scale_factor = 0.7
 vim.opt.guifont = { "JetBrainsMono Nerd Font", "h13" }
 
@@ -31,6 +33,9 @@ require('noice').setup({
       ["cmp.entry.get_documentation"] = true,
     },
   },
+  popupmenu = {
+    enabled = false,
+  },
   presets = {
     long_message_to_split = true, -- long messages will be sent to a split
   },
diff --git a/.vimrc b/.vimrc
index d4609d8..f3d6168 100644
--- a/.vimrc
+++ b/.vimrc
@@ -94,6 +94,7 @@ inoremap <leader>j <Esc>
 
 let mapleader = ','
 nnoremap <leader>f <cmd>ALEFix<cr>
+nnoremap <leader>a <cmd>ALEToggle<cr>
 
 if has('nvim')
   nnoremap <leader>n <cmd>Neotree<cr>
diff --git a/provision_linux b/provision_linux
index dad522f..eaeb6a7 100755
--- a/provision_linux
+++ b/provision_linux
@@ -90,7 +90,6 @@ function desktop_env -d 'Install base desktop utilities and configure theme'
         feh \
         rofi \
         kitty \
-        qutebrowser \
         wget \
         unzip \
         physlock \