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": " {}" },