Browse Source

feat: updates

master
Tovi Jaeschke-Rogers 3 days ago
parent
commit
470004cbf5
12 changed files with 79 additions and 41 deletions
  1. +5
    -3
      .config/alacritty/alacritty.toml
  2. +2
    -1
      .config/nvim/lua/plugins/alpha.lua
  3. +14
    -0
      .config/nvim/lua/plugins/avante.lua
  4. +5
    -0
      .config/nvim/lua/plugins/blink.lua
  5. +1
    -1
      .config/nvim/lua/plugins/colorscheme.lua
  6. +19
    -0
      .config/nvim/lua/plugins/commentless.lua
  7. +22
    -0
      .config/nvim/lua/plugins/dadbod.lua
  8. +0
    -1
      .config/nvim/lua/plugins/flutter-tools.lua
  9. +1
    -1
      .config/zsh/.zprofile
  10. +4
    -0
      .config/zsh/.zshrc
  11. +5
    -0
      .luarc.json
  12. +1
    -34
      .tmux.conf

+ 5
- 3
.config/alacritty/alacritty.toml View File

@ -1,6 +1,3 @@
import = [
"~/.config/alacritty/themes/kanagawa_wave.toml"
]
[env] [env]
TERM = "xterm-256color" TERM = "xterm-256color"
@ -28,3 +25,8 @@ style = "Regular"
action = "SpawnNewInstance" action = "SpawnNewInstance"
key = "Return" key = "Return"
mods = "Control|Shift" mods = "Control|Shift"
[general]
import = [
"~/.config/alacritty/themes/kanagawa_wave.toml"
]

+ 2
- 1
.config/nvim/lua/plugins/alpha.lua View File

@ -2,6 +2,7 @@ return {
'goolord/alpha-nvim', 'goolord/alpha-nvim',
dependencies = { dependencies = {
'echasnovski/mini.icons', 'echasnovski/mini.icons',
'MaximilianLloyd/ascii.nvim',
}, },
config = function () config = function ()
local alpha = require("alpha") local alpha = require("alpha")
@ -18,7 +19,7 @@ return {
} }
-- Set the ASCII art -- Set the ASCII art
dashboard.section.header.val = neovim_lean
dashboard.section.header.val = require('ascii').get_random('text', 'slogons')
-- Remove other sections (buttons, footer, etc.) to show only the ASCII art -- Remove other sections (buttons, footer, etc.) to show only the ASCII art
dashboard.section.buttons.val = {} dashboard.section.buttons.val = {}


+ 14
- 0
.config/nvim/lua/plugins/avante.lua View File

@ -2,7 +2,21 @@ return {
"yetone/avante.nvim", "yetone/avante.nvim",
event = "VeryLazy", event = "VeryLazy",
version = false, version = false,
enabled = false,
keys = {
"<leader>A",
"<cmd>AvanteToggle<cr>"
},
opts = { opts = {
behaviour = {
auto_suggestions = false, -- Experimental stage
auto_set_highlight_group = true,
auto_set_keymaps = false,
auto_apply_diff_after_generation = false,
support_paste_from_clipboard = false,
minimize_diff = true, -- Whether to remove unchanged lines when applying a code block
enable_token_counting = true, -- Whether to enable token counting. Default to true.
},
}, },
build = "make", build = "make",
dependencies = { dependencies = {


+ 5
- 0
.config/nvim/lua/plugins/blink.lua View File

@ -4,6 +4,7 @@ return {
dependencies = { dependencies = {
'rafamadriz/friendly-snippets', 'rafamadriz/friendly-snippets',
'mikavilpas/blink-ripgrep.nvim', 'mikavilpas/blink-ripgrep.nvim',
{ 'kristijanhusak/vim-dadbod-completion', ft = { 'sql', 'mysql', 'plsql' }, lazy = true },
}, },
version = '1.*', version = '1.*',
@ -38,8 +39,12 @@ return {
'path', 'path',
'snippets', 'snippets',
'buffer', 'buffer',
'dadbod',
}, },
providers = {
dadbod = { name = "Dadbod", module = "vim_dadbod_completion.blink" },
},
}, },
signature = { signature = {


+ 1
- 1
.config/nvim/lua/plugins/colorscheme.lua View File

@ -29,6 +29,6 @@ return {
}) })
-- setup must be called before loading -- setup must be called before loading
vim.cmd("colorscheme kanagawa")
require("kanagawa").load("wave")
end, end,
} }

+ 19
- 0
.config/nvim/lua/plugins/commentless.lua View File

@ -0,0 +1,19 @@
return {
"soemre/commentless.nvim",
cmd = "Commentless",
keys = {
{
"<leader>/",
function()
require("commentless").toggle()
end,
desc = "Toggle Comments",
},
},
dependencies = {
"nvim-treesitter/nvim-treesitter",
},
opts = {
-- Customize Configuration
},
}

+ 22
- 0
.config/nvim/lua/plugins/dadbod.lua View File

