From d931ceaf517fdec540d91fb9b363b5f2db65eb32 Mon Sep 17 00:00:00 2001 From: Mitchell Riedstra Date: Tue, 23 Jan 2024 18:12:03 -0500 Subject: more tweaks to the fedora script. Aggressively remove padding and reduce font sizes --- fedora.sh | 7 ++++--- foot/foot.ini | 10 ++++++---- river/init | 7 ++++--- waybar/style.css | 48 ++++++++---------------------------------------- waylandrc | 2 +- 5 files changed, 23 insertions(+), 51 deletions(-) diff --git a/fedora.sh b/fedora.sh index a526435..42cabf5 100755 --- a/fedora.sh +++ b/fedora.sh @@ -1,12 +1,12 @@ #!/bin/sh set -ex -codedir="$HOME/scm" zigdir="$HOME/scm/zig/zig0.11.0" zigout="${zigdir}.tar.xz" zigurl="https://ziglang.org/download/0.11.0/zig-linux-x86_64-0.11.0.tar.xz" zigsigurl="${zigurl}.minisig" zigkey="RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U" -sudo yum -y install wget minisign wlroots wlroots-devel +sudo yum -y install wget minisign wlroots wlroots-devel wayland-protocols-devel \ + libevdev-devel mkdir -p "$(dirname "$zigdir")" cd "$(dirname "$zigdir")" if ! [ -d "$zigdir" ] ; then @@ -21,5 +21,6 @@ fi export PATH="$zigdir:$PATH" cd - ./bldRiver.sh -sudo yum -y install foot bemenu waybar swaylock swaybg grim slurp +sudo yum -y install foot bemenu waybar swaylock swaybg grim slurp wdisplays \ + kanshi wlr-randr wtype ./bldSession.sh diff --git a/foot/foot.ini b/foot/foot.ini index 08868b6..086df83 100644 --- a/foot/foot.ini +++ b/foot/foot.ini @@ -1,13 +1,15 @@ term=xterm-256color # font=JetbrainsMono Nerd Font:Regular:size=11 # font=IBM 3270:Regular:size=8 -font=IBM 3270:Regular:size=12 +# font=IBM 3270:Regular:size=14 # font=CozetteHiDpi:style=Medium:size=14 -# font=Iosevka Term:style=Regular:size=5.5 +# font=Iosevka Term:style=Regular:size=9 +# font=curie:style=Regular:size=9 +font=curie:style=Italic:size=9 dpi-aware=no -pad=20x20 +# pad=20x20 # pad=10x10 -# pad=5x5 +pad=5x5 notify=notify-send -a ${app-id} -i ${app-id} ${title} ${body} [bell] diff --git a/river/init b/river/init index 8797716..09a3b8c 100755 --- a/river/init +++ b/river/init @@ -161,20 +161,21 @@ riverctl rule-add -app-id "bar" csd # Set the default layout generator to be rivertile and start it. # River will send the process group of the init executable SIGTERM on exit. riverctl default-layout rivertile -rivertile -view-padding 6 -outer-padding 6 & +rivertile -view-padding 0 -outer-padding 0 & riverctl map normal Super+Control L spawn swaylock riverctl map normal Super D spawn bemenu-run riverctl map normal Super B spawn 'pkill -SIGUSR1 waybar' riverctl focus-follows-cursor normal -riverctl map normal Super+Shift P spawn 'grim /tmp/screenshot_$(date +%S).png' -riverctl map normal Super+Shift+Control P spawn 'grim -g "$(slurp)" /tmp/screenshot_$(date +%S).png' +riverctl map normal Super+Shift P spawn 'grim /tmp/screenshot_$(date +%s).png' +riverctl map normal Super+Shift+Control P spawn 'grim -g "$(slurp)" /tmp/screenshot_$(date +%s).png' riverctl map normal Super P spawn dpw-menu riverctl map normal Super+Control P spawn 'dpw-menu -o' riverctl map normal Super O spawn 'dpw-menu --type' riverctl map normal Super+Shift O spawn 'dpw-menu -t -o' +riverctl map normal Super backslash spawn 'pm' # Only start these once... diff --git a/waybar/style.css b/waybar/style.css index 58bae86..02d009c 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,13 +1,16 @@ -window.eDP-1 * { font-size: 18px; } +/* window.eDP-1 * { font-size: 18px; } */ * { - font-family: "IBM 3270"; - font-size: 12px; + font-family: "curie"; + font-size: 10px; + + padding: 0px; + margin: 0px; } window#waybar { - background: none; - border-bottom: 3px solid #8FBCBB; + background: #2e3440; + } window#waybar.hidden { @@ -16,18 +19,14 @@ window#waybar.hidden { #window { color: #8FBCBB; - /* background: #2E3440; */ } #tags { - /* background: #2e3440; */ } #tags button { - /* transition: none; */ color: #4c566a; background: transparent; - border-radius: 0px; } #tags button.occupied { @@ -38,7 +37,6 @@ window#waybar.hidden { #tags button.focused { color: #81a1c1; - /* border-bottom: 3px solid #81a1c1; */ background: #4C566A; border-radius: inherit; @@ -54,48 +52,18 @@ window#waybar.hidden { #temperature { background: #2e3440; color: #81A1C1; - /* border-bottom: 3px solid #6a7796; */ } #pulseaudio { color: #D08770; background: #2E3440; - /* border-bottom: 3px solid #6a7796; */ } #battery { color: #A3BE8C; background: #2E3440; - /* border-bottom: 3px solid #6a7796; */ } #network, #cpuTemp, #battery, #pulseaudio, #date, #powerUsage { padding-left: 15px; } - -#battery.critical:not(.charging) { - background-color: #d8dee9; - color: #2e3440; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; -} - -@keyframes blink { - to { - background-color: #bf616a; - color: #d8dee9; - } -} - -#tray { - color: #d8dee9; - background: #2E3440; - /* border-bottom: 3px solid #6a7796; */ -} - -#tags button.focused, #battery, #pulseaudio { - border-bottom: 3px solid #8FBCBB; -} diff --git a/waylandrc b/waylandrc index 303bf56..f24d87d 100755 --- a/waylandrc +++ b/waylandrc @@ -13,6 +13,6 @@ export QT_QPA_PLATFORMTHEME=qt5ct . ~/.kshrc export ENV=$HOME/.kshrc -export BEMENU_OPTS="--fn 'IBM 3270 14' --tb '#3B4252' --tf '#8FBCBB' --cf '#E5E9F0' --nb '#2e3440' --ab '#3b4252' --nf '#e5e9f0' --af '#e5e9f0' --fb '#2e3440' --ff '#a3be8c' --hb '#2e3440' --hf '#a3be8c' " +export BEMENU_OPTS="--fn 'Curie 10' --tb '#3B4252' --tf '#8FBCBB' --cf '#E5E9F0' --nb '#2e3440' --ab '#3b4252' --nf '#e5e9f0' --af '#e5e9f0' --fb '#2e3440' --ff '#a3be8c' --hb '#2e3440' --hf '#a3be8c' " exec river -- cgit v1.2.3