diff --git a/.config/i3/config b/.config/i3/config index d1ab739..155ee24 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -164,7 +164,7 @@ bindsym $mod+s gaps inner current plus 5 bindsym $mod+Shift+s gaps inner current minus 5 #bindsym $mod+d exec rofi -config ~/.config/rofi/config -show drun -bindsym $mod+d exec dmenu_run -fn 'Ubuntu Mono derivative Powerline-10' -h '16' -nb '#5E81AC' -sf '#4C566A' -sb '#88C0D0' -nf '#2E3440' +bindsym $mod+d exec dmenu_run -fn 'UbuntuMono Nerd Font-10' -h '16' -nb '#5E81AC' -sf '#4C566A' -sb '#88C0D0' -nf '#2E3440' bindsym Mod1+d exec ~/.config/Scripts/rofi-bangs.sh bindsym $mod+Shift+d gaps inner current set 0; gaps outer current set 0 diff --git a/.config/polybar/bottom-bar b/.config/polybar/bottom-bar index 552a563..e4fb60f 100644 --- a/.config/polybar/bottom-bar +++ b/.config/polybar/bottom-bar @@ -13,4 +13,4 @@ padding-right = 1 module-margin-left = 1 module-margin-right = 1 font-0 = FontAwesome:size=10.5;1 -font-1 = Ubuntu Mono derivative Powerline:size=10;1 +font-1 = UbuntuMono Nerd Font:size=10.5;1 diff --git a/.config/polybar/config b/.config/polybar/config index a95d53a..35378f5 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -363,40 +363,16 @@ headphone-id = 19 mapped = true interval = 5 format-volume = -label-volume = %percentage%% +label-volume = "%percentage%% " label-volume-foreground = ${colors.foreground} format-muted = format-muted-foreground = ${colors.alert} -label-muted =  muted -ramp-volume-0 =  -ramp-volume-1 =  +label-muted = "  muted " +ramp-volume-0 = "  " +ramp-volume-1 = "  " ramp-volume-foreground = ${colors.foreground} -ramp-headphones-0 =  -ramp-headphones-1 =  - -[module/battery1] -type = internal/battery -battery = BAT1 -adapter = ADP1 -full-at = 98 -format-charging = -format-discharging = -format-full-prefix = " " -format-full-prefix-foreground = ${colors.foreground} -ramp-capacity-0-foreground = ${colors.alert} -ramp-capacity-0 =  -ramp-capacity-1 =  -ramp-capacity-2 =  -ramp-capacity-3 =  -ramp-capacity-4 =  -ramp-capacity-foreground = ${colors.foreground} -animation-charging-0 =  -animation-charging-1 =  -animation-charging-2 =  -animation-charging-3 =  -animation-charging-4 =  -animation-charging-foreground = ${colors.foreground} -animation-charging-framerate = 750 +ramp-headphones-0 = "  " +ramp-headphones-1 = "  " [module/battery] type = internal/battery @@ -404,35 +380,35 @@ battery = BAT1 adapter = ADP1 full-at = 98 time-format = %H:%M -label-charging = %percentage%% -label-discharging = %percentage%% +label-charging = "%percentage%% " +label-discharging = "%percentage%% " format-charging = format-discharging = format-charging-foreground = ${colors.foreground} label-charging-foreground = ${colors.foreground} format-discharging-foreground = ${colors.foreground} label-discharging-foreground = ${colors.foreground} -format-full-prefix = " " +format-full-prefix = " " format-full-prefix-foreground = ${colors.foreground} label-full-foreground = ${colors.foreground} -animation-charging-0 =  -animation-charging-1 =  -animation-charging-2 =  -animation-charging-3 =  -animation-charging-4 =  +animation-charging-0 = "  " +animation-charging-1 = "  " +animation-charging-2 = "  " +animation-charging-3 = "  " +animation-charging-4 = "  " animation-charging-foreground = ${colors.foreground} animation-charging-framerate = 500 -animation-discharging-0 =  -animation-discharging-1 =  -animation-discharging-2 =  -animation-discharging-3 =  -animation-discharging-4 =  +animation-discharging-0 = "  " +animation-discharging-1 = "  " +animation-discharging-2 = "  " +animation-discharging-3 = "  " +animation-discharging-4 = "  " animation-discharging-framerate = 1000 animation-discharging-foreground = ${colors.foreground} [module/networkmanager] type = custom/text -content = "net " +content = " net  " content-foreground = ${colors.foreground} click-left = networkmanager_dmenu @@ -448,25 +424,12 @@ label-connected = %{A1:networkmanager_dmenu:}%downspeed%%{A} label-connected-foreground = ${colors.foreground} label-disconnected = -;[module/wlan] -;type = internal/network -;interface = wlp2s0 -;interval = 3.0 -;format-connected = -;format-connected-prefix = " " -;format-connected-prefix-foreground = ${colors.foreground-alt} -;format-disconnected = -;label-connected = %{A1:networkmanager_dmenu:}%downspeed%%{A} %essid% -;label-connected-foreground = ${colors.foreground} -;label-disconnected = %ifname% disconnected -;label-disconnected-foreground = ${colors.foreground-alt} - [module/wlan] type = internal/network interface = wlp2s0 interval = 3.0 format-connected = -label-connected =  %essid%  %signal%  %upspeed:8%  %downspeed:8% +label-connected = "  %essid%  %signal%  %upspeed:8%  %downspeed:8% " label-disconnected =  label-disconnected-foreground = ${colors.foreground} ;label-disconnected = "%{A1:connman-gtk &:}%{A}" diff --git a/.config/polybar/top-bar b/.config/polybar/top-bar index 953778c..c5fe749 100644 --- a/.config/polybar/top-bar +++ b/.config/polybar/top-bar @@ -12,8 +12,8 @@ padding-left = 0 padding-right = 0 module-margin-left = 1 module-margin-right = 1 -font-0 = Ubuntu Mono derivative Powerline:size=10;1 -font-1 = FontAwesome:size=10;1 +font-0 = FontAwesome:size=10;1 +font-1 = UbuntuMono Nerd Font:size=10.5;1 scroll-up = i3wm-wsnext scroll-down = i3wm-wsprev diff --git a/.config/rofi/config b/.config/rofi/config index 306fb7a..74270c7 100644 --- a/.config/rofi/config +++ b/.config/rofi/config @@ -3,7 +3,7 @@ rofi.color-normal: #fbf8f1, #2A1A17, #fbf8f1, #ff923b, #2A1A17 rofi.color-urgent: #fbf8f1, #d6b48d, #22231D, #d6b48d, #2A1A17 rofi.color-active: #fbf8f1, #E1B959, #fbf8f1, #E1B959, #fbf8f1 rofi.color-window: #fbf8f1, #ff923b, #DD712E -rofi.font:Ubuntu Mono derivative Powerline 12 +rofi.font:UbuntuMono Nerd Font 12 rofi.color-enabled: true rofi.fake-transparency: true rofi.lines: 20 diff --git a/.config/wpg/templates/config_rofi_config.base b/.config/wpg/templates/config_rofi_config.base index 306fb7a..74270c7 100644 --- a/.config/wpg/templates/config_rofi_config.base +++ b/.config/wpg/templates/config_rofi_config.base @@ -3,7 +3,7 @@ rofi.color-normal: #fbf8f1, #2A1A17, #fbf8f1, #ff923b, #2A1A17 rofi.color-urgent: #fbf8f1, #d6b48d, #22231D, #d6b48d, #2A1A17 rofi.color-active: #fbf8f1, #E1B959, #fbf8f1, #E1B959, #fbf8f1 rofi.color-window: #fbf8f1, #ff923b, #DD712E -rofi.font:Ubuntu Mono derivative Powerline 12 +rofi.font:UbuntuMono Nerd Font 12 rofi.color-enabled: true rofi.fake-transparency: true rofi.lines: 20 diff --git a/.config/wpg/templates/config_twmn_twmn.conf.base b/.config/wpg/templates/config_twmn_twmn.conf.base index f6461c1..ab70588 100644 --- a/.config/wpg/templates/config_twmn_twmn.conf.base +++ b/.config/wpg/templates/config_twmn_twmn.conf.base @@ -4,7 +4,7 @@ always_on_top=true background_color={color0} bounce=true bounce_duration=500 -font=TamzenForPowerline +font=UbuntuMono Nerd Font font_size=12 font_variant=medium foreground_color=#999999 diff --git a/.p10k.zsh b/.p10k.zsh index d908b93..114e756 100644 --- a/.p10k.zsh +++ b/.p10k.zsh @@ -1,173 +1,49 @@ -# Generated by Powerlevel10k configuration wizard on 2020-02-29 at 21:38 EET. -# Based on romkatv/powerlevel10k/config/p10k-pure.zsh, checksum 30812. -# Wizard options: nerdfont-complete + powerline, small icons, pure, original, 2 lines, -# sparse, transient_prompt, instant_prompt=quiet. -# Type `p10k configure` to generate another config. -# -# Config file for Powerlevel10k with the style of Pure (https://github.com/sindresorhus/pure). -# -# Differences from Pure: -# -# - Git: -# - `@c4d3ec2c` instead of something like `v1.4.0~11` when in detached HEAD state. -# - No automatic `git fetch` (the same as in Pure with `PURE_GIT_PULL=0`). -# -# Apart from the differences listed above, the replication of Pure prompt is exact. This includes -# even the questionable parts. For example, just like in Pure, there is no indication of Git status -# being stale; prompt symbol is the same in command, visual and overwrite vi modes; when prompt -# doesn't fit on one line, it wraps around with no attempt to shorten it. -# -# If you like the general style of Pure but not particularly attached to all its quirks, type -# `p10k configure` and pick "Lean" style. This will give you slick minimalist prompt while taking -# advantage of Powerlevel10k features that aren't present in Pure. +# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. +# Initialization code that may require console input (password prompts, [y/n] +# confirmations, etc.) must go above this block; everything else may go below. +if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then + source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" +fi -# Temporarily change options. -'builtin' 'local' '-a' 'p10k_config_opts' -[[ ! -o 'aliases' ]] || p10k_config_opts+=('aliases') -[[ ! -o 'sh_glob' ]] || p10k_config_opts+=('sh_glob') -[[ ! -o 'no_brace_expand' ]] || p10k_config_opts+=('no_brace_expand') -'builtin' 'setopt' 'no_aliases' 'no_sh_glob' 'brace_expand' +POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir vcs nvm kubecontext) -() { - emulate -L zsh +POWERLEVEL9K_DISABLE_RPROMPT=true +POWERLEVEL9K_PROMPT_ADD_NEWLINE=true +POWERLEVEL9K_LEFT_SEGMENT_END_SEPARATOR= +POWERLEVEL9K_PROMPT_ON_NEWLINE=true +POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX= +POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX='%F{%(?.green.red)}➜%f ' - autoload -Uz is-at-least && is-at-least 5.1 || return +POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR= +POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR=' ' +POWERLEVEL9K_WHITESPACE_BETWEEN_LEFT_SEGMENTS= - # Unset all configuration options. - unset -m 'POWERLEVEL9K_*' +POWERLEVEL9K_DIR_SHOW_WRITABLE=true +typeset POWERLEVEL9K_DIR_{ETC,HOME,HOME_SUBFOLDER,DEFAULT,NOT_WRITABLE}_BACKGROUND=none +typeset POWERLEVEL9K_DIR_{HOME,HOME_SUBFOLDER,ETC,DEFAULT}_FOREGROUND=cyan +typeset POWERLEVEL9K_{ETC,FOLDER,HOME,HOME_SUB}_ICON= +POWERLEVEL9K_DIR_NOT_WRITABLE_VISUAL_IDENTIFIER_COLOR=red +POWERLEVEL9K_LOCK_ICON=$'\uE0A2' - # Prompt colors. - local grey='242' - local red='1' - local yellow='3' - local blue='4' - local magenta='5' - local cyan='6' - local white='7' +POWERLEVEL9K_VCS_MAX_SYNC_LATENCY_SECONDS=1e9 +typeset POWERLEVEL9K_VCS_{CLEAN,UNTRACKED,MODIFIED,LOADING}_BACKGROUND=none +typeset POWERLEVEL9K_VCS_{CLEAN,UNTRACKED,MODIFIED,LOADING}_FOREGROUND=magenta +typeset POWERLEVEL9K_VCS_{CLEAN,UNTRACKED,MODIFIED,LOADING}_{STAGED,UNSTAGED,UNTRACKED,INCOMING_CHANGES,OUTGOING_CHANGES,STASH,ACTION}FORMAT_FOREGROUND=red +typeset POWERLEVEL9K_VCS_{GIT,GIT_GITHUB,GIT_BITBUCKET,GIT_GITLAB}_ICON= +POWERLEVEL9K_VCS_BRANCH_ICON='%fon %F{magenta}\uE0A0 ' +POWERLEVEL9K_VCS_UNTRACKED_ICON=$'%{\b?%}' +POWERLEVEL9K_VCS_UNSTAGED_ICON=$'%{\b!%}' +POWERLEVEL9K_VCS_STAGED_ICON=$'%{\b+%}' - # Left prompt segments. - typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=( - # =========================[ Line #1 ]========================= - context # user@host - dir # current directory - vcs # git status - command_execution_time # previous command duration - # =========================[ Line #2 ]========================= - newline # \n - virtualenv # python virtual environment - prompt_char # prompt symbol - ) - - # Right prompt segments. - typeset -g POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=( - # =========================[ Line #1 ]========================= - # command_execution_time # previous command duration - # virtualenv # python virtual environment - # context # user@host - # time # current time - # =========================[ Line #2 ]========================= - newline # \n - ) - - # Basic style options that define the overall prompt look. - typeset -g POWERLEVEL9K_BACKGROUND= # transparent background - typeset -g POWERLEVEL9K_{LEFT,RIGHT}_{LEFT,RIGHT}_WHITESPACE= # no surrounding whitespace - typeset -g POWERLEVEL9K_{LEFT,RIGHT}_SUBSEGMENT_SEPARATOR=' ' # separate segments with a space - typeset -g POWERLEVEL9K_{LEFT,RIGHT}_SEGMENT_SEPARATOR= # no end-of-line symbol - typeset -g POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION= # no segment icons - - # Add an empty line before each prompt except the first. This doesn't emulate the bug - # in Pure that makes prompt drift down whenever you use the Alt-C binding from fzf or similar. - typeset -g POWERLEVEL9K_PROMPT_ADD_NEWLINE=true - - # Magenta prompt symbol if the last command succeeded. - typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS}_FOREGROUND=$magenta - # Red prompt symbol if the last command failed. - typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS}_FOREGROUND=$red - # Default prompt symbol. - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIINS_CONTENT_EXPANSION='❯' - # Prompt symbol in command vi mode. - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VICMD_CONTENT_EXPANSION='❮' - # Prompt symbol in visual vi mode is the same as in command mode. - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIVIS_CONTENT_EXPANSION='❮' - # Prompt symbol in overwrite vi mode is the same as in command mode. - typeset -g POWERLEVEL9K_PROMPT_CHAR_OVERWRITE_STATE=false - - # Grey Python Virtual Environment. - typeset -g POWERLEVEL9K_VIRTUALENV_FOREGROUND=$grey - # Don't show Python version. - typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION=false - typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER= - - # Blue current directory. - typeset -g POWERLEVEL9K_DIR_FOREGROUND=$blue - - # Context format when root: user@host. The first part white, the rest grey. - typeset -g POWERLEVEL9K_CONTEXT_ROOT_TEMPLATE="%F{$white}%n%f%F{$grey}@%m%f" - # Context format when not root: user@host. The whole thing grey. - typeset -g POWERLEVEL9K_CONTEXT_TEMPLATE="%F{$grey}%n@%m%f" - # Don't show context unless root or in SSH. - typeset -g POWERLEVEL9K_CONTEXT_{DEFAULT,SUDO}_CONTENT_EXPANSION= - - # Show previous command duration only if it's >= 5s. - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=5 - # Don't show fractional seconds. Thus, 7s rather than 7.3s. - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION=0 - # Duration format: 1d 2h 3m 4s. - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FORMAT='d h m s' - # Yellow previous command duration. - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND=$yellow - - # Grey Git prompt. This makes stale prompts indistinguishable from up-to-date ones. - typeset -g POWERLEVEL9K_VCS_FOREGROUND=$grey - - # Disable async loading indicator to make directories that aren't Git repositories - # indistinguishable from large Git repositories without known state. - typeset -g POWERLEVEL9K_VCS_LOADING_TEXT= - - # Don't wait for Git status even for a millisecond, so that prompt always updates - # asynchronously when Git state changes. - typeset -g POWERLEVEL9K_VCS_MAX_SYNC_LATENCY_SECONDS=0 - - # Cyan ahead/behind arrows. - typeset -g POWERLEVEL9K_VCS_{INCOMING,OUTGOING}_CHANGESFORMAT_FOREGROUND=$cyan - # Don't show remote branch, current tag or stashes. - typeset -g POWERLEVEL9K_VCS_GIT_HOOKS=(vcs-detect-changes git-untracked git-aheadbehind) - # Don't show the branch icon. - typeset -g POWERLEVEL9K_VCS_BRANCH_ICON= - # When in detached HEAD state, show @commit where branch normally goes. - typeset -g POWERLEVEL9K_VCS_COMMIT_ICON='@' - # Don't show staged, unstaged, untracked indicators. - typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED}_ICON= - # Show '*' when there are staged, unstaged or untracked files. - typeset -g POWERLEVEL9K_VCS_DIRTY_ICON='*' - # Show '⇣' if local branch is behind remote. - typeset -g POWERLEVEL9K_VCS_INCOMING_CHANGES_ICON=':⇣' - # Show '⇡' if local branch is ahead of remote. - typeset -g POWERLEVEL9K_VCS_OUTGOING_CHANGES_ICON=':⇡' - # Don't show the number of commits next to the ahead/behind arrows. - typeset -g POWERLEVEL9K_VCS_{COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=1 - # Remove space between '⇣' and '⇡' and all trailing spaces. - typeset -g POWERLEVEL9K_VCS_CONTENT_EXPANSION='${${${P9K_CONTENT/⇣* :⇡/⇣⇡}// }//:/ }' - - # Grey current time. - typeset -g POWERLEVEL9K_TIME_FOREGROUND=$grey - # Format for the current time: 09:51:02. See `man 3 strftime`. - 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 rather than the end times of - # their preceding commands. - typeset -g POWERLEVEL9K_TIME_UPDATE_ON_COMMAND=false - - # Transient prompt works similarly to the builtin transient_rprompt option. It trims down prompt - # when accepting a command line. Supported values: - # - # - off: Don't change prompt when accepting a command line. - # - always: Trim down prompt when accepting a command line. - # - same-dir: Trim down prompt when accepting a command line unless this is the first command - # typed after changing current working directory. - typeset -g POWERLEVEL9K_TRANSIENT_PROMPT=always +POWERLEVEL9K_NVM_BACKGROUND=none +POWERLEVEL9K_NVM_FOREGROUND=green +POWERLEVEL9K_NODE_ICON='%fvia %F{green}⬢' +POWERLEVEL9K_KUBECONTEXT_BACKGROUND=none +POWERLEVEL9K_KUBECONTEXT_FOREGROUND=cyan +POWERLEVEL9K_KUBERNETES_ICON='%fat %F{cyan}☸️ ' +POWERLEVEL9K_KUBECONTEXT_SHOW_DEFAULT_NAMESPACE=false + # Instant prompt mode. # # - off: Disable instant prompt. Choose this if you've tried instant prompt and found @@ -185,11 +61,3 @@ # can slow down prompt by 1-2 milliseconds, so it's better to keep it turned off unless you # really need it. typeset -g POWERLEVEL9K_DISABLE_HOT_RELOAD=true - - # If p10k is already loaded, reload configuration. - # This works even with POWERLEVEL9K_DISABLE_HOT_RELOAD=true. - (( ! $+functions[p10k] )) || p10k reload -} - -(( ${#p10k_config_opts} )) && setopt ${p10k_config_opts[@]} -'builtin' 'unset' 'p10k_config_opts'