From 01953ff9ae0e0f6eec7cf3454e8796e60336c366 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 30 Mar 2021 06:16:57 -0500 Subject: [PATCH] Making some minor improvements to awesome --- awesome/init.fnl | 8 +++++--- awesome/rc.lua | 15 --------------- awesome/rules.fnl | 5 +++-- awesome/theme.lua | 14 +++++++++++--- picom.conf | 2 ++ qutebrowser/config.py | 2 +- rofi/launchers-git/blurry.rasi | 3 ++- rofi/launchers-git/windows.sh | 2 +- scripts/rifle-sxiv | 2 +- 9 files changed, 26 insertions(+), 27 deletions(-) diff --git a/awesome/init.fnl b/awesome/init.fnl index 304f810..6ecb1d2 100644 --- a/awesome/init.fnl +++ b/awesome/init.fnl @@ -68,10 +68,10 @@ (local alt "Mod1") ;; Set hostname so that we can utilize specific features on different machines -(local hostname-handle (io.popen "hostname")) -(local hostname (hostname-handle:read "a")) +(global hostname-handle (io.popen "hostname")) +(global hostname (hostname-handle:read "a")) (hostname-handle:close) -(local laptop (= hostname "chris-linuxlaptop\n")) +(global laptop (= hostname "chris-linuxlaptop\n")) ;; Table of layouts to cover with awful.layout.inc, order matters. (set awful.layout.layouts [ @@ -472,6 +472,8 @@ (client.connect_signal "focus" (fn [c] (set c.border_color beautiful.border_focus))) (client.connect_signal "unfocus" (fn [c] (set c.border_color beautiful.border_normal))) +(awful.screen.focus 1) + (awful.spawn "picom --experimental-backend") (awful.spawn "xset r rate 220 90") (awful.spawn "/usr/lib/polkit-kde-authentication-agent-1") diff --git a/awesome/rc.lua b/awesome/rc.lua index fbc95d0..0331f8c 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -4,19 +4,4 @@ local gears = require("gears") fennel.path = fennel.path .. ";.config/awesome/?.fnl" table.insert(package.loaders or package.searchers, fennel.searcher) --- pcall(require, "luarocks.loader") --- -- local fennel = require("./fennel") --- fennel = require("./fennel") --- local gears = require("gears") --- fennel.path = fennel.path .. ";.config/awesome/?.fnl" --- table.insert(package.loaders or package.searchers, fennel.make_searcher({correlate=true})) - --- local fennel = require("./fennel") --- fennel.path = fennel.path .. ";.config/awesome/?.fnl" --- fennel.makeSearcher({ --- correlate = true, --- useMetadata = true --- }) --- table.insert(package.loaders or package.searchers, fennel.searcher) - require("init") -- load ~/.config/awesome/init.fnl diff --git a/awesome/rules.fnl b/awesome/rules.fnl index e888733..94d62d6 100644 --- a/awesome/rules.fnl +++ b/awesome/rules.fnl @@ -10,13 +10,14 @@ { :rule { } :propertites { - :border-width beautiful.border_width + :border_width beautiful.border_width :border_color beautiful.border_normal :focus awful.client.focus.filter :raise true ;; :keys keys ;; :buttons clientbuttons - :screen awful.screen.preferred + ;; :screen awful.screen.preferred + :size_hints_honor false :placement (+ awful.placement.no_overlap awful.placement.no_offscreen) ;; :shape gears.shape.rounded_rect } diff --git a/awesome/theme.lua b/awesome/theme.lua index 65b0505..8e9c942 100644 --- a/awesome/theme.lua +++ b/awesome/theme.lua @@ -107,14 +107,22 @@ theme.menu_width = dpi(100) -- mstab theme.mstab_bar_ontop = true -- whether you want to allow the bar to be ontop of clients -theme.mstab_dont_resize_slaves = false -- whether the tabbed stack windows should be smaller than the +theme.mstab_dont_resize_slaves = true -- whether the tabbed stack windows should be smaller than the -- currently focused stack window (set it to true if you use -- transparent terminals. False if you use shadows on solid ones theme.mstab_bar_padding = "default" -- how much padding there should be between clients and your tabbar -- by default it will adjust based on your useless gaps. -- If you want a custom value. Set it to the number of pixels (int) -theme.mstab_border_radius = 10 -- border radius of the tabbar -theme.mstab_bar_height = 50 -- height of the tabbar + +if(laptop) +then + theme.mstab_bar_height = 100 -- height of the tabbar + theme.mstab_border_radius = 20 -- border radius of the tabbar +else + theme.mstab_bar_height = 50 + theme.mstab_border_radius = 10 -- border radius of the tabbar +end + theme.mstab_tabbar_position = "top" -- position of the tabbar (mstab currently does not support left,right) theme.mstab_tabbar_style = "default" -- style of the tabbar ("default", "boxes" or "modern") -- defaults to the tabbar_style so only change if you want a diff --git a/picom.conf b/picom.conf index a487774..bde8f31 100644 --- a/picom.conf +++ b/picom.conf @@ -94,6 +94,7 @@ shadow-exclude = [ # "class_g = 'Alacritty'", "class_g ?= 'Notify-osd'", "class_g = 'Cairo-clock'", + # "class_g = 'awesome'", # "class_g = 'qutebrowser'", "class_g = 'slop'", # "class_g = 'qutebrowser'", @@ -279,6 +280,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 = 'slop'", "_GTK_FRAME_EXTENTS@:c", "class_g = 'soffice'", diff --git a/qutebrowser/config.py b/qutebrowser/config.py index 93db9ec..4caee3e 100644 --- a/qutebrowser/config.py +++ b/qutebrowser/config.py @@ -814,7 +814,7 @@ c.colors.webpage.darkmode.policy.page = "smart" ## Force `prefers-color-scheme: dark` colors for websites. ## Type: Bool -c.colors.webpage.prefers_color_scheme_dark = True +c.colors.webpage.prefered_color_scheme = dark ## Number of commands to save in the command history. 0: no history / -1: ## unlimited diff --git a/rofi/launchers-git/blurry.rasi b/rofi/launchers-git/blurry.rasi index 0ab5648..ed81932 100644 --- a/rofi/launchers-git/blurry.rasi +++ b/rofi/launchers-git/blurry.rasi @@ -17,6 +17,7 @@ configuration { fullscreen: false; hide-scrollbar: true; sidebar-mode: true; + columns: 2; } * { @@ -110,7 +111,7 @@ sidebar { listview { background-color: @transparent; - columns: 1; + columns: 2; spacing: 4px; cycle: false; dynamic: true; diff --git a/rofi/launchers-git/windows.sh b/rofi/launchers-git/windows.sh index f4af3e1..f279f02 100755 --- a/rofi/launchers-git/windows.sh +++ b/rofi/launchers-git/windows.sh @@ -8,4 +8,4 @@ else #echo "this is not hidpi" fi -rofi -no-lazy-grab -show window -modi window -theme launchers-git/"$style".rasi +rofi -no-lazy-grab -show window -modi window -window-command "wmctrl -i -a {window}" -theme launchers-git/"$style".rasi diff --git a/scripts/rifle-sxiv b/scripts/rifle-sxiv index 072c60a..6afb872 100755 --- a/scripts/rifle-sxiv +++ b/scripts/rifle-sxiv @@ -19,7 +19,7 @@ # not work in dash and others), so we cannot store the result of listfiles to a # variable. -if [ $(hostname) = 'chris-linuxlaptop' ]; then +if [ $(hostname) = 'syl' ]; then echo laptop size=2300x1500 else