update

12 files changed, 53 insertions, 107 deletions

diff --git a/modules/foot.nix b/modules/foot.nix
index da752d2..18e1e80 100644
--- a/modules/foot.nix
+++ b/modules/foot.nix
@@ -18,7 +18,8 @@ in
       settings = {
         main = {
           # font="ComicShannsMono Nerd Font Mono:size=12";
-          font="BerkeleyMonoPatched Nerd Font:size=12";
+          # font="BerkeleyMonoPatched Nerd Font Mono:size=12";
+          font ="GoMono Nerd Font Mono:size=12";
           title="term";
           resize-by-cells="no";
           pad="0x0 center";
diff --git a/modules/git/default.nix b/modules/git/default.nix
index 45af5c1..ab5f51e 100644
--- a/modules/git/default.nix
+++ b/modules/git/default.nix
@@ -19,6 +19,7 @@ in
         co = "checkout";
         ri = "rebase -i";
         ag = "add -g";
+        ac = "commit --ammend";
         pushf = "push --force-with-lease";
       };
       delta = {
diff --git a/modules/global.nix b/modules/global.nix
index 1e5bfb8..3dfae3e 100644
--- a/modules/global.nix
+++ b/modules/global.nix
@@ -99,7 +99,7 @@ in
         nerd-fonts.comic-shanns-mono
         eza
         ripgrep
-        lean4
+        elan
         dmenu
         berkeley-mono
       ] ++ (lib.optional cfg.notNixOS nixgl.auto.nixGLDefault)
diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index 34c6e51..92f4e66 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -61,6 +61,7 @@ in
           tree-sitter-toml
           tree-sitter-markdown
           tree-sitter-markdown-inline
+          tree-sitter-tablegen
         ]))
 
         {
@@ -95,7 +96,8 @@ in
         vim.cmd[[
         colorscheme ${scheme.name}
         hi PmenuSel guifg=${scheme.base05} guibg=${scheme.base03}
-        hi StatusLine guibg=fg guifg=bg cterm=reverse gui=bold
+        " hi StatusLine guibg=fg guifg=bg cterm=reverse gui=bold
+        hi StatusLine guibg=bg guifg=fg
         hi FloatBorder guifg=${scheme.base01}
         hi WinSeparator guifg=${scheme.base01}
         hi WinBar guifg=${scheme.base03}
diff --git a/modules/neovim/nvim/after/ftplugin/markdown.lua b/modules/neovim/nvim/after/ftplugin/markdown.lua
index 87efc4b..322e6a2 100644
--- a/modules/neovim/nvim/after/ftplugin/markdown.lua
+++ b/modules/neovim/nvim/after/ftplugin/markdown.lua
@@ -6,3 +6,4 @@ vim.keymap.set({'n', 'v'}, 'n', 'g<Down>', { buffer = true })
 vim.keymap.set({'n', 'v'}, 'e', 'g<Up>', { buffer = true })
 
 vim.opt.statusline="%f"
+vim.opt.conceallevel=3
diff --git a/modules/neovim/nvim/lua/config/lsp/init.lua b/modules/neovim/nvim/lua/config/lsp/init.lua
index 29d015c..7ba79de 100644
--- a/modules/neovim/nvim/lua/config/lsp/init.lua
+++ b/modules/neovim/nvim/lua/config/lsp/init.lua
@@ -80,14 +80,14 @@ vim.api.nvim_create_autocmd("LspAttach", { callback = function(args)
   --   vim.lsp.inlay_hint.enable()
   -- end
 
-  if client:supports_method(methods.textDocument_formatting) then
-    vim.api.nvim_create_autocmd("BufWritePre", {
-      buffer = args.buf,
-      callback = function()
-        vim.lsp.buf.format({bufnr = args.buf, id = client_id})
-      end
-    })
-  end
+  -- if client:supports_method(methods.textDocument_formatting) then
+  --   vim.api.nvim_create_autocmd("BufWritePre", {
+  --     buffer = args.buf,
+  --     callback = function()
+  --       vim.lsp.buf.format({bufnr = args.buf, id = client_id})
+  --     end
+  --   })
+  -- end
 end})
 
 -- local lspconfig = require('lspconfig')
diff --git a/modules/neovim/nvim/lua/config/settings.lua b/modules/neovim/nvim/lua/config/settings.lua
index c44f0e9..54bedb0 100644
--- a/modules/neovim/nvim/lua/config/settings.lua
+++ b/modules/neovim/nvim/lua/config/settings.lua
@@ -16,6 +16,7 @@ vim.opt.fillchars = {eob = " "}
 vim.o.smd = false
 --vim.opt.laststatus = 3
 vim.opt.laststatus=3
+vim.opt.cmdheight=0
 --%-0{minwid}.{maxwid}{item
 -- vim.opt.statusline="%=%f%=%r %p%% « %l, %c %y"
 vim.opt.statusline="%f%=%p%% « %l, %c "
@@ -33,7 +34,7 @@ vim.cmd[[packadd! termdebug]]
 vim.opt.pumheight = 6
 vim.opt.expandtab = true
 vim.o.mouse=""
-vim.o.guicursor=""
+-- vim.o.guicursor=""
 vim.o.swapfile=false
 vim.opt.foldmethod = "expr"
 vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
@@ -41,6 +42,7 @@ vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
 vim.opt.foldlevel = 99
 -- vim.cmd[[syntax off]]
 -- vim.o.winborder = 'rounded' breaks telescope
+
 vim.cmd[[set wildchar=<C-n>]]
 -- vim.api.nvim_set_hl(0, 'Comment', {})
 vim.api.nvim_set_hl(0, 'Constant', {})
diff --git a/modules/sway/default.nix b/modules/sway/default.nix
index 885841b..60495fb 100644
--- a/modules/sway/default.nix
+++ b/modules/sway/default.nix
@@ -50,6 +50,7 @@ in
 
         fonts = {
           names = [ "BerkeleyMonoPatched Nerd Font" ];
+          style = "Bold";
           size = 10.0;
         };
 
@@ -90,25 +91,25 @@ in
         colors = {
           background = scheme.base00;
           focused = {
-            border = scheme.base01;
-            background = scheme.base01;
+            border = scheme.base00;
+            background = scheme.base00;
             text = scheme.base0E;
             indicator = scheme.base02;
-            childBorder = scheme.base0B;
+            childBorder = scheme.base01;
           };
           focusedInactive = {
-            border = scheme.base01;
-            background = scheme.base01;
+            border = scheme.base00;
+            background = scheme.base00;
             text = scheme.base0E;
             indicator = scheme.base02;
-            childBorder = scheme.base01;
+            childBorder = scheme.base00;
           };
           unfocused = {
-            border = scheme.base01;
-            background = scheme.base01;
+            border = scheme.base00;
+            background = scheme.base00;
             text = scheme.base03;
             indicator = scheme.base00;
-            childBorder = scheme.base01;
+            childBorder = scheme.base00;
           };
         };
 
@@ -271,7 +272,7 @@ in
 
       extraConfig = ''
         title_align center
-        default_border pixel 1
+        default_border pixel 2
       '';
     };
   };
diff --git a/modules/tmux/default.nix b/modules/tmux/default.nix
index 4fab8e3..9ab9ab3 100644
--- a/modules/tmux/default.nix
+++ b/modules/tmux/default.nix
@@ -99,6 +99,9 @@ in
         bind -T copy-mode-vi E send-keys -X scroll-up 
         bind -T copy-mode-vi I send-keys -X bottom-line
 
+        bind -T copy-mode-vi v send-keys -X begin-selection
+        bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel
+
         bind -r M resize-pane -L 10
         bind -r N resize-pane -D 10
         bind -r E resize-pane -U 10
diff --git a/modules/zsh/default.nix b/modules/zsh/default.nix
index 3142974..be2a35c 100644
--- a/modules/zsh/default.nix
+++ b/modules/zsh/default.nix
@@ -50,6 +50,7 @@ in
         source ~/.oh-my-zsh/themes/${cfg.theme}.zsh-theme 
         setopt nobeep
         export KEYTIMEOUT=1
+        export NO_COLOR=1
 #       export KEYTIMEOUT=20 # note, set higher if you want to use surround mode or any chording
 
         bindkey -M vicmd m vi-backward-char 
@@ -80,13 +81,27 @@ in
 
         export PATH=$HOME:/.local/riscv/bin:$PATH:$HOME/.local/bin
 
+        function zle-keymap-select() {
+          case $KEYMAP in 
+            vicmd) echo -ne '\e[1 q';; # block
+            viins) echo -ne '\e[5 q';; # beam
+            main) echo -ne '\e[5 q';; # beam
+          esac
+        }
+        zle -N zle-keymap-select
+        zle-line-init() {
+          zle -K viins
+          echo -ne '\e[5 q' # beam
+        }
+        zle -N zle-line-init
+        echo -ne '\e[5 q'
         precmd() {
-          # roleplaying to hide my zsh usage 
           print -Pn "\e]0;$(dirs -p | head -1)\e\\"
           print -Pn "\e]133;A\e\\"
           if ! builtin zle; then
             print -n "\e]133;D\e\\"
           fi
+          echo -ne '\e[5 q'
         }
         function preexec {
           print -Pn "\e]0;''${(q)1}\e\\"
diff --git a/modules/zsh/themes/simple.zsh-theme b/modules/zsh/themes/simple.zsh-theme
index dc9a201..135eed0 100644
--- a/modules/zsh/themes/simple.zsh-theme
+++ b/modules/zsh/themes/simple.zsh-theme
@@ -2,91 +2,10 @@ function virtualenv_info {
   [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
 }
 
-function gitstatus_prompt_update() {
-  typeset -g GITSTATUS_PROMPT=''
-  local p
-
-  gitstatus_query 'MY' || return 1 # we could use -c to do async
-  [[ $VCS_STATUS_RESULT == 'ok-sync' ]] || return 0 # not in a repo
-
-
-  local green='%{%F{green}%}'
-  local red='%{%F{red}%}'
-  local yellow='%{%F{yellow}%}'
-  local blue='%{%F{blue}%}'
-
-  local name
-  if [[ -n $VCS_STATUS_LOCAL_BRANCH ]]; then
-    name=$VCS_STATUS_LOCAL_BRANCH
-  elif [[ -n $VCS_STATUS_TAG ]]; then 
-    p+='%f#'
-    name="${VCS_STATUS_TAG}"
-  else
-    p+='%f@'
-    name="#${VCS_STATUS_COMMIT[1,8]}"
-  fi
-
-  (( $#name > 32 )) && name[13,-13]="…"  # truncate long branch names and tags
-  p+="${green}${name//\%/%%}"            # escape %
-
-   # ⇣42 if behind the remote.
-  (( VCS_STATUS_COMMITS_BEHIND )) && p+=" ${green}⇣${VCS_STATUS_COMMITS_BEHIND}"
-  # ⇡42 if ahead of the remote; no leading space if also behind the remote: ⇣42⇡42.
-  (( VCS_STATUS_COMMITS_AHEAD && !VCS_STATUS_COMMITS_BEHIND )) && p+=" "
-  (( VCS_STATUS_COMMITS_AHEAD  )) && p+="${green}⇡${VCS_STATUS_COMMITS_AHEAD}"
-  # ⇠42 if behind the push remote.
-  (( VCS_STATUS_PUSH_COMMITS_BEHIND )) && p+=" ${green}⇠${VCS_STATUS_PUSH_COMMITS_BEHIND}"
-  (( VCS_STATUS_PUSH_COMMITS_AHEAD && !VCS_STATUS_PUSH_COMMITS_BEHIND )) && p+=" "
-  # ⇢42 if ahead of the push remote; no leading space if also behind: ⇠42⇢42.
-  (( VCS_STATUS_PUSH_COMMITS_AHEAD  )) && p+="${green}⇢${VCS_STATUS_PUSH_COMMITS_AHEAD}"
-  # *42 if have stashes.
-  (( VCS_STATUS_STASHES        )) && p+=" ${green}*${VCS_STATUS_STASHES}"
-  # 'merge' if the repo is in an unusual state.
-  [[ -n $VCS_STATUS_ACTION     ]] && p+=" ${red}${VCS_STATUS_ACTION}"
-  # ~42 if have merge conflicts.
-  (( VCS_STATUS_NUM_CONFLICTED )) && p+=" ${red}~${VCS_STATUS_NUM_CONFLICTED}"
-  # +42 if have staged changes.
-  (( VCS_STATUS_NUM_STAGED     )) && p+=" ${yellow}+${VCS_STATUS_NUM_STAGED}"
-  # !42 if have unstaged changes.
-  (( VCS_STATUS_NUM_UNSTAGED   )) && p+=" ${yellow}!${VCS_STATUS_NUM_UNSTAGED}"
-  # ?42 if have untracked files. It's really a question mark, your font isn't broken.
-  (( VCS_STATUS_NUM_UNTRACKED  )) && p+=" ${blue}?${VCS_STATUS_NUM_UNTRACKED}"
-
-  GITSTATUS_PROMPT="%f${p}%f"
-}
-
-INS_MODE='%{%F{reset}%}[%{%F{green}%}i%{%F{reset}%}]'
-NORMAL_MODE='%{%F{reset}%}[%{%F{yellow}%}n%{%F{reset}%}]'
-VI_MODE=$INS_MODE
-
-function zle-keymap-select() {
-  VI_MODE="${${KEYMAP/vicmd/${NORMAL_MODE}}/(main|viins)/${INS_MODE}}"
-  zle reset-prompt
-#  zle -R
-}
-
-zle -N zle-keymap-select # hook readline so we can determine mode
-
-# normally, SIGINT (<C-c>) will put you in ins, but indictator wont update.
-# fix: hook TRAPINT, update mode and repropagate the SIGINT
-# im too lazy to figure out if its possible to keep normal mode and send a sigint
-TRAPINT() {
-    export VI_MODE=$INS_MODE
-    return $((128+$1))
-}
-
-source "$(gitstatus-share)/gitstatus.plugin.zsh" || return
-
-gitstatus_stop 'MY' && gitstatus_start -s -1 -u -1 -c -1 -d -1 'MY'
-
-autoload -Uz add-zsh-hook
-add-zsh-hook precmd gitstatus_prompt_update
+# autoload -Uz add-zsh-hook
 
 setopt prompt_subst prompt_percent no_prompt_bang
 
 NEWLINE=$'\n'
-GIT_PROMPT_INFO=${GITSTATUS_PROMPT:+ $GITSTATUS_PROMPT}
-PROMPT='%F{magenta}%~% %f%  ${VI_MODE}${NEWLINE}%{%F{yellow}%}λ %b%f% '
-RPROMPT='$(virtualenv_info)% ${GITSTATUS_PROMPT:+ $GITSTATUS_PROMPT} '
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+PROMPT='%~% %f%  ${NEWLINE}λ %b%f% '
+RPROMPT='$(virtualenv_info)% '
diff --git a/void/home.nix b/void/home.nix
index aa2771e..9efc627 100644
--- a/void/home.nix
+++ b/void/home.nix
@@ -16,6 +16,7 @@
       ];
     };
 
+    zsh.theme = "simple";
     foot.enable = true;
     colors.mountain.enable = true;
     # colors.default-dark.enable = true;