diff --git a/aliases/key_aliases.tmpl b/aliases/key_aliases.tmpl index 1f5ac3e..21b5594 100644 --- a/aliases/key_aliases.tmpl +++ b/aliases/key_aliases.tmpl @@ -126,7 +126,8 @@ ssl "mosh --ssh='ssh -p 399' kevin@$LAPTOP_IP" # vultr # ssa "mosh atxadmin@45.32.87.10" -ssa "ssh -t kevin@3.147.85.36 tmux a" +ssa "ssh -i ~/.ssh/ai16z-test.pem ai16z@54.197.220.164" +ssaw "ssh -t kevin@3.147.85.36 tmux a" # ssv "mosh kevin@45.32.87.10" # test server sites @@ -359,6 +360,7 @@ am "antimicro" a "task" aa "task add" aal "task add proj:lnx" +aan "task add proj:anp" aap "task add proj:" aas "task add proj:sch" # aam "task add proj:ms" @@ -446,7 +448,8 @@ it "sxiv -t *" kill "kill -9" #kal "killall" ka "killall" -kc "killall chromium" +#kc "killall chromium" +kc "killall chrome" kcm "killall compton" kd "killall Discord && killall Discord" ke "killall electron" @@ -1266,3 +1269,4 @@ vpt "nordvpn status" # ]]] vpn # ft "dexscreener ethereum 0x983b92EA1F0A20844466f3E4BB988c1dE145293E" + diff --git a/aliases/key_dirs.tmpl b/aliases/key_dirs.tmpl index 03babfc..2039f86 100644 --- a/aliases/key_dirs.tmpl +++ b/aliases/key_dirs.tmpl @@ -277,6 +277,9 @@ jhi ~/school/job-hunt/interview-questions jhig ~/school/job-hunt/interview-questions/grafana el ~/coding/eliza +an ~/coding/ai-nft-proj/ +anb ~/coding/ai-nft-proj/backend +anf ~/coding/ai-nft-proj/frontend # ]]] sch # diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl index de0190a..698b010 100755 --- a/dot_config/fish/config.fish.tmpl +++ b/dot_config/fish/config.fish.tmpl @@ -71,7 +71,7 @@ set -x HASTE_SERVER https://pste.gq set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH /usr/local/lib /usr/local/lib64 set -x GOPATH ~/go # set -x PATH $GRAALVM_BIN $PATH ~/.local/bin ~/scripts ~/scripts/colors ~/go/bin ~/.minetest/minetest/bin ~/.gem/ruby/2.6.0/bin -set -x PATH $PATH ~/.local/bin ~/scripts ~/scripts/colors $GOPATH/bin ~/.minetest/minetest/bin ~/.gem/ruby/*/bin ~/.yarn/bin /home/kevin/.linuxbrew/bin ~/.fnm/current/bin +set -x PATH $PATH ~/.local/bin ~/scripts ~/scripts/colors $GOPATH/bin ~/.minetest/minetest/bin ~/.gem/ruby/*/bin ~/.yarn/bin ~/.linuxbrew/bin ~/.fnm/current/bin ~/.nimble/bin set -x PKG_CONFIG_PATH $PKG_CONFIG_PATH /usr/lib/pkgconfig # Java [[[ # @@ -194,12 +194,12 @@ abbr ! "sudo !!" # task [[[ # abbr aan "task-anno ''" -abbr ae "task-edit" +abbr aed "task-edit" abbr adl "task-delete" abbr adn "task-done" abbr adu "task-due" abbr adr "task-due-rm" -abbr an "task-next" +abbr anx "task-next" abbr anr "task-next-rm" abbr ant "task-notes" abbr apr "task-mod-pri" @@ -208,7 +208,7 @@ abbr aprm "task-mod-pri M" abbr aprn "task-mod-pri ''" abbr aprh "task-mod-pri H" abbr apj "task-mod-proj" -abbr asr "task-start" +abbr ar "task-start" abbr at "task-mod-tag" abbr atj "task-mod-tag jira" abbr aw "task-wait" @@ -309,6 +309,15 @@ abbr xya "export-pkgs" # school [[[ # +abbr aw "aws ec2" +abbr awav "aws-attach-volume" +abbr awlv "aws ec2 describe-volumes --query \"sort_by(Volumes, &CreateTime)[*].{ID:VolumeId,Name:Tags[?Key=='Name']|[0].Value,Created:CreateTime}\" --output table" +abbr awdtv "aws ec2 detach-volume --volume-id" +abbr awdlv "aws ec2 delete-volume --volume-id" +abbr awli "aws ec2 describe-instances --query \"sort_by(Reservations[].Instances[], &LaunchTime)[*].[InstanceId, Tags[?Key=='Name'].Value | [0], LaunchTime, InstanceType, State.Name]\" --output table" +abbr awsai "aws ec2 start-instances --instance-ids" +abbr awsti "aws ec2 stop-instances --instance-ids" + # ]]] school # # ]]] fxn abbr's # @@ -318,3 +327,7 @@ abbr xya "export-pkgs" source /home/kevin/.config/fish/key_abbr.fish > /dev/null cat /home/kevin/.cache/wal/sequences # ~/scripts/xmodmap-custom + +#ssh-add ~/.ssh/ai16z-test.pem > /dev/null +# keychain --agents ssh id_rsa +#set -Ux SSH_AUTH_SOCK (keychain --eval --agents ssh id_rsa | grep setenv | sed -E 's/setenv (\S+) (\S+);/\2/') diff --git a/dot_config/fish/functions/aws-attach-volume.fish b/dot_config/fish/functions/aws-attach-volume.fish new file mode 100644 index 0000000..d1b09d5 --- /dev/null +++ b/dot_config/fish/functions/aws-attach-volume.fish @@ -0,0 +1,3 @@ +function aws-attach-volume + aws ec2 attach-volume --volume-id $argv[1] --instance-id $argv[2] --device /dev/sda1 +end \ No newline at end of file diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl index fbb2446..26aea19 100755 --- a/dot_config/i3/config.tmpl +++ b/dot_config/i3/config.tmpl @@ -477,7 +477,8 @@ set $ws11 "11  " # assign [class="Summoners War Exporter"] $ws11 workspace $ws11 output $secondary # bindsym $mod+F11 workspace $ws11; exec $term -e htop -s PERCENT_CPU -bindsym $mod+F11 workspace $ws11; exec $term -e htop -s PERCENT_MEM +#bindsym $mod+F11 workspace $ws11; exec $term -e htop -s PERCENT_MEM +bindsym $mod+F11 workspace $ws11; exec $term -e btop # bindsym Mod4+$mod+F11 workspace $ws11; exec $term -e fish -c 'tmux-attach backup' bindsym Control+Shift+F11 workspace $ws11; exec $term -e fish -c 'tmux-attach backup' bindsym Mod4+t workspace $ws11; exec nordvpn connect && transmission-gtk diff --git a/dot_taskopenrc b/dot_taskopenrc index ee8b244..d9f7a6d 100644 --- a/dot_taskopenrc +++ b/dot_taskopenrc @@ -1,72 +1,83 @@ - -# BROWSER='xdg-open $FILE &>/dev/null' -BROWSER='firefox' -EDITOR='nvim' -#FILE_CMD='xdg-open' -TASKBIN='task' - -# If you sync tasks NOTES_FOLDER should be a location that syncs and is available to -# other computers, i.e. /users/dropbox/tasknotes -# NOTES_FOLDER to store notes in, must already exist! -NOTES_FOLDER="$HOME/.task/notes/" - -# Preferred extension for tasknotes -NOTES_EXT=".md" - -# Path to notes file. UUID will be replaced with the actual uuid of -# the task. If NOTES_CMD -# Default is: ${NOTES_FOLDER}UUID${NOTES_EXT} -#NOTES_FILE="$HOME/tasknotes/UUID.txt" - -# Command that opens notes. UUID will be replaced with the actual uuid of -# the task. -# Default is: $EDITOR $NOTES_FILE -#NOTES_CMD="vim "$HOME/tasknotes/$UUID.txt"" - -# Specify the default sorting. -# Default is taskwarrior's default sorting, i.e. sorting by task IDs. -#DEFAULT_SORT="urgency-,label,annot" - -# Apply a default taskwarrior filter in order to exclude certain tasks. -# Default is: status.is:pending -#DEFAULT_FILTER= - -# Default command for '-i' -# Default is: ls -la -#DEFAULT-i="ls -la" - -# Add some paths to the taskopen's PATH variable -#PATH_EXT=/path/to/taskopen/scripts -PATH_EXT=/usr/share/taskopen/scripts - -# Regular expression that referes to the NOTES_FILE. -# Default is: Notes -#NOTES_REGEX="Notes" - -# Regular expression that identifies annotations openable by BROWSER. -# Default is: www|http -#BROWSER_REGEX="www|http" - -# Regular expression that identifies file paths in annotations. Will be opened by xdg-open. -# Default is: \.|\/|~ -#FILE_REGEX="\.|\/|~" - -# Regular expression that identifies a text annotation. Automatically triggers raw edit mode like '-r'. -#TEXT_REGEX=".*" - -# Custom regular expression that specifies annotations passed to CUSTOM1_CMD, e.g: -#CUSTOM1_REGEX="Message-[Ii][Dd]:|message:" -#CUSTOM1_CMD="muttjumpwrapper" - -# Custom regular expression that specifies annotations passed to CUSTOM2_CMD. -#CUSTOM2_REGEX="" -#CUSTOM2_CMD="" - -# Execute an arbitrary command if there is no annotation available. The corresponding taskwarrior IDs will -# be passed as arguments, e.g. "addnote 21 42" -#NO_ANNOTATION_HOOK=addnote - -# Make additional taskwarrior attributes available as sort keys and environment variables. -# E.g. TASK_ATTRIBUTES="project,tags" allows to sort by "task_project" or "task_tags" and to use -# "$TASK_PROJECT" or "$TASK_TAGS" within your (custom) commands. -#TASK_ATTRIBUTES="" +[General] +EDITOR = nvim # Use your preferred editor +path_ext = /usr/share/taskopen/scripts +taskbin = task + +[Actions] +notes.regex = "Notes" # Match tasks with the "Notes" annotation +notes.command = "$EDITOR $HOME/.task/notes/$UUID.md" # Custom notes directory +#notes.modes = any +notes.modes = normal + +# # BROWSER='xdg-open $FILE &>/dev/null' +# BROWSER='firefox' +# EDITOR='nvim' +# #FILE_CMD='xdg-open' +# TASKBIN='task' +# +# # If you sync tasks NOTES_FOLDER should be a location that syncs and is available to +# # other computers, i.e. /users/dropbox/tasknotes +# # NOTES_FOLDER to store notes in, must already exist! +# NOTES_FOLDER="$HOME/.task/notes/" +# data_location="$HOME/.task/notes/" +# +# # Preferred extension for tasknotes +# NOTES_EXT=".md" +# +# # Path to notes file. UUID will be replaced with the actual uuid of +# # the task. If NOTES_CMD +# # Default is: ${NOTES_FOLDER}UUID${NOTES_EXT} +# #NOTES_FILE="$HOME/tasknotes/UUID.txt" +# +# # Command that opens notes. UUID will be replaced with the actual uuid of +# # the task. +# # Default is: $EDITOR $NOTES_FILE +# #NOTES_CMD="vim "$HOME/tasknotes/$UUID.txt"" +# +# # Specify the default sorting. +# # Default is taskwarrior's default sorting, i.e. sorting by task IDs. +# #DEFAULT_SORT="urgency-,label,annot" +# +# # Apply a default taskwarrior filter in order to exclude certain tasks. +# # Default is: status.is:pending +# #DEFAULT_FILTER= +# +# # Default command for '-i' +# # Default is: ls -la +# #DEFAULT-i="ls -la" +# +# # Add some paths to the taskopen's PATH variable +# #PATH_EXT=/path/to/taskopen/scripts +# PATH_EXT=/usr/share/taskopen/scripts +# +# # Regular expression that referes to the NOTES_FILE. +# # Default is: Notes +# #NOTES_REGEX="Notes" +# +# # Regular expression that identifies annotations openable by BROWSER. +# # Default is: www|http +# #BROWSER_REGEX="www|http" +# +# # Regular expression that identifies file paths in annotations. Will be opened by xdg-open. +# # Default is: \.|\/|~ +# #FILE_REGEX="\.|\/|~" +# +# # Regular expression that identifies a text annotation. Automatically triggers raw edit mode like '-r'. +# #TEXT_REGEX=".*" +# +# # Custom regular expression that specifies annotations passed to CUSTOM1_CMD, e.g: +# #CUSTOM1_REGEX="Message-[Ii][Dd]:|message:" +# #CUSTOM1_CMD="muttjumpwrapper" +# +# # Custom regular expression that specifies annotations passed to CUSTOM2_CMD. +# #CUSTOM2_REGEX="" +# #CUSTOM2_CMD="" +# +# # Execute an arbitrary command if there is no annotation available. The corresponding taskwarrior IDs will +# # be passed as arguments, e.g. "addnote 21 42" +# #NO_ANNOTATION_HOOK=addnote +# +# # Make additional taskwarrior attributes available as sort keys and environment variables. +# # E.g. TASK_ATTRIBUTES="project,tags" allows to sort by "task_project" or "task_tags" and to use +# # "$TASK_PROJECT" or "$TASK_TAGS" within your (custom) commands. +# #TASK_ATTRIBUTES="" diff --git a/dot_taskrc b/dot_taskrc index 17fca48..d77087d 100644 --- a/dot_taskrc +++ b/dot_taskrc @@ -20,7 +20,7 @@ data.location=~/.task # Color theme (uncomment one to use){{{ #include /usr/share/doc/task/rc/light-16.theme #include /usr/share/doc/task/rc/light-256.theme -include /usr/share/doc/task/rc/dark-16.theme +# include /usr/share/doc/task/rc/dark-16.theme # include /usr/share/doc/task/rc/dark-256.theme #include /usr/share/doc/task/rc/dark-red-256.theme #include /usr/share/doc/task/rc/dark-green-256.theme @@ -82,9 +82,10 @@ context.mny=project:mny context.pey=project:pey context.sch=project:sch +context=none # context=home # context=out -context=sch +#context=sch # context=mny # context=pey # context=not-pey diff --git a/dot_vimrc.tmpl b/dot_vimrc.tmpl index aeca5d7..f163825 100644 --- a/dot_vimrc.tmpl +++ b/dot_vimrc.tmpl @@ -61,7 +61,7 @@ filetype plugin indent on autocmd BufNewFile,BufRead .* set syntax=sh autocmd BufRead,BufNewFile /tmp/calcurse*,~/.calcurse/notes/* set filetype=markdown autocmd FileType *css,gitcommit,haskell,htmldjango,html,graphql,javascript,javascriptreact,json,lisp,markdown, - \racket,tex,text,yaml set tabstop=2 shiftwidth=2 + \racket,tex,text,typescript,typescriptreact,yaml set tabstop=2 shiftwidth=2 " autocmd BufNewFile,BufRead *.md set filetype=markdown " autocmd Filetype markdown set textwidth=0 " autocmd Filetype html set foldmarker=0 @@ -345,6 +345,9 @@ Plug 'jidn/vim-dbml' Plug 'tpope/vim-surround' " Plug 'tpope/vim-commentary' Plug 'preservim/nerdcommenter' +"Plug 'vimwiki/vimwiki' + "let g:vimwiki_list = [{'path': '~/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}] +"Plug 'tools-life/taskwiki' " ]]] vim-plug " " Mappings [[[ " diff --git a/scripts/executable_kraken b/scripts/executable_kraken index 8717d8f..19ecdf4 100755 --- a/scripts/executable_kraken +++ b/scripts/executable_kraken @@ -32,7 +32,8 @@ elif (( $(echo "$price < 100" | bc -l) )); then echo "$price" | tr -d '.' | awk '{print substr($0, 1, 3)}' elif (( $(echo "$price < 1000" | bc -l) )); then echo "$price" | numfmt --grouping | cut -c -3 -elif (( $(echo "$price < 10000" | bc -l) )); then +#elif (( $(echo "$price < 10000" | bc -l) )); then +elif (( $(echo "$price < 100000" | bc -l) )); then echo "$price" | cut -c -3 elif (( $(echo "$price > 100000" | bc -l) )); then echo "$price" | numfmt --grouping | cut -c -3