From 44346ef468df924c7ffbb6f2b2ad5cffabb2ff21 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sat, 11 Feb 2023 10:02:36 +0000 Subject: [PATCH 1/3] Rename packages to pacman --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 910cd84a..cfb615a7 100644 --- a/Makefile +++ b/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 From 1920de4a662d5765c03b328c3d88aa8554daf449 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sat, 11 Feb 2023 10:05:00 +0000 Subject: [PATCH 2/3] Check for pyenv before initialising --- home/zprofile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/home/zprofile b/home/zprofile index 285c32d8..4f7124b6 100644 --- a/home/zprofile +++ b/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 From 46c4460d92b16b7500051840cd1c60c85670229a Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sat, 11 Feb 2023 10:16:31 +0000 Subject: [PATCH 3/3] Add font size to wezterm, fix some depracation in tabby --- config/nvim/lua/config/feline.lua | 1 + config/nvim/lua/config/tabby.lua | 2 +- config/wezterm/wezterm.lua | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/nvim/lua/config/feline.lua b/config/nvim/lua/config/feline.lua index 34c53250..76c04738 100644 --- a/config/nvim/lua/config/feline.lua +++ b/config/nvim/lua/config/feline.lua @@ -442,6 +442,7 @@ require("feline").setup({ force_inactive = { filetypes = { "NvimTree", + "Trouble", "packer", "dap-repl", "dapui_scopes", diff --git a/config/nvim/lua/config/tabby.lua b/config/nvim/lua/config/tabby.lua index 5a49254c..a7154058 100644 --- a/config/nvim/lua/config/tabby.lua +++ b/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") .. " " diff --git a/config/wezterm/wezterm.lua b/config/wezterm/wezterm.lua index 0cad3010..caf7154c 100644 --- a/config/wezterm/wezterm.lua +++ b/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",