Update dotfiles

README.md

@@ -15,7 +15,6 @@ My personal configurations, managed with the 'dotdrop' submodule.
 + Shell: `zsh`
 + Terminal: `alacritty`
 + Theme: `Nord`
-+ Vim-Bar: `airline`
 + WM: `i3-gaps`
 
 ## Requirements

dotfiles/alacritty/alacritty.yml

@@ -34,8 +34,8 @@ window:
   # Blank space added around the window in pixels. This padding is scaled
   # by DPI and the specified value is always added at both opposing sides.
   padding:
-    x: 5
+    x: 15
-    y: 5
+    y: 15
 
   # Spread additional padding evenly around the terminal content.
   dynamic_padding: false

dotfiles/bash/bashrc

@@ -10,7 +10,7 @@ HOST="\[\033[0;93m\]\h\[\033[m\]"
 GIT="\[\033[1;91m\](\$(git_branch))\[\033[m\]"
 ICON="\[\033[1;92m\]➜\[\033[m\]"
 DIR="\[\033[1;94m\]\w\[\033[m\]"
-export PS1="${HOST} ${ICON}  ${DIR} "
+export PS1="[${HOST}] ${ICON}  ${DIR} "
 
 # Quality of Life
 alias ..="cd .."

dotfiles/dunst/dunstrc

@@ -62,7 +62,7 @@
 
     # Defines width in pixels of frame around the notification window.
     # Set to 0 to disable.
-    frame_width = 5
+    frame_width = 2
 
     # Defines color of the frame around the notification window.
     frame_color = "#18191E"

dotfiles/i3/config

@@ -116,10 +116,10 @@ for_window [class="^.*"] border pixel 0
 
 # Colors from https://www.nordtheme.com/
 # class                 border  backgr. text    indicator child_border
-client.focused          #2e3440 #2e3440 #ECEFF4 #A3BE8C   #A3BE8C
+client.focused          #a3be8c #2e3440 #ECEFF4 #A3BE8C   #A3BE8C
-client.focused_inactive #2e3440 #2e3440 #ECEFF4 #BF616A   #5f676a
+client.focused_inactive #2e3440 #2e3440 #ECEFF4 #2e3440   #5f676a
-client.unfocused        #333333 #222222 #D8DEE9 #BF616A   #222222
+client.unfocused        #333333 #222222 #D8DEE9 #2e3440   #2e3440
-client.urgent           #2f343a #BF616A #ECEFF4 #BF616A   #900000
+client.urgent           #2f343a #BF616A #ECEFF4 #BF616A   #BF616A
 client.background       #ffffff
 
 {%@@ if profile == "work" @@%}

dotfiles/polybar/config

@@ -1,25 +1,29 @@
 ; vim: ft=dosini
 
 [colors]
-nord_red = #BF616A
+red = #BF616A
-nord_orange = #D08770
+orange = #D08770
-nord_yellow = #EBCB8B
+yellow = #EBCB8B
-nord_green = #A3BE8C
+green = #A3BE8C
-nord_purple = #B48EAD
+purple = #B48EAD
 
-nord_blue0 = #8FBCBB
+blue0 = #8FBCBB
-nord_blue1 = #88C0D0
+blue1 = #88C0D0
-nord_blue2 = #81A1C1
+blue2 = #81A1C1
-nord_blue3 = #5E81AC
+blue3 = #5E81AC
 
 nord0 = #2E3440
+nord1 = #3b4252
+nord2 = #434c5e
 nord3 = #4C566A
 
+frost0 = #d8dee9
+frost1 = #e5e9f0
 frost2 = #ECEFF4
 
+nord0_trans = #dd2E3440
 
-accent = ${colors.nord_green}
+accent = ${colors.green}
-modules_fg = ${colors.frost2}
 background = ${colors.nord0}
 foreground = ${colors.frost2}
 
@@ -27,31 +31,32 @@ foreground = ${colors.frost2}
 [settings]
 format-foreground = ${colors.foreground}
 format-background = ${colors.background}
-format-padding = 0
-format-margin = 0
 screenchange-reload = true
 
 ###############################################################################
-[bar/laptop]
+[bar/main]
 monitor = "eDP-1"
 enable-ipc = false
 
+# FONTS PROVIDED WITH DOTFILES
+# https://github.com/stark/siji
+
 font-0 = "Inconsolata:pixelsize=11;2"
-font-1 = "InconsolataLGC Nerd Font Mono:pixelsize=14;4"
+font-1 = "IPAGothic:fontformat=truetype:antialias=false:pixelsize=11"
-font-2 = "IPAGothic:fontformat=truetype:antialias=false:pixelsize=11"
+font-2 = "Siji:size=7;2"
 
 bottom = false
 fixed-center = true
 
 padding-left = 0
-padding-right = 1
+padding-right = 0
 
 radius = 0.0
 
 foreground = ${colors.foreground}
-background = ${colors.background}
+background = ${colors.nord0_trans}
 
-tray-position = right
+tray-position =
 
 width = 100%:-16px
 height = 27