@ -0,0 +1,22 @@
return {
'kristijanhusak/vim-dadbod-ui',
dependencies = {
{ 'tpope/vim-dadbod', lazy = true },
{ 'kristijanhusak/vim-dadbod-completion', ft = { 'sql', 'mysql', 'plsql' }, lazy = true }, -- Optional
},
cmd = {
'DBUI',
'DBUIToggle',
'DBUIAddConnection',
'DBUIFindBuffer',
},
init = function()
-- Your DBUI configuration
vim.g.db_ui_use_nerd_fonts = 1
vim.g.db_ui_auto_execute_table_helpers = 1
vim.g.dbs = {
dev = 'mariadb://jack:secret@localhost:33061/jack?ssl=false',
}
end,
}

+ 0
- 1
.config/nvim/lua/plugins/flutter-tools.lua View File

@ -3,6 +3,5 @@ return {
lazy = false, lazy = false,
dependencies = { dependencies = {
'nvim-lua/plenary.nvim', 'nvim-lua/plenary.nvim',
'stevearc/dressing.nvim',
}, },
} }

+ 1
- 1
.config/zsh/.zprofile View File

@ -1,3 +1,3 @@
if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
if [[ -z "$DISPLAY" ]] && [[ "$XDG_VTNR" = 1 ]] && [[ $(tty) = /dev/tty1 ]]; then
exec startx exec startx
fi fi

+ 4
- 0
.config/zsh/.zshrc View File

@ -3,6 +3,8 @@
# Speed debugging # Speed debugging
# zmodload zsh/zprof # zmodload zsh/zprof
stty -ixon
if [[ "$(locale LC_CTYPE)" == "UTF-8" ]]; then if [[ "$(locale LC_CTYPE)" == "UTF-8" ]]; then
setopt COMBINING_CHARS setopt COMBINING_CHARS
fi fi
@ -128,5 +130,7 @@ export PATH=~/.config/composer/vendor/bin:$PATH
export PATH="/opt/flutter/bin:$PATH" export PATH="/opt/flutter/bin:$PATH"
export PATH="$PATH":"$HOME/.pub-cache/bin"
# Speed debugging # Speed debugging
# zprof # zprof

+ 5
- 0
.luarc.json View File

@ -0,0 +1,5 @@
{
"diagnostics.globals": [
"vim"
]
}

+ 1
- 34
.tmux.conf View File

@ -70,29 +70,6 @@ bind S command-prompt -p "New Session:" "new-session -A -s '%%'"
bind-key -r f run-shell "tmux neww ~/.local/bin/tmux-sessionizer" bind-key -r f run-shell "tmux neww ~/.local/bin/tmux-sessionizer"
# Flow colorscheme | Tmux
# https://github.com/0xstepit/flow.nvim
## Statusbar style
# set -g status-position top
# set -g status-right-length "100"
# set -g status-left-length "100"
# set -g status-style bg=#141A1F,fg=#3D4F5C
# set -g window-status-style fg=#3D4F5C,bg=#141A1F
# setw -g window-status-separator " "
# set -g window-status-current-style fg=colour198
# set -g window-status-format "(#I) #W"
# set -g window-status-current-format "(#I) #W"
# set -g status-left "#[fg=#0D0D0D,bg=#75BDF0] #S #[bg=#3D4F5C,fg=#75BDF0] #h #[bg=#141A1F] "
# set -g status-right "#[bg=#3D4F5C,fg=#75BDF0] %H:%M #[fg=#0D0D0D,bg=#75BDF0] %A %d. %b %Y "
#
# set -g message-command-style fg=#FF007C
# set -g message-style "fg=#FF007C, bg=#141A1F" # color used in the message popup.
#
# set -g mode-style "fg=#FF007C"
# ## Borders
# set -g pane-border-style "fg=#3D4F5C"
# set -g pane-active-border-style "fg=#3D4F5C"
# List of plugins # List of plugins
set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'tmux-plugins/tmux-sensible'
@ -103,17 +80,7 @@ set -g @plugin 'tmux-plugins/tmux-sensible'
set -g @plugin 'Nybkox/tmux-kanagawa' set -g @plugin 'Nybkox/tmux-kanagawa'
set -g @kanagawa-show-powerline true set -g @kanagawa-show-powerline true
set -g @kanagawa-theme 'wave' set -g @kanagawa-theme 'wave'
# set -g @plugin 'jibingeo/tmux-colors-ayu'
# set -g @plugin 'egel/tmux-gruvbox'
# set -g @tmux-gruvbox 'dark' # or 'light'
# set -g @plugin 'catppuccin/tmux'
# set -g @catppuccin_flavour 'mocha'
# set -g @catppuccin_status_left_separator ""
# set -g @catppuccin_window_middle_separator " "
# set -g @catppuccin_status_modules_right "application session directory date_time"
# set -g @kanagawa-ignore-window-colors true
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
run '~/.tmux/plugins/tpm/tpm' run '~/.tmux/plugins/tpm/tpm'

Loading…
Cancel
Save