fix(fish): find & move to onepasswordRead

blahspam · Jul 31, 2024 · f4aa821 · f4aa821
1 parent 5932372
commit f4aa821
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 30 deletions.
diff --git a/dot_config/fish/abbreviations.fish b/dot_config/fish/abbreviations.fish
@@ -41,6 +41,9 @@ 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 kbs 'kubectl get svcs'
 abbr -a kbc kubectx
 
 # Terraform / Terragrunt
@@ -50,4 +53,4 @@ abbr -a tfd 'terraform destroy'
 abbr -a tg terragrunt
 
 # Miscellaneous
-abbr -a src 'exec fish'
+abbr -a src 'exec fish'
diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl
@@ -16,14 +16,14 @@ set -gx XDG_RUNTIME_DIR $HOME/.run
 
 set -gx ADFS_USERNAME $(whoami)
 set -gx ADFS_AWS_PROFILE comcast
-set -gx ARTIFACTORY_TOKEN {{ (onepasswordDetailsFields "Artifactory Token").credential.value }}
+set -gx ARTIFACTORY_TOKEN {{ onepasswordRead "op://Private/Artifactory Token/credential" }}
 set -gx CDPATH . ~/Develop
 set -gx DOCKER_CONFIG $XDG_CONFIG_HOME/docker
 set -gx EDITOR nvim
-set -gx GHE_TOKEN {{ (onepasswordDetailsFields "GHE Token").credential.value }}
-set -gx GHEC_TOKEN {{ (onepasswordDetailsFields "GHEC Token").credential.value }}
+set -gx GHE_TOKEN {{ onepasswordRead "op://Private/GHE Token/credential" }}
+set -gx GHEC_TOKEN {{ onepasswordRead "op://Private/GHEC Token/credential"}}
 set -gx GIT_EDITOR nvim
-set -gx GITHUB_TOKEN {{ (onepasswordItemFields "Github").token.value }}
+set -gx GITHUB_TOKEN {{ onepasswordRead "op://Private/Github/token" }}
 set -gx GOPATH $HOME/Develop/go
 set -gx GOBIN $GOPATH/bin
 set -gx HOMEBREW_HOME /opt/homebrew
@@ -33,11 +33,11 @@ set -gx LESSHISTFILE $XDG_DATA_HOME/less/history
 set -gx NTUSER $(whoami)
 set -gx PGPASSFILE $XDG_CONFIG_HOME/psql/pgpass
 set -gx PGSERVICEFILE $XDG_CONFIG_HOME/psql/pg_service.conf
-set -gx PM_USER {{ (onepasswordDetailsFields "Proxmox").username.value }}
-set -gx PM_PASS {{ (onepasswordDetailsFields "Proxmox").password.value }}
+set -gx PM_USER {{ onepasswordRead "op://Private/Proxmox/username" }}
+set -gx PM_PASS {{ onepasswordRead "op://Private/Proxmox/password" }}
 set -gx PSQLRC $XDG_CONFIG_HOME/psql/psqlrc
 set -gx PSQL_HISTORY $XDG_DATA_HOME/psql/history
-set -gx RDEI_TOKEN {{ (onepasswordDetailsFields "RDEI Token").credential.value }}
+set -gx RDEI_TOKEN {{ onepasswordRead "op://Private/RDEI Token/credential" }}
 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

diff --git a/dot_config/fish/functions/find.fish b/dot_config/fish/functions/find.fish
@@ -1,3 +1,3 @@
-function find --wraps fd -d "Find files"
+function find -d "Find files"
   fd $argv
-erd
+end
diff --git a/dot_config/git/config b/dot_config/git/config
@@ -78,6 +78,3 @@ path = ~/.config/git/ghec_config
 
 [includeIf "gitdir:~/Develop/jbaile223_comcast/"]
 path = ~/.config/git/ghec_config
-
-[includeIf "gitdir:~/Develop/yggdrasil/"]
-path = ~/config/git/ghe_config
diff --git a/dot_config/git/ghe_config b/dot_config/git/ghe_config
@@ -1,10 +1,7 @@
-[core]
-sshCommand = ssh -i ~/.ssh/id_rsa
-
 [github]
 user = jbailey223
 
 [user]
 email = jeff_bailey@comcast.com
 name = Jeff Bailey
-signingkey = ~/.ssh/id_rsa.pub
+signingkey = ~/.ssh/blahspam.pub
diff --git a/dot_config/git/ghec_config b/dot_config/git/ghec_config
@@ -1,9 +1,6 @@
 [commit]
 gpgsign = true
 
-[core]
-sshCommand = ssh -i ~/.ssh/github-jbaile223
-
 [github]
 user = jbailey223_comcast
 
@@ -13,4 +10,4 @@ format = ssh
 [user]
 email = Jeff_Bailey@cable.comcast.com
 name = Jeff Bailey
-signingkey = ~/.ssh/github-jbaile223.pub
+signingkey = ~/.ssh/jbaile223.pub
diff --git a/dot_config/git/github_config b/dot_config/git/github_config
@@ -1,9 +1,6 @@
 [commit]
 gpgsign = true
 
-[core]
-sshCommand = ssh -i ~/.ssh/id_rsa
-
 [github]
 user = blahspam
 
@@ -13,4 +10,4 @@ format = ssh
 [user]
 email = jeff@blahspam.com
 name = Jeff Bailey
-signingkey = ~/.ssh/id_rsa.pub
+signingkey = ~/.ssh/blahspam.pub
diff --git a/private_dot_ssh/blahspam.pub.tmpl b/private_dot_ssh/blahspam.pub.tmpl
@@ -0,0 +1 @@
+{{- onepasswordRead "op://Private/SSH - blahspam/public key" -}}
diff --git a/private_dot_ssh/github-jbaile223.pub.tmpl b/private_dot_ssh/github-jbaile223.pub.tmpl
diff --git a/private_dot_ssh/id_rsa.pub.tmpl b/private_dot_ssh/id_rsa.pub.tmpl
diff --git a/private_dot_ssh/jbaile223.pub.tmpl b/private_dot_ssh/jbaile223.pub.tmpl
@@ -0,0 +1 @@
+{{- onepasswordRead "op://Private/SSH - jbaile223/public key" -}}
diff --git a/private_dot_ssh/private_blahspam.tmpl b/private_dot_ssh/private_blahspam.tmpl
@@ -0,0 +1 @@
+{{- onepasswordRead "op://Private/SSH - blahspam/private key" -}}
diff --git a/private_dot_ssh/private_config.tmpl b/private_dot_ssh/private_config.tmpl
@@ -1 +1,14 @@
-{{- (onepasswordItemFields "SSH").config.value -}}
+Host mini
+  User jeff
+  HostName mini.local
+
+Host pve
+  User root
+  HostName pve-01.blahspam.net
+
+Host *
+  IdentitiesOnly yes
+  IdentityFile ~/.ssh/blahspam
+  ServerAliveInterval 10
+  TCPKeepAlive no
+  UseKeychain yes
diff --git a/private_dot_ssh/private_github-jbaile223.tmpl b/private_dot_ssh/private_github-jbaile223.tmpl
diff --git a/private_dot_ssh/private_id_rsa.tmpl b/private_dot_ssh/private_id_rsa.tmpl
diff --git a/private_dot_ssh/private_jbaile223.tmpl b/private_dot_ssh/private_jbaile223.tmpl
@@ -0,0 +1 @@
+{{- onepasswordRead "op://Private/SSH - jbaile223/private key" -}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{{- onepasswordRead "op://Private/SSH - blahspam/public key" -}}