From b1ea62811df3eb73a1800d32b038851fc8f9d821 Mon Sep 17 00:00:00 2001 From: Pratik Tripathy Date: Thu, 3 Jun 2021 14:46:58 +0530 Subject: [PATCH] cleanups and updates --- .aliases | 1 + .bashrc | 14 +-- .config/Code/User/settings.json | 16 +-- .config/Code/User/snippets/go.json | 0 .config/remmina/remmina.pref | 126 ----------------------- .gitconfig | 0 .gitignore | 0 .gosetup | 0 .neon_alias | 0 .p10k.zsh | 156 +++++++++++++++-------------- .profile | 3 +- .tmux.conf | 0 .vscode/argv.json | 10 +- .vscode/settings.json | 0 .zshrc | 27 +++-- Bash Boilerplate/template.sh | 0 LICENSE | 0 README.md | 0 18 files changed, 126 insertions(+), 227 deletions(-) mode change 100644 => 100755 .aliases mode change 100644 => 100755 .bashrc mode change 100644 => 100755 .config/Code/User/settings.json mode change 100644 => 100755 .config/Code/User/snippets/go.json delete mode 100644 .config/remmina/remmina.pref mode change 100644 => 100755 .gitconfig mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .gosetup mode change 100644 => 100755 .neon_alias mode change 100644 => 100755 .p10k.zsh mode change 100644 => 100755 .profile mode change 100644 => 100755 .tmux.conf mode change 100644 => 100755 .vscode/argv.json mode change 100644 => 100755 .vscode/settings.json mode change 100644 => 100755 .zshrc mode change 100644 => 100755 Bash Boilerplate/template.sh mode change 100644 => 100755 LICENSE mode change 100644 => 100755 README.md diff --git a/.aliases b/.aliases old mode 100644 new mode 100755 index 056cd44..0542e11 --- a/.aliases +++ b/.aliases @@ -59,6 +59,7 @@ alias ping8="ping 8.8.8.8" alias ping1="ping 1.1.1.1" alias p8="ping8" alias p1="ping1" +alias flush-dns="sudo systemd-resolve --flush-caches" alias dnsreset="sudo systemctl restart dnscrypt-proxy" alias dnscheck="dnscrypt-proxy -resolve google.com" alias pubip="curl https://ipinfo.io/ip; echo" diff --git a/.bashrc b/.bashrc old mode 100644 new mode 100755 index bb2b305..5085f1e --- a/.bashrc +++ b/.bashrc @@ -189,22 +189,24 @@ jazz_my_prompt() { [[ ! -f ~/.set_path ]] || source ~/.set_path +# Aliases [[ ! -f ~/.aliases ]] || source ~/.aliases [[ ! -f ~/.aliases_personal ]] || source ~/.aliases_personal [[ ! -f ~/.neon_alias ]] || source ~/.neon_alias +# Dev Setup Configurations [[ ! -f ~/.gosetup ]] || source ~/.gosetup [[ ! -f ~/.flutterpathsetup ]] || source ~/.flutterpathsetup +[[ ! -f ~/.env ]] || source ~/.env +[[ ! -f ~/.skaffoldenv ]] || source ~/.skaffoldenv export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion -# tabtab source for packages -# uninstall by removing these lines -[[ -f ~/.config/tabtab/__tabtab.zsh ]] && . ~/.config/tabtab/__tabtab.zsh || true - # Kubernetes Autocompletion -source <(kubectl completion bash) +command -v kubectl && source <(kubectl completion bash) -source ~/.env \ No newline at end of file +[[ ! -f ~/.config/exercism/exercism_completion.bash ]] || source ~/.config/exercism/exercism_completion.bash +[[ ! -f "$HOME/.cargo/env" ]] || source "$HOME/.cargo/env" +export QT_PLUGIN_PATH=~/.local/lib/qt/plugins/: diff --git a/.config/Code/User/settings.json b/.config/Code/User/settings.json old mode 100644 new mode 100755 index 0b43f2e..64952dd --- a/.config/Code/User/settings.json +++ b/.config/Code/User/settings.json @@ -29,8 +29,8 @@ "diffEditor.ignoreTrimWhitespace": false, // // Editor Font - "editor.fontFamily": "'FuraCode Nerd Font', 'Droid Sans Mono', 'monospace', monospace, 'Droid Sans Fallback'", - "editor.fontSize": 17.4, + "editor.fontFamily": "Hasklug Nerd Font", + "editor.fontSize": 19, "editor.fontLigatures": true, "terminal.integrated.fontFamily": "FuraCode Nerd Font", "terminal.integrated.fontSize": 17, @@ -38,7 +38,7 @@ // Workbench - Everything that surrounds the editor "workbench.startupEditor": "newUntitledFile", "workbench.sideBar.location": "left", - "window.zoomLevel": -1, //Reduces the Activity Bar size + // "window.zoomLevel": -1, //Reduces the Activity Bar size "workbench.colorCustomizations": { "tab.activeBackground": "#07f7af3f", "tab.activeBorder": "#ffffff" @@ -180,10 +180,9 @@ // Themes "workbench.iconTheme": "material-icon-theme", "theme-by-language.themes": { - "*": "Visual Studio Dark", + "*": "GitHub Dark", "markdown": "Community Material Theme Darker High Contrast" }, - "workbench.colorTheme": "Visual Studio Dark", "python.languageServer": "Pylance", // Rust @@ -200,7 +199,12 @@ "rust-analyzer.cargo.target": null, "rust-analyzer.completion.postfix.enable": false, "rust-analyzer.inlayHints.enable": false, - "rust-analyzer.inlayHints.typeHints": false + "rust-analyzer.inlayHints.typeHints": false, + + // + "editor.acceptSuggestionOnEnter": "smart", + "editor.snippetSuggestions": "top", + "workbench.colorTheme": "GitHub Dark Dimmed" // } diff --git a/.config/Code/User/snippets/go.json b/.config/Code/User/snippets/go.json old mode 100644 new mode 100755 diff --git a/.config/remmina/remmina.pref b/.config/remmina/remmina.pref deleted file mode 100644 index 9e4e9fe..0000000 --- a/.config/remmina/remmina.pref +++ /dev/null @@ -1,126 +0,0 @@ -[remmina_pref] -secret=2Uryr5G5hXC8DDXY+Kgk4B6wNwIMrpo5W7FWKfP0i8w= -save_view_mode=true -floating_toolbar_placement=0 -toolbar_placement=3 -prevent_snap_welcome_message=false -fullscreen_on_auto=true -always_show_tab=true -hide_connection_toolbar=true -default_action=0 -scale_quality=3 -ssh_loglevel=1 -screenshot_path=/home/CommonFolder/Pictures/Screenshots/Remmina -ssh_parseconfig=true -hide_toolbar=false -hide_statusbar=false -small_toolbutton=false -view_file_mode=1 -resolutions=1400x1050,640x480,800x600,1024x768,1152x864,1280x960 -keystrokes=Send hello world§hello world\\n -main_width=681 -main_height=703 -main_maximize=false -main_sort_column_id=1 -main_sort_order=0 -expanded_group=Routers -toolbar_pin_down=false -sshtunnel_port=4732 -applet_new_ontop=false -applet_hide_count=false -applet_enable_avahi=false -disable_tray_icon=false -dark_tray_icon=false -recent_maximum=10 -default_mode=2 -tab_mode=0 -fullscreen_toolbar_visibility=0 -show_buttons_icons=0 -show_menu_icons=0 -auto_scroll_step=10 -hostkey=65383 -shortcutkey_fullscreen=102 -shortcutkey_autofit=49 -shortcutkey_nexttab=65363 -shortcutkey_prevtab=65361 -shortcutkey_scale=115 -shortcutkey_grab=65383 -shortcutkey_viewonly=109 -shortcutkey_screenshot=65481 -shortcutkey_minimize=65478 -shortcutkey_disconnect=65473 -shortcutkey_toolbar=116 -vte_font=FuraCode Nerd Font 11 -vte_allow_bold_text=true -vte_lines=5120 -rdp_use_client_keymap=0 -rdp_quality_0=6F -rdp_quality_1=7 -rdp_quality_2=1 -rdp_quality_9=80 -rdp_deviceScaleFactor=0 -rdp_desktopScaleFactor=0 -rdp_desktopOrientation=0 -recent_SSH=51.38.124.34,ovh-pratik - -[ssh_colors] -background=rgb(1,17,22) -cursor=rgb(74,252,214) -foreground=rgb(255,255,255) -color0=rgb(2,32,38) -color1=rgb(178,48,45) -color2=rgb(0,169,65) -color3=rgb(89,129,156) -color4=rgb(69,154,134) -color5=rgb(0,89,157) -color6=rgb(93,126,25) -color7=rgb(64,85,85) -color8=rgb(56,68,81) -color9=rgb(255,66,66) -color10=rgb(42,234,94) -color11=rgb(142,212,253) -color12=rgb(97,213,186) -color13=rgb(18,152,255) -color14=rgb(152,208,40) -color15=rgb(88,251,214) - -[usage_stats] -periodic_usage_stats_permission_asked=true -periodic_usage_stats_permitted=false -periodic_usage_stats_last_sent=0 - -[remmina] -name= -ssh_stricthostkeycheck=0 -ssh_enabled=0 -exec= -sshlogenabled=1 -ssh_compression=1 -server= -keyboard_grab=0 -ssh_kex_algorithms= -ssh_hostkeytypes= -ssh_auth=3 -postcommand= -group=Hetzner -ssh_color_scheme=6 -ssh_charset= -sshlogfolder=/media/pratik/Work/SSH/Hetzner/ssh_log/pratik -ssh_loopback=0 -ssh_username=pratik -password= -disablepasswordstoring=0 -window_maximize=1 -viewmode=1 -ssh_proxycommand= -save_ssh_server= -save_ssh_username=pratik -window_height=703 -precommand= -window_width=681 -sshlogname= -ssh_ciphers= -ssh_server= -protocol=SSH -ssh_privatekey=/home/pratik/.ssh/id_hetzner_pratik -last_success=20191007 diff --git a/.gitconfig b/.gitconfig old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.gosetup b/.gosetup old mode 100644 new mode 100755 diff --git a/.neon_alias b/.neon_alias old mode 100644 new mode 100755 diff --git a/.p10k.zsh b/.p10k.zsh old mode 100644 new mode 100755 index ee7216b..afb36ac --- a/.p10k.zsh +++ b/.p10k.zsh @@ -1,8 +1,8 @@ -# Generated by Powerlevel10k configuration wizard on 2020-10-13 at 23:22 IST. -# Based on romkatv/powerlevel10k/config/p10k-classic.zsh, checksum 49789. -# Wizard options: nerdfont-complete + powerline, large icons, classic, unicode, darkest, -# 12h time, angled separators, blurred heads, sharp tails, 2 lines, solid, full frame, -# sparse, many icons, concise, instant_prompt=verbose. +# Generated by Powerlevel10k configuration wizard on 2021-03-14 at 23:24 IST. +# Based on romkatv/powerlevel10k/config/p10k-classic.zsh, checksum 40036. +# Wizard options: nerdfont-complete + powerline, small icons, classic, unicode, dark, +# 24h time, angled separators, sharp heads, sharp tails, 2 lines, dotted, full frame, +# sparse, few icons, concise, instant_prompt=verbose. # Type `p10k configure` to generate another config. # # Config for Powerlevel10k with classic powerline prompt style. Type `p10k configure` to generate @@ -32,17 +32,12 @@ # The list of segments shown on the left. Fill it with the most important segments. typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=( # =========================[ Line #1 ]========================= - os_icon # os identifier - user - dir_writable + # os_icon # os identifier dir # current directory - history - background_jobs vcs # git status # =========================[ Line #2 ]========================= newline # \n - prompt_char # prompt symbol - root_indicator + # prompt_char # prompt symbol ) # The list of segments shown on the right. Fill it with less important segments. @@ -95,7 +90,7 @@ midnight_commander # midnight commander shell (https://midnight-commander.org/) nix_shell # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html) vi_mode # vi mode (you don't need this if you've enabled prompt_char) - vpn_ip # virtual private network indicator + # vpn_ip # virtual private network indicator # load # CPU load # disk_usage # disk usage # ram # free RAM @@ -118,7 +113,7 @@ typeset -g POWERLEVEL9K_MODE=nerdfont-complete # When set to `moderate`, some icons will have an extra space after them. This is meant to avoid # icon overlap when using non-monospace fonts. When set to `none`, spaces are not added. - typeset -g POWERLEVEL9K_ICON_PADDING=moderate + typeset -g POWERLEVEL9K_ICON_PADDING=none # When set to true, icons appear before content on both sides of the prompt. When set # to false, icons go after content. If empty or not set, icons go before content in the left @@ -138,25 +133,25 @@ # Connect left prompt lines with these symbols. You'll probably want to use the same color # as POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND below. - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX='%238F╭─' - typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_PREFIX='%238F├─' - typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX='%238F╰─' + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX='%240F╭─' + typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_PREFIX='%240F├─' + typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX='%240F╰─' # Connect right prompt lines with these symbols. - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_SUFFIX='%238F─╮' - typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_SUFFIX='%238F─┤' - typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_SUFFIX='%238F─╯' + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_SUFFIX='%240F─╮' + typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_SUFFIX='%240F─┤' + typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_SUFFIX='%240F─╯' # Filler between left and right prompt on the first prompt line. You can set it to ' ', '·' or # '─'. The last two make it easier to see the alignment between left and right prompt and to # separate prompt from command output. You might want to set POWERLEVEL9K_PROMPT_ADD_NEWLINE=false # for more compact prompt if using using this option. - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR='─' + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR='·' typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_BACKGROUND= typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_GAP_BACKGROUND= if [[ $POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR != ' ' ]]; then # The color of the filler. You'll probably want to match the color of POWERLEVEL9K_MULTILINE # ornaments defined above. - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=238 + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=240 # Start filler from the edge of the screen if there are no left segments on the first line. typeset -g POWERLEVEL9K_EMPTY_LINE_LEFT_PROMPT_FIRST_SEGMENT_END_SYMBOL='%{%}' # End filler on the edge of the screen if there are no right segments on the first line. @@ -164,20 +159,20 @@ fi # Default background color. - typeset -g POWERLEVEL9K_BACKGROUND=234 + typeset -g POWERLEVEL9K_BACKGROUND=236 # Separator between same-color segments on the left. - typeset -g POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR='%242F\uE0B1' + typeset -g POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR='%244F\uE0B1' # Separator between same-color segments on the right. - typeset -g POWERLEVEL9K_RIGHT_SUBSEGMENT_SEPARATOR='%242F\uE0B3' + typeset -g POWERLEVEL9K_RIGHT_SUBSEGMENT_SEPARATOR='%244F\uE0B3' # Separator between different-color segments on the left. typeset -g POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR='\uE0B0' # Separator between different-color segments on the right. typeset -g POWERLEVEL9K_RIGHT_SEGMENT_SEPARATOR='\uE0B2' # The right end of left prompt. - typeset -g POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL='▓▒░' + typeset -g POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL='\uE0B0' # The left end of right prompt. - typeset -g POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL='░▒▓' + typeset -g POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0B2' # The left end of left prompt. typeset -g POWERLEVEL9K_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0B2' # The right end of right prompt. @@ -267,7 +262,7 @@ # respectively. typeset -g POWERLEVEL9K_DIR_TRUNCATE_BEFORE_MARKER=false # Don't shorten this many last directory segments. They are anchors. - typeset -g POWERLEVEL9K_SHORTEN_DIR_LENGTH=0 + typeset -g POWERLEVEL9K_SHORTEN_DIR_LENGTH=1 # Shorten directory if it's longer than this even if there is space for it. The value can # be either absolute (e.g., '80') or a percentage of terminal width (e.g, '50%'). If empty, # directory will be shortened only when prompt doesn't fit or when other parameters demand it @@ -286,13 +281,13 @@ # the full directory that was used in previous commands. typeset -g POWERLEVEL9K_DIR_HYPERLINK=false - # Enable special styling for non-writable directories. See POWERLEVEL9K_LOCK_ICON and - # POWERLEVEL9K_DIR_CLASSES below. - typeset -g POWERLEVEL9K_DIR_SHOW_WRITABLE=v2 + # Enable special styling for non-writable and non-existent directories. See POWERLEVEL9K_LOCK_ICON + # and POWERLEVEL9K_DIR_CLASSES below. + typeset -g POWERLEVEL9K_DIR_SHOW_WRITABLE=v3 - # The default icon shown next to non-writable directories when POWERLEVEL9K_DIR_SHOW_WRITABLE is - # set to v2. - typeset -g POWERLEVEL9K_LOCK_ICON='🔒' + # The default icon shown next to non-writable and non-existent directories when + # POWERLEVEL9K_DIR_SHOW_WRITABLE is set to v3. + # typeset -g POWERLEVEL9K_LOCK_ICON='⭐' # POWERLEVEL9K_DIR_CLASSES allows you to specify custom icons and colors for different # directories. It must be an array with 3 * N elements. Each triplet consists of: @@ -304,8 +299,8 @@ # # Triplets are tried in order. The first triplet whose pattern matches $PWD wins. # - # If POWERLEVEL9K_DIR_SHOW_WRITABLE is set to v2 and the current directory is not writable, - # its class gets suffix _NOT_WRITABLE. + # If POWERLEVEL9K_DIR_SHOW_WRITABLE is set to v3, non-writable and non-existent directories + # acquire class suffix _NOT_WRITABLE and NON_EXISTENT respectively. # # For example, given these settings: # @@ -314,8 +309,9 @@ # '~(|/*)' HOME '' # '*' DEFAULT '') # - # Whenever the current directory is ~/work or a subdirectory of ~/work, it gets styled with class - # WORK or WORK_NOT_WRITABLE. + # Whenever the current directory is ~/work or a subdirectory of ~/work, it gets styled with one + # of the following classes depending on its writability and existence: WORK, WORK_NOT_WRITABLE or + # WORK_NON_EXISTENT. # # Simply assigning classes to directories doesn't have any visible effects. It merely gives you an # option to define custom colors and icons for different directory classes. @@ -332,18 +328,24 @@ # typeset -g POWERLEVEL9K_DIR_WORK_NOT_WRITABLE_SHORTENED_FOREGROUND=103 # typeset -g POWERLEVEL9K_DIR_WORK_NOT_WRITABLE_ANCHOR_FOREGROUND=39 # + # # Styling for WORK_NON_EXISTENT. + # typeset -g POWERLEVEL9K_DIR_WORK_NON_EXISTENT_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_DIR_WORK_NON_EXISTENT_FOREGROUND=31 + # typeset -g POWERLEVEL9K_DIR_WORK_NON_EXISTENT_SHORTENED_FOREGROUND=103 + # typeset -g POWERLEVEL9K_DIR_WORK_NON_EXISTENT_ANCHOR_FOREGROUND=39 + # # If a styling parameter isn't explicitly defined for some class, it falls back to the classless # parameter. For example, if POWERLEVEL9K_DIR_WORK_NOT_WRITABLE_FOREGROUND is not set, it falls # back to POWERLEVEL9K_DIR_FOREGROUND. # - # typeset -g POWERLEVEL9K_DIR_CLASSES=() + typeset -g POWERLEVEL9K_DIR_CLASSES=() # Custom prefix. - # typeset -g POWERLEVEL9K_DIR_PREFIX='%244Fin ' + # typeset -g POWERLEVEL9K_DIR_PREFIX='%246Fin ' #####################################[ vcs: git status ]###################################### # Branch icon. Set this parameter to '\uF126 ' for the popular Powerline branch icon. - typeset -g POWERLEVEL9K_VCS_BRANCH_ICON='\uF126 ' + typeset -g POWERLEVEL9K_VCS_BRANCH_ICON= # Untracked files icon. It's really a question mark, your font isn't broken. # Change the value of this parameter to show a different icon. @@ -369,7 +371,7 @@ if (( $1 )); then # Styling for up-to-date Git status. - local meta='%244F' # grey foreground + local meta='%246F' # grey foreground local clean='%76F' # green foreground local modified='%178F' # yellow foreground local untracked='%39F' # blue foreground @@ -384,29 +386,37 @@ fi local res - local where # branch or tag + if [[ -n $VCS_STATUS_LOCAL_BRANCH ]]; then - res+="${clean}${(g::)POWERLEVEL9K_VCS_BRANCH_ICON}" - where=${(V)VCS_STATUS_LOCAL_BRANCH} - elif [[ -n $VCS_STATUS_TAG ]]; then - res+="${meta}#" - where=${(V)VCS_STATUS_TAG} + local branch=${(V)VCS_STATUS_LOCAL_BRANCH} + # If local branch name is at most 32 characters long, show it in full. + # Otherwise show the first 12 … the last 12. + # Tip: To always show local branch name in full without truncation, delete the next line. + (( $#branch > 32 )) && branch[13,-13]="…" # <-- this line + res+="${clean}${(g::)POWERLEVEL9K_VCS_BRANCH_ICON}${branch//\%/%%}" fi - # If local branch name or tag is at most 32 characters long, show it in full. - # Otherwise show the first 12 … the last 12. - # Tip: To always show local branch name in full without truncation, delete the next line. - (( $#where > 32 )) && where[13,-13]="…" + if [[ -n $VCS_STATUS_TAG + # Show tag only if not on a branch. + # Tip: To always show tag, delete the next line. + && -z $VCS_STATUS_LOCAL_BRANCH # <-- this line + ]]; then + local tag=${(V)VCS_STATUS_TAG} + # If tag name is at most 32 characters long, show it in full. + # Otherwise show the first 12 … the last 12. + # Tip: To always show tag name in full without truncation, delete the next line. + (( $#tag > 32 )) && tag[13,-13]="…" # <-- this line + res+="${meta}#${clean}${tag//\%/%%}" + fi - res+="${clean}${where//\%/%%}" # escape % - - # Display the current Git commit if there is no branch or tag. - # Tip: To always display the current Git commit, remove `[[ -z $where ]] &&` from the next line. - [[ -z $where ]] && res+="${meta}@${clean}${VCS_STATUS_COMMIT[1,8]}" + # Display the current Git commit if there is no branch and no tag. + # Tip: To always display the current Git commit, delete the next line. + [[ -z $VCS_STATUS_LOCAL_BRANCH && -z $VCS_STATUS_TAG ]] && # <-- this line + res+="${meta}@${clean}${VCS_STATUS_COMMIT[1,8]}" # Show tracking branch name if it differs from local branch. if [[ -n ${VCS_STATUS_REMOTE_BRANCH:#$VCS_STATUS_LOCAL_BRANCH} ]]; then - res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}" # escape % + res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}" fi # ⇣42 if behind the remote. @@ -470,9 +480,9 @@ typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_COLOR=76 typeset -g POWERLEVEL9K_VCS_LOADING_VISUAL_IDENTIFIER_COLOR=244 # Custom icon. - # typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_EXPANSION='⭐' + typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_EXPANSION= # Custom prefix. - # typeset -g POWERLEVEL9K_VCS_PREFIX='%244Fon ' + # typeset -g POWERLEVEL9K_VCS_PREFIX='%246Fon ' # Show status of repositories of these types. You can add svn and/or hg if you are # using them. If you do, your prompt may become slow even when your current directory @@ -523,17 +533,17 @@ ###################[ command_execution_time: duration of the last command ]################### # Show duration of the last command if takes at least this many seconds. - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=0 + typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=3 # Show this many fractional digits. Zero means round to seconds. - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION=6 + typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION=0 # Execution time color. typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND=248 # Duration format: 1d 2h 3m 4s. typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FORMAT='d h m s' # Custom icon. - # typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_VISUAL_IDENTIFIER_EXPANSION='⭐' + typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_VISUAL_IDENTIFIER_EXPANSION= # Custom prefix. - # typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PREFIX='%244Ftook ' + # typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PREFIX='%246Ftook ' #######################[ background_jobs: presence of background jobs ]####################### # Don't show the number of background jobs. @@ -597,7 +607,7 @@ typeset -g POWERLEVEL9K_ASDF_SHOW_SYSTEM=true # If set to non-empty value, hide tools unless there is a file matching the specified file pattern - # in the current directory, or its parent diretory, or its grandparent directory, and so on. + # in the current directory, or its parent directory, or its grandparent directory, and so on. # # Note: If this parameter is set to empty value, it won't hide tools. # Note: SHOW_ON_UPGLOB isn't specific to asdf. It works with all prompt segments. @@ -864,7 +874,7 @@ # Custom icon. # typeset -g POWERLEVEL9K_CONTEXT_VISUAL_IDENTIFIER_EXPANSION='⭐' # Custom prefix. - # typeset -g POWERLEVEL9K_CONTEXT_PREFIX='%244Fwith ' + # typeset -g POWERLEVEL9K_CONTEXT_PREFIX='%246Fwith ' ###[ virtualenv: python virtual environment (https://docs.python.org/3/library/venv.html) ]### # Python virtual environment color. @@ -1192,7 +1202,7 @@ #############[ kubecontext: current kubernetes context (https://kubernetes.io/) ]############# # Show kubecontext only when the the command you are typing invokes one of these tools. # Tip: Remove the next line to always show kubecontext. - typeset -g POWERLEVEL9K_KUBECONTEXT_SHOW_ON_COMMAND='kubectl|helm|kubens|kubectx|oc|istioctl|kogito|k9s|helmfile' + typeset -g POWERLEVEL9K_KUBECONTEXT_SHOW_ON_COMMAND='kubectl|helm|kubens|kubectx|oc|istioctl|kogito|k9s|helmfile|fluxctl|stern' # Kubernetes context classes for the purpose of using different colors, icons and expansions with # different contexts. @@ -1274,7 +1284,7 @@ POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION+='${${:-/$P9K_KUBECONTEXT_NAMESPACE}:#/default}' # Custom prefix. - # typeset -g POWERLEVEL9K_KUBECONTEXT_PREFIX='%244Fat ' + # typeset -g POWERLEVEL9K_KUBECONTEXT_PREFIX='%246Fat ' #[ aws: aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) ]# # Show aws only when the the command you are typing invokes one of these tools. @@ -1435,7 +1445,7 @@ typeset -g POWERLEVEL9K_VPN_IP_CONTENT_EXPANSION= # Regular expression for the VPN network interface. Run `ifconfig` or `ip -4 a show` while on VPN # to see the name of the interface. - typeset -g POWERLEVEL9K_VPN_IP_INTERFACE='(gpd|wg|(.*tun))[0-9]*' + typeset -g POWERLEVEL9K_VPN_IP_INTERFACE='(gpd|wg|(.*tun)|tailscale)[0-9]*' # If set to true, show one segment per matching network interface. If set to false, show only # one segment corresponding to the first matching network interface. # Tip: If you set it to true, you'll probably want to unset POWERLEVEL9K_VPN_IP_CONTENT_EXPANSION. @@ -1459,7 +1469,7 @@ typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='${P9K_IP_RX_RATE:+%70F⇣$P9K_IP_RX_RATE }${P9K_IP_TX_RATE:+%215F⇡$P9K_IP_TX_RATE }%38F$P9K_IP_IP' # Show information for the first network interface whose name matches this regular expression. # Run `ifconfig` or `ip -4 a show` to see the names of all network interfaces. - typeset -g POWERLEVEL9K_IP_INTERFACE='e.*' + typeset -g POWERLEVEL9K_IP_INTERFACE='[ew].*' # Custom icon. # typeset -g POWERLEVEL9K_IP_VISUAL_IDENTIFIER_EXPANSION='⭐' @@ -1512,15 +1522,15 @@ # Current time color. typeset -g POWERLEVEL9K_TIME_FOREGROUND=66 # Format for the current time: 09:51:02. See `man 3 strftime`. - typeset -g POWERLEVEL9K_TIME_FORMAT='%D{%a %I:%M:%S %p}' + typeset -g POWERLEVEL9K_TIME_FORMAT='%D{%H:%M:%S}' # If set to true, time will update when you hit enter. This way prompts for the past # commands will contain the start times of their commands as opposed to the default # behavior where they contain the end times of their preceding commands. typeset -g POWERLEVEL9K_TIME_UPDATE_ON_COMMAND=false # Custom icon. - # typeset -g POWERLEVEL9K_TIME_VISUAL_IDENTIFIER_EXPANSION='⭐' + typeset -g POWERLEVEL9K_TIME_VISUAL_IDENTIFIER_EXPANSION= # Custom prefix. - # typeset -g POWERLEVEL9K_TIME_PREFIX='%244Fat ' + # typeset -g POWERLEVEL9K_TIME_PREFIX='%246Fat ' # Example of a user-defined prompt segment. Function prompt_example will be called on every # prompt if `example` prompt segment is added to POWERLEVEL9K_LEFT_PROMPT_ELEMENTS or diff --git a/.profile b/.profile old mode 100644 new mode 100755 index 2124798..2676600 --- a/.profile +++ b/.profile @@ -26,4 +26,5 @@ if [ -d "$HOME/.local/bin" ] ; then PATH="$HOME/.local/bin:$PATH" fi -export PATH="$HOME/.cargo/bin:/media/pratik/Personal_Projects/DevSetUps/IDEs/flutter/bin:$PATH" +export PATH="$HOME/.cargo/bin:/media/pratik/Projects/DevSetUps:/media/pratik/Projects/DevSetUps/IDEs/flutter/bin:$PATH" +source "$HOME/.cargo/env" diff --git a/.tmux.conf b/.tmux.conf old mode 100644 new mode 100755 diff --git a/.vscode/argv.json b/.vscode/argv.json old mode 100644 new mode 100755 index 02bacbf..3e25892 --- a/.vscode/argv.json +++ b/.vscode/argv.json @@ -12,5 +12,13 @@ // Enabled by default by VS Code to resolve color issues in the renderer // See https://github.com/Microsoft/vscode/issues/51791 for details - "disable-color-correct-rendering": true + "disable-color-correct-rendering": true, + + // Allows to disable crash reporting. + // Should restart the app if the value is changed. + "enable-crash-reporter": false, + + // Unique id used for correlating crash reports sent from this instance. + // Do not edit this value. + "crash-reporter-id": "663adebd-ee7d-4d1f-9723-fd963e7e8e1a" } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json old mode 100644 new mode 100755 diff --git a/.zshrc b/.zshrc old mode 100644 new mode 100755 index 0f55be2..1aedb87 --- a/.zshrc +++ b/.zshrc @@ -49,7 +49,7 @@ HIST_STAMPS="dd.mm.yyyy" # Standard plugins can be found in $ZSH/plugins/ # Custom plugins may be added to $ZSH_CUSTOM/plugins/ -source ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +# source ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh plugins=( git history @@ -57,7 +57,8 @@ plugins=( perms sudo systemd - zsh-syntax-highlighting + # zsh-syntax-highlighting + # exercism ) source $ZSH/oh-my-zsh.sh @@ -65,6 +66,7 @@ source $ZSH/oh-my-zsh.sh # User configuration ##############Pratik POWERLEVEL9K Configs#################################### +POWERLEVEL9K_INSTANT_PROMPT=off POWERLEVEL9K_SHORTEN_DIR_LENGTH=4 # POWERLEVEL9K_SHORTEN_STRATEGY="None" @@ -92,28 +94,25 @@ setopt HIST_IGNORE_SPACE # Don't add commands that start with whitespac ##############Bring all the alias and setup scripts################################ +# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. +[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh + +# Setup path and export variables +[[ ! -f ~/.env ]] || source ~/.env [[ ! -f ~/.set_path ]] || source ~/.set_path +# # Aliases [[ ! -f ~/.aliases ]] || source ~/.aliases [[ ! -f ~/.aliases_personal ]] || source ~/.aliases_personal [[ ! -f ~/.neon_alias ]] || source ~/.neon_alias +# # Dev Setup Configurations [[ ! -f ~/.gosetup ]] || source ~/.gosetup [[ ! -f ~/.flutterpathsetup ]] || source ~/.flutterpathsetup - -# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. -[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh +[[ ! -f ~/.skaffoldenv ]] || source ~/.skaffoldenv export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion -# tabtab source for packages -# uninstall by removing these lines -[[ -f ~/.config/tabtab/__tabtab.zsh ]] && . ~/.config/tabtab/__tabtab.zsh || true - - -# Kubernetes Autocompletion -source <(kubectl completion zsh) - -source ~/.env \ No newline at end of file +[[ ! -f ~/.config/exercism/exercism_completion.bash ]] || source ~/.config/exercism/exercism_completion.bash diff --git a/Bash Boilerplate/template.sh b/Bash Boilerplate/template.sh old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755