@@ -61,31 +66,16 @@ offset-x = 8px
 
 override-redirect = true
 
-module-margin = 1
+modules-left = i3
-
+modules-center =
-modules-left = i3tabs title
+modules-right = spotify volume battery network date
-modules-center = spotify_current
-modules-right = firefox spotify discord pipe backlight volume battery pipe date time pipe
 separator =
 
 wm-name = i3
 wm-restack = i3
 
 ###############################################################################
-[bar/external]
+[module/i3]
-inherit = bar/laptop
-
-tray-position =
-
-monitor = ${env:MONITOR:}
-
-modules-left = i3tabs title
-modules-center = spotify_current
-modules-right = firefox spotify discord pipe volume battery pipe date time
-separator =
-
-###############################################################################
-[module/i3tabs]
 type = internal/i3
 
 pin-workspaces = true
@@ -96,7 +86,7 @@ wrapping-scroll = false
 
 format = <label-state> <label-mode>
 
-background = ${colors.background}
+background = ${colors.nord0}
 
 ws-icon-0 = 1;1
 ws-icon-1 = 2;2
@@ -110,50 +100,40 @@ ws-icon-8 = 9;9
 ws-icon-9 = 10;10
 
 label-focused = %icon%
-label-focused-foreground = ${colors.background}
+label-focused-foreground = ${self.background}
 label-focused-background = ${colors.accent}
-label-focused-padding = 1
+label-focused-padding = 2
 
 label-unfocused = %index%
 label-unfocused-foreground = ${colors.foreground}
 label-unfocused-background = ${self.background}
-label-unfocused-padding = 1
+label-unfocused-padding = 2
 
 label-visible = %index%
 label-visible-foreground = ${colors.foreground}
 label-visible-background = ${self.background}
-label-visible-padding = 1
+label-visible-padding = 2
 
 label-urgent = %index%
-label-urgent-foreground = ${colors.nord_red}
+label-urgent-foreground = ${colors.red}
 label-urgent-background = ${self.background}
-label-urgent-padding = 1
+label-urgent-padding = 2
-
-label-mode = %mode%
-label-mode-padding = 0
-label-mode-foreground = ${colors.accent}
-label-mode-background = ${self.background}
 
 ###############################################################################
 [module/date]
 type = internal/date
 
-interval = 1.0
+format-padding = 2
-
+format-background = ${colors.nord0}
-date = %Y-%m-%d%
-date-alt = %A, %d %B %Y
-
-label = 冀 %date%
-
-###############################################################################
-[module/time]
-type = internal/date
 
 interval = 1.0
 
-time = %H:%M
+time =  %I:%M %p
+time-alt =  %Y-%m-%d%
 
-label =  %time%
+format = <label>
+
+label = %time%
 
 ###############################################################################
 [module/title]
@@ -164,6 +144,29 @@ label-maxlen = 80
 label-empty = "Yoroshiku!"
 format-padding = 2
 
+###############################################################################
+[module/cpu]
+type = internal/cpu
+
+interval = 0.5
+
+format = <label>
+format-prefix = 
+format-padding = 1
+
+label = " %percentage%%"
+
+###############################################################################
+[module/memory]
+type = internal/memory
+
+interval = 3
+
+format = <label>
+format-prefix = 
+
+label = " %mb_used%"
+
 ###############################################################################
 [module/battery]
 type = internal/battery
@@ -171,45 +174,93 @@ full-at = 99
 battery = BAT0
 apdapter = ADP1
 
-format-charging = <ramp-capacity> <label-charging>
+format-charging = <animation-charging> <label-charging>
-format-charging-foreground = ${colors.nord_green}
+format-charging-background = ${colors.nord2}
-label-charging = %percentage%% 
+format-charging-padding = 2
 
 format-discharging = <ramp-capacity> <label-discharging>
-format-discharging-foreground = ${colors.nord_green}
+format-discharging-background = ${colors.nord2}
+format-discharging-padding = 2
+
+format-full = <ramp-capacity> <label-full>
+format-full-background = ${colors.nord2}
+format-full-padding = 2
+
+label-charging = %percentage%%
 label-discharging = %percentage%%
+label-full = 100%
 
-ramp-capacity-0 = 
+; Only applies if <ramp-capacity> is used
-ramp-capacity-1 = 
+ramp-capacity-0 = 
-ramp-capacity-2 = 
+ramp-capacity-1 = 
-ramp-capacity-3 = 
+ramp-capacity-2 = 
+ramp-capacity-3 = 
+ramp-capacity-4 = 
+ramp-capacity-5 = 
+ramp-capacity-6 = 
+ramp-capacity-7 = 
+ramp-capacity-8 = 
+ramp-capacity-9 = 
 
-format-full = <label-full>
+; Only applies if <animation-charging> is used
-format-full-foreground = ${colors.nord_green}
+animation-charging-0 = 
-label-full =  FULL
+animation-charging-1 = 
+animation-charging-2 = 
+animation-charging-3 = 
+
+; Framerate in milliseconds
+animation-charging-framerate = 750
 
 ###############################################################################
 [module/volume]
 type = internal/pulseaudio
 
