Merge branch 'master' into arch-laptop

config/.bashrc

@@ -132,7 +132,7 @@ alias zf='z $(flirt)'
 # ~/.bash_aliases, instead of adding them here directly.
 # See /usr/share/doc/bash-doc/examples in the bash-doc package.
 # if [ -z "$EDITOR" ]; then
-export EDITOR='nvim'
+export EDITOR='kak'
 # fi
 
 if [ -f ~/.bash_aliases ]; then
@@ -173,24 +173,24 @@ tinty_source_shell_theme() {
 # fi
 
 run_kak() {
-    kak -c $SESH 2>/dev/null "$@" || kak -s $SESH "$@"
+    /usr/bin/kak -c $SESH 2>/dev/null "$@" || /usr/bin/kak -s $SESH "$@"
 }
 
 if [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ] && [ -z "$TMUX" ]; then
     SESH="$( (tmux list-sessions 2>/dev/null || echo '-1') | cut -d' ' -f1 | tr -d ':-' | sort -r | head -n1 | xargs -I{} echo '{} + 1' | bc)"
-    # alias kak='tmux new-session -e "EDITOR=\"kak -c $SESH\"" -s $SESH kak -s $SESH > /dev/null'
+    alias kak='tmux new-session -e "EDITOR=\"/usr/bin/kak -c $SESH\"" -s $SESH /usr/bin/kak -s $SESH > /dev/null'
 elif [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ]; then
     SESH="$(tmux display-message -p '#S')"
     # alias kak='kak -c $SESH 2>/dev/null || kak -s $SESH'
-    # alias kak=run_kak
+    alias kak=run_kak
-    # alias vidir='EDITOR="kak -c $SESH 2/dev/null || kak -s $SESH" vidir'
+    alias vidir='EDITOR="/usr/bin/kak -c $SESH 2/dev/null || /usr/bin/kak -s $SESH" vidir'
-    # alias vipe='EDITOR="kak -c $SESH 2>/dev/null|| kak -s $SESH" vipe'
+    alias vipe='EDITOR="/usr/bin/kak -c $SESH 2>/dev/null|| /usr/bin/kak -s $SESH" vipe'
 fi
 
-if [ -n "$(command -v tmux)" ] && [ -z "$TMUX" ]; then
+# if [ -n "$(command -v tmux)" ] && [ -z "$TMUX" ]; then
-    SESH="$( (tmux list-sessions 2>/dev/null || echo '-1') | cut -d' ' -f1 | tr -d ':-' | sort -r | head -n1 | xargs -I{} echo '{} + 1' | bc)"
+#     SESH="$( (tmux list-sessions 2>/dev/null || echo '-1') | cut -d' ' -f1 | tr -d ':-' | sort -r | head -n1 | xargs -I{} echo '{} + 1' | bc)"
-    alias tmux="tmux new-session -s $SESH"
+#     alias tmux="tmux new-session -s $SESH"
-fi
+# fi
 
 alias enter-dev='. enter-dev.sh'
 alias ssh='TERM="xterm-256color" ssh'

config/.config/nvim/lua/config/packer.lua

@@ -7,32 +7,6 @@ return require('packer').startup(function(use)
 	-- Packer can manage itself
 	use 'wbthomason/packer.nvim'
 
-    use {
-        'jake-stewart/multicursor.nvim',
-        config = function()
-            local mc = require'multicursor-nvim'
-            mc.setup{}
-            local set = vim.keymap.set
-            set("n", "<leader>s", mc.searchAllAddCursors)
-            mc.addKeymapLayer(function(layerSet)
-                -- Select a different cursor as the main one.
-                layerSet({"n", "x"}, "<left>", mc.prevCursor)
-                layerSet({"n", "x"}, "<right>", mc.nextCursor)
-
-                -- Delete the main cursor.
-                layerSet({"n", "x"}, "<leader>x", mc.deleteCursor)
-
-                -- Enable and clear cursors using escape.
-                layerSet("n", "<esc>", function()
-                    if not mc.cursorsEnabled() then
-                        mc.enableCursors()
-                    else
-                        mc.clearCursors()
-                    end
-                end)
-            end)
-        end
-    }
 	use {
 		'nvim-telescope/telescope.nvim',
         branch = '0.1.x',

config/.doom.d/init.el

@@ -53,7 +53,7 @@
        zen               ; distraction-free coding or writing
 
        :editor
-       (evil +everywhere); come to the dark side, we have cookies
+       ;; (evil +everywhere); come to the dark side, we have cookies
        file-templates    ; auto-snippets for empty files
        fold              ; (nigh) universal code folding
        (format +onsave)  ; automated prettiness

config/.gitconfig

@@ -7,7 +7,7 @@
 	process = git-lfs filter-process
 	required = true
 [core]
-	editor = nvim
+	editor = kak
 [init]
 	defaultBranch = master
 [sendemail]

config/.tmux.conf

@@ -4,8 +4,8 @@ set -g @rose_pine_variant 'main' # Options are 'main', 'moon' or 'dawn'
 #set -g @plugin 'arcticicestudio/nord-tmux'
 set -g @plugin 'rose-pine/tmux'
 set -g @plugin 'tmux-plugins/tpm'
-set -g default-terminal "xterm-256color"
+set -g default-terminal "tmux-256color"
-set -ga terminal-overrides ",xterm*:Tc"
+set -ga terminal-overrides ",alacritty:Tc"
 set -g mouse on
 # Changes prefix key to control a instead of control b
 unbind C-b