From 1502082ae6e083ead2529838aa8670989da6ac49 Mon Sep 17 00:00:00 2001 From: Marco Thomas Date: Wed, 28 Oct 2020 22:40:43 +0100 Subject: [PATCH] Update --- README.md | 1 + files/.config/dunst/dunstrc | 6 +- files/.config/i3/config | 5 +- files/.config/polybar/config | 94 ++--- files/.config/polybar/config.nord | 352 ------------------ files/.config/polybar/launch.sh.nord | 18 - .../.config/polybar/scripts/popup-calendar.sh | 41 ++ files/.config/polybar/scripts/spotify.sh | 23 -- files/.config/polybar/scripts/yay_updates.sh | 10 +- 9 files changed, 105 insertions(+), 445 deletions(-) delete mode 100644 files/.config/polybar/config.nord delete mode 100755 files/.config/polybar/launch.sh.nord create mode 100755 files/.config/polybar/scripts/popup-calendar.sh delete mode 100755 files/.config/polybar/scripts/spotify.sh diff --git a/README.md b/README.md index 5b41f99..799c8e5 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ + [vim-plug](https://github.com/junegunn/vim-plug) + fzf ++ xdotool, yad ### Nvim LSP diff --git a/files/.config/dunst/dunstrc b/files/.config/dunst/dunstrc index 01f243f..07ca4a3 100644 --- a/files/.config/dunst/dunstrc +++ b/files/.config/dunst/dunstrc @@ -254,21 +254,21 @@ [urgency_low] # IMPORTANT: colors have to be defined in quotation marks. # Otherwise the "#" and following would be interpreted as a comment. - background = "#1e2127" + background = "#000000" foreground = "#e5e9f0" timeout = 10 # Icon for notifications with low urgency, uncomment to enable #icon = /path/to/icon [urgency_normal] - background = "#1e2127" + background = "#000000" foreground = "#e5e9f0" timeout = 10 # Icon for notifications with normal urgency, uncomment to enable #icon = /path/to/icon [urgency_critical] - background = "#1e2127" + background = "#000000" foreground = "#e5e9f0" timeout = 0 # Icon for notifications with critical urgency, uncomment to enable diff --git a/files/.config/i3/config b/files/.config/i3/config index e2d8b5a..cc922d2 100644 --- a/files/.config/i3/config +++ b/files/.config/i3/config @@ -83,7 +83,6 @@ bindsym XF86AudioPrev exec playerctl previous # ======================================== Open Applications mode "Open" { - bindsym c exec gsimplecal bindsym d exec discord; exec Discord bindsym f exec firefox bindsym m exec thunderbird @@ -185,6 +184,10 @@ gaps inner 8 # Keyboard layout exec setxkbmap -layout za +exec export GTK_IM_MODULE=fcitx +exec export QT_IM_MODULE=fcitx +exec export XMODIFIERS=@im=fcitx + exec feh --bg-scale $HOME/data/wallpaper/wallpaper.png exec dunst exec picom diff --git a/files/.config/polybar/config b/files/.config/polybar/config index a344870..8c62369 100644 --- a/files/.config/polybar/config +++ b/files/.config/polybar/config @@ -8,11 +8,11 @@ yellow = #d19a66 accent = #98c379 accent-alt = #98c379 +############################## BARS [bar/laptop] monitor = ${env:MONITOR} font-0 = "Heebo Medium:pixelsize=10;1" -#font-0 = "FiraCode Nerd Font Mono:pixelsize=9;2" font-1 = "Noto Sans CJK JP:antialiase=false:pixelsize=9;1" font-2 = "Siji:size=7;1" font-3 = "Wuncon Siji:size=7;1" @@ -45,23 +45,21 @@ wm-restack = i3 [bar/desktop] inherit = bar/laptop -modules-right = update_yay volume date +modules-right = update_yay volume calendar [bar/desktop_second] inherit = bar/desktop tray-position = none +modules-right = volume calendar -modules-right = volume date - +############################## MODULES [module/i3] type = internal/i3 pin-workspaces = true wrapping-scroll = false format = -format-NAME-font = 1 - ws-icon-0 = 1;一 ws-icon-1 = 2;二 ws-icon-2 = 3;三 @@ -72,7 +70,6 @@ ws-icon-6 = 7;七 ws-icon-7 = 8;八 ws-icon-8 = 9;九 ws-icon-9 = 10;十 -ws-icon-default =  label-focused = "%icon%" label-focused-foreground = ${colors.background} @@ -96,12 +93,23 @@ label-mode-foreground = ${colors.urgent} [module/xwindow] type = internal/xwindow label = %title% -label-underline = ${colors.accent} label-maxlen = 100 +label-underline = ${colors.accent} [module/date] type = internal/date date = %a, %d.%b %Y %H:%M + +format-prefix = " " +format-prefix-foreground = ${colors.accent-alt} +format-underline = ${colors.accent} + +[module/calendar] +type = custom/script +exec = ~/.config/polybar/scripts/popup-calendar.sh +interval = 5 +click-left = ~/.config/polybar/scripts/popup-calendar.sh --popup & + format-prefix = " " format-prefix-foreground = ${colors.accent-alt} format-underline = ${colors.accent} @@ -111,6 +119,7 @@ type = internal/backlight #ls -1 /sys/class/backlight card = amdgpu_bl0 label = %percentage%% + format-prefix = " " format-prefix-foreground = ${colors.accent-alt} format-underline = ${colors.accent} @@ -121,20 +130,19 @@ battery = BAT0 apdapter = ADP1 format-charging = -format-discharging = -format-full = - +label-charging = %percentage%% +animation-charging-foreground = ${colors.accent-alt} format-charging-underline = ${colors.yellow} + +format-discharging = +label-discharging = %percentage%% format-discharging-underline = ${colors.accent} + +format-full = +label-full = %percentage%% format-full-underline = ${colors.accent} ramp-capacity-foreground = ${colors.accent-alt} -animation-charging-foreground = ${colors.accent-alt} - -label-charging = %percentage%% -label-discharging = %percentage%% -label-full = %percentage%% - ramp-capacity-0 =  ramp-capacity-1 =  ramp-capacity-2 =  @@ -150,33 +158,28 @@ animation-charging-0 =  animation-charging-1 =  animation-charging-2 =  animation-charging-3 =  - animation-charging-framerate = 750 [module/volume] type = internal/pulseaudio -format-volume = +format-volume = -click-right = pavucontrol & - -bar-volume-width = 10 -bar-volume-indicator = | -bar-volume-fill = ─ -bar-volume-empty = ─ -bar-volume-fill-foreground = #ffffff - -ramp-volume-0 = " " -ramp-volume-1 = " " -ramp-volume-2 = " " -ramp-volume-3 = " " -ramp-volume-4 = " " -ramp-headphones-0 =  -ramp-headphones-1 =  -ramp-volume-foreground = ${colors.accent-alt} +#bar-volume-width = 10 +#bar-volume-indicator = | +#bar-volume-fill = ─ +#bar-volume-empty = ─ +#bar-volume-fill-foreground = #ffffff +# +#ramp-volume-0 = " " +#ramp-volume-1 = " " +#ramp-volume-2 = " " +#ramp-volume-3 = " " +#ramp-volume-4 = " " +#ramp-volume-foreground = ${colors.accent-alt} label-volume = %percentage%% -#format-volume-prefix = " " -#format-volume-prefix-foreground = ${colors.accent-alt} +format-volume-prefix = " " +format-volume-prefix-foreground = ${colors.accent-alt} format-volume-underline = ${colors.accent} format-muted-prefix = " " @@ -189,34 +192,31 @@ interface = wlo1 interval = 3.0 accumulate-stats = true unknown-as-up = true + label-connected = %essid% format-connected-prefix = " " format-connected-prefix-foreground = ${colors.accent-alt} format-connected-underline = ${colors.accent} + label-disconnected = "No Wifi" format-disconnected-underline = ${colors.urgent} -[module/networkupdown] -type = internal/network -interface = enp24s0 -interval = 3.0 -accumulate-stats = true -unknown-as-up = true -label-connected =  %upspeed%  %downspeed% - [module/update_yay] type = custom/script exec = ~/.config/polybar/scripts/yay_updates.sh tail = true +interval = 60 +click-left = alacritty -e yay & + format-prefix = " " format-prefix-foreground = ${colors.accent-alt} format-underline = ${colors.accent} -interval = 60 [module/spotify] type = custom/script +exec = python ~/.config/polybar/scripts/spotify_status.py -f '{artist}: {song}' interval = 1 + format-prefix = " " format-prefix-foreground = ${colors.accent-alt} format-underline = ${colors.accent} -exec = python ~/.config/polybar/scripts/spotify_status.py -f '{artist}: {song}' diff --git a/files/.config/polybar/config.nord b/files/.config/polybar/config.nord deleted file mode 100644 index cd7d4d8..0000000 --- a/files/.config/polybar/config.nord +++ /dev/null @@ -1,352 +0,0 @@ -; vim: ft=dosini -[colors] -transparent = #00000000 - -red = #BF616A -orange = #D08770 -yellow = #EBCB8B -green = #A3BE8C -purple = #B48EAD - -blue0 = #8FBCBB -blue1 = #88C0D0 -blue2 = #81A1C1 -blue3 = #5E81AC - -nord0 = #2E3440 -nord1 = #3b4252 -nord2 = #434c5e -nord3 = #4C566A - -frost0 = #d8dee9 -frost1 = #e5e9f0 -frost2 = #ECEFF4 - -accent = ${colors.green} -foreground = ${colors.frost2} -background = ${colors.nord0} - -################################################################################ -[bar/global] -monitor = ${env:MONITOR} - -font-0 = "FiraCode Nerd Font Mono:pixelsize=9;3" -font-1 = "IPAGothic:fontformat=truetype:antialias=false:pixelsize=11;2" -font-2 = "Siji:size=7;2" - -bottom = false -radius = 12 - -height = 27px - -foreground = ${colors.foreground} -background = #2e3440 - -module-margin= 0 - -wm-name = i3 -wm-restack = i3 - -################################################################################ -[bar/all] -inherit = bar/global -width = 80% - -override-redirect = true - -padding = 3 - -offset-x = 10%:-8px -offset-y = 8px - -modules-left = i3 -modules-center = spotify -modules-right = update backlight volume date - -################################################################################ -[bar/workspaces] -inherit = bar/global -width = 10% - -override-redirect = true - -offset-x = 8px -offset-y = 8px - -line-size = 3 - -modules-center = i3 - -################################################################################ -[bar/music] -inherit = bar/global -width = 22% - -override-redirect = true - -offset-x = 11.5%-8px -offset-y = 8px - -modules-center = spotify - -################################################################################ -[bar/status] -inherit = bar/global -width = 20% - -override-redirect = true -fixed-center = true - -offset-x = 80%:-8px -offset-y = 8px - -module-margin = 1 - -line-size = 3 - -modules-center = backlight volume battery date - -################################################################################ -[bar/tray] -inherit = bar/global -width = 7% - -override-redirect = true -fixed-center = true - -bottom = true - -offset-x = 93%:-8px -offset-y = 8px - -tray-position = center -tray-padding = 2 - -modules-center = update - -############################################################################### -[module/i3] -type = internal/i3 - -pin-workspaces = true -wrapping-scroll = false - - -format = - -foreground = ${colors.foreground} - -ws-icon-0 = 1;一 -ws-icon-1 = 2;二 -ws-icon-2 = 3;三 -ws-icon-3 = 4;四 -ws-icon-4 = 5;五 -ws-icon-5 = 6;六 -ws-icon-6 = 7;七 -ws-icon-7 = 8;八 -ws-icon-8 = 9;九 -ws-icon-9 = 10;十 -ws-icon-default =  - -#label-focused = "" -label-focused = "%icon%" -label-focused-padding = 1 -label-focused-underline = ${colors.green} - -#label-unfocused = "" -label-unfocused = "%icon%" -label-unfocused-padding = 1 - -label-urgent = "%icon%" -label-urgent-foreground = ${colors.red} -label-urgent-padding = 1 - -############################################################################### -[module/date] -type = internal/date - -interval = 1.0 - -#time =  %I:%M %p - %A, %d %B %Y -time =  %I:%M %p %d.%m.%Y -time-alt =  %I:%M %p - -format =