dotfiles

commit b8bb19620ba0e87f34f9eb71c134a18a38093435
parent 0ea62b94c4cf2adebb9b5ab8acbd00276fcbd38d
Author: Szymon Mikulicz <szymon.mikulicz@posteo.net>
Date:   Mon, 20 Apr 2026 23:37:35 +0200

Merge branch 'main' of git.sr.ht:~ashymad/dotfiles

Diffstat:
M
i3status-rust/.config/i3status-rust/config.toml
 | 
9
++++++---
M
mlterm/.mlterm/main
 | 
13
++++++-------
M
scripts/.local/bin/g
 | 
1
+
M
zsh/.zshenv
 | 
18
++++++++++++++++--

4 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/i3status-rust/.config/i3status-rust/config.toml b/i3status-rust/.config/i3status-rust/config.toml
@@ -8,9 +8,12 @@ idle_fg = "#abcdef"
 
 [icons]
 icons = "awesome4"
-[icons.overrides]
-bat = ["|E|", "|_|", "|=|", "|F|"]
-bat_charging = "|^| "
+
+[[block]]
+block = "music"
+
+[[block]]
+block = "battery"
 
 [[block]]
 block = "cpu"
diff --git a/mlterm/.mlterm/main b/mlterm/.mlterm/main
@@ -1,20 +1,19 @@
 use_multi_column_char = true
 mod_meta_mode=esc
 use_ot_layout = true
-use_dynamic_comb = false
 use_combining = true
 use_anti_alias = true
 use_scrollbar = false
-depth=32
+depth = 32
 vt_color_mode = true
-alpha=200
+alpha = 200
 termtype = xterm-256color
 borderless = true
 use_variable_column_width = true
 fontsize = 11
 
-fg_color=#e0def4
-bg_color=#232136
+fg_color = #e0def4
+bg_color = #232136
 
-cursor_bg_color=#56526e
-cursor_fg_color=#e0def4
+cursor_bg_color = #56526e
+cursor_fg_color = #e0def4
diff --git a/scripts/.local/bin/g b/scripts/.local/bin/g
@@ -5,6 +5,7 @@ a)    sub="add" ;;
 bi)   sub="bisect" ;;
 b|br) sub="branch" ;;
 cl)   sub="clone" ;;
+cn)   sub="clean" ;;
 c|co) sub="commit" ;;
 d)    sub="diff" ;;
 f)    sub="fetch" ;;
diff --git a/zsh/.zshenv b/zsh/.zshenv
@@ -1,7 +1,21 @@
 skip_global_compinit=1
 export PATH="$HOME/.local/bin:$HOME/.usr/local/bin:$PATH"
-export EDITOR=nvim
-export SUDO_EDITOR=nvim
+
+export MISE_Found="$(which mise &>/dev/null; echo $?)"
+tools=( 'vivid' 'nvim' )
+declare -A tool_paths
+
+for tool in "${tools[@]}"; do
+    if [[ $MISE_Found == 0 ]] && tool_path="$(mise x -- which $tool)"; then
+        tool_paths[$tool]="$tool_path"
+    elif tool_path="$(which $tool)"; then
+        tool_paths[$tool]="$tool_path"
+    fi
+done
+
+[ -n ${tool_paths[nvim]} ] && export EDITOR="${tool_paths[nvim]}" && export SUDO_EDITOR="$EDITOR"
+[ -n ${tool_paths[vivid]} ] && export LS_COLORS="$(${tool_paths[vivid]} generate rose-pine-moon)"
+
 export PERL5LIB="$HOME/.usr/local/lib/perl5/"
 export XDG_DATA_DIRS="$XDG_DATA_DIRS:$HOME/.usr/local/share"
 export PYTHONPATH="$HOME/.usr/local/lib/python3/dist-packages"