commit f6bdea68173909b2140561962a969b16fd836ea8
parent a363194668976c9c26f386a5064b840e5f8cfcf2
Author: Jake Koroman <jakekoroman@proton.me>
Date: Wed, 20 Nov 2024 11:22:04 -0500
Change to sandbar and change river binds for Colemak DH.
Diffstat:
6 files changed, 76 insertions(+), 38 deletions(-)
diff --git a/.config/river/bar b/.config/river/bar
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+FIFO="$XDG_RUNTIME_DIR/sandbar"
+[ -e "$FIFO" ] && rm -f "$FIFO"
+mkfifo "$FIFO"
+
+while cat "$FIFO"; do :; done | sandbar \
+ -font "Iosevka Nerd Font:size=10" \
+ -hide-vacant-tags \
+ -tags 4 a r s t
diff --git a/.config/river/init b/.config/river/init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# This is the example configuration file for river.
#
@@ -11,27 +11,27 @@
# Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc.
riverctl map normal Super Return spawn $TERMINAL
-riverctl map normal Super N spawn '$TERMINAL -e newsboat'
-riverctl map normal Super+Shift N spawn '$TERMINAL -e neomutt'
-riverctl map normal Super P spawn fuzzel
-riverctl map normal Super E spawn 'emacsclient -c -a "emacs"'
-riverctl map normal Super Delete spawn myswaylock
+riverctl map normal Super+Shift+Control+Alt N spawn '$TERMINAL -e newsboat'
+riverctl map normal Super+Shift+Control+Alt M spawn '$TERMINAL -e neomutt'
+riverctl map normal Super+Shift+Control+Alt R spawn fuzzel
+riverctl map normal Super+Shift+Control+Alt E spawn 'emacsclient -c -a "emacs"'
+riverctl map normal Super+Shift+Control+Alt Delete spawn myswaylock
+riverctl map normal Super+Shift+Control+Alt Period spawn rdpmenu
+riverctl map normal Super+Shift+Control+Alt Slash spawn bookmarks
+riverctl map normal Super+Shift+Control+Alt S spawn 'wayshot -s "$(slurp)" --stdout | swappy -f -'
+riverctl map normal Super+Shift+Control+Alt P spawn passmenu-otp
+
riverctl map normal Super+Shift C close
riverctl map normal Super+Control Q exit
-riverctl map normal Super R spawn rdpmenu
-riverctl map normal Super Slash spawn bookmarks
-riverctl map normal Super S spawn 'wayshot -s "$(slurp)" --stdout | wl-copy'
-riverctl map normal Super+Shift S spawn 'wayshot -s "$(slurp)" --stdout | swappy -f -'
-riverctl map normal Super F12 spawn passmenu-otp
# Super+J and Super+K to focus the next/previous view in the layout stack
-riverctl map normal Super J focus-view next
-riverctl map normal Super K focus-view previous
+riverctl map normal Super E focus-view next
+riverctl map normal Super I focus-view previous
# Super+Shift+J and Super+Shift+K to swap the focused view with the next/previous
# view in the layout stack
-riverctl map normal Super+Shift J swap next
-riverctl map normal Super+Shift K swap previous
+riverctl map normal Super+Shift E swap next
+riverctl map normal Super+Shift I swap previous
# Super+Period and Super+Comma to focus the next/previous output
riverctl map normal Super Period focus-output right
@@ -42,33 +42,33 @@ riverctl map normal Super+Shift Period send-to-output -current-tags right
riverctl map normal Super+Shift Comma send-to-output -current-tags left
# Super+Shift+Return to bump the focused view to the top of the layout stack
-riverctl map normal Super+Shift Return zoom
+riverctl map normal Super M zoom
# Super+H and Super+L to decrease/increase the main ratio of rivertile(1)
-riverctl map normal Super H send-layout-cmd rivertile "main-ratio -0.05"
-riverctl map normal Super L send-layout-cmd rivertile "main-ratio +0.05"
+riverctl map normal Super N send-layout-cmd rivertile "main-ratio -0.05"
+riverctl map normal Super O send-layout-cmd rivertile "main-ratio +0.05"
# Super+Shift+H and Super+Shift+L to increment/decrement the main count of rivertile(1)
-riverctl map normal Super+Shift H send-layout-cmd rivertile "main-count +1"
-riverctl map normal Super+Shift L send-layout-cmd rivertile "main-count -1"
+riverctl map normal Super+Shift N send-layout-cmd rivertile "main-count +1"
+riverctl map normal Super+Shift O send-layout-cmd rivertile "main-count -1"
# Super+Alt+{H,J,K,L} to move views
-riverctl map normal Super+Alt H move left 100
-riverctl map normal Super+Alt J move down 100
-riverctl map normal Super+Alt K move up 100
-riverctl map normal Super+Alt L move right 100
+riverctl map normal Super+Alt N move left 100
+riverctl map normal Super+Alt E move down 100
+riverctl map normal Super+Alt I move up 100
+riverctl map normal Super+Alt O move right 100
# Super+Alt+Control+{H,J,K,L} to snap views to screen edges
-riverctl map normal Super+Alt+Control H snap left
-riverctl map normal Super+Alt+Control J snap down
-riverctl map normal Super+Alt+Control K snap up
-riverctl map normal Super+Alt+Control L snap right
+riverctl map normal Super+Alt+Control N snap left
+riverctl map normal Super+Alt+Control E snap down
+riverctl map normal Super+Alt+Control I snap up
+riverctl map normal Super+Alt+Control O snap right
# Super+Alt+Shift+{H,J,K,L} to resize views
-riverctl map normal Super+Alt+Shift H resize horizontal -100
-riverctl map normal Super+Alt+Shift J resize vertical 100
-riverctl map normal Super+Alt+Shift K resize vertical -100
-riverctl map normal Super+Alt+Shift L resize horizontal 100
+riverctl map normal Super+Alt+Shift N resize horizontal -100
+riverctl map normal Super+Alt+Shift E resize vertical 100
+riverctl map normal Super+Alt+Shift I resize vertical -100
+riverctl map normal Super+Alt+Shift O resize horizontal 100
# Super + Left Mouse Button to move views
riverctl map-pointer normal Super BTN_LEFT move-view
@@ -79,21 +79,22 @@ riverctl map-pointer normal Super BTN_RIGHT resize-view
# Super + Middle Mouse Button to toggle float
riverctl map-pointer normal Super BTN_MIDDLE toggle-float
-for i in $(seq 1 9)
+tag_names=(x a r s t)
+for i in $(seq 1 5)
do
tags=$((1 << ($i - 1)))
# Super+[1-9] to focus tag [0-8]
- riverctl map normal Super $i set-focused-tags $tags
+ riverctl map normal Super ${tag_names[$i]} set-focused-tags $tags
# Super+Shift+[1-9] to tag focused view with tag [0-8]
- riverctl map normal Super+Shift $i set-view-tags $tags
+ riverctl map normal Super+Shift ${tag_names[$i]} set-view-tags $tags
# Super+Control+[1-9] to toggle focus of tag [0-8]
- riverctl map normal Super+Control $i toggle-focused-tags $tags
+ riverctl map normal Super+Control ${tag_names[$i]} toggle-focused-tags $tags
# Super+Shift+Control+[1-9] to toggle tag [0-8] of focused view
- riverctl map normal Super+Shift+Control $i toggle-view-tags $tags
+ riverctl map normal Super+Shift+Control ${tag_names[$i]} toggle-view-tags $tags
done
# Super+0 to focus all tags
diff --git a/deploy b/deploy
@@ -42,6 +42,7 @@ symlink_file "$(pwd)/device-specific/$hardware/emacs.el" "$(pwd)/.config/emacs/l
symlink_file "$(pwd)/device-specific/$hardware/dwl-hardware.h" "$(pwd)/dwl/device.h"
symlink_file "$(pwd)/device-specific/$hardware/river" "$(pwd)/.config/river/device"
symlink_file "$(pwd)/device-specific/$hardware/waybar" "$(pwd)/.config/waybar/config.jsonc"
+symlink_file "$(pwd)/device-specific/$hardware/baraction" "$(pwd)/scripts/baraction"
mkdir -p "$(pwd)/.config/foot"
sed "s/{FOOT_FONT}/$FOOT_FONT/g" "$(pwd)/shared-configs/foot/template.ini" > "$(pwd)/.config/foot/foot.ini"
diff --git a/device-specific/desktop/baraction b/device-specific/desktop/baraction
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+FIFO="$XDG_RUNTIME_DIR/sandbar"
+[ -e "$FIFO" ] || mkfifo "$FIFO"
+
+clock() {
+ printf "$(LANG=fr_CA.utf8 date +'%A %Y-%m-%d %H:%M')"
+}
+
+display() {
+ echo "all status $(clock)" > "$FIFO"
+}
+
+while true; do
+ display
+ sleep 60
+done
diff --git a/device-specific/desktop/river b/device-specific/desktop/river
@@ -12,5 +12,11 @@ wlr-randr --output DP-2 --mode 1920x1080@143.854996Hz --pos 0,0 --output DP-3 --
emacs --bg-daemon &
gentoo-pipewire-launcher restart &
myswayidle &
-waybar &
wbg ~/Pictures/wallpaper &
+. ~/.config/river/bar &
+baraction &
+
+riverctl map normal None XF86AudioRaiseVolume spawn 'pamixer -i 1'
+riverctl map normal None XF86AudioLowerVolume spawn 'pamixer -d 1'
+
+riverctl input tablet-1386-890-Wacom_One_by_Wacom_S_Pen map-to-output DP-3
+\ No newline at end of file
diff --git a/scripts/baraction b/scripts/baraction
@@ -0,0 +1 @@
+/home/jake/dotfiles/device-specific/desktop/baraction
+\ No newline at end of file
