Compare commits

...

5 Commits

7 changed files with 61 additions and 12 deletions

18
.bashrc
View File

@ -1,3 +1,10 @@
if [[ $- == *i* ]]; then # in interactive session
# ble.sh
# https://github.com/akinomyoga/ble.sh#13-set-up-bashrc
BLE="${HOME}/programs/ble.sh/out/ble.sh"
[[ -f ${BLE} ]] && source ${BLE} --noattach
fi
# Navigation
alias vim="nvim"
alias lg="lazygit"
@ -74,8 +81,13 @@ if [[ -d ${HOME}/bin ]]; then
export PATH=$PATH:${HOME}/bin
fi
# Enable atuin
# https://docs.atuin.sh
eval "$(atuin init bash)"
# fzf
eval "$(fzf --bash)"
#eval "$(fzf --bash)"
export FZF_DEFAULT_OPTS=" \
--color=bg+:#ccd0da,bg:#eff1f5,spinner:#dc8a78,hl:#d20f39 \
@ -162,3 +174,7 @@ elif [ "$BASH" != "" ]; then
PS1="\n╔ \w\$(prev_status_prompt)\$(git_prompt) -- \$(date '+%y-%m-%dT%H:%M:%S')\n╚ \h\$ "
fi
# ble.sh
# https://github.com/akinomyoga/ble.sh#13-set-up-bashrc
[[ ${BLE_VERSION-} ]] && ble-attach

13
atuin.toml Normal file
View File

@ -0,0 +1,13 @@
# https://docs.atuin.sh/configuration/config/
workspaces = true
keymap_mode = "auto"
enter_accept = true
history_filter = [
"^cd$",
"^lg$",
"^ls$",
"^clear$",
"^vim$",
]

View File

@ -62,6 +62,10 @@ function performSetup() {
mkdir -p ~/.config/lazygit
ln -fns ${DOTFILES_DIR}/.lazygit ~/.config/lazygit/config.yml
echo "Linking Atuin..."
mkdir -p ~/.config/atuin
ln -fns ${DOTFILES_DIR}/atuin.toml ~/.config/atuin/config.toml
echo "Linking tmux..."
linkFile ".tmux.conf"
@ -93,12 +97,15 @@ function performSetup() {
gcc \
tmux neovim \
eza bat fzf ripgrep fd jq gron \
hadolint \
git lazygit git-delta \
crane dive \
go sqlite \
stripe-cli restic
npm install -g @devcontainers/cli
npm install -g mjml
npm install -g jsonlint
popd > /dev/null
}

View File

@ -884,7 +884,7 @@ require('lazy').setup({
-- Here are some example plugins that I've included in the Kickstart repository.
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
--
-- require 'kickstart.plugins.debug',
require 'kickstart.plugins.debug',
-- require 'kickstart.plugins.indent_line',
require 'kickstart.plugins.lint',
require 'kickstart.plugins.autopairs',

View File

@ -7,5 +7,17 @@ return {
'kristijanhusak/vim-dadbod-ui',
'kristijanhusak/vim-dadbod-completion',
},
config = function() end,
config = function()
vim.api.nvim_create_autocmd('FileType', {
pattern = { 'sql', 'mysql', 'plsql' },
desc = 'Add dadbod-completion',
callback = function()
require('cmp').setup.buffer {
sources = {
{ name = 'vim-dadbod-completion' },
},
}
end,
})
end,
}

View File

@ -17,7 +17,7 @@ return {
require('focus').setup {}
local ignore_buftypes = { 'dbui' }
local ignore_filetypes = { 'dbui' }
local ignore_filetypes = { 'dbui', 'dapui_breakpoints', 'dapui_stacks', 'dapui_scopes', 'dap_repl', 'dapui_console' }
local augroup = vim.api.nvim_create_augroup('FocusDisable', { clear = true })
vim.api.nvim_create_autocmd('WinEnter', {

View File

@ -11,6 +11,7 @@ return {
dependencies = {
-- Creates a beautiful debugger UI
'rcarriga/nvim-dap-ui',
'theHamsta/nvim-dap-virtual-text',
-- Required dependency for nvim-dap-ui
'nvim-neotest/nvim-nio',
@ -82,13 +83,13 @@ return {
dap.listeners.before.event_terminated['dapui_config'] = dapui.close
dap.listeners.before.event_exited['dapui_config'] = dapui.close
-- Install golang specific config
require('dap-go').setup {
delve = {
-- On Windows delve must be run attached or it crashes.
-- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring
detached = vim.fn.has 'win32' == 0,
},
}
-- Golang debugging is handled by ray-x/go instead of the below config.
-- require('dap-go').setup {
-- delve = {
-- -- On Windows delve must be run attached or it crashes.
-- -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring
-- detached = vim.fn.has 'win32' == 0,
-- },
-- }
end,
}