Setup neovim, alacritty and fish for dms

This commit is contained in:
2026-05-05 08:28:42 +02:00
parent 87bc320fd7
commit 9b1106c639
6 changed files with 73 additions and 66 deletions
+2 -4
View File
@@ -1,10 +1,8 @@
[general]
import = [
"~/.config/alacritty/dank-theme.toml"
]
import = [ "~/.config/alacritty/dank-theme.toml" ]
[font]
size = 12.5
size = 13
[font.normal]
family = "Hack Nerd Font"
+22 -22
View File
@@ -1,31 +1,31 @@
[colors.primary]
background = '#101418'
foreground = '#e0e2e8'
background = '#131412'
foreground = '#e4e2df'
[colors.selection]
text = '#e0e2e8'
background = '#084b72'
text = '#e4e2df'
background = '#404a3b'
[colors.cursor]
text = '#101418'
cursor = '#99ccfa'
text = '#131412'
cursor = '#bfcab7'
[colors.normal]
black = '#101418'
red = '#ff729d'
green = '#7dfa8d'
yellow = '#fff772'
blue = '#7eb9ed'
magenta = '#214c73'
cyan = '#99ccfa'
white = '#eff7ff'
black = '#131412'
red = '#e88068'
green = '#6bca65'
yellow = '#fcea71'
blue = '#b3bfaa'
magenta = '#545d4d'
cyan = '#bfcab7'
white = '#ccd4c7'
[colors.bright]
black = '#969ca2'
red = '#ff9fbc'
green = '#a5ffb1'
yellow = '#fffaa5'
blue = '#aad7ff'
magenta = '#b9deff'
cyan = '#d2e9ff'
white = '#f8fbff'
black = '#7d8379'
red = '#ffb19f'
green = '#a2f29d'
yellow = '#fff3a5'
blue = '#d3decc'
magenta = '#f5ffee'
cyan = '#f8fff4'
white = '#fbfff8'
+29 -26
View File
@@ -4,6 +4,8 @@
# Disable fish greeting
set -g fish_greeting
alias nvim='/usr/local/nvim_012/bin/nvim'
# Core settings
set -gx EDITOR nvim
set -gx VISUAL nvim
@@ -21,6 +23,9 @@ set -gx GOCACHE "$HOME/.go/cache"
set -gx GOROOT /usr/local/go
set -gx PATH /usr/local/go/bin $GOPATH/bin $PATH
# Direnv
direnv hook fish | source
# ==============================================================================
# FZF configuration
# ==============================================================================
@@ -191,32 +196,30 @@ set -g __fish_git_prompt_char_dirtystate '+'
set -g __fish_git_prompt_char_stagedstate '●'
set -g __fish_git_prompt_char_untrackedfiles ''
direnv hook fish | source
# Auto-attach to tmux on interactive shell start
if status is-interactive && not set -q TMUX
# Get all session names matching shell, shell-2, shell-3 etc
set sessions (tmux list-sessions -F '#S' 2>/dev/null)
# if status is-interactive && not set -q TMUX
# # Get all session names matching shell, shell-2, shell-3 etc
# set sessions (tmux list-sessions -F '#S' 2>/dev/null)
if test (count $sessions) -eq 0
tmux new-session -s shell
else
# Check if any shell session is unattached and attach it
set target (tmux list-sessions -F '#{session_name} #{session_attached}' 2>/dev/null \
| grep '^shell' | grep ' 0$' | head -1 | awk '{print $1}')
# if test (count $sessions) -eq 0
# tmux new-session -s shell
# else
# # Check if any shell session is unattached and attach it
# set target (tmux list-sessions -F '#{session_name} #{session_attached}' 2>/dev/null \
# | grep '^shell' | grep ' 0$' | head -1 | awk '{print $1}')
if test -n "$target"
tmux attach -t $target
else
# All shell sessions attached — find next number
set nums 1
for s in $sessions
if string match -rq '^shell-(\d+)$' $s
set nums $nums (string replace 'shell-' '' $s)
end
end
set next (math (string join \n $nums | sort -n | tail -1) + 1)
tmux new-session -s shell-$next
end
end
end
# if test -n "$target"
# tmux attach -t $target
# else
# # All shell sessions attached — find next number
# set nums 1
# for s in $sessions
# if string match -rq '^shell-(\d+)$' $s
# set nums $nums (string replace 'shell-' '' $s)
# end
# end
# set next (math (string join \n $nums | sort -n | tail -1) + 1)
# tmux new-session -s shell-$next
# end
# end
# end
+1 -1
View File
@@ -42,6 +42,6 @@ map("v", "<Tab>" , ">gv")
map("n", "gd", ":lua vim.lsp.buf.definition()<CR>")
map("n", "<leader>p", ":b#<CR>")
map("n", "<leader>e", ":Ex<CR>")
map("n", "<leader>c", ":bd<CR>")
map("n", "<leader>x", ":bd<CR>")
require("plugins")
+18 -7
View File
@@ -2,12 +2,14 @@ vim.pack.add({
{ src = "https://github.com/ibhagwan/fzf-lua" },
{ src = "https://github.com/tribela/transparent.nvim" },
{ src = "https://github.com/neovim/nvim-lspconfig" },
{ src = "https://github.com/nvim-treesitter/nvim-treesitter", version = "main" },
{ src="https://github.com/folke/trouble.nvim" },
{ src="https://github.com/stevearc/oil.nvim" },
{ src="https://github.com/akinsho/toggleterm.nvim" },
{ src="https://github.com/romus204/tree-sitter-manager.nvim" }
})
require("tree-sitter-manager").setup({})
local map = vim.keymap.set
local acmd = vim.api.nvim_create_autocmd
@@ -20,16 +22,16 @@ acmd('FileType', {
})
require("fzf-lua").setup()
map("n", "<leader>ff", ":lua FzfLua.files()<CR>")
map("n", "<leader>fo", ":lua FzfLua.buffers()<CR>")
map("n", "<leader>sp", ":lua FzfLua.grep_project()<CR>")
map("n", "<leader>sf", ":lua FzfLua.grep_curbuf()<CR>")
map("n", "<leader>f", ":lua FzfLua.files()<CR>")
map("n", "<leader>o", ":lua FzfLua.buffers()<CR>")
map("n", "<leader>ss", ":lua FzfLua.grep_project()<CR>")
map("n", "<leader>sb", ":lua FzfLua.grep_curbuf()<CR>")
map("n", "<leader>sw", ":lua FzfLua.grep_cword()<CR>")
map("n", "<leader>sh", ":lua FzfLua.help_tags()<CR>")
require("trouble").setup()
map("n", "<leader>pa", ":lua FzfLua.lsp_code_actions()<CR>")
map('n', '<leader>pp', ":Trouble diagnostics toggle<CR>")
map("n", "<leader>ca", ":lua FzfLua.lsp_code_actions()<CR>")
map('n', '<leader>cd', ":Trouble diagnostics toggle<CR>")
require("oil").setup({
keymaps = {
@@ -59,3 +61,12 @@ require("toggleterm").setup({
})
map({"t","n"}, "<C-`>", function() require("toggleterm").toggle(1, nil, nil, "float") end)
map({"t","n"}, "<C-\\>", function() require("toggleterm").toggle(1, nil, nil, "vertical") end)
local Terminal = require('toggleterm.terminal').Terminal
local lazygit = Terminal:new({ cmd = "gitu", hidden = true, direction = "float", })
function _lazygit_toggle()
lazygit:toggle()
end
vim.api.nvim_set_keymap("n", "<leader>g", "<cmd>lua _lazygit_toggle()<CR>", {noremap = true, silent = true})