Added NM dispatcher script for nfs, zshrc alias, i3 changed WS names, polybar updated for own colors and added & changed blocks

2018-01-08 16:40:11 +01:00
parent defc9f6849
commit ebdcd6f82e
6 changed files with 129 additions and 75 deletions
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -14,14 +14,29 @@ background-alt = #25426A
 ;foreground = ${xrdb:color7:#222}
 foreground = #dfdfdf
 foreground-alt = #55729A
-primary = #ffb52a
-secondary = #e60053
 alert = #bd2c40
+black   = #1d1d1d
+red     = #d73555
+green   = #35d755
+yellow  = #d7d755
+blue    = #3555d7
+magenta = #d755d7
+cyan    = #55b7b7
+white   = #e7e7e7
+bright_black   = '0x303030'
+bright_red     = '0xc76484'
+bright_green   = '0x64c784'
+bright_yellow  = '0xc7c784'
+bright_blue    = '0x6484c7'
+bright_magenta = '0x7355d7'
+bright_cyan    = '0x84c7c7'
+bright_white   = '0xd7d7d7'
+

 [bar/top]
 ;monitor = ${env:MONITOR:HDMI-1}
 width = 100%
-height = 28
+height = 26
 ;offset-x = 1%
 ;offset-y = 1%
 radius = 0
@@ -36,10 +51,10 @@ line-color = #f00
 border-size = 0
 border-color = #00000000

-padding-left = 0
-padding-right = 1
+module-padding-left = 1
+module-padding-right = 1

-module-margin-left = 1
+module-margin-left = 0
 module-margin-right = 1

 font-0 = "xos4 Terminus:pixelsize=16"
@@ -47,21 +62,10 @@ font-1 = FontAwesome:pixelsize=16;1

 modules-left = i3
 modules-center = xwindow
-modules-right = filesystem volume xkeyboard memory cpu eth date battery powermenu
+modules-right = network filesystem volume battery xkeyboard cpu memory date powermenu

 tray-position = right
 tray-padding = 2
-;tray-transparent = true
-;tray-background = #0063ff
-
-;wm-restack = bspwm
-;wm-restack = i3
-
-;override-redirect = true
-
-;scroll-up = bspwm-desknext
-;scroll-down = bspwm-deskprev
-
 scroll-up = i3wm-wsnext
 scroll-down = i3wm-wsprev

@@ -73,23 +77,24 @@ type = internal/i3
 format = <label-state> <label-mode>
 index-sort = true
 wrapping-scroll = false
+strip-wsnumbers = true

 ; Only show workspaces on the same output as the bar
 pin-workspaces = true

-label-mode-padding = 2
-label-mode-foreground = #000
-label-mode-background = ${colors.primary}
+label-mode-padding = 1
+label-mode-foreground = ${colors.black}
+label-mode-background = ${colors.cyan}

 ; focused = Active workspace on focused monitor
 label-focused = %name%
 label-focused-background = ${colors.background-alt}
-label-focused-underline= ${colors.primary}
-label-focused-padding = 2
+label-focused-underline=  ${colors.cyan}
+label-focused-padding = 1

 ; unfocused = Inactive workspace on any monitor
 label-unfocused = %index%
-label-unfocused-padding = 2
+label-unfocused-padding = 1

 ; visible = Active workspace on unfocused monitor
 label-visible = %index%
@@ -99,29 +104,26 @@ label-visible-padding = ${self.label-focused-padding}

 ; urgent = Workspace with urgency hint set
 label-urgent = %index%
-label-urgent-background = ${colors.alert}
+label-urgent-background = ${colors.red}
 label-urgent-padding = 2

 [module/xwindow]
 type = internal/xwindow
 label =  %title:0:30:...%
-format-foreground = #AA3552
+format-foreground = ${colors.white}

 [module/xkeyboard]
 type = internal/xkeyboard
 blacklist-0 = num lock
+blacklist-1 = scroll lock
+blacklist-2 = caps lock

 format-prefix = " "
 format-prefix-foreground = ${colors.foreground-alt}
-format-prefix-underline = ${colors.secondary}
+format-prefix-underline = ${colors.red}

 label-layout = %layout%
-label-layout-underline = ${colors.secondary}
-
-label-indicator-padding = 0
-label-indicator-margin = 0
-label-indicator-background = ${colors.secondary}
-label-indicator-underline = ${colors.secondary}
+label-layout-underline = ${colors.red}

 [module/filesystem]
 type = internal/fs
@@ -133,41 +135,75 @@ format-unmounted = <label-unmounted>
 mount-0 = /
 mount-1 = /media

-label-mounted = %{F#0a81f5}%mountpoint%%{F-}: %free%
+label-mounted = %{F#55b7b7}%mountpoint%%{F-}: %free%
 label-unmounted = %mountpoint%
 label-unmounted-foreground = ${colors.foreground-alt}

 [module/cpu]
 type = internal/cpu
 interval = 2
-format-prefix = " "
+format = <ramp-coreload>
+format-prefix = ""
 format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #f90000
-label = %percentage:2%%
+format-underline = ${colors.yellow}
+ramp-coreload-0 = ▁
+ramp-coreload-1 = ▂
+ramp-coreload-2 = ▃
+ramp-coreload-3 = ▄
+ramp-coreload-4 = ▅
+ramp-coreload-5 = ▆
+ramp-coreload-6 = ▇
+ramp-coreload-7 = █

 [module/memory]
 type = internal/memory
 interval = 2
-format-prefix = " "
+format = <bar-used>
+format-prefix =
 format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #4bffdc
-label = %percentage_used%%
+format-underline = ${colors.green}
+label = %gb_used%/%gb_total%

-[module/eth]
+bar-used-indicator =
+bar-used-width = 12
+bar-used-foreground-0 = ${colors.bright_green}
+bar-used-foreground-1 = ${colors.green}
+bar-used-foreground-2 = ${colors.red}
+bar-used-foreground-3 = ${colors.bright_red}
+bar-used-fill = ▐
+bar-used-empty = ▐
+bar-used-empty-foreground = ${colors.foreground-alt}
+
+[module/network]
 type = internal/network
 interface = wlp3s0
-interval = 3.0
+interval = 1.0

-format-connected-underline = #55aa55
-format-connected-prefix = " "
-format-connected-prefix-foreground = ${colors.foreground-alt}
-label-connected = %local_ip%
+udspeed-minwidth = 5
+accumulate-stats = true

-format-disconnected =
-;format-disconnected = <label-disconnected>
-;format-disconnected-underline = ${self.format-connected-underline}
-;label-disconnected = %ifname% disconnected
-;label-disconnected-foreground = ${colors.foreground-alt}
+format-connected = <ramp-signal> <label-connected>
+format-disconnected = <label-disconnected>
+format-packetloss = <animation-packetloss> <label-connected>
+
+label-connected = %essid%
+label-connected-foreground = ${colors.green}
+label-disconnected = %ifname%
+label-disconnected-foreground = ${colors.bright_red}
+
+ramp-signal-0 = ▁
+ramp-signal-1 = ▃
+ramp-signal-2 = ▄
+ramp-signal-3 = ▅
+ramp-signal-4 = ▆
+ramp-signal-5 = █
+; Only applies if <animation-packetloss> is used
+animation-packetloss-0 = 
+animation-packetloss-0-foreground = ${colors.yellow}
+animation-packetloss-1 = 
+animation-packetloss-1-foreground = ${colors.black}
+; Framerate in milliseconds
+animation-packetloss-framerate = 500
 [module/battery]
 type = internal/battery
 full-at = 99
@@ -177,9 +213,10 @@ time-format = %H:%M

 format-charging = <animation-charging> <label-charging>
 format-discharging = <ramp-capacity> <label-discharging>
+format-full-foreground = ${colors.green}
 label-charging = %percentage%%
-label-discharging = %percentage%%
-label-full = Fully charged
+label-discharging = %time%
+label-full = 

 ramp-capacity-0 = 
 ramp-capacity-1 = 
@@ -194,7 +231,6 @@ animation-charging-3 = 
 animation-charging-4 = 
 ; Framerate in milliseconds
 animation-charging-framerate = 500
-
 poll-interval = 5

 [module/date]
@@ -202,16 +238,16 @@ type = internal/date
 interval = 5

 date =
-date-alt = " %Y-%m-%d"
+date-alt = " %d/%m/%Y"

 time = %H:%M
 time-alt = %H:%M:%S

 format-prefix-foreground = ${colors.foreground-alt}
 format-prefix= 
-format-underline = #0a6cf5
+format-underline = ${colors.blue}

-label = %date% %time%
+label = %time%%date%

 [module/volume]
 type = internal/volume
@@ -248,9 +284,9 @@ expand-right = true

 format-spacing = 1
 label-open = 
-label-open-foreground = ${colors.secondary}
+label-open-foreground = ${colors.red}
 label-close =  cancel
-label-close-foreground = ${colors.secondary}
+label-close-foreground = ${colors.red}
 label-separator = |
 label-separator-foreground = ${colors.foreground-alt}

--- a/.config/ranger/bookmarks
+++ b/.config/ranger/bookmarks
@@ -1,4 +1,4 @@
-':/home/tristan/build/dotfiles/.config/alacritty
+':/home/tristan/Downloads
 v:/home/tristan/build/rineja/app/views
 a:/home/tristan/build/rineja/app/assets
 c:/home/tristan/build/rineja/app/controllers
--- a/.i3/config
+++ b/.i3/config
@@ -143,11 +143,11 @@ workspace_auto_back_and_forth yes
 workspace $WS1 output primary

 #Primary workspaces
-set $WS1 "1 "
-set $WS2 "2 "
-set $WS3 "3 "
-set $WS4 "4 "
-set $WS5 "5 "
+set $WS1 "1:"
+set $WS2 "2:"
+set $WS3 "3:"
+set $WS4 "4:"
+set $WS5 "5:"
 bindsym $mod+1 workspace $WS1
 bindsym $mod+2 workspace $WS2
 bindsym $mod+3 workspace $WS3
@@ -170,10 +170,10 @@ bindsym $m+Shift+4 move container to workspace $WS4
 bindsym $m+Shift+5 move container to workspace $WS5

 #Secondary workspaces
-set $WSW1 "W1"
-set $WSW2 "W2"
-set $WSW3 "W3"
-set $WSW4 "W4"
+set $WSW1 "W1:"
+set $WSW2 "W2:"
+set $WSW3 "W3:"
+set $WSW4 "W4:"
 bindsym $mod+F1 workspace $WSW1
 bindsym $mod+F2 workspace $WSW2
 bindsym $mod+F3 workspace $WSW3
--- a/.zshrc
+++ b/.zshrc
@@ -51,3 +51,4 @@ export RANGER_LOAD_DEFAULT_RC=FALSE
 alias ccat="source-highlight --out-format=esc -i"
 alias lal="ls -la"
 alias lh="ls -lh"
+alias ip="ip -c"
--- a/install.sh
+++ b/install.sh
@@ -14,9 +14,9 @@ symlink_dotfiles() {
    safe_link "$SCRIPT_DIR/.oh-my-zsh"
    safe_link "$SCRIPT_DIR/.zshrc"
    for file in .config/*; do
-        ln -s "${SCRIPT_DIR}/${file}" "${HOME}/${file}"
+        [ ! -e "$dest" ] && ln -fs "${SCRIPT_DIR}/${file}" "${HOME}/${file}"
    done
-    ln -s "${SCRIPT_DIR}/zsh-themes" "${HOME}/.oh-my-zsh/custom/themes"
+    [ ! -e "$dest" ] && ln -fs "${SCRIPT_DIR}/zsh-themes" "${HOME}/.oh-my-zsh/custom/themes"

 }
 git submodule update
@@ -26,19 +26,21 @@ do
        sudo pacman -Syyu
    fi

-    if [ $var == "-ii" ]; then
+    if [ $var == "-y" ] ; then
        sudo pacman -S wget
        wget https://aur.archlinux.org/cgit/aur.git/snapshot/yaourt.tar.gz
        wget https://aur.archlinux.org/cgit/aur.git/snapshot/package-query.tar.gz
-        tar -xvf package-query.tar.gz &
-        tar -xvf yaourt.tar.gz
+        tar -xvf package-query.tar.gz & tar -xvf yaourt.tar.gz
        cd package-query
        makepkg -sri
        cd ../yaourt
        makepkg -sri
        cd ..
        rm -r package-query* yaourt*
-        yaourt -S zsh zsh-syntax-highlighting i3blocks neovim i3-wm i3lock-color-git ctags alacritty-scrollback-git polybar mplayer udiskie nitrogen compton dunst megasync parcellite rofi terminus terminess-powerline-font-git ttf-font-awesome-4 openssh
+    fi
+
+    if [ $var == "-ii" ]; then
+        yaourt -S zsh zsh-syntax-highlighting i3blocks neovim i3-wm i3lock-color-git ctags alacritty-scrollback-git polybar mplayer udiskie nitrogen compton dunst megasync parcellite rofi terminus terminess-powerline-font-git ttf-font-awesome-4 openssh arc-gtk-theme lxappearance numix-circle-arc-icons-git
        symlink_dotfiles
    fi

--- a/nmdispatcher/90-media.sh
+++ b/nmdispatcher/90-media.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+REMOTE='192.168.1.2:/'
+LOCAL='/media'
+
+interface=$1 status=$2
+if [ "$CONNECTION_UUID" = "7e64138d-bb9f-4869-9140-6c8276895990" ]; then
+  case $status in
+    up)
+        mount $REMOTE $LOCAL
+      ;;
+    down)
+        umount /media
+      ;;
+  esac
+fi