diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua index 9d94255..3b2cab9 100644 --- a/.config/wezterm/wezterm.lua +++ b/.config/wezterm/wezterm.lua @@ -2,12 +2,15 @@ local wezterm = require("wezterm") return { -- window_background_opacity = 1, - window_background_opacity = 1, + window_background_opacity = 0.95, + macos_window_background_blur = 10, + window_decorations = "RESIZE", color_scheme = "Catppuccin Mocha", font = wezterm.font("Iosevka NFP", { weight = "DemiBold", stretch = "Normal", style = "Normal" }), font_size = 14, freetype_load_target = "Light", - freetype_render_target = "Normal", + freetype_load_flags = "DEFAULT", + freetype_render_target = "Light", hide_tab_bar_if_only_one_tab = true, inactive_pane_hsb = { hue = 5.0, diff --git a/.config/zsh/fzf-tab.zsh b/.config/zsh/fzf-tab.zsh index a9504b1..74fcbdf 100644 --- a/.config/zsh/fzf-tab.zsh +++ b/.config/zsh/fzf-tab.zsh @@ -7,3 +7,5 @@ zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS} zstyle ':completion:*' menu no zstyle ':fzf-tab:complete:cd:*' fzf-preview 'eza -1 --color=always $realpath' zstyle ':fzf-tab:*' switch-group '<' '>' + +LESSOPEN="|/opt/homebrew/bin/lesspipe.sh %s"; export LESSOPEN diff --git a/.config/zsh/pager.zsh b/.config/zsh/pager.zsh index d4048e3..f5bd1b3 100644 --- a/.config/zsh/pager.zsh +++ b/.config/zsh/pager.zsh @@ -15,7 +15,7 @@ function p () { } alias pl="p -l" -alias jqp="jq . | p -l json" -alias yqp="yq . | p -l yaml" +# alias jqp="jq . | p -l json" +#alias yqp="yq . | p -l yaml" alias pjq="jq . | p -l json" alias pyq="yq . | p -l yaml" diff --git a/.config/zsh/zoxide.zsh b/.config/zsh/zoxide.zsh new file mode 100644 index 0000000..786b78c --- /dev/null +++ b/.config/zsh/zoxide.zsh @@ -0,0 +1 @@ +alias cd=z diff --git a/.gitconfig##template b/.gitconfig##template index 92bd2e1..b7988c2 100644 --- a/.gitconfig##template +++ b/.gitconfig##template @@ -35,6 +35,8 @@ [alias] mdr = merge --no-commit --no-ff + mom = merge --no-edit origin/main + moma = merge --no-edit origin/master dlb = "dead-local-branches" ddlb = "delete-dead-local-branches" fdlb = "force-delete-dead-local-branches"