From 88ea27b400baeaf7d401f02bff1c8cf651c94e4e Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 20 Apr 2023 14:44:00 -0500 Subject: Theme! Now featuring lots of lovely green --- X11/Xresources | 6 +-- awesome/themes/default/theme.lua | 4 +- foot/foot.ini | 4 +- hypr/hyprland.conf | 8 ++-- waybar/config | 13 ++++++- waybar/config-Hyprland | 13 ++++++- waybar/config-river | 13 ++++++- waybar/style.css | 79 +++++++++++++++++++++------------------- 8 files changed, 90 insertions(+), 50 deletions(-) diff --git a/X11/Xresources b/X11/Xresources index 21e18e4..dc73fff 100644 --- a/X11/Xresources +++ b/X11/Xresources @@ -7,11 +7,11 @@ dmenu.font: mononoki Nerd Font Mono:size=24 dwm.normbgcolor: #000000 dwm.normbordercolor: #1b1d1c dwm.normfgcolor: #ffffff -dwm.selbgcolor: #2783a1 -dwm.selbordercolor: #2783a1 +dwm.selbgcolor: #198844 +dwm.selbordercolor: #198844 dwm.selfgcolor: #ffffff dwm.urgfgcolor: #ffffff -dwm.urgbordercolor: #2783a1 +dwm.urgbordercolor: #198844 dwm.urgbgcolor: #cc342b dwm.borderpx: 3 dwm.gappx: 6 diff --git a/awesome/themes/default/theme.lua b/awesome/themes/default/theme.lua index 221e0d0..9f199db 100644 --- a/awesome/themes/default/theme.lua +++ b/awesome/themes/default/theme.lua @@ -15,8 +15,8 @@ theme.font = "mononoki Nerd Font Mono 18" theme.font2 = "mononoki Nerd Font Mono 12" theme.bg_normal = "#000000" -theme.bg_focus = "#39c1ed" -theme.bg_accent = "#198844" +theme.bg_focus = "#198844" +theme.bg_accent = "#555555" theme.bg_urgent = "#ff0000" theme.bg_minimize = "#444444" theme.bg_systray = theme.bg_focus diff --git a/foot/foot.ini b/foot/foot.ini index 3817067..11ebba6 100644 --- a/foot/foot.ini +++ b/foot/foot.ini @@ -77,7 +77,7 @@ foreground=c5c8c6 ## Normal/regular colors (color palette 0-7) regular0=1b1d1c # black regular1=89231d # red -regular2=4eec4e # green +regular2=198844 # green regular3=ae7518 # yellow regular4=2b55b2 # blue regular5=784e93 # magenta @@ -87,7 +87,7 @@ regular7=b4b7b5 # white ## Bright colors (color palette 8-15) bright0=969896 # bright black bright1=cc342b # bright red -bright2=198844 # bright green +bright2=4eec4e # bright green bright3=fba922 # bright yellow bright4=3971ed # bright blue bright5=a36ac7 # bright magenta diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 36bf50a..cc80cb1 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -44,9 +44,11 @@ general { gaps_in = 5 gaps_out = 20 border_size = 2 - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) - layout = dwindle + #col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg + #col.inactive_border = rgba(595959aa) + col.active_border = rgba(198844ee) + col.inactive_border = rgba(1b1d1cee) + layout = master no_cursor_warps = false } #}}} diff --git a/waybar/config b/waybar/config index 6be1ce2..e17ac9a 100644 --- a/waybar/config +++ b/waybar/config @@ -11,7 +11,7 @@ "modules-left":[ "custom/launcher"], "modules-center":[], - "modules-right":[ "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight", "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"], + "modules-right":[ "mpd", "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight", "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"], // Modules configuration @@ -24,6 +24,17 @@ "unlocked": "" } }, + "mpd": { + "format": "{artist}-{title}", + "format-stopped": "", + "format-paused": "{artist}-{title}", + "format-disconnected": "", + "artist-len": 15, + "title-len": 15, + //"album-len": 15, + //"max-length": 30, + "on-click": "mpc toggle" + }, "idle_inhibitor": { "format": "{icon}", "format-icons": { diff --git a/waybar/config-Hyprland b/waybar/config-Hyprland index 903fcc7..1d4743a 100644 --- a/waybar/config-Hyprland +++ b/waybar/config-Hyprland @@ -11,7 +11,7 @@ "modules-left":[ "wlr/workspaces", "custom/launcher", "hyprland/window"], "modules-center":[], - "modules-right":[ "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight", "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"], + "modules-right":[ "mpd", "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight", "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"], // Modules configuration @@ -35,6 +35,17 @@ "unlocked": "" } }, + "mpd": { + "format": "{artist} - {title}", + "format-stopped": "", + "format-paused": "{artist} - {title}", + "format-disconnected": "", + "artist-len": 15, + "title-len": 15, + //"album-len": 15, + //"max-length": 200, + "on-click": "mpc toggle" + }, "idle_inhibitor": { "format": "{icon}", "format-icons": { diff --git a/waybar/config-river b/waybar/config-river index 3e84358..6dfbd36 100644 --- a/waybar/config-river +++ b/waybar/config-river @@ -11,7 +11,7 @@ "modules-left":[ "river/tags", "custom/launcher"], "modules-center":[], - "modules-right":[ "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight", "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"], + "modules-right":[ "mpd", "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight", "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"], // Modules configuration @@ -27,6 +27,17 @@ "unlocked": "" } }, + "mpd": { + "format": "{artist}-{title}", + "format-stopped": "", + "format-paused": "{artist}-{title}", + "format-disconnected": "", + "artist-len": 15, + "title-len": 15, + //"album-len": 15, + //"max-length": 30, + "on-click": "mpc toggle" + }, "idle_inhibitor": { "format": "{icon}", "format-icons": { diff --git a/waybar/style.css b/waybar/style.css index 8333fb6..f002c9b 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -21,38 +21,42 @@ window#waybar.hidden { } +/* #workspaces button { background: #1f1f1f; color: #ffffff; border-radius: 20px; - } +*/ /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ #workspaces button { - background: #2b55b2; + background: #333333; color: white; - border-bottom: 3px solid #000000; + border-bottom: 3px solid #1b1d1c; } +/* #workspaces button:hover { background: #39c1ed; color: black; border-bottom: 3px solid #ffffff; } +*/ #workspaces button.active { - background: #39c1ed; + background: #198844; } +/* #workspaces button.active:hover { background: #39c1ed; color: black; border-bottom: 3px solid #ffffff; - } +*/ #workspaces button.urgent { background-color: #eb4d4b; @@ -106,18 +110,18 @@ window#waybar.hidden { } #clock { - background-color: #171717; + background-color: #1b1d1c; color: #ffffff; } #battery { - background-color: #ffffff; - color: #000000; + background-color: #1b1d1c; + color: #ffffff; } #battery.charging, #battery.plugged { - color: #ffffff; - background-color: #26A65B; + color: #26A65B; + background-color: #1b1d1c; } @keyframes blink { @@ -142,99 +146,100 @@ label:focus { } #cpu { - background-color: #171717; + background-color: #1b1d1c; color: #ffffff; } #memory { - background-color: #171717; + background-color: #198844; color: #ffffff; } #disk { - background-color: #171717; + background-color: #1b1d1c; color: #ffffff; } #backlight { - background-color: #90b1b1; + background-color: #198844; + color: #ffffff; } #network { - background-color: #171717; + background-color: #198844; color: #ffffff; } #network.disconnected { - background-color: #171717; - color: red; + background-color: #1b1d1c; + color: #ffffff; } #pulseaudio { - background-color: #171717; + background-color: #198844; color: #ffffff; } #pulseaudio.muted { - background-color: #171717; - color: red; + background-color: #1b1d1c; + color: #198844; } #custom-media { - background-color: #171717; + background-color: #1b1d1c; color: white; } #custom-media.custom-spotify { - background-color: #171717; + background-color: #1b1d1c; color: white; } #custom-media.custom-vlc { - background-color: #171717; + background-color: #1b1d1c; color: white; } #custom-power{ - background-color: #171717; + background-color: #1b1d1c; font-size: 18px; margin-right: 5px; } #custom-launcher{ - background-color: #171717; + background-color: #1b1d1c; font-size: 20px; margin-left: 5px; } #custom-layout{ - background-color: #171717; + background-color: #1b1d1c; color: white; font-size:20px; } #custom-updater { - background-color: #171717; + background-color: #1b1d1c; color: white; } #custom-snip { - background-color: #171717; + background-color: #1b1d1c; color: skyblue; font-size: 20px; } #custom-wallpaper { - background-color: #171717; + background-color: #1b1d1c; color: pink; font-size: 20px; } #tags{ - background-color: #171717; + background-color: #1b1d1c; font-size: 20px; } @@ -253,12 +258,12 @@ label:focus { #taskbar{ - background-color: #171717; + background-color: #1b1d1c; border-radius: 0px 20px 20px 0px; } #temperature { - background-color: #171717; + background-color: #1b1d1c; color: #ffffff; } @@ -267,24 +272,24 @@ label:focus { } #tray { - background-color: #171717; + background-color: #198844; color: #ffffff; } #tray > .passive { -gtk-icon-effect: dim; - background-color: #171717; + background-color: #198844; color: #ffffff; } #tray > .needs-attention { -gtk-icon-effect: highlight; - background-color: #171717; + background-color: #198844; color: #ffffff; } #idle_inhibitor { - background-color: #171717; + background-color: #1b1d1c; border-radius: 20px 0px 0px 20px; } @@ -297,7 +302,7 @@ label:focus { } #language { - background-color: #171717; + background-color: #1b1d1c; color: #ffffff; min-width: 16px; } -- cgit v1.2.3 From 59bd2b89d3f772c0c1cf16316a26f5c86b108fec Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 20 Apr 2023 14:45:56 -0500 Subject: fix awesome (bling) and don't swallow virtualbox --- awesome/rc.lua | 3 ++- awesome/themes/default/theme.lua | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/awesome/rc.lua b/awesome/rc.lua index 002d609..634a650 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -17,7 +17,6 @@ local naughty = require("naughty") package.loaded["naughty.dbus"] = {} local menubar = require("menubar") local hotkeys_popup = require("awful.hotkeys_popup") -local bling = require("bling") -- Enable hotkeys help widget for VIM and other apps -- when client with a matching name is opened: require("awful.hotkeys_popup.keys") @@ -62,6 +61,7 @@ beautiful.init(theme.dir .. "/theme.lua") beautiful.useless_gap = 5 beautiful.wallpaper = awful.util.get_configuration_dir() .. "../../background.png" font = beautiful.font or "mononoki Nerd Font Mono 18" +local bling = require("bling") -- Widget definitions/initializations @@ -769,6 +769,7 @@ awful.rules.rules = { "sptrem", "qpwgraph", "QjackCtl", + "Tk", "gcr-prompter" } }, diff --git a/awesome/themes/default/theme.lua b/awesome/themes/default/theme.lua index 9f199db..0d8b7b8 100644 --- a/awesome/themes/default/theme.lua +++ b/awesome/themes/default/theme.lua @@ -138,7 +138,7 @@ You might just want to copy that whole part into your theme.lua and start adjust --]] -- LuaFormatter off -- window swallowing -theme.dont_swallow_classname_list = { "firefox", "Gimp", "Lutris" } -- list of class names that should not be swallowed +theme.dont_swallow_classname_list = { "firefox", "Gimp", "Lutris", "VirtualBox Manager", "VirtualBox Machine" } -- list of class names that should not be swallowed theme.dont_swallow_filter_activated = true -- whether the filter above should be active -- flash focus -- cgit v1.2.3 From b63a95de9f9fa3c81377a3a86aa2a890dc940ca7 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 20 Apr 2023 14:46:33 -0500 Subject: Resize foot font --- foot/foot.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foot/foot.ini b/foot/foot.ini index 11ebba6..429b0e4 100644 --- a/foot/foot.ini +++ b/foot/foot.ini @@ -8,7 +8,7 @@ # title=foot # locked-title=no -font=mononoki Nerd Font Mono:size=10 +font=mononoki Nerd Font Mono:size=7 # font-bold= # font-italic= # font-bold-italic= -- cgit v1.2.3 From b3b096ee80e1dffe3098b01512521eb58531a1ab Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 20 Apr 2023 14:48:33 -0500 Subject: hypr: add blur_xray and try to be more efficient --- hypr/hyprland.conf | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index cc80cb1..c93c2b3 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -33,11 +33,6 @@ input { } #}}} -animation=global,0,1,default -#animation=windows,0,1,default -#animation=fade,0,1,default -#animation=workspaces,0,1,default - #{{{ General options general { # See https://wiki.hyprland.org/Configuring/Variables/ for more @@ -57,6 +52,7 @@ general { misc { enable_swallow = true swallow_regex = ^(St)$ + vfr = true } #}}} @@ -68,6 +64,7 @@ decoration { blur_size = 3 blur_passes = 1 blur_new_optimizations = on + blur_xray = yes drop_shadow = yes shadow_range = 4 shadow_render_power = 3 @@ -77,7 +74,7 @@ decoration { #{{{ Animations options animations { - enabled = yes + enabled = no # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more bezier = myBezier, 0.05, 0.9, 0.1, 1.05 animation = windows, 1, 7, myBezier -- cgit v1.2.3 From 9d4e7c516e978383791d486fbf3ca4c7c380ed0a Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 20 Apr 2023 14:49:26 -0500 Subject: hypr: change some bindings, add gamemode.sh --- hypr/gamemode.sh | 14 ++++++++++++++ hypr/hyprland.conf | 7 ++++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100755 hypr/gamemode.sh diff --git a/hypr/gamemode.sh b/hypr/gamemode.sh new file mode 100755 index 0000000..a07ac4a --- /dev/null +++ b/hypr/gamemode.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env sh +HYPRGAMEMODE=$(hyprctl getoption animations:enabled | sed -n '2p' | awk '{print $2}') +if [ $HYPRGAMEMODE = 1 ] ; then + hyprctl --batch "\ + keyword animations:enabled 0;\ + keyword decoration:drop_shadow 0;\ + keyword decoration:blur 0;\ + keyword general:gaps_in 0;\ + keyword general:gaps_out 0;\ + keyword general:border_size 1;\ + keyword decoration:rounding 0" + exit +fi +hyprctl reload diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index c93c2b3..f674342 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -195,6 +195,7 @@ binde = $mainMod $secdMod, J, resizeactive, 0 10 #DWINDLE bind = $mainMod SHIFT, Q, killactive, bind = $mainMod SHIFT, E, exit, bind = $mainMod SHIFT, SPACE, togglefloating, +bind = $mainMod $secdMod, F2, exec, ~/.config/hypr/gamemode.sh bind = $mainMod, F, fullscreen, 0 bind = $mainMod, M, fullscreen, 1 #}}} @@ -268,8 +269,8 @@ bind = $mainMod $secdMod, P, exec, passmenu #}}} #{{{ Misc bindings -bind = $mainMod, Return, exec, st -bind = $mainMod $secdMod, F, exec, st -e lf +bind = $mainMod, Return, exec, foot +bind = $mainMod $secdMod, F, exec, foot lf bind = $mainMod, W, exec, waytoggle bind = $mainMod, Q, exec, loginctl lock-session bind = $mainMod SHIFT, G, exec, get-app-id @@ -322,7 +323,7 @@ submap = reset #}}} #{{{ Media bindings -bindl = $secdMod, P, exec, playerctl -p mpd play-pause +bindl = $secdMod, P, exec, playerctl play-pause bindel = , XF86AudioRaiseVolume, exec, volsv -i 5 bindel = , XF86AudioLowerVolume, exec, volsv -d 5 bind = , XF86AudioMute, exec, volsv -t -- cgit v1.2.3 From 6f9af3bf5f0e8497d44ff6b7871815d3d57a877f Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 20 Apr 2023 14:49:59 -0500 Subject: Change dmenu mount script for my own --- sxhkd/sxhkdrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc index 070e3bb..cfd9e9e 100755 --- a/sxhkd/sxhkdrc +++ b/sxhkd/sxhkdrc @@ -73,7 +73,7 @@ alt + super + n # run dmenu interface for mount alt + super + comma - dmenumount -x + dmount -x # run dmenu interface for umount alt + super + period -- cgit v1.2.3