-format-volume = <label-volume>
+format-volume-background = ${colors.nord3}
-label-volume = 墳 %percentage%%
+format-volume-padding = 2
 
-format-muted = <label-muted>
+format-volume = <ramp-volume> <label-volume>
-format-muted-foreground = ${colors.nord_red}
+
-label-muted = 婢 MUTED
+label-volume = %percentage%%
+
+format-muted-prefix = " "
+format-muted-padding = 2
+label-muted = "Muted"
+
+ramp-volume-0 = 
+ramp-volume-1 = 
+ramp-volume-2 = 
+ramp-volume-3 = 
+ramp-volume-4 = 
+
+ramp-headphones-0 = 
+ramp-headphones-1 = 
 
 ###############################################################################
 [module/network]
 type = internal/network
 interface = wlo1
-interval = 10.0
 
-format-connected = <label-connected>
+interval = 1.0
-label-connected = 泌 %essid%
+accumulate-stats = true
+unknown-as-up = true
 
-format-disconnectded = <label-disconnected>
+format-connected = <ramp-signal> <label-connected>
-label-disconnected = 泌 No Wifi
+format-connected-background = ${colors.nord1}
+format-connected-padding = 2
+
+format-disconnected = <label-disconnected>
+format-disconnected-background = ${colors.nord1}
+format-disconnected-padding = 2
+
+label-connected = %essid%
+label-disconnected =  Disconnected
+
+; Only applies if <ramp-signal> is used
+ramp-signal-0 = 
+ramp-signal-1 = 
+ramp-signal-2 = 
+ramp-signal-3 = 
+ramp-signal-4 = 
 
 ###############################################################################
 [module/backlight]
@@ -218,7 +269,7 @@ type = internal/backlight
 card = amdgpu_bl0
 
 format = <label>
-label =  %percentage%%
+label = %percentage%%
 
 ###############################################################################
 [module/load]
@@ -227,31 +278,11 @@ exec = ~/.config/polybar/scripts/load.sh
 interval = 5.0
 
 ###############################################################################
-[module/spotify_current]
+[module/spotify]
+format-padding = 2
+format-background = ${colors.blue3}
+
 type = custom/script
 exec = ~/.config/polybar/scripts/spotify.sh %artist% - %title%
 tail = true
 interval = 2
-
-###############################################################################
-[module/spotify]
-type = custom/text
-content = ""
-click-left = spotify &
-
-###############################################################################
-[module/discord]
-type = custom/text
-content = "ﭮ"
-click-left = Discord &
-
-###############################################################################
-[module/firefox]
-type = custom/text
-content = ""
-click-left = firefox &
-
-###############################################################################
-[module/pipe]
-type = custom/text
-content = "|"

dotfiles/polybar/start.sh

@@ -4,9 +4,9 @@ while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
 if type "xrandr"; then
   for mon in $(xrandr --query | grep " connected" | cut -d" " -f1); do
     if [[ ${mon} = *eDP-1* ]]; then
-        polybar --reload laptop &
+        polybar --reload main &
     else
-        MONITOR=$mon polybar --reload external &
+        MONITOR=$mon polybar --reload main &
     fi
   done
 else

dotfiles/ranger/rc.conf

@@ -4,6 +4,6 @@ set preview_images true
 default_linemode devicons
 
 # separators, outline, both, none
-set draw_borders none
+set draw_borders both
 
 set mouse_enabled true

dotfiles/scripts/launchpolybar

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-sh $HOME/.config/polybar/start.sh

dotfiles/zsh/zshrc

@@ -4,7 +4,8 @@ autoload -U colors && colors
 precmd_vcs_info() { vcs_info }
 precmd_functions+=( precmd_vcs_info )
 setopt prompt_subst
-export PROMPT="%{$fg[yellow]%}%m %{$fg_bold[green]%}➜ %{$fg_bold[blue]%}%~ %{$fg_bold[green]%}\$vcs_info_msg_0_ %{$reset_color%}"
+#export PROMPT="%{$fg[yellow]%}%m %{$fg_bold[green]%}➜ %{$fg_bold[blue]%}%~ %{$fg_bold[green]%}\$vcs_info_msg_0_ %{$reset_color%}"
+export PROMPT="%{$fg[yellow]%}%m %{$fg_bold[blue]%}%~ %{$fg_bold[green]%}\$vcs_info_msg_0_ %{$reset_color%}"
 zstyle ':vcs_info:git:*' formats '%b'
 
 ## Exports
@@ -31,6 +32,8 @@ alias l='ls -lFh'     #size,show type,human readable
 alias la='ls -lAFh'   #long list,show almost all,show type,human readable
 alias ll='ls -l'      #long list
 
+alias c='clear'
+
 alias rm='rm -i' # Ask before removal
 alias cp='cp -i' # Ask before removal
 alias mv='mv -i' # Ask before removal