Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2f07de753b | |||
| 60a2a61eab | |||
|
|
0beada7beb | ||
|
|
63c8911ada | ||
|
|
aa0a3c702c |
@@ -22,17 +22,17 @@
|
||||
"heirline.nvim": { "branch": "master", "commit": "fae936abb5e0345b85c3a03ecf38525b0828b992" },
|
||||
"hover.nvim": { "branch": "main", "commit": "3b49066e09e03e63be6d6f43ae2b8bcd58301f63" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
|
||||
"lazydev.nvim": { "branch": "main", "commit": "01bc2aacd51cf9021eb19d048e70ce3dd09f7f93" },
|
||||
"lsp_signature.nvim": { "branch": "master", "commit": "a793d02b6a5e639fa9d3f2a89a839fa688ab2d0a" },
|
||||
"lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
|
||||
"mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" },
|
||||
"mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
|
||||
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
|
||||
"mini.animate": { "branch": "main", "commit": "8ce6df739aa9d14c876bace722af28c3d09e9971" },
|
||||
"mini.animate": { "branch": "main", "commit": "0365de8b69331c25d0d0d7573407a7dc7719e578" },
|
||||
"mini.bufremove": { "branch": "main", "commit": "285bdac9596ee7375db50c0f76ed04336dcd2685" },
|
||||
"neo-tree.nvim": { "branch": "main", "commit": "c4c168e459395275c552179a1baf9c3d885d6a74" },
|
||||
"neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
|
||||
"neoconf.nvim": { "branch": "main", "commit": "f630568a4d04154803886f21ca60923f12709f0f" },
|
||||
"none-ls.nvim": { "branch": "main", "commit": "a117163db44c256d53c3be8717f3e1a2a28e6299" },
|
||||
"nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" },
|
||||
@@ -55,13 +55,13 @@
|
||||
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
|
||||
"promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" },
|
||||
"resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" },
|
||||
"schemastore.nvim": { "branch": "main", "commit": "960a5cf992c033170499ccc7003df59734ed40a8" },
|
||||
"schemastore.nvim": { "branch": "main", "commit": "aa25399c48236b77af71d4b64cdf157d2ba4e990" },
|
||||
"smart-splits.nvim": { "branch": "master", "commit": "ddb23c1a1cf1507bda487cda7f6e4690965ef9f5" },
|
||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "a17d611a0e111836a1db5295f04945df407c5135" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
|
||||
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "c098362fe603d3922095e7db595961e020bdf2d0" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
|
||||
"vim-illuminate": { "branch": "master", "commit": "19cb21f513fc2b02f0c66be70107741e837516a1" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" },
|
||||
"zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
|
||||
|
||||
@@ -7,13 +7,17 @@
|
||||
export XDG_CURRENT_DESKTOP=river
|
||||
export XDG_SESSION_TYPE=wayland
|
||||
|
||||
export MOZ_ENABLE_WAYLAND=1
|
||||
|
||||
export XCURSOR_SIZE=36
|
||||
|
||||
## Start portals
|
||||
dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
|
||||
xdg-desktop-portal-wlr &
|
||||
xdg-desktop-portal &
|
||||
/usr/libexec/xdg-desktop-portal-wlr &
|
||||
/usr/libexec/xdg-desktop-portal &
|
||||
|
||||
## Start easyeffects
|
||||
flatpak run com.github.wwmm.easyeffects --gapplication-service &
|
||||
#flatpak run com.github.wwmm.easyeffects --gapplication-service &
|
||||
|
||||
# Mod1+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot)
|
||||
riverctl map normal Mod1+Shift Return spawn foot
|
||||
@@ -124,36 +128,8 @@ riverctl map passthrough Mod1 F11 enter-mode normal
|
||||
|
||||
# Lock screen
|
||||
#riverctl map normal Mod1+Shift L spawn waylock
|
||||
riverctl map normal Mod1+Shift L spawn 'swaylock \
|
||||
--clock \
|
||||
--indicator-idle-visible \
|
||||
--indicator-radius 100 \
|
||||
--indicator-thickness 7 \
|
||||
--ring-color 2D464D \
|
||||
--key-hl-color be5046 \
|
||||
--text-color ffffff \
|
||||
--line-color 00000000 \
|
||||
--inside-color 00000088 \
|
||||
--separator-color 00000000 \
|
||||
--fade-in 0.2 \
|
||||
--effect-blur 7x1 \
|
||||
--image ~/Pictures/bg-astronaut.jpg'
|
||||
|
||||
swayidle \
|
||||
timeout 300 'swaylock \
|
||||
--clock \
|
||||
--indicator-idle-visible \
|
||||
--indicator-radius 100 \
|
||||
--indicator-thickness 7 \
|
||||
--ring-color 2D464D \
|
||||
--key-hl-color be5046 \
|
||||
--text-color ffffff \
|
||||
--line-color 00000000 \
|
||||
--inside-color 00000088 \
|
||||
--separator-color 00000000 \
|
||||
--fade-in 0.2 \
|
||||
--effect-blur 7x1 \
|
||||
--image ~/Pictures/bg-astronaut.jpg' &
|
||||
riverctl map normal Mod1+Shift L spawn lockscreen
|
||||
swayidle timeout 300 lockscreen &
|
||||
|
||||
# Various media key mapping examples for both normal and locked mode which do
|
||||
# not have a modifier
|
||||
@@ -183,7 +159,7 @@ riverctl map normal Mod1+Shift Print spawn "grim -g \"\$(slurp -p)\" -t ppm - |
|
||||
riverctl focus-follows-cursor normal
|
||||
|
||||
# Borders & Colors
|
||||
riverctl background-color 0x002b36
|
||||
riverctl background-color 0x202223
|
||||
riverctl border-color-focused 0x93a1a1
|
||||
riverctl border-color-unfocused 0x586e75
|
||||
riverctl border-width 1
|
||||
@@ -192,8 +168,9 @@ riverctl border-width 1
|
||||
riverctl set-repeat 30 200
|
||||
|
||||
# Keyboard layouts
|
||||
riverctl keyboard-layout -options "grp:win_space_toggle" "us,cz(qwerty)"
|
||||
#riverctl keyboard-layout CShack
|
||||
riverctl map normal Mod1 c spawn 'riverctl keyboard-layout "cz(qwerty)"'
|
||||
riverctl map normal Mod1 u spawn 'riverctl keyboard-layout "us"'
|
||||
riverctl keyboard-layout "us" # default layout
|
||||
|
||||
# Make all views with an app-id that starts with "float" and title "foo" start floating.
|
||||
riverctl rule-add -app-id 'float*' -title 'foo' float
|
||||
@@ -218,6 +195,9 @@ riverctl spawn "udiskie -ANt"
|
||||
# Color temp
|
||||
riverctl spawn "wlsunset -l 50.08 -L 14.42 -t 5000 -T 6500"
|
||||
|
||||
# Cursor size
|
||||
riverctl xcursor-theme Adwaita 22
|
||||
|
||||
# Wallpaper
|
||||
riverctl spawn "swaybg -c 1D1F21"
|
||||
#[[ -e ~/.config/wallpaper.png ]] &&
|
||||
@@ -257,3 +237,5 @@ filtile \
|
||||
smart-padding 0, \
|
||||
main-ratio 55, \
|
||||
main-location left
|
||||
|
||||
riverctl spawn ssh-agent
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"position": "bottom",
|
||||
"modules-left": ["river/tags", "river/window"],
|
||||
"modules-center": [],
|
||||
"modules-right": ["tray", "network", "custom/audio", "clock"],
|
||||
"modules-right": ["tray", "bluetooth", "network", "custom/audio", "battery", "clock"],
|
||||
|
||||
"river/tags": {
|
||||
"num-tags": 9
|
||||
@@ -51,14 +51,14 @@
|
||||
//"on-click-right": "~/.scripts/restart_network.sh"
|
||||
},
|
||||
|
||||
//"bluetooth": {
|
||||
// "on-click": "foot bluetuith",
|
||||
// "on-click-right": "~/.scripts/toggle_bluetooth.sh",
|
||||
// "format-on": "",
|
||||
// "format-off": "",
|
||||
// "format-disabled": "",
|
||||
// "format-connected": ""
|
||||
//},
|
||||
"bluetooth": {
|
||||
"on-click": "foot bluetuith",
|
||||
"on-click-right": "~/.scripts/toggle_bluetooth.sh",
|
||||
"format-on": "",
|
||||
"format-off": "",
|
||||
"format-disabled": "",
|
||||
"format-connected": ""
|
||||
},
|
||||
|
||||
//"wireplumber": {
|
||||
// "format": "{icon} {volume}%",
|
||||
@@ -87,19 +87,19 @@
|
||||
"on-scroll-down": "pamixer --decrease 5"
|
||||
},
|
||||
|
||||
//"battery": {
|
||||
// "states": {
|
||||
// "good": 95,
|
||||
// "warning": 30,
|
||||
// "critical": 15
|
||||
// },
|
||||
// "format":"{icon} {capacity}%",
|
||||
// "format-charging": " {capacity}%",
|
||||
// "format-plugged": "",
|
||||
// "format-icons": ["", "", "", "", "", "", "", "", "", ""],
|
||||
// "interval": 30,
|
||||
// "tooltip-format": "{time}",
|
||||
//},
|
||||
"battery": {
|
||||
"states": {
|
||||
"good": 95,
|
||||
"warning": 30,
|
||||
"critical": 15
|
||||
},
|
||||
"format":"{icon} {capacity}%",
|
||||
"format-charging": " {capacity}%",
|
||||
"format-plugged": "",
|
||||
"format-icons": ["", "", "", "", "", "", "", "", "", ""],
|
||||
"interval": 30,
|
||||
"tooltip-format": "{time}",
|
||||
},
|
||||
|
||||
"tray": {
|
||||
"spacing": 10
|
||||
|
||||
19
.local/bin/lockscreen
Executable file
19
.local/bin/lockscreen
Executable file
@@ -0,0 +1,19 @@
|
||||
#!/bin/sh
|
||||
|
||||
riverctl keyboard-layout us
|
||||
|
||||
exec swaylock \
|
||||
--clock \
|
||||
--show-keyboard-layout \
|
||||
--indicator-idle-visible \
|
||||
--indicator-radius 100 \
|
||||
--indicator-thickness 7 \
|
||||
--ring-color 2D464D \
|
||||
--key-hl-color be5046 \
|
||||
--text-color ffffff \
|
||||
--line-color 00000000 \
|
||||
--inside-color 00000088 \
|
||||
--separator-color 00000000 \
|
||||
--fade-in 0.2 \
|
||||
--effect-blur 7x1 \
|
||||
--color 202223
|
||||
@@ -1,33 +1,32 @@
|
||||
#!/usr/bin/env bash
|
||||
# Toggle default PipeWire sink between Steinberg UR22mkII and Starship/Matisse
|
||||
# Toggle default PipeWire sink between Built-in Audio and Cisco 700 USB Adapter
|
||||
|
||||
# sinks
|
||||
#STEINBERG_ID=60
|
||||
#STARSHIP_ID=59
|
||||
# Get sinks section
|
||||
SINKS=$(wpctl status | sed -n '/Sinks:/,/Sources:/p')
|
||||
|
||||
# Extract IDs (ignore default *) and match specific names
|
||||
STARSHIP_ID=$(echo "$SINKS" | tr -d '*' | grep -i "Starship" | grep -v "Easy Effects" | awk '{print $2}' | tr -d '.')
|
||||
STEINBERG_ID=$(echo "$SINKS" | tr -d '*' | grep -i "Steinberg" | grep -v "Easy Effects" | awk '{print $2}' | tr -d '.')
|
||||
# Extract IDs (ignore default * and Easy Effects virtual sinks)
|
||||
BUILTIN_ID=$(echo "$SINKS" | tr -d '*' | grep -i "Built-in Audio" | grep -v "Easy Effects" | awk '{print $2}' | tr -d '.')
|
||||
CISCO_ID=$(echo "$SINKS" | tr -d '*' | grep -i "Cisco HS 730-0TG" | grep -v "Easy Effects" | awk '{print $2}' | tr -d '.')
|
||||
|
||||
# Get current default sink name (not just the ID)
|
||||
CURRENT_SINK=$(wpctl status | awk '/Audio\/Sink/ {print $3}')
|
||||
|
||||
# Detect which sink is active and toggle
|
||||
if [[ "$CURRENT_SINK" == *"Steinberg"* ]]; then
|
||||
echo "Switching to Starship/Matisse output..."
|
||||
wpctl set-default "$STARSHIP_ID"
|
||||
if [[ "$CURRENT_SINK" == *"alsa_output.pci-0000_00_1f.3.analog-stereo"* ]]; then
|
||||
echo "Switching to Cisco HS 730-0TG..."
|
||||
wpctl set-default "$CISCO_ID"
|
||||
else
|
||||
echo "Switching to Steinberg UR22mkII output..."
|
||||
wpctl set-default "$STEINBERG_ID"
|
||||
echo "Switching to Built-in Audio..."
|
||||
wpctl set-default "$BUILTIN_ID"
|
||||
fi
|
||||
|
||||
# Optionally move active streams
|
||||
# Move active streams to new default sink
|
||||
echo "Moving active streams to new sink..."
|
||||
for stream in $(wpctl status | awk '/\. Stream/{print $1}'); do
|
||||
for stream in $(wpctl status | awk '/\. Stream/ {print $1}'); do
|
||||
wpctl move-stream "$stream" @DEFAULT_AUDIO_SINK@ 2>/dev/null
|
||||
done
|
||||
|
||||
# Confirm new default
|
||||
echo "New default sink:"
|
||||
wpctl status | grep "Audio/Sink"
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@ muted=$(pamixer --get-mute)
|
||||
# Determine alt value for Waybar
|
||||
if [ "$muted" = "true" ]; then
|
||||
case "$sink_name" in
|
||||
*Steinberg*) alt="headphones-muted" ;;
|
||||
*) alt="speaker-muted" ;;
|
||||
*Cisco*) alt="headphones-muted" ;;
|
||||
*) alt="speaker-muted" ;;
|
||||
esac
|
||||
else
|
||||
case "$sink_name" in
|
||||
*Steinberg*) alt="headphones" ;;
|
||||
*) alt="speaker" ;;
|
||||
*Cisco*) alt="headphones" ;;
|
||||
*) alt="speaker" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user