4 Commits

Author SHA1 Message Date
Michael Chalupiak
88b5ef02f5 .bashrc 2025-08-17 14:35:56 -04:00
Michael Chalupiak
04da38c6a2 Merge remote-tracking branch 'refs/remotes/github/master' 2025-08-17 14:18:27 -04:00
Michael Chalupiak
bce85fa1a7 move nvim config 2025-08-17 14:17:37 -04:00
Michael Chalupiak
59dd7303af Merge branch 'macmini'
New neovim config
2025-08-17 11:28:03 -04:00
6 changed files with 71 additions and 6 deletions

View File

@@ -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"

View File

@@ -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'
@@ -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)"

View File

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

View File

@@ -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>')

View File

@@ -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)
if client.server_capabilities.inlayHintProvider then
vim.lsp.inlya_hint.enable(args.buf, true)
end
local client = vim.lsp.get_client_by_id(args.data.client_id)
if client:supports_method('textDocument/inlayHint') or client.server_capabilities.inlayHintProvider then
vim.lsp.inlay_hint.enable(true, { bufnr = args.buf })
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,
-- },
-- },
-- }
-- }
-- })

View File

@@ -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