From 81a8ca2b4e3b9e69236aac5b3747a079d0045f27 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 25 Jun 2021 13:24:51 -0500 Subject: [PATCH 1/2] making things work decent in sway --- alacritty/alacritty.yml | 2 +- fish/config.fish | 3 +- mpv/mpv.conf | 2 +- nyxt/init.lisp | 2 +- qutebrowser/qsettings/QtProject.conf | 6 +-- rofi/launchers-git/laptop.rasi | 2 +- rofi/rofi-pass/config | 2 +- scripts/rofipass | 62 ++++++++++++++++++++++++++++ sway/config | 11 +++-- waybar/config | 6 +-- waybar/style.css | 2 +- 11 files changed, 84 insertions(+), 16 deletions(-) create mode 100755 scripts/rofipass diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml index 07739e5..87bfb06 100644 --- a/alacritty/alacritty.yml +++ b/alacritty/alacritty.yml @@ -318,7 +318,7 @@ colors: # # Window opacity as a floating point number from `0.0` to `1.0`. # The value `0.0` is completely transparent and `1.0` is opaque. -background_opacity: 0.80 +background_opacity: 1 #selection: #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t" diff --git a/fish/config.fish b/fish/config.fish index 6b039e5..7d8148b 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -204,10 +204,11 @@ alias yay "paru" alias yeet "paru -Rns" alias ls "exa -l" alias la "exa -la" +alias mpf "mpv --profile=fast" ### Start X at login if status is-login if test -z "$DISPLAY" -a "$XDG_VTNR" = 1 exec startx - end +end end diff --git a/mpv/mpv.conf b/mpv/mpv.conf index 9cca60b..af6caab 100644 --- a/mpv/mpv.conf +++ b/mpv/mpv.conf @@ -3,7 +3,7 @@ vo=gpu af=scaletempo2 autofit=70% geometry=50%:50% -input-ipc-server="/tmp/mpvsocket" +# input-ipc-server="/tmp/mpvsocket" hwdec=auto rtsp-transport=udp diff --git a/nyxt/init.lisp b/nyxt/init.lisp index 3a28b2e..98e2fca 100644 --- a/nyxt/init.lisp +++ b/nyxt/init.lisp @@ -48,7 +48,7 @@ :background "#282a36" :color "#e2e4e5") ("#container" - :grid-template-columns "0px 0px 1.5fr 0px 2fr 0px 1fr 0px") + :grid-template-columns "0px 0px 1.5fr 2fr 0.5fr 0px 0.5fr 0px") ("#controls" :background-color "#282a36" :color "#f3f99d" diff --git a/qutebrowser/qsettings/QtProject.conf b/qutebrowser/qsettings/QtProject.conf index 0b1032d..108a1f2 100644 --- a/qutebrowser/qsettings/QtProject.conf +++ b/qutebrowser/qsettings/QtProject.conf @@ -1,8 +1,8 @@ [FileDialog] -history=file:///home/chris/Videos, file:///home/chris, file:///home/chris/Downloads, file:///home/chris/tfc, file:///home/chris/Pictures/Phone/Camera, file:///run/media/chris/LUMIX/DCIM/110_PANA -lastVisited=file:///run/media/chris/LUMIX/DCIM/110_PANA +history=file:///home/chris/Downloads, file:///home/chris/Pictures/Phone/Camera +lastVisited=file:///home/chris/Downloads qtVersion=5.15.2 shortcuts=file:, file:///home/chris sidebarWidth=116 treeViewHeader=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x2\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x2L\0\0\0\x4\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x4\0\0\0\xff\0\0\0\x1\0\0\0\0\0\0\0X\0\0\0\x1\0\0\0\0\0\0\0X\0\0\0\x1\0\0\0\0\0\0\0\x9d\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\xff\xff\xff\xff) -viewMode=Detail +viewMode=List diff --git a/rofi/launchers-git/laptop.rasi b/rofi/launchers-git/laptop.rasi index d2d7d3a..f3a05db 100644 --- a/rofi/launchers-git/laptop.rasi +++ b/rofi/launchers-git/laptop.rasi @@ -10,6 +10,6 @@ configuration { - font: "VictorMono Nerd Font 28.0"; + font: "VictorMono Nerd Font 14.0"; } @import "/home/chris/.dotfiles/rofi/launchers-git/blurry.rasi" diff --git a/rofi/rofi-pass/config b/rofi/rofi-pass/config index fd54a69..ade96bb 100644 --- a/rofi/rofi-pass/config +++ b/rofi/rofi-pass/config @@ -3,7 +3,7 @@ # root=/path/to/root if [ $(hostname) = "syl" ]; then - style="laptop" + style="desktop" #echo "this is hidpi" else style="desktop" diff --git a/scripts/rofipass b/scripts/rofipass new file mode 100755 index 0000000..02453d5 --- /dev/null +++ b/scripts/rofipass @@ -0,0 +1,62 @@ +#!/usr/bin/env bash +# Very basic interface for pass using wofi + +# Get all password files and create an array +root=~/.password-store +CACHE=~/.local/tmp/pass_wofi +seat=seat0 + +list_passwords() { + shopt -s nullglob globstar + cd "${root}" || exit + pw_list=(**/*.gpg) + printf '%s\n' "${pw_list[@]%.gpg}" | sort -n + +} + +prompt='search for passwords...' +SECRET=$(list_passwords | rofi -i -prompt="${prompt}" -dmenu) + +# Ask whether pass, user or both are required + +options=("Password" \ + "User" \ + "User and password" \ + "QR-Code" \ + "OTP") + +option=$(printf '%s\n' "${options[@]%}" | rofi -i -dmenu -width 400 -lines 4 -prompt="...") + +echo $option + +case ${option} in + Password ) + echo "Test" + wtype $(pass ${SECRET} | head -n 1) + ;; + User ) + wtype $(pass ${SECRET} | rg user: | awk '{$1 = ""; print $0}') + ;; + "User and password" ) + wtype $(pass ${SECRET} | rg user: | awk '{$1 = ""; print $0}') + wtype -k TAB + wtype $(pass ${SECRET} | head -n 1) + ;; + "QR-Code" ) + if [[ $SECRET =~ wifi$ ]]; then + # Produce a valid wifi QR-code + WIFISSID=$(pass get_user ${SECRET}) + WIFIPASS=$(pass get_pass ${SECRET}) + WIFIQR="WIFI:T:WPA;S:${WIFISSID};P:${WIFIPASS};;" + qrencode -s 8 -o - $WIFIQR | feh --title "pass: QR-WIFI" - + else + # Only password + pass show -q1 ${SECRET} + fi + ;; + "OTP" ) + wtype $(pass otp ${SECRET}) + ;; +esac + +# wl-copy -o -s ${seat} ${PASSWD_PASS} diff --git a/sway/config b/sway/config index 86f6beb..2de269c 100644 --- a/sway/config +++ b/sway/config @@ -73,9 +73,9 @@ titlebar_border_thickness 1 bindsym Menu exec $menu bindsym $mod+Menu exec rofi -no-lazy-grab -show run -modi run | xargs swaymsg exec -- bindsym $mod+s exec filesearch - + #Pass - bindsym $mod+p exec rofi-pass + bindsym $mod+p exec rofipass # Screenshot bindsym Print exec grim -g "${slurp}" - | wl-copy @@ -129,6 +129,9 @@ titlebar_border_thickness 1 bindsym $mod+8 workspace number 8 bindsym $mod+9 workspace number 9 bindsym $mod+0 workspace number 10 + # Switching around workspaces + bindsym $mod+Mod1+l workspace next + bindsym $mod+Mod1+h workspace prev # Move focused container to workspace bindsym $mod+Shift+1 move container to workspace number 1 bindsym $mod+Shift+2 move container to workspace number 2 @@ -221,6 +224,7 @@ bindsym $mod+r mode "resize" set $mode_launcher Launcher bindsym $mod+o mode "$mode_launcher" +# Clear notifications bindsym $mod+Ctrl+m exec makoctl dismiss -a mode "$mode_launcher" { @@ -249,11 +253,12 @@ for_window [app_id="pulsemixer"] floating enable for_window [app_id="qutebrowser"] move container to workspace number 2 for_window [app_id="qutebrowser"] opacity 1 for_window [app_id="emacs"] opacity 0.95 -#for_window [app_id="__focused__"] opacity 1 +for_window [app_id="__focused__"] opacity 1 exec emacs --daemon exec mako exec waystart +exec export QT_QPA_PLATFORMTHEME="qt5ct" xwayland enable include /etc/sway/config.d/* diff --git a/waybar/config b/waybar/config index 300f851..6fe7434 100644 --- a/waybar/config +++ b/waybar/config @@ -1,14 +1,14 @@ { // "layer": "top", // Waybar at top layer "position": "bottom", // Waybar position (top|bottom|left|right) - "height": 20, // Waybar height (to be removed for auto height) + "height": 25, // Waybar height (to be removed for auto height) // "width": 1280, // Waybar width // Choose the order of the modules "modules-left": ["sway/workspaces", "sway/mode", "sway/window"], "modules-center": ["clock"], - "modules-right": ["pulseaudio", "network", "cpu", "memory", "temperature", "battery", "battery#bat2", "tray"], + "modules-right": ["pulseaudio", "network", "cpu", "memory", "battery", "battery#bat2", "tray"], "margin-top": 5, - "margin-bottom": 5, + "margin-bottom": 10, // Modules configuration "sway/workspaces": { "disable-scroll": true, diff --git a/waybar/style.css b/waybar/style.css index 347d34e..6d01219 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -166,7 +166,7 @@ window#waybar.solo { padding-right: 10px; border-radius: 20px; transition: none; - color: @base0C; + color: @base0E; background: @backtransparent; } From c49eed3c486c0267bb50138e9a62fd7c0345780c Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Mon, 5 Jul 2021 13:15:44 -0500 Subject: [PATCH 2/2] bumps for laptop --- alacritty/alacritty.yml | 2 +- awesome/init.fnl | 2 +- qutebrowser/config.py | 2 +- qutebrowser/quickmarks | 1 + river/init | 26 +++++++++++++++----------- rofi/config.rasi | 2 +- rofi/launchers-git/laptop.rasi | 2 +- rofi/rofi-pass/config | 2 +- scripts/mem | 9 +++++++++ sway/config | 8 ++++---- waybar/config | 5 ++++- 11 files changed, 39 insertions(+), 22 deletions(-) create mode 100755 scripts/mem diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml index 87bfb06..93b7a61 100644 --- a/alacritty/alacritty.yml +++ b/alacritty/alacritty.yml @@ -318,7 +318,7 @@ colors: # # Window opacity as a floating point number from `0.0` to `1.0`. # The value `0.0` is completely transparent and `1.0` is opaque. -background_opacity: 1 +background_opacity: 0.75 #selection: #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t" diff --git a/awesome/init.fnl b/awesome/init.fnl index 53458f3..982bbc0 100644 --- a/awesome/init.fnl +++ b/awesome/init.fnl @@ -79,7 +79,7 @@ (if (= "syl\n" stdout) (global laptop true) (global laptop false)))) -(local laptop false) +(local laptop true) ;; Table of layouts to cover with awful.layout.inc, order matters. (set awful.layout.layouts [ diff --git a/qutebrowser/config.py b/qutebrowser/config.py index 787099c..8bc3a27 100644 --- a/qutebrowser/config.py +++ b/qutebrowser/config.py @@ -2483,7 +2483,7 @@ config.bind("o", "set-cmd-text -s :open") ## Bindings for MPV and YTDL config.bind("v", "hint links spawn --detach mpv --profile=fast --force-window yes {hint-url}") -config.bind("gv", "spawn --detach mpv --profile=fast --force-window yes --ytdl=bestvideo[height<=?720][fps<=?30]+bestaudio/best {url}") +config.bind("gv", "spawn --detach mpv --profile=fast --force-window yes --ytdl=bestvideo[height<=?720][fps<=?30]+bestaudio/best \'{url}\'") config.bind("gc", 'spawn org-capture "{url}"') config.bind( "gV", diff --git a/qutebrowser/quickmarks b/qutebrowser/quickmarks index 767160a..e115ba2 100644 --- a/qutebrowser/quickmarks +++ b/qutebrowser/quickmarks @@ -20,3 +20,4 @@ ha https://home.cochrun.xyz/lovelace/default_view tfc https://www.tfcconnection.org/ nvtfc https://www.facebook.com/NorthernValleyTFC tnc https://staff.tfcconnection.org/apps/dashboard/ +oml https://outlook.live.com/mail/0/inbox diff --git a/river/init b/river/init index 1981e04..9e4a1bf 100755 --- a/river/init +++ b/river/init @@ -13,7 +13,9 @@ mod="Mod4" # Mod+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot) riverctl map normal $mod Return spawn alacritty riverctl map normal $mod E spawn emacsclient -c -a 'emacs' -riverctl map normal Menu spawn rofi -no-lazy-grab -show run -modi run +riverctl map normal $mod B spawn qutebrowser +riverctl map normal None Menu spawn rofi -no-lazy-grab -show drun -modi drun +riverctl map normal $mod Menu spawn rofi -no-lazy-grab -show run -modi run # Mod+Q to close the focused view riverctl map normal $mod C close @@ -31,20 +33,20 @@ riverctl map normal $mod+Shift J swap next riverctl map normal $mod+Shift K swap previous # Mod+Period and Mod+Comma to focus the next/previous output -riverctl map normal $mod Period focus-output next -riverctl map normal $mod Comma focus-output previous +riverctl map normal $mod L focus-output next +riverctl map normal $mod H focus-output previous # Mod+Shift+{Period,Comma} to send the focused view to the next/previous output -riverctl map normal $mod+Shift Period send-to-output next -riverctl map normal $mod+Shift Comma send-to-output previous +riverctl map normal $mod O send-to-output next +# riverctl map normal $mod+Shift Comma send-to-output previous # Mod+Return to bump the focused view to the top of the layout stack # riverctl map normal $mod Return zoom # Mod+H and Mod+L to decrease/increase the main factor by 5% # If using rivertile(1) this determines the width of the main stack. -riverctl map normal $mod H mod-main-factor -0.05 -riverctl map normal $mod L mod-main-factor +0.05 +riverctl map normal $mod+Control H mod-main-factor -0.05 +riverctl map normal $mod+Control L mod-main-factor +0.05 # Mod+Shift+H and Mod+Shift+L to increment/decrement the number of # main views in the layout @@ -149,9 +151,6 @@ done # Set repeat rate riverctl set-repeat 180 200 -# Set the layout on startup -riverctl layout rivertile - # Set app-ids of views which should float riverctl float-filter-add "float" riverctl float-filter-add "popup" @@ -170,4 +169,9 @@ riverctl xcursor-theme breeze-snow wlr-randr --output eDP-1 --pos 0,0 --scale 2 # Turn on Waybar -waybar +exec waybar + +# Set and exec into the default layout generator, rivertile. +# River will send the process group of the init executable SIGTERM on exit. +riverctl default-layout rivertile +exec rivertile diff --git a/rofi/config.rasi b/rofi/config.rasi index 469b42f..c911358 100644 --- a/rofi/config.rasi +++ b/rofi/config.rasi @@ -10,4 +10,4 @@ configuration { run-command: "fish -c {cmd}"; run-list-command: "fish -c functions"; } -@import "/home/chris/.dotfiles/rofi/launchers-git/desktop.rasi" +@import "/home/chris/.dotfiles/rofi/launchers-git/laptop.rasi" diff --git a/rofi/launchers-git/laptop.rasi b/rofi/launchers-git/laptop.rasi index f3a05db..d2d7d3a 100644 --- a/rofi/launchers-git/laptop.rasi +++ b/rofi/launchers-git/laptop.rasi @@ -10,6 +10,6 @@ configuration { - font: "VictorMono Nerd Font 14.0"; + font: "VictorMono Nerd Font 28.0"; } @import "/home/chris/.dotfiles/rofi/launchers-git/blurry.rasi" diff --git a/rofi/rofi-pass/config b/rofi/rofi-pass/config index ade96bb..fd54a69 100644 --- a/rofi/rofi-pass/config +++ b/rofi/rofi-pass/config @@ -3,7 +3,7 @@ # root=/path/to/root if [ $(hostname) = "syl" ]; then - style="desktop" + style="laptop" #echo "this is hidpi" else style="desktop" diff --git a/scripts/mem b/scripts/mem new file mode 100755 index 0000000..6904f2c --- /dev/null +++ b/scripts/mem @@ -0,0 +1,9 @@ +#!/bin/sh +# Get the percentage of used memory and print it +read used total <<< $(free -m | awk '/Mem/{printf $2" "$3}') + +percent=$(bc -l <<< "100 * $total / $used") + +mem=$(awk -v u=$used -v t=$total -v p=$percent 'BEGIN {printf "%sMi/%sMi %.1f% ", t, u, p}') + +echo $mem diff --git a/sway/config b/sway/config index 2de269c..c0ac414 100644 --- a/sway/config +++ b/sway/config @@ -51,10 +51,10 @@ gaps inner 20 default_border none -border_images.focused /home/chris/.dotfiles/sway/rounded_and_shadows_custom.png -border_images.focused_inactive /home/chris/.dotfiles/sway/rounded_and_shadows_custom.png -border_images.unfocused /home/chris/.dotfiles/sway/rounded_and_shadows_custom.png -border_images.urgent /home/chris/.dotfiles/sway/rounded_and_shadows_custom.png +# border_images.focused /home/chris/.dotfiles/sway/rounded_and_shadows_custom.png +# border_images.focused_inactive /home/chris/.dotfiles/sway/rounded_and_shadows_custom.png +# border_images.unfocused /home/chris/.dotfiles/sway/rounded_and_shadows_custom.png +# border_images.urgent /home/chris/.dotfiles/sway/rounded_and_shadows_custom.png font pango: VictorMono Nerd Font 10 titlebar_border_thickness 1 diff --git a/waybar/config b/waybar/config index 6fe7434..96b6953 100644 --- a/waybar/config +++ b/waybar/config @@ -4,7 +4,7 @@ "height": 25, // Waybar height (to be removed for auto height) // "width": 1280, // Waybar width // Choose the order of the modules - "modules-left": ["sway/workspaces", "sway/mode", "sway/window"], + "modules-left": ["sway/workspaces", "river/tags", "sway/mode", "sway/window"], "modules-center": ["clock"], "modules-right": ["pulseaudio", "network", "cpu", "memory", "battery", "battery#bat2", "tray"], "margin-top": 5, @@ -25,6 +25,9 @@ "default": "" } }, + "river/tags": { + "num-tags": 5 + }, "sway/mode": { "format": " {}" },