From 24db65b6ed880b71fcdf8e35b0c930f39d658792 Mon Sep 17 00:00:00 2001 From: Jason Hilder Date: Thu, 11 Jun 2026 09:11:50 +0200 Subject: [PATCH] Who knows... --- config/alacritty/alacritty.toml | 92 +++++++++++++-------------------- config/fish/config.fish | 18 ++++++- config/nvim/init.lua | 56 ++++++++++++++++---- 3 files changed, 97 insertions(+), 69 deletions(-) diff --git a/config/alacritty/alacritty.toml b/config/alacritty/alacritty.toml index c6f35e1..6e6c6d4 100644 --- a/config/alacritty/alacritty.toml +++ b/config/alacritty/alacritty.toml @@ -1,8 +1,7 @@ [general] -# import = [ "~/.config/alacritty/dank-theme.toml" ] [font] -size = 12.5 +size = 13 offset = { x = 0, y = 3 } normal = { family = "JetBrainsMono Nerd Font", style = "Regular" } @@ -15,63 +14,42 @@ decorations = "None" style.shape = "Beam" style.blinking = "Always" -# THEME [colors.primary] -background = "#181818" -foreground = "#E4E4E4" - -[colors.cursor] -text = "#0e0e0e" -cursor = "#d4a943" - -[colors.vi_mode_cursor] -text = "#0e0e0e" -cursor = "#ebcb8b" - -[colors.selection] -text = "#dddddd" -background = "#47464c" - -[colors.search.matches] -foreground = "#dddddd" -background = "#47464c" - -[colors.search.focused_match] -foreground = "#131314" -background = "#b8943a" - -[colors.footer_bar] -foreground = "#dddddd" -background = "#131314" - -[colors.hints.start] -foreground = "#131314" -background = "#ebcb8b" - -[colors.hints.end] -foreground = "#131314" -background = "#b8943a" - -[colors.line_indicator] -foreground = "None" -background = "None" +background = '#141415' +foreground = '#cdcdcd' [colors.normal] -black = "#131314" -red = "#b38f8f" -green = "#a3be8c" -yellow = "#ebcb8b" -blue = "#6c7a8a" -magenta = "#b3a3d3" -cyan = "#6ac6f2" -white = "#dddddd" +black = '#252530' +red = '#d8647e' +green = '#7fa563' +yellow = '#f3be7c' +blue = '#6e94b2' +magenta = '#bb9dbd' +cyan = '#aeaed1' +white = '#cdcdcd' [colors.bright] -black = "#444444" -red = "#d9a6a6" -green = "#a3be8c" -yellow = "#fbe4a8" -blue = "#8fa3b3" -magenta = "#d3a3d3" -cyan = "#8ac6f2" -white = "#ffffff" +black = '#606079' +red = '#e08398' +green = '#99b782' +yellow = '#f5cb96' +blue = '#8ba9c1' +magenta = '#c9b1ca' +cyan = '#bebeda' +white = '#d7d7d7' + +[colors.hints.start] +foreground = "CellBackground" +background = "CellForeground" + +[colors.hints.end] +foreground = "CellBackground" +background = "CellForeground" + +[colors.search.matches] +foreground = "CellBackground" +background = "CellForeground" + +[colors.search.focused_match] +foreground = "CellBackground" +background = '#f3be7c' diff --git a/config/fish/config.fish b/config/fish/config.fish index 8858ce4..826a753 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -61,7 +61,7 @@ alias ls='ls -lh --color=auto --group-directories-first' alias ll='ls -lAh --color=auto --group-directories-first' alias la='ls -la --color=auto --group-directories-first' alias l='ls -CF --color=auto' -alias tree='tree -C' +alias tree='tree --dirsfirst -C' # Safety aliases alias rm='rm -I --preserve-root' @@ -87,12 +87,14 @@ alias ldk='lazydocker' # Custom shortcuts alias reload='source ~/.config/fish/config.fish' +alias p='exec ~/.local/bin/project-select' alias prj='cd ~/Projects/ && ll' alias dots='cd ~/.dotfiles' alias dotman='bash ~/.dotfiles/install.sh' alias todo='cd ~/Todo/ && nvim index.md' alias myip='curl ipinfo.io/ip; echo ""' alias lspmake='bear -- make -B' +alias sub='subl . && exit' alias tc='tmux attach' alias td='tmux detach' alias db='lazysql' @@ -103,7 +105,19 @@ alias services-down='docker compose -f /home/jason/Documents/Compose/local-servi ## Basic project picker using mini sessions and neovim function pp - nvim -c "lua MiniSessions.select()" + set project ( + find ~/Projects -mindepth 1 -maxdepth 1 -type d | + awk -F/ '{print $NF "\t" $0}' | + fzf --with-nth=1 + ) + + if test -z "$project" + return + end + + set project (echo $project | cut -f2) + + cd $project && /usr/local/nvim_012/bin/nvim $project end # ============================================================================== diff --git a/config/nvim/init.lua b/config/nvim/init.lua index ef982af..24532dc 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,9 +1,10 @@ require("vim._core.ui2").enable({}) map = vim.keymap.set -vim.g.mapleader = " " vim.g.termguicolors = true - --- mini.basics sets defaults see plugin folder for more +vim.g.netrw_keepdir = 1 +vim.g.netrw_winsize = 30 +vim.g.netrw_browse_split = 4 +vim.o.nu = true vim.o.swapfile = false vim.o.winborder = "single" vim.o.winblend = 0 @@ -17,13 +18,15 @@ vim.o.clipboard = "unnamedplus" vim.o.foldmethod = "expr" vim.o.foldlevel = 99 vim.o.completeopt = "menuone,noselect,fuzzy,nosort" +vim.opt.listchars:append("tab:> ") vim.opt.shortmess:append("c") +vim.o.list = true +vim.o.undofile = true vim.o.undodir = os.getenv("HOME") .. "/.cache/nvim/undodir" - vim.cmd.colorscheme("retrobox") -vim.api.nvim_set_hl(0, "Normal", { bg = "#181818" }) -vim.api.nvim_set_hl(0, "NormalNC", { bg = "#181818" }) +vim.o.errorformat = "%f(%l:%c) %m,%-G%.%#" +-- ----------------------------- -- @BINDS -- ----------------------------- map("t", "", "") @@ -37,10 +40,45 @@ map("v", "J", ":m '>+1gv=gv") map("v", "K", ":m '<-2gv=gv") map("v", "", "" , ">gv") -map("n", "", ":find ") -map("n", "", ":Ex") +map("n", "", ":find ") +map("n", "", ":Lex") map("n", "", ":bd") +map("i", "", vim.lsp.buf.signature_help) +-- ----------------------------- +-- @PLUGINS +-- ----------------------------- +vim.pack.add({ + { src = 'https://github.com/ibhagwan/fzf-lua' }, + { src = 'https://github.com/neovim/nvim-lspconfig' }, + { src = 'https://github.com/echasnovski/mini.nvim' }, + { src = 'https://github.com/sheerun/vim-polyglot' }, + { src = 'https://github.com/romus204/tree-sitter-manager.nvim' }, + { src = 'https://github.com/xiyaowong/transparent.nvim' }, + { src = "https://github.com/vague-theme/vague.nvim" }, +}) + +require("mini.completion").setup() +require("tree-sitter-manager").setup() + +require('vague').setup({ transparent = true, }) +vim.cmd.colorscheme('vague') + +-- Lsp specific, uses nvim-lspconfigs with the below +vim.lsp.enable({ "gopls", "ols" }) +map("n", "gd", ":lua vim.lsp.buf.definition()") +map("n", "ld", ":lua vim.diagnostic.open_float()") +map("n", "lr", ":lua vim.lsp.buf.rename()") +map("n", "la", ":lua vim.lsp.buf.code_action()") + +require("fzf-lua").setup({}) +map("n", "", ":FzfLua files") +map("n", "", ":FzfLua buffers") +map("n", "", ":FzfLua diagnostics_workspace") +map("n", "", ":FzfLua live_grep") +map("n", "", ":FzfLua grep_curbuf") + +-- ----------------------------- -- @AUTOCMDS -- ----------------------------- -- Terminals should open with insert mode @@ -54,7 +92,6 @@ vim.api.nvim_create_autocmd({ "BufEnter", "TermEnter", "WinEnter" }, { end end }) - -- highlights yanked text vim.api.nvim_create_autocmd("TextYankPost", { callback = function() @@ -64,7 +101,6 @@ vim.api.nvim_create_autocmd("TextYankPost", { }) end, }) - -- removes trailing whitespace on save vim.api.nvim_create_autocmd("BufWritePre", { callback = function()