diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg index 54901cc..ee72315 100644 --- a/ansible/ansible.cfg +++ b/ansible/ansible.cfg @@ -161,7 +161,7 @@ home=~/.config/ansible ;bin_ansible_callbacks=False # (tmppath) Temporary directory for Ansible to use on the controller. -local_tmp=~/.local/ansible/tmp +local_tmp=~/.local/share/ansible/tmp # (list) List of logger names to filter out of the log file ;log_filter= @@ -274,7 +274,7 @@ vault_identity=michael # (path) The vault password file to use. Equivalent to --vault-password-file or --vault-id # If executable, it will be run and the resulting stdout will be used as the password. -vault_password_file=~/.local/share/scripts/vault-gopass +vault_password_file=~/.local/share/scripts/vault-gopass-client # (integer) Sets the default verbosity, equivalent to the number of ``-v`` passed in the command line. ;verbosity=0 diff --git a/wezterm/wezterm.lua b/wezterm/wezterm.lua index 9de53b5..b0b74b0 100644 --- a/wezterm/wezterm.lua +++ b/wezterm/wezterm.lua @@ -1,8 +1,8 @@ -local wezterm = require('wezterm') +local wezterm = require("wezterm") local config = {} if wezterm.config_builder then - config = wezterm.config_builder() + config = wezterm.config_builder() end --config.color_scheme = 'rose-pine' @@ -12,28 +12,27 @@ end -- background = "#131111" -- } -config.color_scheme = 'Catppuccin Mocha' - +config.color_scheme = "Catppuccin Mocha" -- Font -config.font = wezterm.font_with_fallback { - 'JetBrains Mono', - 'Inconsolata Nerd Font Mono', -} +config.font = wezterm.font_with_fallback({ + "JetBrains Mono", + "Inconsolata Nerd Font Mono", +}) config.font_size = 16.0 -- Window config.adjust_window_size_when_changing_font_size = false config.enable_scroll_bar = false config.initial_cols = 150 -config.initial_rows= 80 +config.initial_rows = 80 config.window_padding = { - left = 5, - right = 5, - top = 0, - bottom = 0 + left = 10, + right = 5, + top = 0, + bottom = 0, } -config.window_close_confirmation = 'NeverPrompt' +config.window_close_confirmation = "NeverPrompt" --config.window_decorations = 'TITLE' -- Tab Bar diff --git a/zsh/config/.zshrc b/zsh/config/.zshrc index 85d35a4..0b84f0e 100755 --- a/zsh/config/.zshrc +++ b/zsh/config/.zshrc @@ -124,9 +124,6 @@ zsh_add_plugin "zsh-users/zsh-autosuggestions" zsh_add_plugin "zsh-users/zsh-syntax-highlighting" zsh_add_plugin "Aloxaf/fzf-tab" -# Use fzf in history / search contexts. -eval "$(fzf --zsh)" - #------------------------------ completions ------------------------------ # case insensitive path-completion
 zstyle ':completion:*' matcher-list 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} l:|=* r:|=*' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} l:|=* r:|=*' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} l:|=* r:|=*'
 @@ -202,6 +199,10 @@ alias nvim-kickstart='NVIM_APPNAME=kickstart nvim' # set neovim to use kickst alias nvim-lazy='NVIM_APPNAME=lazy nvim' # set neovim to use lazy config. alias wget="wget --hsts-file=$XDG_DATA_HOME/wget-hsts" # set wget history location. +# NOTE: This needs to stay near the bottom, or it doesn't work properly. +# Use fzf in history / search contexts. +source <(fzf --zsh) + #------------------------------ local configs ------------------------------ # TODO: The .zshrc-local is a legacy location and should be removed once my machines are