Merge branch 'dev' of github.com:ksyasuda/SudacodeRice into dev

polybar-themes/sblocks/colors.ini

@@ -13,26 +13,25 @@
 
 ;; main colors
 ; background = #3B4252
-background = #24282f
+background = #282c34
 ; background-alt = #4C566A
 ; background-alt = "#464b55"
 background-alt = "#464b55"
 ; foreground = #ECEFF4
 foreground = #bbc2cf
-; foreground-alt = #E5E9F0
 foreground-alt = "#abb2bf"
 primary = "#98be65"
 white = "#bbc2cf"
 black = "#464b55"
-red = "#ff6c6b"
+red = "#e06c75"
 pink = #EC6798
 purple = "#c678dd"
-blue = "#51afef"
-cyan = "#46d9ff"
+blue = "#1E90FF"
+cyan = "#56B6c2"
 teal = #00B19F
-green = "#98be65"
+green = "#98c379"
 lime = #B9C244
-yellow = "#ecbe7b"
+yellow = "#d19a66"
 amber = #EDB83F
 orange = #da8548
 brown = #AC8476

polybar-themes/sblocks/config.ini

@@ -61,16 +61,18 @@ fixed-center = true
 ; Dimension defined as pixel value (e.g. 35) or percentage (e.g. 50%),
 ; the percentage can optionally be extended with a pixel offset like so:
 ; 50%:-10, this will result in a width or height of 50% minus 10 pixels
-width = 95%
+; width = 95%
+width = 99.2%
 ; height = 34
 height = 40
 
 ; Offset defined as pixel value (e.g. 35) or percentage (e.g. 50%)
 ; the percentage can optionally be extended with a pixel offset like so:
-; 50%:-10, this will result in an offset in the x or y direction 
+; 50%:-10, this will result in an offset in the x or y direction
 ; of 50% minus 10 pixels
