[bash] Add __git_branch to PROMPT_COMMAND

alacritty/.config/alacritty/alacritty.toml

@@ -1,7 +1,7 @@
 [window]
 startup_mode = "Maximized"
 opacity = 1
-dynamic_padding = true
+dynamic_padding = false
 
 [font]
 normal.family = "Iosevka"

bash/.bashrc

@@ -17,6 +17,7 @@ alias plasma='/usr/lib/plasma-dbus-run-session-if-needed /usr/bin/startplasma-wa
 alias yt-mp3='yt-dlp --output "%(artist)s - %(title)s.%(ext)s" --extract-audio --embed-metadata --embed-thumbnail --audio-format mp3 --audio-quality 0'
 alias yt-mp4='yt-dlp --format "bv*[ext=mp4]+ba[ext=m4a]/b[ext=mp4]"'
 alias lg='looking-glass-client -s'
+alias grub-update='sudo grub-mkconfig -o /boot/grub/grub.cfg'
 
 # Environment variables
 export PATH="$PATH:$HOME/.local/bin"
@@ -24,9 +25,17 @@ export PATH="$PATH:$HOME/.local/bin"
 # Theme
 BLUE="\[\e[0;34m\]"
 RED="\[\e[0;91m\]"
+YELLOW="\e[0;33m"
 RESET="\[\e[0m\]"
 
-PS1="[\u@$RED\h$RESET \w]\$$RESET "
+__git_branch() {
+    local branch="$(git branch --show-current 2>/dev/null)"
+    if [[ -n "$branch" ]]; then
+        echo " $YELLOW$branch$RESET"
+    fi
+}
+
+PROMPT_COMMAND='PS1="[\u@$RED\h$RESET \w$(__git_branch)]\$$RESET "'
 
 # Setup zoxide
 eval "$(zoxide init --cmd cd bash)"

neovim/.config/nvim/init.lua

@@ -60,10 +60,6 @@ map("n", "<leader>dm", ":delmarks!<CR>")
 map("n", "<leader>x", ":!chmod +x %<CR>")
 map("n", "<leader>cd", ":cd %:h | pwd<CR>")
 
--- Move through quick fixes
-map("n", "<C-j>", ":cnext<CR>")
-map("n", "<C-k>", ":cprev<CR>")
-
 -- Tabs
 map("n", "<leader>tt", ":tabnew<CR>")
 map("n", "<leader>tw", ":tabclose<CR>")
@@ -73,8 +69,8 @@ map("n", "<leader>tf", ":tabfirst<CR>")
 map("n", "<leader>tl", ":tablast<CR>")
 
 -- Buffers
-map("n", "<leader>bc", ":enew<CR>")
-map("n", "<leader>bd", ":bdelete<CR>")
+map("n", "<leader>n", ":enew<CR>")
+map("n", "<leader>db", ":bdelete<CR>")
 map("n", "<TAB>", ":bnext<CR>")
 map("n", "<S-TAB>", ":bprevious<CR>")
 map("n", "<leader>\\", ":buffer term<CR>")
@@ -91,11 +87,21 @@ map("v", "K", ":move '<-2<CR>gv=gv")
 -- Run last command in terminal
 map("n", "<leader>r", ":buffer term<CR>i<Up><CR><C-\\><C-n>")
 
+-- Window movement
+map("n", "<M-h>", "<C-w>h")
+map("n", "<M-j>", "<C-w>j")
+map("n", "<M-k>", "<C-w>k")
+map("n", "<M-l>", "<C-w>l")
+map("t", "<M-h>", "<cmd>wincmd h<CR>")
+map("t", "<M-j>", "<cmd>wincmd j<CR>")
+map("t", "<M-k>", "<cmd>wincmd k<CR>")
+map("t", "<M-l>", "<cmd>wincmd l<CR>")
+
 -- Window resizing
-map("n", "<C-Up>", "<cmd>resize -2<CR>")
-map("n", "<C-Down>", "<cmd>resize +2<CR>")
-map("n", "<C-Left>", "<cmd>vertical resize -2<CR>")
-map("n", "<C-Right>", "<cmd>resize +2<CR>")
+map("n", "<M-Up>", "<cmd>resize -2<CR>")
+map("n", "<M-Down>", "<cmd>resize +2<CR>")
+map("n", "<M-Left>", "<cmd>vertical resize -2<CR>")
+map("n", "<M-Right>", "<cmd>vertical resize +2<CR>")
 
 -- Listchars
 local listchars = {
@@ -174,16 +180,23 @@ require("lazy").setup({
 
     -- Git integration
     { "tpope/vim-fugitive" },
-    { "lewis6991/gitsigns.nvim", opts = {} }
+    { "lewis6991/gitsigns.nvim", opts = {} },
+
+    -- Text aligning
+    { "Vonr/align.nvim", branch = "v2" }
 })
 
 -- Plugin keymaps
 map("n", "<leader>f", ":Pick files<CR>")
+map("n", "<leader>b", ":Pick buffers<CR>")
 map("n", "<leader>u", ":UndotreeToggle<CR>")
 map("n", "<leader>gs", ":Git<CR>")
 map("n", "<leader>gt", ":Gitsigns toggle_signs<CR>")
 map("n", "<leader>gp", ":Gitsigns preview_hunk<CR>")
 map("n", "<leader>gb", ":Gitsigns toggle_current_line_blame<CR>")
+map("x", "<leader>a", function()
+    require("align").align_to_string({ preview = true, regex = true })
+end)
 
 -- Colorscheme
 cmd.colorscheme("gruber-darker")

ssh/.ssh/config

@@ -1,5 +1 @@
-ServerAliveInterval 60
-
-Host lampone
-    Hostname vinco.undo.it
-    User pi
+ServerAliveInterval 30

tmux/.tmux.conf

@@ -4,6 +4,7 @@ set-window-option -g mode-keys vi
 
 bind-key -n C-t set-option -g status
 
+set-option -a terminal-features "alacritty:RGB"
 
 # https://github.com/sbernheim4/dotfiles/blob/master/tmux/.tmux.conf