diff --git a/awesome/init.fnl b/awesome/init.fnl index d76401a..fab520f 100644 --- a/awesome/init.fnl +++ b/awesome/init.fnl @@ -173,7 +173,19 @@ :buttons taglist_buttons :style { :bg_focus beautiful.bg_focus + :fg_focus beautiful.base01 + :bg_occupied beautiful.bg_normal + :bg_empty beautiful.bg_normal } + :layout { + :spacing (dpi 10) + :spacing_widget { + :valign "center" + :halign "center" + :widget wibox.container.place + } + :layout wibox.layout.flex.horizontal + } })) ;; Create a tasklist widget @@ -200,7 +212,7 @@ } :layout wibox.layout.flex.horizontal } - :widget_template { + :widget_template { 1 { 1 { 1 { 1 { @@ -224,6 +236,9 @@ :id "background_role" :widget wibox.container.background } +:widget wibox.container.margin +:left (dpi 10) +} })) (set s.myminimizedtasklist (awful.widget.tasklist { @@ -273,11 +288,18 @@ } })) - (set s.mytextclock (wibox.widget { + (set s.mytextclock { 1 { 1 (wibox.widget { :layout wibox.layout.fixed.horizontal 1 { :format " %a %b %d, %l:%M %p " - :widget wibox.widget.textclock}})) + :widget wibox.widget.textclock}}) + :widget wibox.container.margin + :left 10 + :right 10} + :widget wibox.container.background + :shape gears.shape.rounded_bar + :bg beautiful.bg_normal + :fg beautiful.base0B}) (set s.myemptywidget (wibox.widget { ;; an empty widget for spacing things out :text "" @@ -295,15 +317,28 @@ :layout wibox.layout.fixed.horizontal})) (set s.volumetext (awful.widget.watch "pamixer --get-volume-human" 1)) + (set s.mictext (awful.widget.watch "pamixer --source 48 --get-volume-human" 1)) (set s.volumeicon (wibox.widget.textbox " ")) - (set s.volumespace (wibox.widget.textbox " ")) + (set s.micicon (wibox.widget.textbox " ")) + (set s.volumespace (wibox.widget.textbox " ")) - (set s.volumewidget (wibox.widget { + (set s.volumewidget { 1 { 1 { 1 (wibox.widget { 1 s.volumeicon 2 s.volumetext 3 s.volumespace + 4 s.micicon + 5 s.mictext + 6 s.volumespace :layout wibox.layout.fixed.horizontal - })) + }) + :widget wibox.container.margin + :left 10} + :widget wibox.container.background + :shape gears.shape.rounded_bar + :bg beautiful.bg_normal + :fg beautiful.base09} + :widget wibox.container.margin + :right 10}) (set s.batterytext (awful.widget.watch "cat /sys/class/power_supply/BAT1/capacity" 30)) (set s.batteryicon (wibox.widget.textbox " ")) @@ -315,24 +350,44 @@ 3 s.batteryspace :layout wibox.layout.fixed.horizontal})) - (set s.cputext (awful.widget.watch "cpu" 10)) + (set s.cputext (awful.widget.watch "cpu" 5)) (set s.cpuicon (wibox.widget.textbox " ")) - (set s.cpuspace (wibox.widget.textbox " ")) + (set s.cpuspace (wibox.widget.textbox " ")) - (set s.cpuwidget (wibox.widget { + (set s.cpuwidget { 1 { 1 { 1 (wibox.widget { 1 s.cpuicon 2 s.cputext 3 s.cpuspace :layout wibox.layout.fixed.horizontal - })) + :fg beautiful.base0B + }) + :widget wibox.container.margin + :left 9} + :widget wibox.container.background + :shape gears.shape.rounded_bar + :bg beautiful.bg_normal + :fg beautiful.base0A} + :widget wibox.container.margin + :right 10}) +(set s.mysystray { 1 { 1 { 1 (wibox.widget.systray) + :widget wibox.container.margin + :right 10 + :left 10} + :widget wibox.container.background + :shape gears.shape.rounded_bar + :bg beautiful.bg_normal + :fg beautiful.base0C} + :widget wibox.container.margin + :right 10}) + (set s.myrightwidgets { 1 { :layout wibox.layout.fixed.horizontal 1 s.cpuwidget 2 s.volumewidget 3 (if laptop s.batterywidget s.myemptywidget) - 4 wibox.widget.systray + 4 s.mysystray 5 s.mylayoutbox } :widget wibox.container.background @@ -352,7 +407,7 @@ :stretch false :type "dock" :shape gears.shape.rounded_bar - :bg beautiful.bg_normal + :bg beautiful.transparent :fg beautiful.fg_normal :opacity 0.65 :screen s })) @@ -374,7 +429,7 @@ :right (dpi 10) :widget wibox.container.margin } - 2 s.mytextclock + 2 s.mytextclock :fg beautiful.base0B 3 { ;; Right widgets 1 { :layout wibox.layout.align.horizontal diff --git a/awesome/rules.fnl b/awesome/rules.fnl index 54ebf41..f28d192 100644 --- a/awesome/rules.fnl +++ b/awesome/rules.fnl @@ -110,6 +110,7 @@ :name [ "Event Tester" "remove images?" + "Blender Preferences" ] :role [ "pop-up" diff --git a/awesome/theme.lua b/awesome/theme.lua index 8e9c942..af3f00e 100644 --- a/awesome/theme.lua +++ b/awesome/theme.lua @@ -37,14 +37,14 @@ theme.base0F = "#b2643c" theme.bg_normal = theme.base00 theme.bg_light = theme.base01 theme.bg_focus = theme.base0D -- Base02 -theme.bg_minimize = "#78787e" +theme.bg_minimize = theme.base02 theme.bg_urgent = "#ff5c57" -theme.bg_systray = theme.bg_normal +theme.bg_systray = theme.transparent -theme.fg_normal = "#a5a5a9" -theme.fg_focus = theme.base02 +theme.fg_normal = theme.base05 +theme.fg_focus = theme.base03 theme.fg_urgent = "#e2e4e5" -theme.fg_minimize = "#e2e4e5" +theme.fg_minimize = theme.base04 theme.red = "#ff5c57" @@ -67,7 +67,8 @@ theme.master_width_factor = 0.65 -- prompt_[fg|bg|fg_cursor|bg_cursor|font] -- hotkeys_[bg|fg|border_width|border_color|shape|opacity|modifiers_fg|label_bg|label_fg|group_margin|font|description_font] -- Example: ---theme.taglist_bg_focus = "#ff0000" +theme.taglist_bg = theme.base00 +theme.taglist_shape = gears.shape.rounded_bar -- Generate taglist squares: local taglist_square_size = dpi(0) diff --git a/picom.conf b/picom.conf index a9b0515..52bbd91 100644 --- a/picom.conf +++ b/picom.conf @@ -94,7 +94,7 @@ shadow-exclude = [ # "class_g = 'Alacritty'", "class_g ?= 'Notify-osd'", "class_g = 'Cairo-clock'", - # "class_g = 'awesome'", + "class_g = 'awesome'", # "class_g = 'qutebrowser'", "class_g = 'slop'", # "class_g = 'qutebrowser'", @@ -282,7 +282,7 @@ blur-background-exclude = [ # prevents picom from blurring the background # when taking selection screenshot with `main` # https://github.com/naelstrof/maim/issues/130 - # "class_g = 'awesome'", + "class_g = 'awesome'", "class_g = 'slop'", "_GTK_FRAME_EXTENTS@:c", "class_g = 'soffice'", diff --git a/qutebrowser/qsettings/QtProject.conf b/qutebrowser/qsettings/QtProject.conf index 178ebf8..0adb6d0 100644 --- a/qutebrowser/qsettings/QtProject.conf +++ b/qutebrowser/qsettings/QtProject.conf @@ -1,6 +1,6 @@ [FileDialog] -history=file:///home/chris/Downloads, file:///home/chris, file:///home/chris/Documents/TFC Stuff/newsletterpics, file:///home/chris/Videos/vimeo, file:///home/chris/Pictures/tfc -lastVisited=file:///home/chris/Pictures/tfc +history=file:///home/chris/Downloads, file:///home/chris, file:///home/chris/Documents/TFC Stuff/newsletterpics, file:///home/chris/Videos/vimeo, file:///home/chris/Pictures/tfc, file:///home/chris/Pictures +lastVisited=file:///home/chris/Pictures qtVersion=5.15.2 shortcuts=file:, file:///home/chris sidebarWidth=116 diff --git a/scripts/cpu b/scripts/cpu index 3499006..e71c98c 100755 --- a/scripts/cpu +++ b/scripts/cpu @@ -1,3 +1,5 @@ -#!/bin/bash -awk '{u=$2+$4; t=$2+$4+$5; if (NR==1){u1=u; t1=t;} else print ($2+$4-u1) * 100 / (t-t1) "%"; }' \ - <(rg 'cpu ' /proc/stat) <(sleep 1;rg 'cpu ' /proc/stat) +#!/bin/sh +# awk '{u=$2+$4; t=$2+$4+$5; if (NR==1){u1=u; t1=t;} else print ($2+$4-u1) * 100 / (t-t1) "%"; }' \ + # <(rg 'cpu ' /proc/stat) <(sleep 1;rg 'cpu ' /proc/stat) +# echo 100 - $(mpstat | rg all | cut -d \ -f43) | bc +mpstat 1 1 | rg Average | awk '{print $3+$4+$5}' | sed 's/\(.*\)/\1%/g'