Merge branch 'master' into arch-laptop

config/.bashrc

@@ -17,6 +17,8 @@ PATH=$PATH:~/.nimble/bin/
 PATH=$PATH:~/Documents/suckless/dylan/opendylan-2024.1/bin
 PATH=$PATH:~/.config/emacs/bin/
 PATH=$PATH:~/.mint/bin/
+PATH=$PATH:~/glamoroustoolkit/bin/
+PATH=$PATH:~/Documents/Projects/Cuis-Smalltalk-Dev/
 # don't put duplicate lines or lines starting with space in the history.
 # See bash(1) for more options
 HISTCONTROL=ignoreboth
@@ -150,6 +152,7 @@ eval "$(fzf --bash)"
 
 export TMUX_TMPDIR=/tmp
 export TINTED_SHELL_ENABLE_BASE16_VARS=1
+export PKG_CONFIG_PATH=/usr/local/share/pkgconfig/:$PKG_CONFIG_PATH
 
 tinty_source_shell_theme() {
   tinty $@
@@ -184,8 +187,8 @@ 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 vidir='EDITOR="/usr/bin/kak -c $SESH 2/dev/null || /usr/bin/kak -s $SESH" vidir'
+    alias vidir='EDITOR="/usr/bin/kak -c $SESH 2>/dev/null || /usr/bin/kak -s $SESH" vidir'
-    alias vipe='EDITOR="/usr/bin/kak -c $SESH 2>/dev/null|| /usr/bin/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

config/.config/dconf/user.txt

@@ -1631,7 +1631,7 @@ selected-color=(true, 0.64666666666666672, 0.23711111111111116, 0.23711111111111
 clock-format='12h'
 date-format='regular'
 location-mode='path-bar'
-show-hidden=true
+show-hidden=false
 show-size-column=true
 show-type-column=true
 sidebar-width=168
@@ -1976,8 +1976,8 @@ midi-backend='jack'
 [org/zrythm/Zrythm/ui]
 jack-transport-type='none'
 main-window-is-maximized=true
-main-window-height=480
+main-window-height=576
-main-window-width=640
+main-window-width=945
 
 [org/zrythm/Zrythm/ui/plugin-browser]
 plugin-browser-collections=@as []
@@ -2497,3 +2497,7 @@ window-width=1000
 window-fullscreen=false
 window-height=700
 window-maximized=false
+
+[ar/xjuan/Cambalache/state/window]
+state=uint32 0
+size=(1071, 645)

config/.config/helix/config.toml

@@ -0,0 +1,39 @@
+theme = "rose_pine"
+
+[editor]
+line-number = "relative"
+rulers = [80]
+color-modes = true
+completion-trigger-len = 1
+idle-timeout = 50
+
+[editor.statusline]
+left = []
+center = []
+right = ["spinner", "diagnostics", "version-control", "file-modification-indicator", "file-name", "file-encoding", "read-only-indicator", "position", "mode", "selections", "spacer"]
+mode.normal = "normal"
+mode.insert = "insert"
+mode.select = "select"
+
+[editor.lsp]
+display-inlay-hints = true
+display-messages = true
+display-progress-messages = true
+
+[editor.cursor-shape]
+normal = "block"
+insert = "bar"
+select = "underline"
+
+[editor.indent-guides]
+render = true
+
+[keys.normal."space".e] # config mode
+c = ":config-open"
+l = ":e ~/.config/helix/languages.toml"
+r = ":config-reload"
+
+[keys.normal.g]
+j = "goto_last_line"
+k = "goto_file_start"
+e = "goto_file_end"

config/.config/helix/languages.toml

@@ -0,0 +1,6 @@
+[[languages]]
+indent = { tab-width = 2, unit = "    " }
+
+[language-server.harper-ls]
+command = "harper-ls"
+args = ["--stdio"]

config/.config/kak/kakrc

@@ -150,61 +150,75 @@ hook global BufCreate .* %{
     editorconfig-load
     autoconfigtab
 }
-#
-# define-command sleuth -docstring 'Heuristically set buffer options' %{
-#   try %{
-#     evaluate-commands -draft %{
-#       # Search the first indent level
-#       execute-keys 'gg' '/' '^\h+' '<ret>'
-#
-#       # Tab vs. Space
-#       # https://youtu.be/V7PLxL8jIl8
-#       try %{
-#         execute-keys '<a-k>' '\t' '<ret>'
-#         #set-option buffer indentwidth 0
-#         noexpandtab
-#       } catch %{
-#         set-option buffer indentwidth %val{selection_length}
-#         expandtab
-#       }
-#     }
-#   }
-# }
-#
-# define-command git-status -docstring 'Show git diff' %{
-#     hook -group git-status global BufOpenFile .* %{
-#         git show-diff
-#     }
-#
-#     hook -group git-status global BufWritePost .* %{
-#         git show-diff
-#     }
-# }
-#
-# define-command disable-git-status -docstring 'Disable git diff gutter' %{
-#     remove-hooks global git-status
-# }
-#
-# define-command sleuth-enable -docstring 'Enable sleuth' %{
-#   # Run sleuth when opening and saving files.
-#   hook -group sleuth global BufOpenFile .* %{
-#     sleuth
-#   }
-#
-#   hook -group sleuth global BufWritePost .* %{
-#     sleuth
-#   }
-# }
-#
-# define-command sleuth-disable -docstring 'Disable sleuth' %{
-#   remove-hooks global sleuth
-# }
-#
-# ## LSP ##
-lsp-enable
-lsp-auto-hover-enable
 
-lsp-inlay-diagnostics-enable global
+define-command sleuth -docstring 'Heuristically set buffer options' %{
+  try %{
+    evaluate-commands -draft %{
+      # Search the first indent level
+      execute-keys 'gg' '/' '^\h+' '<ret>'
+
+      # Tab vs. Space
+      # https://youtu.be/V7PLxL8jIl8
+      try %{
+        execute-keys '<a-k>' '\t' '<ret>'
+        #set-option buffer indentwidth 0
+        noexpandtab
+      } catch %{
+        set-option buffer indentwidth %val{selection_length}
+        expandtab
+      }
+    }
+  }
+}
+
+define-command git-status -docstring 'Show git diff' %{
+    hook -group git-status global BufOpenFile .* %{
+        git show-diff
+    }
+
+    hook -group git-status global BufWritePost .* %{
+        git show-diff
+    }
+}
+
+define-command disable-git-status -docstring 'Disable git diff gutter' %{
+    remove-hooks global git-status
+}
+
+define-command sleuth-enable -docstring 'Enable sleuth' %{
+  # Run sleuth when opening and saving files.
+  hook -group sleuth global BufOpenFile .* %{
+    sleuth
+  }
+
+  hook -group sleuth global BufWritePost .* %{
+    sleuth
+  }
+}
+
+define-command sleuth-disable -docstring 'Disable sleuth' %{
+  remove-hooks global sleuth
+}
+
+## LSP ##
+# lsp-enable
+# lsp-inlay-diagnostics-enable global
+hook global WinSetOption filetype=(c|zig|python|ruby|lua|java|html|css|swift) %{
+    # set-option window lsp_auto_highlight_references true
+    set-option window lsp_hover_anchor true
+    lsp-auto-hover-enable
+    lsp-auto-hover-insert-mode-enable
+    lsp-enable-window
+}
+
+hook global WinSetOption filetype=(rust) %{
+    # set-option window lsp_auto_highlight_references true
+    set-option window lsp_hover_anchor true
+    lsp-auto-hover-enable
+    # lsp-auto-hover-insert-mode-enable
+    lsp-enable-window
+}
+
 hook global WinSetOption filetype=(c|zig|rust|python|ruby|lua|java|html|css) %{
       hook window -group semantic-tokens BufReload .* lsp-semantic-tokens
         hook window -group semantic-tokens NormalIdle .* lsp-semantic-tokens

config/.config/nvim/after/plugin/lsp.lua

@@ -1,12 +1,6 @@
 local lsp = require('lsp-zero')
 local lsp_config = require("lspconfig")
 
-lsp.preset('recommended')
-
-lsp.ensure_installed({
-	'lua_ls',
-})
-
 --Enable (broadcasting) snippet capability for completion
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities.textDocument.completion.completionItem.snippetSupport = true
@@ -31,6 +25,8 @@ lsp_config.hls.setup{}
 
 lsp_config.clojure_lsp.setup{}
 
+lsp_config.clangd.setup{}
+
 lsp_config.sourcekit.setup{}
 
 local cmp = require("cmp")

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

@@ -103,13 +103,20 @@ return require('packer').startup(function(use)
 
 	-- use 'mbbill/undotree'
 
+    use {
+        'mason-org/mason.nvim',
+        config = function()
+            require('mason').setup()
+        end,
+    }
+
 	use {
 		'VonHeikemen/lsp-zero.nvim',
 		requires = {
 			-- LSP Support
 			{ 'neovim/nvim-lspconfig' },
-			{ 'williamboman/mason.nvim' },
+			{ 'mason-org/mason.nvim' },
-			{ 'williamboman/mason-lspconfig.nvim' },
+			{ 'mason-org/mason-lspconfig.nvim' },
 
 			-- Autocompletion
 			{ 'hrsh7th/nvim-cmp' },

config/.doom.d/custom.el

@@ -10,9 +10,16 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes
-   '("56044c5a9cc45b6ec45c0eb28df100d3f0a576f18eef33ff8ff5d32bac2d9700" "48042425e84cd92184837e01d0b4fe9f912d875c43021c3bcb7eeb51f1be5710" "09e98c608045c7778c67d5671161cfbb741cc25350abe61e3eb2ce798bb88209" "691d671429fa6c6d73098fc6ff05d4a14a323ea0a18787daeb93fde0e48ab18b" "e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2" "8c7e832be864674c220f9a9361c851917a93f921fedb7717b1b5ece47690c098" "e4a702e262c3e3501dfe25091621fe12cd63c7845221687e36a79e17cf3a67e0" "f5f80dd6588e59cfc3ce2f11568ff8296717a938edd448a947f9823a4e282b66" default))
+   '("56044c5a9cc45b6ec45c0eb28df100d3f0a576f18eef33ff8ff5d32bac2d9700"
+     "48042425e84cd92184837e01d0b4fe9f912d875c43021c3bcb7eeb51f1be5710"
+     "09e98c608045c7778c67d5671161cfbb741cc25350abe61e3eb2ce798bb88209"
+     "691d671429fa6c6d73098fc6ff05d4a14a323ea0a18787daeb93fde0e48ab18b"
+     "e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2"
+     "8c7e832be864674c220f9a9361c851917a93f921fedb7717b1b5ece47690c098"
+     "e4a702e262c3e3501dfe25091621fe12cd63c7845221687e36a79e17cf3a67e0"
+     "f5f80dd6588e59cfc3ce2f11568ff8296717a938edd448a947f9823a4e282b66" default))
  '(magit-todos-insert-after '(bottom) nil nil "Changed by setter of obsolete option `magit-todos-insert-at'")
- '(package-selected-packages '(lsp-ui)))
+ '(package-selected-packages '(lsp-ui vlf)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.