From 70a9a265f4915d3b854faacb87142361fc549eac Mon Sep 17 00:00:00 2001 From: Nick Boughton Date: Tue, 1 Jun 2021 20:18:26 +0100 Subject: [PATCH] current config --- .gitignore | 1 + azote/azoterc | 10 - gtk-3.0/gtk.css | 7 +- i3/config | 2 +- nwg-launchers/nwgbar/bar.json | 22 ++ nwg-launchers/nwgbar/style.css | 28 +++ nwg-launchers/nwgdmenu/style.css | 22 ++ picom/picom.conf | 378 +---------------------------- polybar/config | 135 +++++++---- polybar/launch.sh | 7 +- sway/config | 4 +- wal/templates/colors-alacritty.yml | 31 --- wal/templates/colors-mako | 4 +- waybar/config | 79 +++--- waybar/style.css | 39 +-- 15 files changed, 215 insertions(+), 554 deletions(-) delete mode 100644 azote/azoterc create mode 100644 nwg-launchers/nwgbar/bar.json create mode 100644 nwg-launchers/nwgbar/style.css create mode 100644 nwg-launchers/nwgdmenu/style.css diff --git a/.gitignore b/.gitignore index 8fdd13a..0f45309 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ vivaldi/ qt5ct/ rofi.old/ torbrowser/ +vlc/ diff --git a/azote/azoterc b/azote/azoterc deleted file mode 100644 index 2350510..0000000 --- a/azote/azoterc +++ /dev/null @@ -1,10 +0,0 @@ -{ - "thumb_width": "240", - "columns": "3", - "color_icon_w": "100", - "color_icon_h": "50", - "clip_prev_size": "30", - "palette_quality": "10", - "tracking_interval_seconds": "5", - "screen_measurement_delay": "300" -} \ No newline at end of file diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 802c6e2..6e8cad0 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -1,12 +1,9 @@ -decoration { - box-shadow: none; -} - +decoration, decoration:backdrop { box-shadow: none; } .titlebar, .titlebar .background { - border-radius: 0; + border-radius: 0px; } diff --git a/i3/config b/i3/config index b8a08ce..2b61d87 100644 --- a/i3/config +++ b/i3/config @@ -33,7 +33,7 @@ exec --no-startup-id ~/.fehbg exec --no-startup-id redshift-gtk exec --no-startup-id picom -b exec --no-startup-id dunst -exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock -c 000000 --nofork +#exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock -c 000000 --nofork exec --no-startup-id nm-applet --indicator exec --no-startup-id insync start diff --git a/nwg-launchers/nwgbar/bar.json b/nwg-launchers/nwgbar/bar.json new file mode 100644 index 0000000..d09f3d5 --- /dev/null +++ b/nwg-launchers/nwgbar/bar.json @@ -0,0 +1,22 @@ +[ + { + "name": "Lock screen", + "exec": "swaylock -f", + "icon": "system-lock-screen" + }, + { + "name": "Logout", + "exec": "swaymsg exit", + "icon": "system-log-out" + }, + { + "name": "Reboot", + "exec": "systemctl reboot", + "icon": "system-reboot" + }, + { + "name": "Shutdown", + "exec": "systemctl -i poweroff", + "icon": "system-shutdown" + } +] diff --git a/nwg-launchers/nwgbar/style.css b/nwg-launchers/nwgbar/style.css new file mode 100644 index 0000000..871ec03 --- /dev/null +++ b/nwg-launchers/nwgbar/style.css @@ -0,0 +1,28 @@ +#bar { + margin: 30px /* affects top/bottom & left/right alignment */ +} + +button, image { + background: none; + border-style: none; + box-shadow: none; + color: #999 +} + +button { + padding-left: 10px; + padding-right: 10px; + margin: 5px +} + +button:hover { + background-color: rgba (255, 255, 255, 0.1) +} + +button:focus { + box-shadow: 0 0 2px; +} + +grid { + /* e.g. for common background to all buttons */ +} diff --git a/nwg-launchers/nwgdmenu/style.css b/nwg-launchers/nwgdmenu/style.css new file mode 100644 index 0000000..fd063d6 --- /dev/null +++ b/nwg-launchers/nwgdmenu/style.css @@ -0,0 +1,22 @@ +/* Don't delete, just in case: the menu anchor is a button */ +button { + background: none; + border-style: none; + box-shadow: none; +} + +box { + /* Uncomment to set vertical margin + margin-top: 30px; + margin-bottom: 30px; + */ +} + +#searchbox { + /* Adjust to your taste */ +} + +/* Menu items */ +label { + padding-left: 5px +} diff --git a/picom/picom.conf b/picom/picom.conf index c1c689d..e0312c7 100644 --- a/picom/picom.conf +++ b/picom/picom.conf @@ -1,421 +1,45 @@ -################################# -# Shadows # -################################# - - -# Enabled client-side shadows on windows. Note desktop windows -# (windows with '_NET_WM_WINDOW_TYPE_DESKTOP') never get shadow, -# unless explicitly requested using the wintypes option. -# -# shadow = false -shadow = false; - -# The blur radius for shadows, in pixels. (defaults to 12) -# shadow-radius = 12 +shadow = true; shadow-radius = 20; - -# The opacity of shadows. (0.0 - 1.0, defaults to 0.75) -# shadow-opacity = .75 - -# The left offset for shadows, in pixels. (defaults to -15) -# shadow-offset-x = -15 shadow-offset-x = -10; - -# The top offset for shadows, in pixels. (defaults to -15) -# shadow-offset-y = -15 shadow-offset-y = -10; -# Avoid drawing shadows on dock/panel windows. This option is deprecated, -# you should use the *wintypes* option in your config file instead. -# -# no-dock-shadow = false - -# Don't draw shadows on drag-and-drop windows. This option is deprecated, -# you should use the *wintypes* option in your config file instead. -# -# no-dnd-shadow = false - -# Red color value of shadow (0.0 - 1.0, defaults to 0). -# shadow-red = 0 - -# Green color value of shadow (0.0 - 1.0, defaults to 0). -# shadow-green = 0 - -# Blue color value of shadow (0.0 - 1.0, defaults to 0). -# shadow-blue = 0 - -# Do not paint shadows on shaped windows. Note shaped windows -# here means windows setting its shape through X Shape extension. -# Those using ARGB background is beyond our control. -# Deprecated, use -# shadow-exclude = 'bounding_shaped' -# or -# shadow-exclude = 'bounding_shaped && !rounded_corners' -# instead. -# -# shadow-ignore-shaped = '' - -# Specify a list of conditions of windows that should have no shadow. -# -# examples: -# shadow-exclude = "n:e:Notification"; -# -# shadow-exclude = [] shadow-exclude = [ "name = 'Notification'", - "class_g = 'Conky'", "class_g ?= 'Notify-osd'", - "class_g = 'Cairo-clock'", "_GTK_FRAME_EXTENTS@:c", "class_g = 'i3-frame'", "class_g = 'zoom'" ]; -# Specify a X geometry that describes the region in which shadow should not -# be painted in, such as a dock window region. Use -# shadow-exclude-reg = "x10+0+0" -# for example, if the 10 pixels on the bottom of the screen should not have shadows painted on. -# -# shadow-exclude-reg = "" - -# Crop shadow of a window fully on a particular Xinerama screen to the screen. -# xinerama-shadow-crop = false - - -################################# -# Fading # -################################# - - -# Fade windows in/out when opening/closing and when opacity changes, -# unless no-fading-openclose is used. -# fading = false fading = true; - -# Opacity change between steps while fading in. (0.01 - 1.0, defaults to 0.028) -# fade-in-step = 0.028 fade-in-step = 0.03; - -# Opacity change between steps while fading out. (0.01 - 1.0, defaults to 0.03) -# fade-out-step = 0.03 fade-out-step = 0.03; - -# The time between steps in fade step, in milliseconds. (> 0, defaults to 10) -# fade-delta = 10 - -# Specify a list of conditions of windows that should not be faded. -# fade-exclude = [] - -# Do not fade on window open/close. -# no-fading-openclose = false - -# Do not fade destroyed ARGB windows with WM frame. Workaround of bugs in Openbox, Fluxbox, etc. -# no-fading-destroyed-argb = false - - -################################# -# Transparency / Opacity # -################################# - - -# Opacity of inactive windows. (0.1 - 1.0, defaults to 1.0) -# inactive-opacity = 1 inactive-opacity = 1.0; - -# Opacity of window titlebars and borders. (0.1 - 1.0, disabled by default) -# frame-opacity = 1.0 frame-opacity = 1.0; - -# Default opacity for dropdown menus and popup menus. (0.0 - 1.0, defaults to 1.0) -# menu-opacity = 1.0 - -# Let inactive opacity set by -i override the '_NET_WM_OPACITY' values of windows. -# inactive-opacity-override = true inactive-opacity-override = false; - -# Default opacity for active windows. (0.0 - 1.0, defaults to 1.0) -# active-opacity = 1.0 - -# Dim inactive windows. (0.0 - 1.0, defaults to 0.0) -# inactive-dim = 0.0 - -# Specify a list of conditions of windows that should always be considered focused. -# focus-exclude = [] focus-exclude = [ "class_g = 'Cairo-clock'" ]; - -# Use fixed inactive dim value, instead of adjusting according to window opacity. -# inactive-dim-fixed = 1.0 - -# Specify a list of opacity rules, in the format `PERCENT:PATTERN`, -# like `50:name *= "Firefox"`. picom-trans is recommended over this. -# Note we don't make any guarantee about possible conflicts with other -# programs that set '_NET_WM_WINDOW_OPACITY' on frame or client windows. -# example: -# opacity-rule = [ "80:class_g = 'URxvt'" ]; -# -# opacity-rule = [] - - -################################# -# Background-Blurring # -################################# - - -# Parameters for background blurring, see the *BLUR* section for more information. -# blur-method = -# blur-size = 12 -# -# blur-deviation = false - -# Blur background of semi-transparent / ARGB windows. -# Bad in performance, with driver-dependent behavior. -# The name of the switch may change without prior notifications. -# -# blur-background = false - -# Blur background of windows when the window frame is not opaque. -# Implies: -# blur-background -# Bad in performance, with driver-dependent behavior. The name may change. -# -# blur-background-frame = false - - -# Use fixed blur strength rather than adjusting according to window opacity. -# blur-background-fixed = false - - -# Specify the blur convolution kernel, with the following format: -# example: -# blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1"; -# -# blur-kern = '' blur-kern = "3x3box"; - -# Exclude conditions for background blur. -# blur-background-exclude = [] blur-background-exclude = [ "window_type = 'dock'", "window_type = 'desktop'", "_GTK_FRAME_EXTENTS@:c" ]; -################################# -# General Settings # -################################# - -# Daemonize process. Fork to background after initialization. Causes issues with certain (badly-written) drivers. -# daemon = false - -# Specify the backend to use: `xrender`, `glx`, or `xr_glx_hybrid`. -# `xrender` is the default one. -# # backend = 'glx' backend = "xrender"; - -# Enable/disable VSync. -# vsync = false vsync = true; - -# Enable remote control via D-Bus. See the *D-BUS API* section below for more details. -# dbus = false - -# Try to detect WM windows (a non-override-redirect window with no -# child that has 'WM_STATE') and mark them as active. -# -# mark-wmwin-focused = false mark-wmwin-focused = true; - -# Mark override-redirect windows that doesn't have a child window with 'WM_STATE' focused. -# mark-ovredir-focused = false mark-ovredir-focused = true; - -# Try to detect windows with rounded corners and don't consider them -# shaped windows. The accuracy is not very high, unfortunately. -# -# detect-rounded-corners = false detect-rounded-corners = true; - -# Detect '_NET_WM_OPACITY' on client windows, useful for window managers -# not passing '_NET_WM_OPACITY' of client windows to frame windows. -# -# detect-client-opacity = false detect-client-opacity = true; - -# Specify refresh rate of the screen. If not specified or 0, picom will -# try detecting this with X RandR extension. -# # refresh-rate = 60 refresh-rate = 0; - -# Limit picom to repaint at most once every 1 / 'refresh_rate' second to -# boost performance. This should not be used with -# vsync drm/opengl/opengl-oml -# as they essentially does sw-opti's job already, -# unless you wish to specify a lower refresh rate than the actual value. -# -# sw-opti = - -# Use EWMH '_NET_ACTIVE_WINDOW' to determine currently focused window, -# rather than listening to 'FocusIn'/'FocusOut' event. Might have more accuracy, -# provided that the WM supports it. -# -# use-ewmh-active-win = false - -# Unredirect all windows if a full-screen opaque window is detected, -# to maximize performance for full-screen windows. Known to cause flickering -# when redirecting/unredirecting windows. -# -# unredir-if-possible = false - -# Delay before unredirecting the window, in milliseconds. Defaults to 0. -# unredir-if-possible-delay = 0 - -# Conditions of windows that shouldn't be considered full-screen for unredirecting screen. -# unredir-if-possible-exclude = [] - -# Use 'WM_TRANSIENT_FOR' to group windows, and consider windows -# in the same group focused at the same time. -# -# detect-transient = false detect-transient = true; - -# Use 'WM_CLIENT_LEADER' to group windows, and consider windows in the same -# group focused at the same time. 'WM_TRANSIENT_FOR' has higher priority if -# detect-transient is enabled, too. -# -# detect-client-leader = false detect-client-leader = true; - -# Resize damaged region by a specific number of pixels. -# A positive value enlarges it while a negative one shrinks it. -# If the value is positive, those additional pixels will not be actually painted -# to screen, only used in blur calculation, and such. (Due to technical limitations, -# with use-damage, those pixels will still be incorrectly painted to screen.) -# Primarily used to fix the line corruption issues of blur, -# in which case you should use the blur radius value here -# (e.g. with a 3x3 kernel, you should use `--resize-damage 1`, -# with a 5x5 one you use `--resize-damage 2`, and so on). -# May or may not work with *--glx-no-stencil*. Shrinking doesn't function correctly. -# -# resize-damage = 1 - -# Specify a list of conditions of windows that should be painted with inverted color. -# Resource-hogging, and is not well tested. -# -# invert-color-include = [] - -# GLX backend: Avoid using stencil buffer, useful if you don't have a stencil buffer. -# Might cause incorrect opacity when rendering transparent content (but never -# practically happened) and may not work with blur-background. -# My tests show a 15% performance boost. Recommended. -# -# glx-no-stencil = false - -# GLX backend: Avoid rebinding pixmap on window damage. -# Probably could improve performance on rapid window content changes, -# but is known to break things on some drivers (LLVMpipe, xf86-video-intel, etc.). -# Recommended if it works. -# -# glx-no-rebind-pixmap = false - -# Disable the use of damage information. -# This cause the whole screen to be redrawn everytime, instead of the part of the screen -# has actually changed. Potentially degrades the performance, but might fix some artifacts. -# The opposing option is use-damage -# -# no-use-damage = false use-damage = true; -# Use X Sync fence to sync clients' draw calls, to make sure all draw -# calls are finished before picom starts drawing. Needed on nvidia-drivers -# with GLX backend for some users. -# -# xrender-sync-fence = false - -# GLX backend: Use specified GLSL fragment shader for rendering window contents. -# See `compton-default-fshader-win.glsl` and `compton-fake-transparency-fshader-win.glsl` -# in the source tree for examples. -# -# glx-fshader-win = '' - -# Force all windows to be painted with blending. Useful if you -# have a glx-fshader-win that could turn opaque pixels transparent. -# -# force-win-blend = false - -# Do not use EWMH to detect fullscreen windows. -# Reverts to checking if a window is fullscreen based only on its size and coordinates. -# -# no-ewmh-fullscreen = false - -# Dimming bright windows so their brightness doesn't exceed this set value. -# Brightness of a window is estimated by averaging all pixels in the window, -# so this could comes with a performance hit. -# Setting this to 1.0 disables this behaviour. Requires --use-damage to be disabled. (default: 1.0) -# -# max-brightness = 1.0 - -# Make transparent windows clip other windows like non-transparent windows do, -# instead of blending on top of them. -# -# transparent-clipping = false - -# Set the log level. Possible values are: -# "trace", "debug", "info", "warn", "error" -# in increasing level of importance. Case doesn't matter. -# If using the "TRACE" log level, it's better to log into a file -# using *--log-file*, since it can generate a huge stream of logs. -# -# log-level = "debug" log-level = "warn"; - -# Set the log file. -# If *--log-file* is never specified, logs will be written to stderr. -# Otherwise, logs will to written to the given file, though some of the early -# logs might still be written to the stderr. -# When setting this option from the config file, it is recommended to use an absolute path. -# -# log-file = '/path/to/your/log/file' - -# Show all X errors (for debugging) -# show-all-xerrors = false - -# Write process ID to a file. -# write-pid-path = '/path/to/your/log/file' - -# Window type settings -# -# 'WINDOW_TYPE' is one of the 15 window types defined in EWMH standard: -# "unknown", "desktop", "dock", "toolbar", "menu", "utility", -# "splash", "dialog", "normal", "dropdown_menu", "popup_menu", -# "tooltip", "notification", "combo", and "dnd". -# -# Following per window-type options are available: :: -# -# fade, shadow::: -# Controls window-type-specific shadow and fade settings. -# -# opacity::: -# Controls default opacity of the window type. -# -# focus::: -# Controls whether the window of this type is to be always considered focused. -# (By default, all window types except "normal" and "dialog" has this on.) -# -# full-shadow::: -# Controls whether shadow is drawn under the parts of the window that you -# normally won't be able to see. Useful when the window has parts of it -# transparent, and you want shadows in those areas. -# -# redir-ignore::: -# Controls whether this type of windows should cause screen to become -# redirected again after been unredirected. If you have unredir-if-possible -# set, and doesn't want certain window to cause unnecessary screen redirection, -# you can set this to `true`. -# - corner-radius = 5; wintypes: diff --git a/polybar/config b/polybar/config index c2e3d44..12adf32 100644 --- a/polybar/config +++ b/polybar/config @@ -7,53 +7,6 @@ primary = ${xrdb:color6:#222} secondary = ${xrdb:color3:#222} alert = ${xrdb:color1:#222} -[bar/mybar] -monitor = ${env:MONITOR:} -width = 1900 -height = 30 -override-redirect = true -wm-restack = i3 -offset-x = 10 -offset-y = 10 -radius = 4.0 -fixed-center = true - -background = ${colors.background} -foreground = ${colors.foreground} - -line-size = 3 -line-color = ${colors.foreground} - -border-size = 0 -border-color = ${colors.primary} - -padding-left = 2 -padding-right = 2 - -module-margin-left = 2 -module-margin-right = 2 - -;font-0 = kanitMedium:fontformat=truetype:size=8:antialias=true;2 -;font-1 = unifont:fontformat=truetype:size=8:antialias=true;2 -;font-2 = siji:pixelsize=10;2 - -font-1 = Font Awesome 5 Free:style=Solid:pixelsize=8;2 -font-2 = Font Awesome 5 Free:style=Regular:pixelsize=8;2 -font-3 = Font Awesome 5 Brands:pixelsize=8;2 -font-4 = Font Awesome 5 Regular:pixelsize=8;2 -font-0 = Fira Code:style=Medium:size=8;2 - -modules-left = date battery root_storage home_storage memory swap cpu -modules-center = i3 -modules-right = covid weather updates my-updates backlight-acpi pulseaudio powermenu - -tray-position = center -tray-offset-x = 530 -tray-padding = 2 - -cursor-click = pointer -cursor-scroll = ns-resize - [module/updates] type = custom/script exec = ~/.config/polybar/modules/updates @@ -253,10 +206,88 @@ menu-2-1-exec = menu-open-0 [settings] screenchange-reload = true -;compositing-background = xor -;compositing-background = screen -;compositing-foreground = source -;compositing-border = over -;pseudo-transparency = false + +[bar/top] +monitor = ${env:MONITOR:} +width = 1900 +height = 30 +override-redirect = true +wm-restack = i3 +offset-x = 10 +offset-y = 10 +radius = 4.0 +fixed-center = true + +background = ${colors.background} +foreground = ${colors.foreground} + +line-size = 3 +line-color = ${colors.foreground} + +border-size = 0 +border-color = ${colors.primary} + +padding-left = 2 +padding-right = 2 + +module-margin-left = 2 +module-margin-right = 2 + +font-1 = Font Awesome 5 Free:style=Solid:pixelsize=8;2 +font-2 = Font Awesome 5 Free:style=Regular:pixelsize=8;2 +font-3 = Font Awesome 5 Brands:pixelsize=8;2 +font-4 = Font Awesome 5 Regular:pixelsize=8;2 +font-0 = Fira Code:style=Medium:size=8;2 + +modules-left = date battery root_storage home_storage memory swap cpu +modules-center = i3 +modules-right = covid weather updates my-updates backlight-acpi pulseaudio powermenu + +cursor-click = pointer +cursor-scroll = ns-resize + +tray-position = right +tray-padding = 2 +;tray-offset-x = 100 +;tray-background = #00000000 + +;[bar/bottom] +;bottom = true +;width = 300 +;height = 30 +;override-redirect = true +;wm-restack = i3 +;offset-x = 10 +;offset-y = 10 +;radius = 4.0 +;fixed-center = true + +;background = ${colors.background} +;foreground = ${colors.foreground} + +;line-size = 3 +;line-color = ${colors.foreground} + +;border-size = 0 +;border-color = ${colors.primary} + +;padding-left = 2 +;padding-right = 2 + +;module-margin-left = 2 +;module-margin-right = 2 + +;font-1 = Font Awesome 5 Free:style=Solid:pixelsize=8;2 +;font-2 = Font Awesome 5 Free:style=Regular:pixelsize=8;2 +;font-3 = Font Awesome 5 Brands:pixelsize=8;2 +;font-4 = Font Awesome 5 Regular:pixelsize=8;2 +;font-0 = Fira Code:style=Medium:size=8;2 + +;modules-left = +;modules-center = +;modules-right = powermenu + +;tray-position = center +;tray-padding = 2 ; vim:ft=dosini diff --git a/polybar/launch.sh b/polybar/launch.sh index 43be7ee..266e084 100755 --- a/polybar/launch.sh +++ b/polybar/launch.sh @@ -9,10 +9,13 @@ while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done # Launch Polybar, using default config location ~/.config/polybar/config if type "xrandr"; then for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do - MONITOR=$m polybar --reload mybar & + MONITOR=$m polybar --reload top & done + #polybar --reload bottom & else - polybar --reload mybar & + polybar --reload top & + #polybar --reload bottom & fi + echo "Polybar launched..." diff --git a/sway/config b/sway/config index 669a0f4..6b5d836 100644 --- a/sway/config +++ b/sway/config @@ -49,7 +49,7 @@ exec swayidle -w \ ### Autostart exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec mako -exec autotiling +exec persway -a -o 1 exec nm-applet --indicator exec gammastep-indicator exec insync start @@ -253,7 +253,7 @@ bar { # # gaps # -gaps inner 5 +gaps inner 10 smart_gaps off # diff --git a/wal/templates/colors-alacritty.yml b/wal/templates/colors-alacritty.yml index da84a5e..df2b7ac 100644 --- a/wal/templates/colors-alacritty.yml +++ b/wal/templates/colors-alacritty.yml @@ -147,24 +147,6 @@ colors: magenta: '{color5}' cyan: '{color6}' white: '{color7}' - bright: - black: '{background}' - red: '{color1}' - green: '{color2}' - yellow: '{color3}' - blue: '{color4}' - magenta: '{color5}' - cyan: '{color6}' - white: '{color7}' - dim: - black: '{background}' - red: '{color1}' - green: '{color2}' - yellow: '{color3}' - blue: '{color4}' - magenta: '{color5}' - cyan: '{color6}' - white: '{color7}' # Indexed Colors # @@ -240,19 +222,6 @@ mouse: # If this is `true`, the cursor is temporarily hidden when typing. hide_when_typing: false - url: - # URL launcher - # - # This program is executed when clicking on a text which is recognized as a URL. - # The URL is always added to the command as the last parameter. - launcher: xdg-open - - # URL modifiers - # - # These are the modifiers that need to be held down for opening URLs when clicking - # on them. The available modifiers are documented in the key binding section. - #modifiers: Control|Shift - selection: semantic_escape_chars: ",│`|:\"' ()[]{{}}<>" diff --git a/wal/templates/colors-mako b/wal/templates/colors-mako index 8d7a4ac..f82f250 100644 --- a/wal/templates/colors-mako +++ b/wal/templates/colors-mako @@ -4,9 +4,9 @@ max-visible=5 anchor=top-right width=400 -height=150 +height=1000 margin=20 -border-size=2 +border-size=3 border-radius=4 max-icon-size=32 diff --git a/waybar/config b/waybar/config index 7e5ce3a..bc80627 100644 --- a/waybar/config +++ b/waybar/config @@ -1,36 +1,20 @@ // -*- mode: json -*- -[ +//[ +//{ +// "position": "bottom", +// "layer": "bottom", +// "margin-left": 5, +// "margin-right": 5, +// "margin-bottom": 5, +// "modules-left": ["sway/mode", "wlr/taskbar"], +// "modules-right": ["tray"], +//}, { - "layer": "bottom", - "position": "bottom", - "margin-right": 5, - "margin-left": 5, - "margin-bottom": 5, - "modules-left": ["sway/mode", "wlr/taskbar"], - "modules-right": ["tray"], - "wlr/taskbar": { - "all-outputs": false, - "format": "{icon} {title:.10}", - "icon-theme": "Tela-circle-dark", - "icon-size": 16, - "on-click": "activate", - "on-middle-click": "close", - "on-right-click": "minimize" - }, - "sway/mode": { - "format": "{}", - }, - "tray": { - "icon-size": 14, - "spacing": 10 - } -}, -{ - "layer": "bottom", "position": "top", - "margin-top": 5, - "margin-right": 5, - "margin-left": 5, + "layer": "bottom", + "margin-top": 10, + "margin-right": 10, + "margin-left": 10, "modules-center": [ "sway/workspaces", ], @@ -61,13 +45,14 @@ "custom/separator", "pulseaudio", "custom/separator", - "custom/reboot", - "custom/shutdown" + "tray", + "custom/separator", + "custom/powermenu", ], "sway/workspaces": { "disable-scroll": true, "all-outputs": true, - "format": "{name} {icon}", + "format": "{name} {icon}", "format-icons": { "1": "", "2": "", @@ -170,6 +155,23 @@ "format": " {percentage_used:2}%", "path": "/home" }, + "wlr/taskbar": { + "all-outputs": false, + "format": "{icon}", + "icon-theme": "oomox-walmat", + "icon-size": 16, + "on-click": "activate", + "on-middle-click": "close", + "on-right-click": "minimize" + }, + "sway/mode": { + "format": "{}", + "rotate": 90 + }, + "tray": { + "icon-size": 14, + "spacing": 10 + }, "custom/updates": { "format": " {}", "return-type": "json", @@ -197,14 +199,9 @@ "format": "", "tooltip": false }, - "custom/shutdown": { + "custom/powermenu": { "format": "", - "on-click": "~/.config/waybar/modules/shutdown.sh", - "tooltip": false - }, - "custom/reboot": { - "format": "", - "on-click": "~/.config/waybar/modules/reboot.sh", + "on-click": "nwgbar", "tooltip": false }, "custom/weather": { @@ -227,4 +224,4 @@ "format-icons": ["", ""] } } -] +//] diff --git a/waybar/style.css b/waybar/style.css index 643000c..5b15768 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -19,19 +19,18 @@ font-size: 10px; font-family: "Fira Code", "Font Awesome 5 Free"; font-weight: bold; + border-radius: 4px; } window#waybar { color: @text; - background: none; + background: @background; margin: 0; } .modules-left, .modules-center, .modules-right { - background: @background; - border-radius: 4px; margin: 0; padding: 0; } @@ -39,9 +38,7 @@ window#waybar { /* Base styling for modules */ #workspaces, #mode, -#window, #idle_inhibitor, -#custom-weather, #pulseaudio, #memory, #cpu, @@ -49,14 +46,13 @@ window#waybar { #battery, #backlight, #disk, +#custom-weather, #custom-updates, #custom-auroch, #custom-swap, #custom-separator, -#custom-shutdown, -#custom-reboot, +#custom-powermenu, #custom-covid, -#taskbar, #tray { padding: 2px 10px 0 10px; } @@ -73,7 +69,7 @@ window#waybar { color: @text; margin: 0; padding: 2px 5px 0px 5px; - border-radius: 4px; + border-radius: 0px; } #workspaces button.focused { color: @hilight; @@ -84,14 +80,11 @@ window#waybar { } #disk.1, -#memory, -#custom-reboot, -#custom-updates { +#memory { padding-right: 5px; } #disk.2, #custom-swap, -#custom-shutdown, #custom-auroch { padding-left: 5px; } @@ -127,23 +120,7 @@ window#waybar { color: @hilight; } - -#taskbar, -#tray, -#window { - padding: 0; - margin: 0 3px 0 3px; -} -#taskbar button { - color: @foreground; - border-radius: 4px; - padding: 2px 3px 0px 3px; -} -#taskbar button.active { - color: @hilight; -} - -#tray { +/*#tray { padding: 5px 3px 5px 3px; -} +}*/