Merge branch 'main' of github.com:elitherl/dotfiles

Makefile

@@ -21,7 +21,7 @@ POWERLEVEL_DIR := $(ZSH_CUSTOM_DIR)/themes/powerlevel10k
 TPM_REPO := https://github.com/tmux-plugins/tpm
 TPM_DIR := $(HOME)/.tmux/plugins/tpm
 
-.PHONY: all clean link unlink install uninstall packages
+.PHONY: all clean link unlink install uninstall pacman
 
 all: link install
 
@@ -35,7 +35,7 @@ unlink:
 	for link in $(SSH_TARGETS); do rm "$$link"; done
 	rmdir $(HOME)/.ssh/sockets
 
-install: packages $(ZSH_DIR) $(POWERLEVEL_DIR) $(ZSH_TARGETS) $(PACKER_DIR) $(TPM_DIR)
+install: $(ZSH_DIR) $(POWERLEVEL_DIR) $(ZSH_TARGETS) $(PACKER_DIR) $(TPM_DIR)
 	python3 -m pip list | grep -E "libtmux.*0\.16\.1" > /dev/null ||\
 		python3 -m pip install --user libtmux==0.16.1
 
@@ -43,7 +43,7 @@ uninstall:
 	rm -rf $(ZSH_DIR)
 	rm -rf $(PACKER_DIR)
 
-packages:
+pacman:
 	sort -h pkglist.txt -o pkglist.txt
 	pacman -T - < pkglist.txt ||\
 		sudo pacman --needed -S - < pkglist.txt

config/nvim/lua/config/feline.lua

@@ -442,6 +442,7 @@ require("feline").setup({
   force_inactive = {
     filetypes = {
       "NvimTree",
+      "Trouble",
       "packer",
       "dap-repl",
       "dapui_scopes",

config/nvim/lua/config/tabby.lua

@@ -156,7 +156,7 @@ vim.api.nvim_create_autocmd({ "SessionLoadPost", "ColorScheme" }, {
 ----------------------------------------------------------------------------------------------------
 -- Feline
 
-local filename = require("tabby.filename")
+local filename = require("tabby.module.filename")
 
 local cwd = function()
   return "  " .. vim.fn.fnamemodify(vim.fn.getcwd(), ":t") .. " "

config/wezterm/wezterm.lua

@@ -1,4 +1,5 @@
 return {
+    font_size = 14,
     disable_default_key_bindings = true,
     window_background_opacity = 0.95,
     color_scheme = "nightfox",

home/zprofile

@@ -1,6 +1,8 @@
-export PYENV_ROOT="$HOME/.pyenv"
-export PATH="$PYENV_ROOT/bin:$PATH"
-eval "$(pyenv init --path)"
+command -v pyenv && {
+    export PYENV_ROOT="$HOME/.pyenv"
+    echo $PATH | grep -i pyenv > /dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
+    eval "$(pyenv init --path)"
+}
 
 if [[ -e $HOME/.ssh/id_ed25519 ]]
 then