feat: migrate trivial aliases & funcs to abbrs

blahspam · Dec 27, 2024 · 961b87f · 961b87f
1 parent 49fcc5f
commit 961b87f
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 237 deletions.
diff --git a/dot_colima/default/colima.yaml b/dot_colima/default/colima.yaml
diff --git a/dot_config/fish/abbreviations.fish b/dot_config/fish/abbreviations.fish
@@ -6,8 +6,11 @@ abbr -a ... 'cd ../../'
 abbr -a .... 'cd ../../../'
 abbr -a ..... 'cd ../../../../'
 abbr -a - 'cd -'
-abbr -a cdxc 'cd $XDG_CONFIG_HOME'
-abbr -a cdxd 'cd $XDG_DATA_HOME'
+abbr -a cdc 'cd $XDG_CONFIG_HOME'
+abbr -a cdd 'cd $XDG_DATA_HOME'
+
+abbr -a l 'eza -lao --git-repos-no-status --group --group-directories-first --no-permissions'
+abbr -a ls 'eza'
 
 # Ansible
 abbr -a agx ansible-galaxy
@@ -30,27 +33,36 @@ abbr -a fl 'fvm flutter'
 abbr -a flr 'fvm flutter run'
 
 # Git
+abbr -a g 'git'
 abbr -a gc 'git commit'
-abbr -a gca 'git commit -a'
-abbr -a gcam --set-cursor "git commit -am '%'"
+abbr -a gca --set-cursor "git commit -am '%'"
 abbr -a gco 'git checkout'
-abbr -a gf 'git fetch'
-abbr -a gpl 'git pull'
-abbr -a gps 'git push'
+abbr -a gps 'git push --set-upstream origin $(git branch --show-current)'
 abbr -a wip "git commit -nam 'chore: wip'"
 
 # Kube
 abbr -a kb kubectl
 abbr -a kbp 'kubectl get pods'
-abbr -a kbdp 'kubectl describe pod'
+abbr -a kbd 'kubectl describe pod'
 abbr -a kbs 'kubectl get svcs'
-abbr -a kbc kubectx
+abbr -a kbc 'kubectx'
+
+# Talos
+abbr -a tl 'talosctl'
+abbr -a tla 'talosctl apply -i'
+
+# Terraform / OpenTofu
+abbr -a tf tofu
+abbr -a tfa 'tofu apply'
+abbr -a tfd 'tofu destroy'
 
-# Terraform / Terragrunt
-abbr -a tf terraform
-abbr -a tfa 'terraform apply'
-abbr -a tfd 'terraform destroy'
-abbr -a tg terragrunt
+# Vault
+abbr -a vleas 'vault login -method=oidc role=altcon_ci-owners'
+abbr -a vlygg 'vault login -method=oidc role=yggdrasil_ci-owners_users'
 
 # Miscellaneous
-abbr -a src 'exec fish'
+abbr -a cat 'bat'
+abbr -a find 'fd'
+abbr -a mvn 'mvn -gs $XDG_CONFIG_HOME/maven/settings.xml'
+abbr -a tl 'talosctl'
+abbr -a vim 'nvim'
diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl
@@ -53,6 +53,7 @@ set -gx SOPS_AGE_KEY_FILE $XDG_CONFIG_HOME/sops/age/keys.txt
 set -gx TF_CLI_CONFIG_FILE $XDG_CONFIG_HOME/terraform/config
 set -gx TF_TOKEN_artifactory_comcast_com $ARTIFACTORY_TOKEN
 set -gx TLDR_CACHE_DIR $XDG_CACHE_HOME/tldr
+
 ################################################################################
 # Path
 ################################################################################
@@ -81,4 +82,5 @@ if status --is-interactive
   kubectl completion fish | source
   mcfly init fish | source
   op completion fish | source
+  talosctl completion fish | source
 end
diff --git a/dot_config/fish/functions/cat.fish b/dot_config/fish/functions/cat.fish
diff --git a/dot_config/fish/functions/find.fish b/dot_config/fish/functions/find.fish
diff --git a/dot_config/fish/functions/la.fish b/dot_config/fish/functions/la.fish
diff --git a/dot_config/fish/functions/ll.fish b/dot_config/fish/functions/ll.fish
diff --git a/dot_config/fish/functions/ls.fish b/dot_config/fish/functions/ls.fish
diff --git a/dot_config/fish/functions/mvn.fish b/dot_config/fish/functions/mvn.fish
diff --git a/dot_config/fish/functions/vim.fish b/dot_config/fish/functions/vim.fish
diff --git a/dot_config/git/comcast_config b/dot_config/git/comcast_config
@@ -2,10 +2,10 @@
 gpgsign = true
 
 [core]
-sshCommand = ssh -i ~/.ssh/comcast -o IdentitiesOnly=yes -o ConnectionTimeout=10 -F /dev/null
+sshCommand = ssh -i ~/.ssh/comcast -o IdentitiesOnly=yes -F /dev/null
 
 [github]
-user = jbailey223_comcast
+user = jbaile223_comcast
 
 [gpg]
 format = ssh

diff --git a/dot_config/homebrew-bundle/Brewfile b/dot_config/homebrew-bundle/Brewfile
@@ -21,7 +21,6 @@ brew 'clang-format'
 brew 'colima'
 brew 'coreutils'
 brew 'curl'
-# brew 'dart'
 brew 'direnv'
 brew 'docker'
 brew 'docker-buildx'
@@ -57,7 +56,7 @@ brew 'mas'
 brew 'maven'
 brew 'mcfly'
 brew 'mercurial'
-# brew 'mise'
+brew 'minijinja-cli'
 brew 'nats-server'
 brew 'neovim'
 brew 'node'
@@ -69,7 +68,6 @@ brew 'postgresql@14', restart_service: :changed
 brew 'pre-commit'
 brew 'prettier'
 brew 'python3'
-brew 'python3-venv'
 brew 'qemu'
 brew 'qrencode'
 brew 'rg'
@@ -80,7 +78,7 @@ brew 'stern'
 brew 'sqlfluff'
 brew 'sqlite'
 brew 'svn'
-# brew 'terraform'
+brew 'talosctl'
 brew 'terragrunt'
 brew 'tflint'
 brew 'tinted-builder-rust'
@@ -96,12 +94,12 @@ cask '1password'
 cask '1password-cli'
 cask 'aerial'
 cask 'alfred'
-# cask 'backblaze'
 cask 'balenaetcher'
 cask 'firefox'
 cask 'fly'
 cask 'font-roboto-mono-nerd-font'
 cask 'google-chrome'
+cask 'hiddenbar'
 cask 'istat-menus'
 cask 'iterm2'
 cask 'jetbrains-toolbox'