-offset-x = 2.5%
-offset-y = 0%
+; offset-x = 2.5%
+offset-x = 0.4%
+offset-y = 0.38%
 
 ; Background ARGB color (e.g. #f00, #ff992a, #ddff1023)
 background = ${color.background}
@@ -80,15 +82,16 @@ foreground = ${color.foreground}
 
 ; Background gradient (vertical steps)
 ;   background-[0-9]+ = #aarrggbb
-;;background-0 = 
+;;background-0 =
 
 ; Value used for drawing rounded corners
-; Note: This shouldn't be used together with border-size because the border 
+; Note: This shouldn't be used together with border-size because the border
 ; doesn't get rounded
 ; Individual top/bottom values can be defined using:
 ;   radius-{top,bottom}
-radius-top = 0.0
-radius-bottom = 0.0
+; HANDLED BY PICOM
+; radius-top = 0.0
+; radius-bottom = 0.0
 
 ; Under-/overline pixel size and argb color
 ; Individual values can be defined using:
@@ -114,7 +117,7 @@ border-bottom-color = ${color.primary}
 ; Number of spaces to add at the beginning/end of the bar
 ; Individual side values can be defined using:
 ;   padding-{left,right}
-padding = 0
+padding = 1.5
 
 ; Number of spaces to add before/after each module
 ; Individual side values can be defined using:
@@ -145,10 +148,8 @@ font-4 = "Source Han Sans JP:size=8;3"
 ;   modules-center = xwindow xbacklight
 ;   modules-right = ipc clock
 
-modules-left = sep launcher sep i3-workspaces sep chrome flameshot color-picker
-; modules-left = sep launcher sep bspwm-workspaces sep chrome flameshot color-picker
-modules-center = title-icon title sep cust-mpd-icon cust-mpd-prev custom-mpd cust-mpd-next
-; modules-right = color-switch sep alsa sep battery sep network sep date sep sysmenu sep
+modules-left = sep launcher sep bspwm-workspaces sep chrome flameshot color-picker sep cust-mpd-icon cust-mpd-prev custom-mpd cust-mpd-next
+; modules-center = title-icon title sep cust-mpd-icon cust-mpd-prev custom-mpd cust-mpd-next
 modules-right = package-updates-trigger package-updates bluetooth sep pulseaudio sep network-wlan sep date weather sep sysmenu sep
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
@@ -163,7 +164,7 @@ dim-value = 1.0
 ; If the value is empty or undefined, the atom value
 ; will be created from the following template: polybar-[BAR]_[MONITOR]
 ; NOTE: The placeholders are not available for custom values
-wm-name = i3
+wm-name = bspwm
 
 ; Locale used to localize various module data (e.g. date)
 ; Expects a valid libc locale, for example: sv_SE.UTF-8
@@ -178,7 +179,7 @@ locale = en_US.UTF-8
 ;   center
 ;   right
 ;   none
-tray-position = none
+tray-position = center
 
 ; If true, the bar will not shift its
 ; contents when the tray changes
@@ -187,7 +188,7 @@ tray-detached = false
 ; Tray icon max size
 tray-maxsize = 24
 
-; Background color for the tray container 
+; Background color for the tray container
 ; ARGB color (e.g. #f00, #ff992a, #ddff1023)
 ; By default the tray container will use the bar
 ; background color.
@@ -212,7 +213,7 @@ tray-scale = 1.0
 ; Currently supported WM's:
 ;   bspwm
 ;   i3 (requires: `override-redirect = true`)
-wm-restack = i3
+wm-restack = bspwm
 
 ; Set a DPI values used when rendering text
 ; This only affects scalable fonts
@@ -224,8 +225,8 @@ enable-ipc = true
 
 ; Fallback click handlers that will be called if
 ; there's no matching module handler found.
-click-left = 
-click-middle = 
+click-left =
+click-middle =
 click-right =
 ; scroll-up =
 ; scroll-down =
@@ -239,7 +240,7 @@ double-click-right =
 ; - pointer   : Typically in the form of a hand
 ; - ns-resize : Up and down arrows, can be used to indicate scrolling
 cursor-click = pointer
-cursor-scroll = 
+cursor-scroll =
 
 ;; WM Workspace Specific
 
@@ -286,8 +287,8 @@ compositing-underline = over
 compositing-border = over
 
 ; Define fallback values used by all module formats
-;format-foreground = 
-;format-background = 
+;format-foreground =
+;format-background =
 ;format-underline =
 ;format-overline =
 ;format-spacing =

polybar-themes/sblocks/user_modules.ini

@@ -71,9 +71,9 @@ label-padding = 2
 [module/launcher]
 type = custom/text
 
-content-prefix = 
+content-prefix = ""
 content-prefix-background = ${color.teal}
-content-prefix-padding = 1
+content-prefix-padding = 2
 
 content = " Menu "
 content-background = ${color.background-alt}
@@ -83,7 +83,7 @@ content-underline = ${color.background}
 
 ; "click-(left|middle|right)" will be executed using "/usr/bin/env sh -c $COMMAND"
 ; click-left = ~/.config/polybar/blocks/scripts/launcher.sh &
-click-left = ~/SudacodeRice/scripts/menu_small &
+click-left = rofi -show drun
 ;;click-middle = ~/.config/polybar/blocks/scripts/launcher-full
 click-right = ~/SudacodeRice/scripts/menu_full &
 ; click-right = ~/.config/polybar/blocks/scripts/style-switch.sh &
@@ -97,9 +97,9 @@ click-right = ~/SudacodeRice/scripts/menu_full &
 [module/sysmenu]
 type = custom/text
 
-content-prefix = ⏻
+content-prefix = "⏻"
 content-prefix-background = ${color.red}
-content-prefix-padding = 1
+content-prefix-padding = 2
 
 content = " System "
 content-background = ${color.background-alt}
@@ -301,8 +301,9 @@ exec = rofi-bluetooth --status
 interval = 2
 click-left = ~/SudacodeRice/scripts/rofi-bluetooth.desktop
 click-right = blueman-manager
-format-background = ${color.background-alt}
-format-padding = 1
+label-background = ${color.background-alt}
+label-padding-right = 1
+format-padding = 0
 format-prefix-padding = 1
 format-overline = ${color.background}
 format-underline = ${color.background}