浏览代码

[aliases] Update bookpull stuffs

Colin Powell 6 月之前
父节点
当前提交
c11d449053
共有 6 个文件被更改,包括 40 次插入25 次删除
  1. 2 0
      .gitignore
  2. 13 8
      bash/.aliases
  3. 5 0
      qutebrowser/.config/qutebrowser/bookmarks/urls
  4. 6 1
      qutebrowser/.config/qutebrowser/quickmarks
  5. 7 6
      ssh/.ssh/config
  6. 7 10
      zsh/.zshrc

+ 2 - 0
.gitignore

@@ -73,3 +73,5 @@ default.target.wants
 /bin/.bin/Microsoft Bing for Safari.app/
 /launchd/Library/LaunchAgents/com.microsoft.msbwapp.plist
 /launchd/Library/LaunchAgents/com.microsoft.msbwupdater.plist
+Bing Wallpaper1.1.3.app
+BingWallpaperAppUpdater1.1.3.app

+ 13 - 8
bash/.aliases

@@ -1,16 +1,21 @@
-alias dc="docker-compose $argv"
-alias dj="poetry run python manage.py $argv"
-alias sysu="systemctl --user $argv"
+alias v="vim $*"
+alias c="clear"
+alias dc="docker-compose $*"
+alias dj="poetry run python manage.py $*"
+alias sysu="systemctl --user $*"
 alias fsync="find . -type f -name '*.sync-conflict*'"
-alias vi="vim $argv"
+alias vi="vim $*"
 alias dus="du -sh * | sort -h"
 alias rhea="ssh rhea.local"
 alias pandora="ssh pandora.unbl.ink"
 alias bastion="ssh bastion.unbl.ink"
 alias pull="git pull --rebase --autostash"
 alias push="git push"
-alias asso="aws sso login --profile $argv"
-alias aeks="aws eks update-kubeconfig --name surepreme-sandbox-k8s-use1 --profile $argv"
-alias bookpull="rsync --delete -avzichP root@rhea.local:/tank/books/ ~/.calibre/"
-alias bookpush="rsync --delete -avzichP ~/.calibre/ root@rhea.local:/tank/books/"
+alias asso="aws sso login --profile $*"
+alias qaeks="aws eks update-kubeconfig --name farmers-qa-k8s-use1 --profile $*"
+alias bookpull="rsync --ignore-existing -avzichP root@rhea.local:/tank/books/ ~/.calibre/"
+alias bookpush="rsync --ignore-exsiting -avzichP ~/.calibre/ root@rhea.local:/tank/books/"
 alias chglg="git add ./changelog/ && git commit -m 'Add changelog' && git push"
+alias surepayment="portforward 5001"
+alias sureroc="portforward 5002"
+alias slip="sli dev changelog"

+ 5 - 0
qutebrowser/.config/qutebrowser/bookmarks/urls

@@ -14,3 +14,8 @@ https://15five.lightning.force.com/lightning/r/Case/5004T00000D7iRDQAZ/view 0002
 https://precisely.15five.com/group/list/5341/?page=5 Manage groups · Manage groups · People · 15Five
 https://precisely.15five.com/group/list/5341/ Manage groups · Manage groups · People · 15Five
 https://precisely.15five.com/group/list/5343/ Manage groups · Manage groups · People · 15Five
+https://boardgamegeek.com/forum/10/bgg/hot-deals Hot Deals - Active | Forums | BoardGameGeek
+https://tabletopmerchant.com/collections/deal-of-the-day Deal of the Day
+http://borrdlandia.com/ borrdlandia.com
+https://boardgamegeek.com/market/findmywants?sort=recent&pageid=1&country=US&displaymode=list Find My Wants | GeekMarket
+https://box.unbl.ink/mail/?_task=mail&_action=compose&_id=119820098166a10c9dbcd45&_extwin=1 box.unbl.ink Webmail :: Compose

+ 6 - 1
qutebrowser/.config/qutebrowser/quickmarks

@@ -16,9 +16,14 @@ ghnotif https://github.com/notifications
 cal https://box.unbl.ink/cloud/index.php/apps/calendar/
 mail http://kari.local:8081/stream
 front http://loge.local:8083/stream
