From b99b8b191df3e7e1ad2915ad18694956e533a49b Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Mon, 16 Aug 2021 06:17:28 -0500 Subject: [PATCH] Fix some rules and mpv positioning --- awesome/init.fnl | 139 ++++++++++++++++++++-------------------- awesome/keybindings.fnl | 4 +- awesome/rules.fnl | 8 ++- fish/config.fish | 2 +- mpv/mpv.conf | 1 + scripts/rofi-rbw | 10 +-- 6 files changed, 85 insertions(+), 79 deletions(-) diff --git a/awesome/init.fnl b/awesome/init.fnl index 44f7e4f..da9bd72 100644 --- a/awesome/init.fnl +++ b/awesome/init.fnl @@ -183,80 +183,80 @@ :bg_focus beautiful.bg_focus :fg_focus beautiful.base01 :fg_occupied beautiful.base0B - :bg_occupied beautiful.bg_light - :bg_empty beautiful.bg_light + :bg_occupied beautiful.bg + :bg_empty beautiful.bg } :layout { :spacing (dpi 5) :spacing_widget { - :valign "center" - :halign "center" - :widget wibox.container.place - } - :layout wibox.layout.flex.horizontal - } - })) - - ;; (set s.mytaglistbg ( { - ;; 1 { - ;; s.mytaglist - ;; } - ;; :widget wibox.container.background - ;; :shape gears.shape.rounded_bar - ;; :bg beautiful.bg_normal - ;; })) - - ;; Create a tasklist widget - (set s.mytasklist (awful.widget.tasklist { - :screen s - :filter awful.widget.tasklist.filter.focused - :buttons tasklist_buttons - :style { - :border_width 0 - :shape gears.shape.rounded_bar - :bg_focus beautiful.bg_normal - :fg_focus beautiful.fg_normal - } - :layout { - :spacing (dpi 20) - :spacing_widget { - 1 { - :forced_width (dpi 5) - :forced_height (dpi 20) - :widget wibox.widget.separator - } :valign "center" :halign "center" :widget wibox.container.place } :layout wibox.layout.flex.horizontal } - :widget_template { 1 { - 1 { - 1 { + })) + + ;; (set s.mytaglistbg ( { + ;; 1 { + ;; s.mytaglist + ;; } + ;; :widget wibox.container.background + ;; :shape gears.shape.rounded_bar + ;; :bg beautiful.bg_normal + ;; })) + + ;; Create a tasklist widget + (set s.mytasklist (awful.widget.tasklist { + :screen s + :filter awful.widget.tasklist.filter.focused + :buttons tasklist_buttons + :style { + :border_width 0 + :shape gears.shape.rounded_bar + :bg_focus beautiful.bg_normal + :fg_focus beautiful.fg_normal + } + :layout { + :spacing (dpi 20) + :spacing_widget { + 1 { + :forced_width (dpi 5) + :forced_height (dpi 20) + :widget wibox.widget.separator + } + :valign "center" + :halign "center" + :widget wibox.container.place + } + :layout wibox.layout.flex.horizontal + } + :widget_template { 1 { 1 { 1 { - :id "icon_role" - :widget wibox.widget.imagebox + 1 { + 1 { + :id "icon_role" + :widget wibox.widget.imagebox + } + :margins 6 + :widget wibox.container.margin + :layout wibox.layout.align.horizontal + } + 2 { + :id "text_role" + :widget wibox.widget.textbox + } + :layout wibox.layout.align.horizontal } - :margins 6 + :left (dpi 10) + :right (dpi 10) :widget wibox.container.margin - :layout wibox.layout.align.horizontal + :layout wibox.layout.align.horizontal } - 2 { - :id "text_role" - :widget wibox.widget.textbox - } - :layout wibox.layout.align.horizontal + :id "background_role" + :widget wibox.container.background } - :left (dpi 10) - :right (dpi 10) - :widget wibox.container.margin - :layout wibox.layout.align.horizontal - } - :id "background_role" - :widget wibox.container.background - } :widget wibox.container.margin :left (dpi 10) } @@ -320,7 +320,7 @@ :right 10} :widget wibox.container.background :shape gears.shape.rounded_bar - :bg beautiful.bg_light + :bg beautiful.bg :fg beautiful.base0B}) (set s.myemptywidget (wibox.widget { ;; an empty widget for spacing things out @@ -440,7 +440,7 @@ :widget wibox.container.margin :right (dpi 10)}) -(set s.mysystray { 1 { 1 { 1 (wibox.widget.systray) + (set s.mysystray { 1 { 1 { 1 (wibox.widget.systray) :widget wibox.container.margin :right (dpi 10) :top (dpi 2) @@ -456,7 +456,7 @@ (set s.myrightwidgets { 1 { :layout wibox.layout.fixed.horizontal - ;; 1 s.wttrwidget + 1 s.wttrwidget 2 s.mailwidget 3 s.cpuwidget 4 s.volumewidget @@ -585,15 +585,16 @@ (client.connect_signal "manage" (fn [c] - ;; Set the windows at the slave, - ;; i.e. put it at the end of others instead of setting it master. - (when (not awesome.startup) (awful.client.setslave c)) + ;; Set the windows at the slave, + ;; i.e. put it at the end of others instead of setting it master. + (when (not awesome.startup) (awful.client.setslave c)) - (when (and awesome.startup - (not c.size_hints.user_position) - (not c.size_hints.program_position)) - ;; Prevent clients from being unreachable after screen count changes. - (awful.placement.no_offscreen c)) + (when (and awesome.startup + (not c.size_hints.user_position) + (not c.size_hints.program_position)) + ;; Prevent clients from being unreachable after screen count changes. + (awful.placement.no_offscreen c)) + (when (= c.class "mpv") (awful.placement.centered c)) (awful.client.focus.byidx 1) (: c :activate []))) diff --git a/awesome/keybindings.fnl b/awesome/keybindings.fnl index b028916..775be9e 100644 --- a/awesome/keybindings.fnl +++ b/awesome/keybindings.fnl @@ -147,11 +147,11 @@ {:description "launch eshell in new emacs frame" :group "apps" }) (awful.key [ modkey ] "e" (fn [] (awful.spawn "emacsclient -c -a 'emacs'")) {:description "launch new emacs frame" :group "apps" }) - (awful.key [ modkey ] "p" (fn [] (awful.spawn "rofi-pass")) + (awful.key [ modkey ] "p" (fn [] (awful.spawn "rofi-rbw")) {:description "select pass" :group "apps" }) (awful.key [ modkey shift ] "w" (fn [] (awful.spawn "libreoffice --writer")) {:description "Open Writer" :group "apps" }) - (awful.key [modkey] "b" (fn [] (awful.spawn "qutebrowser")) + (awful.key [modkey] "b" (fn [] (awful.spawn "nyxt")) {:description "launch browser" :group "apps"}) ;; rofi (awful.key [] "Menu" (fn [] (awful.spawn "/home/chris/.dotfiles/rofi/launchers-git/launcher.sh")) diff --git a/awesome/rules.fnl b/awesome/rules.fnl index eec6cc8..d4d8947 100644 --- a/awesome/rules.fnl +++ b/awesome/rules.fnl @@ -18,7 +18,7 @@ ;; :buttons clientbuttons :screen awful.screen.preferred :size_hints_honor false - :placement awful.placement.no_overlap + ;; :placement awful.placement.no_overlap :shape_clip gears.shape.rounded_rect :shape_bounding gears.shape.rounded_rect } @@ -37,7 +37,7 @@ :properties { :floating true :raise true - :height (dpi 870) + :height (dpi 800) :screen (screen.count) :placement (+ awful.placement.no_offscreen awful.placement.centered) } @@ -157,7 +157,11 @@ :rule_any { :class [ "qutebrowser" + "nyxt" ] + :instance [ + "nyxt" + ] } :properties { :screen (screen.count) diff --git a/fish/config.fish b/fish/config.fish index 12dfa0c..02d357f 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -213,7 +213,7 @@ alias mpf "mpv --profile=fast" ### Start X at login if status is-login if test -z "$DISPLAY" -a "$XDG_VTNR" = 1 - exec dbus-run-session startplasma-wayland + exec dbus-run-session startx end end diff --git a/mpv/mpv.conf b/mpv/mpv.conf index 28c85ad..d824384 100644 --- a/mpv/mpv.conf +++ b/mpv/mpv.conf @@ -7,6 +7,7 @@ geometry=50%:50% hwdec=auto rtsp-transport=udp +# ytdl-path=yt-dlp ytdl-format=bestvideo[height<=?720][fps<=?30]+bestaudio/best [fast] diff --git a/scripts/rofi-rbw b/scripts/rofi-rbw index 14ee87d..ac12837 100755 --- a/scripts/rofi-rbw +++ b/scripts/rofi-rbw @@ -27,16 +27,16 @@ echo $option case ${option} in Password ) - echo "Test" - xdotool type $(rbw get ${SECRET}) + echo "${SECRET}" + xdotool type $(rbw get "${SECRET}") ;; User ) - xdotool type $(rbw get --full ${SECRET} | rg Username: | awk '{$1 = ""; print $0}') + xdotool type $(rbw get --full "${SECRET}" | rg Username: | awk '{$1 = ""; print $0}') ;; "User and password" ) - xdotool type $(rbw get --full ${SECRET} | rg Username: | awk '{$1 = ""; print $0}') + xdotool type $(rbw get --full "${SECRET}" | rg Username: | awk '{$1 = ""; print $0}') xdotool key Tab - xdotool type $(rbw get ${SECRET}) + xdotool type $(rbw get "${SECRET}") ;; "QR-Code" ) if [[ $SECRET =~ wifi$ ]]; then