mchalupiak/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into arch-laptop

Browse Source 
merging
This commit is contained in:
Michael Chalupiak 2025-09-18 11:29:27 -04:00
commit 30efa5fd97
6 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/.bashrc
View File

@ -197,9 +197,9 @@ elif [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ]; then
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 fi
if [ -n "$(command -v tmux)" ] && [ -n "$(command -v helix || command -v hx)" ] && [ -z "$TMUX" ]; then if [ -n "$(command -v tmux)" ] && [ -n "$(command -v helix)" ] && [ -z "$TMUX" ]; then
alias helix='tmux new-session -e "EDITOR=hx" hx > /dev/null' alias helix='tmux new-session -e "EDITOR=helix" helix > /dev/null'
alias hx='tmux new-session -e "EDITOR=hx" hx > /dev/null' # alias hx='tmux new-session -e "EDITOR=helix" helix > /dev/null'
fi 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)"

2
config/.config/ghostty/config
View File

@ -3,7 +3,7 @@ font-family = ""
# font-family = "PragmataPro Liga" # font-family = "PragmataPro Liga"
# font-family = "BigBlueTermPlus Nerd Font" # font-family = "BigBlueTermPlus Nerd Font"
# font-family = "Olympe Mono Hacked" # font-family = "Olympe Mono Hacked"
font-family = "Iosevka SS12" font-family = "Iosevka Term SS12"
font-family = "Cascadia Code" font-family = "Cascadia Code"
font-family = "CaskaydiaCove Nerd Font" font-family = "CaskaydiaCove Nerd Font"
# font-family = "Terminess Nerd Font Mono" # font-family = "Terminess Nerd Font Mono"

1
config/.config/nvim/lazy-lock.json
View File

@ -15,6 +15,7 @@
"gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
"gruvbox-material": { "branch": "master", "commit": "6a100833060d26cd3ab85c34c5f7154a1000c12f" }, "gruvbox-material": { "branch": "master", "commit": "6a100833060d26cd3ab85c34c5f7154a1000c12f" },
"gruvbox.nvim": { "branch": "main", "commit": "12c2624287dc827edb5d72b2bc4c9619e692a554" }, "gruvbox.nvim": { "branch": "main", "commit": "12c2624287dc827edb5d72b2bc4c9619e692a554" },
"hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"leap.nvim": { "branch": "main", "commit": "e9cb442c0614a7e8185608f639e10c54e53bb083" }, "leap.nvim": { "branch": "main", "commit": "e9cb442c0614a7e8185608f639e10c54e53bb083" },
"love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" }, "love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" },

1
config/.config/nvim/lua/config/keymap.lua
View File

@ -9,6 +9,7 @@ setnx('<leader>f?', Snacks.picker.grep, 'Search in files')
setnx('<leader>fr', Snacks.picker.recent, 'Find recent files') setnx('<leader>fr', Snacks.picker.recent, 'Find recent files')
setnx('<leader>b', Snacks.picker.buffers, 'List buffers') setnx('<leader>b', Snacks.picker.buffers, 'List buffers')
setnx('<leader>h', Snacks.picker.help, 'Search help') setnx('<leader>h', Snacks.picker.help, 'Search help')
setnx('<leader>X', require'hex'.toggle, 'Toggle hex editor')
setnx('<leader>m', Snacks.picker.marks, 'Search marks') setnx('<leader>m', Snacks.picker.marks, 'Search marks')
setnx('<leader>q', Snacks.picker.qflist, 'Search quickfix list') setnx('<leader>q', Snacks.picker.qflist, 'Search quickfix list')
setnx('<leader>l', Snacks.picker.loclist, 'Search location list') setnx('<leader>l', Snacks.picker.loclist, 'Search location list')

5
config/.config/nvim/lua/config/set.lua
View File

@ -79,4 +79,9 @@ vim.lsp.config('lua_ls', {
} }
}) })
vim.lsp.config('tinymist', {
settings = {
exportPdf = "onType",
}
})
vim.diagnostic.config({ update_in_insert = true, float = true, virtual_lines = true}) vim.diagnostic.config({ update_in_insert = true, float = true, virtual_lines = true})

10
config/.config/nvim/lua/plugins/util.lua
View File

@ -6,6 +6,16 @@ return {
lazy = true, lazy = true,
}, },
{
'RaafatTurki/hex.nvim',
config = true,
cmd = {
'HexDump',
'HexAssemble',
'HexToggle',
},
},
{ {
"sindrets/diffview.nvim", "sindrets/diffview.nvim",
event = 'VeryLazy', event = 'VeryLazy',