diff --git a/config/asdf/cargo-packages b/config/asdf/cargo-packages index 24438df..a40c009 100644 --- a/config/asdf/cargo-packages +++ b/config/asdf/cargo-packages @@ -23,3 +23,5 @@ bottom eza // Tmux Sessionizer: A tool for opening git repositories as tmux sessions tmux-sessionizer +// zoxide, a smarter cd command +zoxide diff --git a/config/asdf/golang-packages b/config/asdf/golang-packages index fc0b055..55d6919 100644 --- a/config/asdf/golang-packages +++ b/config/asdf/golang-packages @@ -23,4 +23,5 @@ github.com/junegunn/fzf@latest golang.org/x/tools/gopls@latest // A language for writing HTML user interfaces in Go. github.com/a-h/templ/cmd/templ@latest - +// A terminal session manager +github.com/joshmedeski/sesh/v2@latest diff --git a/config/exports b/config/exports index a84f500..aaea2da 100755 --- a/config/exports +++ b/config/exports @@ -458,5 +458,7 @@ export SQLITE_HISTORY="${XDG_CACHE_HOME}/sqlite_history" [ -f "$XDG_CONFIG_HOME/exports-secret" ] && source "$XDG_CONFIG_HOME/exports-secret" [ -f "$XDG_CONFIG_HOME/exports-local" ] && source "$XDG_CONFIG_HOME/exports-local" +# shellcheck source=./exports-lakka [ -f "$XDG_CONFIG_HOME/exports-$(hostname)" ] && source "$XDG_CONFIG_HOME/exports-$(hostname)" +# shellcheck source=./exports-lakka-secret [ -f "$XDG_CONFIG_HOME/exports-$(hostname)-secret" ] && source "$XDG_CONFIG_HOME/exports-$(hostname)-secret" diff --git a/config/fish/alias.fish b/config/fish/alias.fish index 47488f8..46c76ee 100644 --- a/config/fish/alias.fish +++ b/config/fish/alias.fish @@ -84,28 +84,5 @@ function configure_tide --description 'Configure tide with the lean style and my --transient=Yes end -# Abbreviations for git -abbr --add gau git add -u -abbr --add gaa git add -A -abbr --add gcv git commit -v - -# Abbreviations for composer -abbr --add c composer -abbr --add cu composer update -abbr --add ci composer install - -# Abbreviations for php artisan -abbr --add .pa php artisan -abbr --add .paf php artisan fresh -abbr --add .pam php artisan migrate -abbr --add .pams php artisan migrate --seed -abbr --add .pat php artisan test - -# Abbreviations for npm -abbr --add .n npm -abbr --add .nt npm test --if-present -abbr --add .nb npm run build --if-present -abbr --add .ns npm run start --if-present - # Random abbreviations abbr --add stats onefetch --nerd-fonts --true-color never diff --git a/config/fish/config.fish b/config/fish/config.fish index d5f769c..c15ffee 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -26,6 +26,9 @@ if status is-interactive # type -q fnm; and fnm env --use-on-cd --shell fish | source type -q load_nvm; and load_nvm > /dev/stderr + # Intialize other tools if available + type -q zoxide; and zoxide init fish | source + # Start tmux if not already running and not in SSH open-tmux # defined in functions/open-tmux.fish end diff --git a/config/fish/exports.fish b/config/fish/exports.fish index 6166d33..b428a04 100644 --- a/config/fish/exports.fish +++ b/config/fish/exports.fish @@ -96,7 +96,7 @@ set -q FNM_RESOLVE_ENGINES; or set -x FNM_RESOLVE_ENGINES true # fzf configuration set -q FZF_BASE; or set -x FZF_BASE "$XDG_CONFIG_HOME/fzf" -set -q FZF_DEFAULT_OPTS; or set -x FZF_DEFAULT_OPTS '--height 40% --tmux bottom,40% --layout reverse --border top' +set -q FZF_DEFAULT_OPTS; or set -x FZF_DEFAULT_OPTS '--height 40% --tmux bottom,70% --layout reverse --border top' # GnuPG configuration set -q GNUPGHOME; or set -x GNUPGHOME "$XDG_DATA_HOME/gnupg" @@ -160,6 +160,10 @@ set -q TMS_CONFIG_FILE; or set -x TMS_CONFIG_FILE "$XDG_CONFIG_HOME/tms/config.t set -q WAKATIME_HOME; or set -x WAKATIME_HOME "$XDG_STATE_HOME/wakatime" x-dc "$WAKATIME_HOME" +# Zoxide configuration +set -q _ZO_DATA_DIR; or set -x _ZO_DATA_DIR "$XDG_DATA_HOME/zoxide" +set -q _ZO_EXCLUDE_DIRS; or set -x _ZO_EXCLUDE_DIRS "$XDG_DATA_HOME" + # Miscellaneous configuration set -q CHEAT_USE_FZF; or set -x CHEAT_USE_FZF true set -q SQLITE_HISTORY; or set -x SQLITE_HISTORY "$XDG_CACHE_HOME/sqlite/sqlite_history" @@ -182,6 +186,6 @@ set -gx tide_prompt_transient_enabled true set -gx tide_prompt_add_newline_before true set -gx tide_prompt_min_cols 34 set -gx tide_prompt_pad_items false -set -gx tide_left_prompt_items context pwd git node python rustc java php pulumi ruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir zig newline character +set -gx tide_left_prompt_items context pwd git node python rustc java php pulumi ruby go gcloud newline character set -gx tide_right_prompt_items status jobs direnv set -gx tide_context_hostname_parts 1 diff --git a/config/task/taskrc b/config/task/taskrc index 78a2a29..427b937 100644 --- a/config/task/taskrc +++ b/config/task/taskrc @@ -79,4 +79,3 @@ taskd.ca=$XDG_DATA_HOME/task/ca.cert.pem taskd.server=inthe.am:53589 taskd.credentials=inthe_am/ivuorinen/b99a4970-94fb-4fb8-b9fe-e1a8140dd44d taskd.trust=strict -