-back http://192.168.40.198:8082/stream
+back http://mundilfari.local:8081/stream
 basement http://loge.local:8081/stream
 dining http://kari.local:8082/stream
 table http://loge.local:8082/stream
 email https://box.unbl.ink/mail/?_task=mail&_mbox=INBOX
 wants https://boardgamegeek.com/market/findmywants?sort=recent&pageid=1&country=US&displaymode=list
+nerdz https://www.gamenerdz.com/deal-of-the-day
+mmdeals https://www.miniaturemarket.com/deals.html?sort=news_from_date+desc&filter[]=product_tag_uFilter:%22Last%20Chance%22&filter[]=categoryPath2_fq:%22Deals%3EBoard%20Games%22&sort=news_from_date%20desc
+extension http://mundilfari.local:8082/stream
+backyard http://mundilfari.local:8081/stream
+yard http://mundilfari.local:8083/stream

+ 7 - 6
ssh/.ssh/config

@@ -15,17 +15,13 @@ Host github.com
     IdentityFile ~/.ssh/2022_git
 
 # Home Gitea account:
-Host code.unbl.ink git.service 192.168.40.118 gogs*
-  Port 22
+Host code.unbl.ink git.service 192.168.40.244
   User git
   IdentityFile ~/.ssh/2024_git
   PreferredAuthentications publickey
   PasswordAuthentication no
   IdentitiesOnly yes
 
-Host gogs*
-  Port 2222
-
 # Mailinabox uses root by default
 Host box.unbl.ink
   IdentityFile ~/.ssh/box_unbl_ink
@@ -67,7 +63,8 @@ Host hati.local tarqeq.local daphnis.local loge.local hyperion.local dione.local
 Host *.local *.service
   StrictHostKeyChecking no
   User root
-  IdentityFile ~/.ssh/2022_h2_powellc
+  #IdentityFile ~/.ssh/2022_h2_powellc
+  IdentityFile ~/.ssh/jails
 
 
 # Root hosts
@@ -96,6 +93,10 @@ Host *.local *.service
     AddKeysToAgent yes
     VerifyHostKeyDNS no
 
+Host 67.205.184.201 life.unbl.ink
+  User root
+  IdentityFile ~/.ssh/1904_powellc
+
 ## Jail hosts all need a jump
 Match exec "onsubnet 192.168.40." host *.service
   User root

+ 7 - 10
zsh/.zshrc

@@ -2,12 +2,15 @@
 export GOPATH="$HOME/.go"
 export PATH=$HOME/.bin:$HOME/var/bin:/usr/local/bin:$PATH:$HOME/.go/bin
 
+
 export ZSH="$HOME/.oh-my-zsh"
 
 ZSH_THEME="robbyrussell"
 
 plugins=(git z fzf asdf direnv emacs yarn)
 
+eval "$(aws configure export-credentials --profile np-farmers --format env)"
+
 source $ZSH/oh-my-zsh.sh
 
 # See ~/.aliases for the various aliases seen in here
@@ -45,13 +48,13 @@ sush() {
   if [[ $1 == "sbx" ]]
   then
     asso sure-inc
-    aeks sure-inc
+    aws eks update-kubeconfig --name surepreme-sandbox-k8s-use1 --profile $argv
     kubectl exec -it $(kubectl get pods | fzf | awk '{print $1}'|head -n 1) -- bash
   fi
 
   if [[ $1 == "qa" ]]
   then
-    aeks np-farmers
+    qaeks np-farmers
     kubectl exec -it $(kubectl get pods | fzf | awk '{print $1}'|head -n 1) -- bash
   fi
 
@@ -63,15 +66,9 @@ sush() {
   fi
 }
 
-roc() {
-    asso np-farmers
-    aeks np-farmers
-    kubectl port-forward $(kubectl get pods | fzf | awk '{print $1}'|head -n 1) 5001:8080
-}
-
 portforward() {
     asso np-farmers
-    aeks np-farmers
+    qaeks np-farmers
     kubectl port-forward $(kubectl get pods | fzf | awk '{print $1}'|head -n 1) $1:8080
 }
 
@@ -92,7 +89,7 @@ refresh_sure_db() {
     createdb -U sure surepreme
     psql -U sure surepreme -c "CREATE EXTENSION postgis"
     pg_restore -d surepreme /tmp/qa_farmers_latest.pgdump
-    rm /tmp/qa_farmers_latest.pgdump
+    #rm /tmp/qa_farmers_latest.pgdump
     echo "Database `surepreme` successfully restores from QA data"
 }