.bashrc

Merging neovim config

config/.bash_profile

@@ -18,3 +18,11 @@ test -r '/home/mikec/.opam/opam-init/init.sh' && . '/home/mikec/.opam/opam-init/
 if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
   exec river
 fi
+HOMEBREW_PREFIX=/opt/homebrew
+export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
+export CPATH="$HOMEBREW_PREFIX/include:$CPATH"
+export LIBRARY_PATH="$HOMEBREW_PREFIX/lib:$LIBRARY_PATH"
+. "/Users/mikec/.local/share/bob/env/env.sh"
+
+test -e "${HOME}/.iterm2_shell_integration.bash" && source "${HOME}/.iterm2_shell_integration.bash"
+

config/.bashrc

@@ -19,6 +19,11 @@ PATH=$PATH:~/.config/emacs/bin/
 PATH=$PATH:~/.mint/bin/
 PATH=$PATH:~/glamoroustoolkit/bin/
 PATH=$PATH:~/Documents/Projects/Cuis-Smalltalk-Dev/
+PATH=$PATH:~/opt/homebrew/bin/
+
+export CFLAGS="$CFLAGS -I/opt/homebrew/include"
+
+LDPATH=$LDPATH:/opt/homebrew/lib/
 # don't put duplicate lines or lines starting with space in the history.
 # See bash(1) for more options
 HISTCONTROL=ignoreboth
@@ -123,7 +128,7 @@ alias _='sudo'
 alias _i='sudo -i'
 alias please='sudo'
 alias fucking='sudo'
-alias hx='helix'
+# alias hx='helix'
 alias bat='bat --theme="base16-256"'
 if [ -n "$(command -v 'eza')" ]; then
   alias ls='eza'
@@ -136,7 +141,7 @@ alias zf='z $(flirt)'
 # See /usr/share/doc/bash-doc/examples in the bash-doc package.
 # if [ -z "$EDITOR" ]; then
 # export EDITOR='kak'
-export EDITOR='helix'
+export EDITOR='nvim'
 # fi
 
 if [ -f ~/.bash_aliases ]; then
@@ -193,7 +198,8 @@ elif [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ]; then
 fi
 
 if [ -n "$(command -v tmux)" ] && [ -n "$(command -v helix || command -v hx)" ] && [ -z "$TMUX" ]; then
-    alias helix='tmux new-session -e "EDITOR=helix" helix > /dev/null'    
+    alias helix='tmux new-session -e "EDITOR=hx" hx > /dev/null'    
+    alias hx='tmux new-session -e "EDITOR=hx" hx > /dev/null'    
 fi
 # 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)"

config/.config/ghostty/config

@@ -1,19 +1,20 @@
 font-family = ""
 # font-family = "FairfaxHaxHD"
 # font-family = "PragmataPro Liga"
-font-family = "BigBlueTermPlus Nerd Font"
+# font-family = "BigBlueTermPlus Nerd Font"
 # font-family = "Olympe Mono Hacked"
+font-family = "Iosevka Term SS12"
 font-family = "Cascadia Code"
 font-family = "CaskaydiaCove Nerd Font"
 # font-family = "Terminess Nerd Font Mono"
 # font-family = "Ubuntu Mono Nerd Font"
-font-family = "Iosevka Term SS12"
 # font-family = "Victor Mono Nerd Font"
 # font-family = "Sudo"
-theme = rose-pine
+theme = light:rose-pine-dawn,dark:rose-pine
 font-size = 14
+font-variation = wdth=100
 # theme = light:xcodelight,dark:xcodedark
 # theme = Monokai Classic
 # window-decoration = false
-gtk-adwaita = false
+# gtk-adwaita = false
-window-decoration = false
+window-decoration = true

config/.config/nvim/lua/config/init.lua

@@ -1,3 +1,4 @@
 require 'config.lazy'
 require 'config.set'
 require 'config.keymap'
+require 'config.lsp'

config/.config/nvim/lua/config/keymap.lua

@@ -29,6 +29,8 @@ setnx('<leader>oT', '<CMD>tabnew<CR>', 'Open new tab')
 setnx('<leader>of', '<CMD>enew<CR>', 'Open new file')
 setnx('<leader>ow', '<CMD>Telescope workspaces', 'Open workspace')
 setnx('<leader>ol', '<CMD>Lazy<CR>', 'Open Lazy')
+setnx('<leader>om', '<CMD>Mason<CR>', 'Open Mason')
+setnx('<leader>oc', '<CMD>cd' .. vim.fn.stdpath('config') .. '<CR><CMD>Oil<CR>', 'Open neovim configuration')
 
 -- Exit terminal mode with ESC
 set('t', '<Esc>', '<C-\\><C-n>')

config/.config/nvim/lua/config/lsp.lua

@@ -1,9 +1,48 @@
 vim.api.nvim_create_autocmd('LspAttach', {
     group = vim.api.nvim_create_augroup('UserLspConfig', {}),
     callback = function(args)
-    local client = vim.lsp.get_client_by_id(args.data.client_id)
+        local client = vim.lsp.get_client_by_id(args.data.client_id)
-    if client.server_capabilities.inlayHintProvider then
+        if client:supports_method('textDocument/inlayHint') or client.server_capabilities.inlayHintProvider then
-        vim.lsp.inlya_hint.enable(args.buf, true)
+            vim.lsp.inlay_hint.enable(true, { bufnr = args.buf })
-    end
+        end
     end
 })
+
+-- vim.lsp.config('rust-analyzer', {
+--     settings = {
+--         ["rust-analyzer"] = {
+--             inlayHints = {
+--                 bindingModeHints = {
+--                     enable = false,
+--                 },
+--                 chainingHints = {
+--                     enable = true,
+--                 },
+--                 closingBraceHints = {
+--                     enable = true,
+--                     minLines = 25,
+--                 },
+--                 closureReturnTypeHints = {
+--                     enable = "never",
+--                 },
+--                 lifetimeElisionHints = {
+--                     enable = "never",
+--                     useParameterNames = false,
+--                 },
+--                 maxLength = 25,
+--                 parameterHints = {
+--                     enable = true,
+--                 },
+--                 reborrowHints = {
+--                     enable = "never",
+--                 },
+--                 renderColons = true,
+--                 typeHints = {
+--                     enable = true,
+--                     hideClosureInitialization = false,
+--                     hideNamedConstructor = false,
+--                 },
+--             },
+--         }
+--     }
+-- })

config/.config/nvim/lua/plugins/lsp.lua

@@ -18,6 +18,15 @@ return {
         },
     },
 
+    -- {
+    --     "MysticalDevil/inlay-hints.nvim",
+    --     event = "LspAttach",
+    --     dependencies = { "neovim/nvim-lspconfig" },
+    --     config = function()
+    --         require("inlay-hints").setup()
+    --     end
+    -- },
+    --
     {
         'saghen/blink.cmp',
         -- optional: provides snippets for the snippet source

config/.gitconfig

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