nvim lazy-lock updated

.bashrc

@@ -120,10 +120,10 @@ function genpasswd() {
 
 ## Download m3u8 stream
 m3u8-download() {
-  yt-dlp --list-formats "$1"
+  youtube-dl --list-formats "$1"
   echo "enter format code:"
   read format_code
-  yt-dlp -f $format_code --hls-prefer-native "$1"
+  youtube-dl -f $format_code --hls-prefer-native "$1"
 }
 
 ## GPG functions
@@ -169,9 +169,8 @@ alias ls="ls --color=auto"
 alias ll="ls -lFh"
 alias la="ls -alh"
 alias l="ls -CF"
-#alias ld="ls -d -F */"
+alias ld="ls -d -F */"
 alias lda="ls -l -d -p */"
-alias tree="tree -C"
 export HISTCONTROL=ignoredups # fuckin history identical vole
 
 ## network
@@ -227,7 +226,6 @@ alias whatsmyip="dig +short myip.opendns.com @resolver1.opendns.com"
 alias htmlvlna="vlna -s -r -x 266E6273703B"
 alias fuck='doas $(history -p \!\!)'
 alias sudo="doas"
-alias treecat="tail -n +1 **/*"
 
 ## void xbps aliases
 #alias xi="doas xbps-install"
@@ -253,15 +251,6 @@ export PATH="$PATH:$HOME/.local/bin"
 export PATH="$PATH:/var/lib/flatpak/exports/bin"
 export PATH="$PATH:$HOME/.local/share/flatpak/exports/bin"
 export PATH="$PATH:/home/fr/git/microlab/wpa_tui/dmenu_scripts"
-export PATH="$PATH:$HOME/.local/bin/flutter/bin"
-export PATH="$PATH:$HOME/.local/bin/cmdline-tools/bin"
-export PATH="$PATH:$HOME/.config/emacs/bin"
-
-export ANDROID_SDK_ROOT="$HOME/.local/android-sdk"
-export ANDROID_HOME="$HOME/.local/android-sdk"
-export PATH="$ANDROID_SDK_ROOT/platform-tools:$PATH"
-export PATH="$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$PATH"
-
 
 # Locales Exports
 export LC_ALL=en_US.UTF-8

.config/doom/config.el

@@ -1,75 +0,0 @@
-;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
-
-;; Place your private configuration here! Remember, you do not need to run 'doom
-;; sync' after modifying this file!
-
-
-;; Some functionality uses this to identify you, e.g. GPG configuration, email
-;; clients, file templates and snippets. It is optional.
-;; (setq user-full-name "John Doe"
-;;       user-mail-address "john@doe.com")
-
-;; Doom exposes five (optional) variables for controlling fonts in Doom:
-;;
-;; - `doom-font' -- the primary font to use
-;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable)
-;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for
-;;   presentations or streaming.
-;; - `doom-symbol-font' -- for symbols
-;; - `doom-serif-font' -- for the `fixed-pitch-serif' face
-;;
-;; See 'C-h v doom-font' for documentation and more examples of what they
-;; accept. For example:
-;;
-;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light)
-;;      doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13))
-;;
-;; If you or Emacs can't find your font, use 'M-x describe-font' to look them
-;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
-;; refresh your font settings. If Emacs still can't find your font, it likely
-;; wasn't installed correctly. Font issues are rarely Doom issues!
-
-;; There are two ways to load a theme. Both assume the theme is installed and
-;; available. You can either set `doom-theme' or manually load a theme with the
-;; `load-theme' function. This is the default:
-(setq doom-theme 'doom-one)
-
-;; This determines the style of line numbers in effect. If set to `nil', line
-;; numbers are disabled. For relative line numbers, set this to `relative'.
-(setq display-line-numbers-type t)
-
-;; If you use `org' and don't want your org files in the default location below,
-;; change `org-directory'. It must be set before org loads!
-(setq org-directory "~/org/")
-
-
-;; Whenever you reconfigure a package, make sure to wrap your config in an
-;; `with-eval-after-load' block, otherwise Doom's defaults may override your
-;; settings. E.g.
-;;
-;;   (with-eval-after-load 'PACKAGE
-;;     (setq x y))
-;;
-;; The exceptions to this rule:
-;;
-;;   - Setting file/directory variables (like `org-directory')
-;;   - Setting variables which explicitly tell you to set them before their
-;;     package is loaded (see 'C-h v VARIABLE' to look them up).
-;;   - Setting doom variables (which start with 'doom-' or '+').
-;;
-;; Here are some additional functions/macros that will help you configure Doom.
-;;
-;; - `load!' for loading external *.el files relative to this one
-;; - `add-load-path!' for adding directories to the `load-path', relative to
-;;   this file. Emacs searches the `load-path' when you load packages with
-;;   `require' or `use-package'.
-;; - `map!' for binding new keys
-;;
-;; To get information about any of these functions/macros, move the cursor over
-;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
-;; This will open documentation for it, including demos of how they are used.
-;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces,
-;; etc).
-;;
-;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
-;; they are implemented.

.config/doom/init.el

@@ -1,200 +0,0 @@
-;;; init.el -*- lexical-binding: t; -*-
-
-;; This file controls what Doom modules are enabled and what order they load
-;; in. Remember to run 'doom sync' after modifying it!
-
-;; NOTE: Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's
-;;   documentation. There you'll find a link to Doom's Module Index where all of
-;;   our modules are listed, including what flags they support.
-
-;; NOTE: Move your cursor over a module's name (or its flags) and press 'K' (or
-;;   'C-c c k' for non-vim users) to view its documentation. This works on flags
-;;   as well (those symbols that start with a plus).
-;;
-;;   Alternatively, press 'gd' (or 'C-c c d') on a module to browse its
-;;   directory (for easy access to its source code).
-
-(doom! :input
-       ;;bidi              ; (tfel ot) thgir etirw uoy gnipleh
-       ;;chinese
-       ;;japanese
-       ;;layout            ; auie,ctsrnm is the superior home row
-
-       :completion
-       ;;company           ; the ultimate code completion backend
-       (corfu +orderless)  ; complete with cap(f), cape and a flying feather!
-       ;;helm              ; the *other* search engine for love and life
-       ;;ido               ; the other *other* search engine...
-       ;;ivy               ; a search engine for love and life
-       vertico           ; the search engine of the future
-
-       :ui
-       ;;deft              ; notational velocity for Emacs
-       doom              ; what makes DOOM look the way it does
-       dashboard         ; a nifty splash screen for Emacs
-       ;;doom-quit         ; DOOM quit-message prompts when you quit Emacs
-       ;;(emoji +unicode)  ; 🙂
-       hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
-       ;;indent-guides     ; highlighted indent columns
-       ;;ligatures         ; ligatures and symbols to make your code pretty again
-       ;;minimap           ; show a map of the code on the side
-       modeline          ; snazzy, Atom-inspired modeline, plus API
-       nav-flash         ; blink cursor line after big motions
-       ;;neotree           ; a project drawer, like NERDTree for vim
-       ophints           ; highlight the region an operation acts on
-       (popup +defaults)   ; tame sudden yet inevitable temporary windows
-       smooth-scroll     ; So smooth you won't believe it's not butter
-       tabs              ; a tab bar for Emacs
-       treemacs          ; a project drawer, like neotree but cooler
-       ;;unicode           ; extended unicode support for various languages
-       (vc-gutter +pretty) ; vcs diff in the fringe
-       vi-tilde-fringe   ; fringe tildes to mark beyond EOB
-       ;;window-select     ; visually switch windows
-       workspaces        ; tab emulation, persistence & separate workspaces
-       zen               ; distraction-free coding or writing
-
-       :editor
-       (evil +everywhere); come to the dark side, we have cookies
-       file-templates    ; auto-snippets for empty files
-       fold              ; (nigh) universal code folding
-       ;;(format +onsave)  ; automated prettiness
-       ;;god               ; run Emacs commands without modifier keys
-       ;;lispy             ; vim for lisp, for people who don't like vim
-       ;;multiple-cursors  ; editing in many places at once
-       ;;objed             ; text object editing for the innocent
-       ;;parinfer          ; turn lisp into python, sort of
-       ;;rotate-text       ; cycle region at point between text candidates
-       snippets          ; my elves. They type so I don't have to
-       (whitespace +guess +trim)  ; a butler for your whitespace
-       ;;word-wrap         ; soft wrapping with language-aware indent
-
-       :emacs
-       dired             ; making dired pretty [functional]
-       electric          ; smarter, keyword-based electric-indent
-       ;;eww               ; the internet is gross
-       ;;ibuffer           ; interactive buffer management
-       tramp             ; remote files at your arthritic fingertips
-       undo              ; persistent, smarter undo for your inevitable mistakes
-       vc                ; version-control and Emacs, sitting in a tree
-
-       :term
-       ;;eshell            ; the elisp shell that works everywhere
-       ;;shell             ; simple shell REPL for Emacs
-       ;;term              ; basic terminal emulator for Emacs
-       ;;vterm             ; the best terminal emulation in Emacs
-
-       :checkers
-       syntax              ; tasing you for every semicolon you forget
-       ;;(spell +flyspell) ; tasing you for misspelling mispelling
-       grammar           ; tasing grammar mistake every you make
-
-       :tools
-       ansible
-       ;;biblio            ; Writes a PhD for you (citation needed)
-       ;;collab            ; buffers with friends
-       ;;debugger          ; stepping through code, to help you add bugs
-       ;;direnv
-       docker
-       ;;editorconfig      ; let someone else argue about tabs vs spaces
-       ;;ein               ; tame Jupyter notebooks with emacs
-       (eval +overlay)     ; run code, run (also, repls)
-       lookup              ; navigate your code and its documentation
-       ;;llm               ; when I said you needed friends, I didn't mean...
-       ;;(lsp +eglot)      ; M-x vscode
-       magit             ; a git porcelain for Emacs
-       ;;make              ; run make tasks from Emacs
-       ;;pass              ; password manager for nerds
-       ;;pdf               ; pdf enhancements
-       ;;terraform         ; infrastructure as code
-       ;;tmux              ; an API for interacting with tmux
-       ;;tree-sitter       ; syntax and parsing, sitting in a tree...
-       ;;upload            ; map local to remote projects via ssh/ftp
-
-       :os
-       (:if (featurep :system 'macos) macos)  ; improve compatibility with macOS
-       ;;tty               ; improve the terminal Emacs experience
-       (tty +osc)
-
-       :lang
-       ;;ada               ; In strong typing we (blindly) trust
-       ;;(agda +local)     ; types of types of types of types...
-       ;;beancount         ; mind the GAAP
-       ;;(cc +lsp)         ; C > C++ == 1
-       ;;clojure           ; java with a lisp
-       ;;common-lisp       ; if you've seen one lisp, you've seen them all
-       ;;coq               ; proofs-as-programs
-       ;;crystal           ; ruby at the speed of c
-       ;;csharp            ; unity, .NET, and mono shenanigans
-       ;;data              ; config/data formats
-       ;;(dart +flutter)   ; paint ui and not much else
-       ;;dhall
-       ;;elixir            ; erlang done right
-       ;;elm               ; care for a cup of TEA?
-       emacs-lisp        ; drown in parentheses
-       ;;erlang            ; an elegant language for a more civilized age
-       ;;ess               ; emacs speaks statistics
-       ;;factor
-       ;;faust             ; dsp, but you get to keep your soul
-       ;;fortran           ; in FORTRAN, GOD is REAL (unless declared INTEGER)
-       ;;fsharp            ; ML stands for Microsoft's Language
-       ;;fstar             ; (dependent) types and (monadic) effects and Z3
-       ;;gdscript          ; the language you waited for
-       ;;(go +lsp)         ; the hipster dialect
-       ;;(graphql +lsp)    ; Give queries a REST
-       ;;(haskell +lsp)    ; a language that's lazier than I am
-       ;;hy                ; readability of scheme w/ speed of python
-       ;;idris             ; a language you can depend on
-       json              ; At least it ain't XML
-       ;;janet             ; Fun fact: Janet is me!
-       ;;(java +lsp)       ; the poster child for carpal tunnel syndrome
-       javascript        ; all(hope(abandon(ye(who(enter(here))))))
-       ;;julia             ; a better, faster MATLAB
-       ;;kotlin            ; a better, slicker Java(Script)
-       ;;latex             ; writing papers in Emacs has never been so fun
-       ;;lean              ; for folks with too much to prove
-       ;;ledger            ; be audit you can be
-       lua               ; one-based indices? one-based indices
-       markdown          ; writing docs for people to ignore
-       ;;nim               ; python + lisp at the speed of c
-       ;;nix               ; I hereby declare "nix geht mehr!"
-       ;;ocaml             ; an objective camel
-       ;;odin              ; C, minus its footguns
-       org               ; organize your plain life in plain text
-       php               ; perl's insecure younger brother
-       ;;plantuml          ; diagrams for confusing people more
-       ;;graphviz          ; diagrams for confusing yourself even more
-       ;;purescript        ; javascript, but functional
-       python            ; beautiful is better than ugly
-       ;;qt                ; the 'cutest' gui framework ever
-       ;;racket            ; a DSL for DSLs
-       ;;raku              ; the artist formerly known as perl6
-       ;;rest              ; Emacs as a REST client
-       ;;rst               ; ReST in peace
-       ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       (rust +lsp)       ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
-       ;;scala             ; java, but good
-       ;;(scheme +guile)   ; a fully conniving family of lisps
-       sh                ; she sells {ba,z,fi}sh shells on the C xor
-       ;;sml
-       ;;solidity          ; do you need a blockchain? No.
-       ;;swift             ; who asked for emoji variables?
-       ;;terra             ; Earth and Moon in alignment for performance.
-       web               ; the tubes
-       yaml              ; JSON, but readable
-       ;;zig               ; C, but simpler
-
-       :email
-       ;;(mu4e +org +gmail)
-       ;;notmuch
-       ;;(wanderlust +gmail)
-
-       :app
-       ;;calendar
-       ;;emms
-       ;;everywhere        ; *leave* Emacs!? You must be joking
-       ;;irc               ; how neckbeards socialize
-       ;;(rss +org)        ; emacs as an RSS reader
-
-       :config
-       ;;literate
-       (default +bindings +smartparens))

.config/doom/packages.el

@@ -1,54 +0,0 @@
-;; -*- no-byte-compile: t; -*-
-;;; $DOOMDIR/packages.el
-
-;; To install a package:
-;;
-;;   1. Declare them here in a `package!' statement,
-;;   2. Run 'doom sync' in the shell,
-;;   3. Restart Emacs.
-;;
-;; Use 'C-h f package\!' to look up documentation for the `package!' macro.
-
-
-;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
-;; (package! some-package)
-
-;; To install a package directly from a remote git repo, you must specify a
-;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
-;; https://github.com/radian-software/straight.el#the-recipe-format
-;; (package! another-package
-;;   :recipe (:host github :repo "username/repo"))
-
-;; If the package you are trying to install does not contain a PACKAGENAME.el
-;; file, or is located in a subdirectory of the repo, you'll need to specify
-;; `:files' in the `:recipe':
-;; (package! this-package
-;;   :recipe (:host github :repo "username/repo"
-;;            :files ("some-file.el" "src/lisp/*.el")))
-
-;; If you'd like to disable a package included with Doom, you can do so here
-;; with the `:disable' property:
-;; (package! builtin-package :disable t)
-
-;; You can override the recipe of a built in package without having to specify
-;; all the properties for `:recipe'. These will inherit the rest of its recipe
-;; from Doom or MELPA/ELPA/Emacsmirror:
-;; (package! builtin-package :recipe (:nonrecursive t))
-;; (package! builtin-package-2 :recipe (:repo "myfork/package"))
-
-;; Specify a `:branch' to install a package from a particular branch or tag.
-;; This is required for some packages whose default branch isn't 'master' (which
-;; our package manager can't deal with; see radian-software/straight.el#279)
-;; (package! builtin-package :recipe (:branch "develop"))
-
-;; Use `:pin' to specify a particular commit to install.
-;; (package! builtin-package :pin "1a2b3c4d5e")
-
-
-;; Doom's packages are pinned to a specific commit and updated from release to
-;; release. The `unpin!' macro allows you to unpin single packages...
-;; (unpin! pinned-package)
-;; ...or multiple packages
-;; (unpin! pinned-package another-pinned-package)
-;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
-;; (unpin! t)

.config/foot/foot.ini

@@ -7,7 +7,7 @@ pad=10x10
 #[mouse-bindings]
 #launch-url=Shift+BTN_LEFT
 
-[colors-dark]
+[colors]
 alpha=0.96
 background=181818
 foreground=d8d8d8

.config/mango/config.conf

@@ -1,433 +0,0 @@
-# mango (0.12.9) configuration
-# Keybindings mirror the user's river (~/.config/river/init) and dwm
-# (~/git/dwm/config.h) setups: MOD1 (Alt) as primary modifier, dwm-style
-# tag handling, river-style window movement.
-#
-# Reference: https://github.com/mangowm/mango/wiki
-
-# ============================================================================
-# Window effects (scenefx)
-# ============================================================================
-blur=0
-blur_layer=0
-blur_optimized=1
-blur_params_num_passes=2
-blur_params_radius=5
-blur_params_noise=0.02
-blur_params_brightness=0.9
-blur_params_contrast=0.9
-blur_params_saturation=1.2
-
-shadows=0
-layer_shadows=0
-shadow_only_floating=1
-shadows_size=10
-shadows_blur=15
-shadows_position_x=0
-shadows_position_y=0
-shadowscolor=0x000000ff
-
-border_radius=0
-no_radius_when_single=0
-focused_opacity=1.0
-unfocused_opacity=1.0
-
-# ============================================================================
-# Animations
-# ============================================================================
-animations=1
-layer_animations=0
-# I hate animations, this will disable them
-layer_animations=0
-animations=0
-# Theyre gone
-animation_type_open=zoom
-animation_type_close=slide
-layer_animation_type_open=slide
-layer_animation_type_close=slide
-animation_fade_in=1
-animation_fade_out=1
-tag_animation_direction=1
-zoom_initial_ratio=0.3
-zoom_end_ratio=0.8
-fadein_begin_opacity=0.5
-fadeout_begin_opacity=0.8
-animation_duration_move=200
-animation_duration_open=100
-animation_duration_tag=0
-animation_duration_close=200
-animation_duration_focus=0
-animation_curve_open=0.46,1.0,0.29,1
-animation_curve_move=0.46,1.0,0.29,1
-animation_curve_tag=0.46,1.0,0.29,1
-animation_curve_close=0.08,0.92,0,1
-animation_curve_focus=0.46,1.0,0.29,1
-animation_curve_opafadeout=0.5,0.5,0.5,0.5
-animation_curve_opafadein=0.46,1.0,0.29,1
-
-# ============================================================================
-# Layouts
-# ============================================================================
-# Scroller
-scroller_structs=20
-scroller_default_proportion=0.8
-scroller_focus_center=0
-scroller_prefer_center=0
-edge_scroller_pointer_focus=1
-scroller_default_proportion_single=1.0
-scroller_proportion_preset=0.5,0.8,1.0
-
-# Master-Stack (matches river filtile main-ratio 55, main-location left)
-new_is_master=1
-default_mfact=0.55
-default_nmaster=1
-smartgaps=1
-
-# ============================================================================
-# Overview
-# ============================================================================
-hotarea_size=10
-enable_hotarea=0
-hotarea_corner=0
-ov_tab_mode=0
-overviewgappi=5
-overviewgappo=30
-
-# ============================================================================
-# Misc behaviour
-# ============================================================================
-no_border_when_single=1
-axis_bind_apply_timeout=100
-focus_on_activate=1
-idleinhibit_ignore_visible=0
-sloppyfocus=1
-warpcursor=0
-focus_cross_monitor=0
-focus_cross_tag=0
-enable_floating_snap=0
-snap_distance=30
-cursor_size=24
-drag_tile_to_tile=1
-
-# ============================================================================
-# Keyboard (matches river: set-repeat 30 200, layout us,cz(qwerty))
-# ============================================================================
-repeat_rate=30
-repeat_delay=200
-numlockon=0
-xkb_rules_layout=us,cz(qwerty)
-xkb_rules_options=grp:win_space_toggle
-
-# ============================================================================
-# Trackpad
-# ============================================================================
-disable_trackpad=1
-tap_to_click=1
-tap_and_drag=1
-drag_lock=1
-trackpad_natural_scrolling=0
-disable_while_typing=1
-left_handed=0
-middle_button_emulation=0
-swipe_min_threshold=1
-
-# ============================================================================
-# Mouse
-# ============================================================================
-mouse_natural_scrolling=0
-
-# ============================================================================
-# Appearance / colors (mostly preserved from previous config)
-# ============================================================================
-gappih=5
-gappiv=5
-gappoh=10
-gappov=10
-scratchpad_width_ratio=0.8
-scratchpad_height_ratio=0.9
-borderpx=1
-rootcolor=0x1D1F21ff
-bordercolor=0x586e75ff
-focuscolor=0x93a1a1ff
-maximizescreencolor=0x89aa61ff
-urgentcolor=0xad401fff
-scratchpadcolor=0x516c93ff
-globalcolor=0xb153a7ff
-overlaycolor=0x14a57cff
-
-# ============================================================================
-# Per-tag layout (default tile, matches dwm and river filtile)
-# Layouts available: tile, scroller, grid, deck, monocle, center_tile,
-# vertical_tile, vertical_scroller, dwindle
-# ============================================================================
-tagrule=id:1,layout_name:tile
-tagrule=id:2,layout_name:tile
-tagrule=id:3,layout_name:tile
-tagrule=id:4,layout_name:tile
-tagrule=id:5,layout_name:tile
-tagrule=id:6,layout_name:tile
-tagrule=id:7,layout_name:tile
-tagrule=id:8,layout_name:tile
-tagrule=id:9,layout_name:tile
-
-# ============================================================================
-# Window rules (mirrors river rule-add and dwm rules)
-# ============================================================================
-# Floating apps (from dwm config)
-windowrule=isfloating:1,appid:Arandr
-windowrule=isfloating:1,appid:Pavucontrol
-windowrule=isfloating:1,appid:mpv
-
-# River rules
-windowrule=isfloating:1,appid:float.*
-windowrule=isfloating:1,title:yazi
-windowrule=isfloating:1,title:river
-
-# ============================================================================
-# Key Bindings
-#
-# Modifier convention follows river/dwm: MOD = ALT (Mod1)
-# Format: bind=MODIFIERS,KEY,COMMAND,PARAMETERS
-# Flags: bindl = works while screen locked
-# ============================================================================
-
-# --- Compositor control --------------------------------------------------
-bind=SUPER,r,reload_config
-# river: Mod1+Shift E exit
-bind=ALT+SHIFT,e,quit
-# river/dwm: Mod1+Shift C close
-bind=ALT+SHIFT,c,killclient
-
-# --- Launchers -----------------------------------------------------------
-# river/dwm: Mod1 p (menu)
-#bind=ALT,p,spawn,fuzzel
-bind=ALT,p,spawn,wmenu-run -F -il 16 -f 'LiterationMono Nerd Font 12' -n bbbbbbff -N 222222ff -s eeeeeeff -S 444444ff -m eeeeeeff -M 444444ff
-
-# river/dwm: Mod1+Shift Return
-bind=ALT+SHIFT,Return,spawn,foot
-
-# Yazi file manager in floating foot (river: Mod1 r)
-#bind=ALT,r,spawn,foot -T yazi -W 150x50 -e yazi
-bind=ALT,r,spawn,foot -T yazi -W 150x50 -e ranger
-
-# --- Focus ---------------------------------------------------------------
-# river: Mod1 J/K focus-view next/previous (dwm: focusstack +1/-1)
-bind=ALT,k,focusstack,next
-bind=ALT,j,focusstack,prev
-
-# Direction-based focus (mango bonus, useful complement)
-bind=ALT,Left,focusdir,left
-bind=ALT,Right,focusdir,right
-bind=ALT,Up,focusdir,up
-bind=ALT,Down,focusdir,down
-
-# --- Swap / move in stack ------------------------------------------------
-# river: Mod1+Shift J/K swap next/previous (dwm: movestack)
-bind=ALT+SHIFT,j,exchange_stack_client,next
-bind=ALT+SHIFT,k,exchange_stack_client,prev
-
-# Direction-based swap
-bind=ALT+SHIFT,Left,exchange_client,left
-bind=ALT+SHIFT,Right,exchange_client,right
-bind=ALT+SHIFT,Up,exchange_client,up
-bind=ALT+SHIFT,Down,exchange_client,down
-
-# --- Master / layout tweaks (river filtile ↔ dwm) ------------------------
-# river: Mod1 H/L send-layout-cmd filtile main-ratio -/+5
-# dwm:   MOD1 H/L setmfact -/+0.05
-bind=ALT,h,setmfact,-0.05
-bind=ALT,l,setmfact,+0.05
-
-# river: Mod1 I/D main-count +/-1   dwm: incnmaster +/-1
-bind=ALT,i,incnmaster,+1
-bind=ALT,d,incnmaster,-1
-
-# river: Mod1 Return zoom (bump to top of stack)
-bind=ALT,Return,zoom
-
-# river: Mod1 Tab focus-previous-tags  dwm: MOD1 Tab view (last tags)
-bind=ALT,Tab,view,-1
-
-# --- Layout switching (dwm: t=tile, m=monocle; river: M=monocle) ---------
-bind=ALT,t,setlayout,tile
-bind=ALT,m,setlayout,monocle
-# dwm: MOD1 Space cycles layout
-bind=ALT,space,switch_layout
-
-# --- Float / fullscreen --------------------------------------------------
-# river: Mod1+Shift Space toggle-float   dwm: MOD1+Shift Space togglefloating
-bind=ALT+SHIFT,space,togglefloating
-# river: Mod1 F toggle-fullscreen  dwm: MOD1 F (was floating layout)
-bind=ALT,f,togglefullscreen
-bind=ALT+SHIFT,f,togglefakefullscreen
-
-# --- Tags 1-9 (river/dwm identical scheme) -------------------------------
-# Mod1+N         : view tag N
-# Mod1+Shift+N   : send window to tag N
-# Mod1+Ctrl+N    : toggle view of tag N
-# Mod1+Ctrl+Shift+N : toggle tag N on focused window
-bind=ALT,1,view,1
-bind=ALT,2,view,2
-bind=ALT,3,view,3
-bind=ALT,4,view,4
-bind=ALT,5,view,5
-bind=ALT,6,view,6
-bind=ALT,7,view,7
-bind=ALT,8,view,8
-bind=ALT,9,view,9
-
-bind=ALT+SHIFT,1,tag,1
-bind=ALT+SHIFT,2,tag,2
-bind=ALT+SHIFT,3,tag,3
-bind=ALT+SHIFT,4,tag,4
-bind=ALT+SHIFT,5,tag,5
-bind=ALT+SHIFT,6,tag,6
-bind=ALT+SHIFT,7,tag,7
-bind=ALT+SHIFT,8,tag,8
-bind=ALT+SHIFT,9,tag,9
-
-bind=ALT+CTRL,1,toggleview,1
-bind=ALT+CTRL,2,toggleview,2
-bind=ALT+CTRL,3,toggleview,3
-bind=ALT+CTRL,4,toggleview,4
-bind=ALT+CTRL,5,toggleview,5
-bind=ALT+CTRL,6,toggleview,6
-bind=ALT+CTRL,7,toggleview,7
-bind=ALT+CTRL,8,toggleview,8
-bind=ALT+CTRL,9,toggleview,9
-
-bind=ALT+CTRL+SHIFT,1,toggletag,1
-bind=ALT+CTRL+SHIFT,2,toggletag,2
-bind=ALT+CTRL+SHIFT,3,toggletag,3
-bind=ALT+CTRL+SHIFT,4,toggletag,4
-bind=ALT+CTRL+SHIFT,5,toggletag,5
-bind=ALT+CTRL+SHIFT,6,toggletag,6
-bind=ALT+CTRL+SHIFT,7,toggletag,7
-bind=ALT+CTRL+SHIFT,8,toggletag,8
-bind=ALT+CTRL+SHIFT,9,toggletag,9
-
-# All tags (river/dwm: 0)
-bind=ALT,0,view,0
-bind=ALT+SHIFT,0,toggletag,0
-
-# --- Monitor focus / move (river: Period/Comma; dwm: same) ---------------
-bind=ALT,period,focusmon,right
-bind=ALT,comma,focusmon,left
-bind=ALT+SHIFT,period,tagmon,right
-bind=ALT+SHIFT,comma,tagmon,left
-
-# --- Overview (mango bonus) ----------------------------------------------
-bind=SUPER,Tab,toggleoverview
-
-# --- Scratchpad ----------------------------------------------------------
-bind=ALT,z,toggle_scratchpad
-bind=SUPER,i,minimized
-bind=SUPER+SHIFT,i,restore_minimized
-
-# --- Window state extras -------------------------------------------------
-bind=SUPER,g,toggleglobal
-bind=SUPER,o,toggleoverlay
-bind=ALT,a,togglemaximizescreen
-
-# --- Gaps ----------------------------------------------------------------
-bind=ALT+SHIFT,x,incgaps,1
-bind=ALT+SHIFT,z,incgaps,-1
-bind=ALT+SHIFT,r,togglegaps
-
-# --- Move / resize floating windows (river-style snap & arrow nudge) -----
-# river: Mod1+Super H/J/K/L move 100   here: ctrl+shift arrows nudge 50
-bind=CTRL+SHIFT,Up,movewin,+0,-50
-bind=CTRL+SHIFT,Down,movewin,+0,+50
-bind=CTRL+SHIFT,Left,movewin,-50,+0
-bind=CTRL+SHIFT,Right,movewin,+50,+0
-
-# river: Mod1+Super+Shift H/J/K/L resize
-bind=CTRL+ALT,Up,resizewin,+0,-50
-bind=CTRL+ALT,Down,resizewin,+0,+50
-bind=CTRL+ALT,Left,resizewin,-50,+0
-bind=CTRL+ALT,Right,resizewin,+50,+0
-
-# --- Lock screen (river: Mod1+Shift L spawn waylock) ---------------------
-# Wrapper script: locks immediately, then runs a 10 s idle blanker while
-# locked (kanshi paused during blank to avoid Lenovo dock profile flip).
-bindl=ALT+SHIFT,l,spawn,~/.config/mango/scripts/lock.sh
-
-# --- Media keys (work in any mode) ---------------------------------------
-bindl=NONE,XF86AudioRaiseVolume,spawn,pamixer -i 5
-bindl=NONE,XF86AudioLowerVolume,spawn,pamixer -d 5
-bindl=NONE,XF86AudioMute,spawn,pamixer --toggle-mute
-bindl=NONE,XF86AudioPlay,spawn,playerctl play-pause
-bindl=NONE,XF86AudioPrev,spawn,playerctl previous
-bindl=NONE,XF86AudioNext,spawn,playerctl next
-bindl=NONE,XF86AudioMedia,spawn,playerctl play-pause
-
-# --- Screenshots (grim/slurp, mirrors river) -----------------------------
-#bind=NONE,Print,spawn_shell,grim - | tee /home/$USER/scrot/$(date +"%F_%T").png | wl-copy
-#bind=ALT,Print,spawn_shell,grim -g "$(slurp -d)" - | tee /home/$USER/scrot/$(date +"%F_%T").png | wl-copy
-#bind=ALT+SHIFT,Print,spawn,hyprpicker -anl
-
-bind=None,Print,spawn_shell, file="/home/$USER/Pictures/Screenshots/$(date +%F_%T).png"; grim -g "$(slurp -d)" "$file" && wl-copy -t image/png < "$file"
-bind=Alt,Print,spawn_shell, grim - | tee /home/$USER/Pictures/Screenshots/$(date +"%F_%T").png | wl-copy -t image/png
-bind=Alt+SHIFT,Print,spawn_shell, grim -g "$(slurp -p)" -t ppm - | convert - -format '%[pixel:p{0,0}]' txt:- | grep -o '#[0-9A-F]\{6\}' | tr -d '\n' | wl-copy -t text/plain
-
-# ============================================================================
-# Mouse bindings (river: Mod1 left=move, right=resize, middle=toggle float)
-# ============================================================================
-mousebind=ALT,btn_left,moveresize,curmove
-mousebind=ALT,btn_right,moveresize,curresize
-mousebind=ALT,btn_middle,togglefloating
-
-# Maximize/restore on plain middle-click anywhere (overview/title contexts)
-mousebind=SUPER,btn_middle,togglemaximizescreen,0
-
-# ============================================================================
-# Axis (scroll) bindings — wheel over root cycles tags
-# ============================================================================
-axisbind=SUPER,UP,viewtoleft_have_client
-axisbind=SUPER,DOWN,viewtoright_have_client
-
-# ============================================================================
-# Layer rules
-# ============================================================================
-layerrule=animation_type_open:zoom,layer_name:fuzzel
-layerrule=animation_type_close:zoom,layer_name:fuzzel
-
-# ============================================================================
-# Autostart (mirrors river spawn ... block)
-# ============================================================================
-env=XDG_CURRENT_DESKTOP,mango
-env=XDG_SESSION_TYPE,wayland
-
-exec-once=dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once=/usr/lib/xdg-desktop-portal-wlr
-exec-once=/usr/lib/xdg-desktop-portal
-
-# Audio
-exec-once=pipewire
-#exec-once=pipewire-pulse
-exec-once=pkill waybar_audio_event_bridge
-exec-once=/home/fr/.local/bin/waybar_audio_event_bridge
-
-# Services
-exec-once=dunst
-exec-once=udiskie -ANt
-
-# Color temperature
-exec-once=wlsunset -l 50.08 -L 14.42 -t 5000 -T 6500
-
-# Wallpaper
-exec-once=swaybg -c 1D1F21
-
-# Status bar (mango-specific waybar config; river bar config is left intact)
-exec-once=waybar -c ~/.config/waybar/config-mango.jsonc
-
-# Idle: blank after 20 min when unlocked (no auto-lock). Manual lock
-# (Alt+Shift+L) and suspend route through ~/.config/mango/scripts/lock.sh
-# which adds a 10 s idle blanker for the locked session. Kanshi is
-# STOP/CONT-bracketed around every wlopm cycle to keep the Lenovo
-# USB-C dock from re-triggering monitor profile switches when DPMS
-# drops the DP-MST link.
-exec-once=swayidle -w timeout 1200 'pkill -STOP kanshi 2>/dev/null; wlopm --off "*"' resume 'wlopm --on "*"; sleep 0.5; pkill -CONT kanshi 2>/dev/null' before-sleep '~/.config/mango/scripts/lock.sh &'
-
-# Multi-monitor configuration
-exec-once=kanshi

.config/mango/scripts/lock.sh

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# Manual screen-lock for mango.
-# - Locks via waylock (immediate lockscreen).
-# - While locked, runs an aggressive 10 s idle blanker.
-# - Pauses kanshi during blank to prevent profile flip-flop on the
-#   Lenovo USB-C dock (DP-MST drops link on DPMS off).
-# - Cleans up on unlock.
-
-set -e
-
-# Don't stack lockers if one is already running (re-press, or
-# before-sleep firing while already locked).
-pgrep -x waylock >/dev/null && exit 0
-
-# Short-timeout idle blanker, only alive while we're locked.
-swayidle -w \
-    timeout 10 'pkill -STOP kanshi 2>/dev/null; wlopm --off "*"' \
-    resume     'wlopm --on  "*"; sleep 0.5; pkill -CONT kanshi 2>/dev/null' \
-    >/dev/null 2>&1 &
-LOCK_IDLE_PID=$!
-
-# Cleanup on unlock: stop the idle watcher, ensure outputs are on,
-# and resume kanshi in case the trap fires mid-blank.
-trap '
-    kill "$LOCK_IDLE_PID" 2>/dev/null || true
-    wlopm --on "*"        2>/dev/null || true
-    pkill -CONT kanshi    2>/dev/null || true
-' EXIT
-
-# Block here until waylock exits on successful auth.
-waylock

.config/nvim/lazy-lock.json

@@ -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" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
-  "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
+  "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" }

.config/river/init

@@ -7,13 +7,15 @@
 export XDG_CURRENT_DESKTOP=river
 export XDG_SESSION_TYPE=wayland
 
+export XCURSOR_SIZE=36
+
 ## Start portals
 dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 xdg-desktop-portal-wlr &
 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
@@ -183,7 +185,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

.config/waybar/config-mango.jsonc

@@ -1,119 +0,0 @@
-{
-	"position": "bottom",
-	"modules-left": ["dwl/tags", "custom/dwm-window"],
-	"modules-center": [],
-	//"modules-right": ["custom/spotify", "tray", "network", "bluetooth", "wireplumber", "battery", "clock", "custom/power"],
-	"modules-right": ["tray", "network", "custom/audio", "clock"],
-
-
-
-
-	"dwl/tags": {
-		"num-tags": 9,
-		"tag-labels": ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
-	},
-
-	"dwl/window": {
-		"format": "[{layout}] {title}",
-		"max-length": 80
-	},
-
-	"custom/dwm-window": {
-		"exec": "~/.local/bin/tag_windows.sh",
-		"max-length": 80
-	},
-
-	"clock": {
-		//"format": "{:%d.%m. %b, %a %H:%M}",
-		"format": "{:%b %d (%a) %I:%M:%S %p}",
-		"timezone": "Europe/Prague",
-		"locale": "en_US.UTF-8",
-		"interval": 1,
-		"tooltip-format": "<tt><small>{calendar}</small></tt>",
-		"calendar": {
-			"mode" : "year",
-			"mode-mon-col" : 3,
-			"weeks-pos" : "right",
-			"on-scroll" : 1,
-			"format": {
-					"months":   "<span color='#ffead3'><b>{}</b></span>",
-					"days":     "<span color='#ecc6d9'><b>{}</b></span>",
-					"weeks":    "<span color='#99ffdd'><b>W{}</b></span>",
-					"weekdays": "<span color='#ffcc66'><b>{}</b></span>",
-					"today":    "<span color='#ff6699'><b><u>{}</u></b></span>"
-					}
-			},
-			"actions":  {
-			"on-click-right": "mode",
-			"on-click-forward": "tz_up",
-			"on-click-backward": "tz_down",
-			"on-scroll-up": "shift_up",
-			"on-scroll-down": "shift_down"
-		}
-	},
-
-	"network": {
-		"interface": "eth0",
-		"format-ethernet": "󰈀 {ifname}: {ipaddr}",
-		"format-disconnected": "󰖪 ",
-		"tooltip-format-ethernet": "{ifname}: {ipaddr}",
-		"tooltip-format-disconnected": "Disconnected",
-		//"on-click": "foot -e nmtui",
-		//"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": "󰂱"
-	//},
-
-	//"wireplumber": {
-	//	"format": "{icon} {volume}%",
-	//	"format-muted": "󰖁 muted",
-	//	"on-click": "pavucontrol -t 3",
-	//	"on-click-right": "pamixer --toggle-mute",
-	//	"max-volume": 125,
-	//	"format-icons": ["", "", ""]
-	//},
-
-	"custom/audio": {
-		"exec": "~/.local/bin/waybar_audio",
-		"signal": 8,
-		"return-type": "json",
-		"format": "{icon} {text}",
-		"format-icons": {
-			"speaker": ["", "", " "],
-			"speaker-muted": "󰖁",
-			"headphones": "󰋋",
-			"headphones-muted": "󰟎"
-		},
-		//"interval": 2,
-		"interval": "once",
-		"on-click": "pamixer --toggle-mute",
-		"on-click-right": "~/.local/bin/toggle_audio",
-		"on-scroll-up": "pamixer --increase 5",
-		"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}",
-	//},
-
-	"tray": {
-		"spacing": 10
-	}
-}

.config/waybar/config.jsonc

@@ -1,8 +1,8 @@
 {
 	"position": "bottom",
-	"modules-left": ["river/tags", "river/layout", "river/window"],
+	"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
@@ -12,12 +12,6 @@
 		"max-length": 80
 	},
 
-	"river/layout": {
-  	"format": "{}",
-  	"min-length": 4,
-  	"on-click": "riverctl send-layout-cmd next"
-	},
-
 	"clock": {
 		//"format": "{:%d.%m. %b, %a %H:%M}",
 		"format": "{:%b %d (%a) %I:%M:%S %p}",
@@ -57,14 +51,14 @@
 		//"on-click-right": "~/.scripts/restart_network.sh"
 	},
 
-	//"bluetooth": {
+	"bluetooth": {
-	//	"on-click": "foot bluetuith",
+		"on-click": "foot bluetuith",
-	//	"on-click-right": "~/.scripts/toggle_bluetooth.sh",
+		"on-click-right": "~/.scripts/toggle_bluetooth.sh",
-	//	"format-on": "󰂯",
+		"format-on": "󰂯",
-	//	"format-off": "󰂲",
+		"format-off": "󰂲",
-	//	"format-disabled": "󰂲",
+		"format-disabled": "󰂲",
-	//	"format-connected": "󰂱"
+		"format-connected": "󰂱"
-	//},
+	},
 
 	//"wireplumber": {
 	//	"format": "{icon} {volume}%",
@@ -86,27 +80,26 @@
 			"headphones": "󰋋",
 			"headphones-muted": "󰟎"
 		},
-		//"interval": 2,
+		"interval": 2,
-		"interval": "once",
 		"on-click": "pamixer --toggle-mute",
 		"on-click-right": "~/.local/bin/toggle_audio",
 		"on-scroll-up": "pamixer --increase 5",
 		"on-scroll-down": "pamixer --decrease 5"
 	},
 
-	//"battery": {
+	"battery": {
-	//	"states": {
+		"states": {
-	//			"good": 95,
+				"good": 95,
-	//			"warning": 30,
+				"warning": 30,
-	//			"critical": 15
+				"critical": 15
-	//	},
+		},
-	//	"format":"{icon} {capacity}%",
+		"format":"{icon} {capacity}%",
-	//	"format-charging": "󰂄 {capacity}%",
+		"format-charging": "󰂄 {capacity}%",
-	//	"format-plugged": "󱐋",
+		"format-plugged": "󱐋",
-	//	"format-icons": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
+		"format-icons": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
-	//	"interval": 30,
+		"interval": 30,
-	//	"tooltip-format": "{time}",
+		"tooltip-format": "{time}",
-	//},
+	},
 
 	"tray": {
 		"spacing": 10

.config/waybar/style.css

@@ -9,7 +9,6 @@
 
 window#waybar {
 	background-color: @bg;
-	padding: 10em;
 }
 
 #tags {

.local/bin/toggle_audio

@@ -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
+# Get sinks section
-#STEINBERG_ID=60
-#STARSHIP_ID=59
 SINKS=$(wpctl status | sed -n '/Sinks:/,/Sources:/p')
 
-# Extract IDs (ignore default *) and match specific names
+# Extract IDs (ignore default * and Easy Effects virtual sinks)
-STARSHIP_ID=$(echo "$SINKS" | tr -d '*' | grep -i "Starship" | grep -v "Easy Effects" | awk '{print $2}' | tr -d '.')
+BUILTIN_ID=$(echo "$SINKS" | tr -d '*' | grep -i "Built-in Audio" | 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 '.')
+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
+if [[ "$CURRENT_SINK" == *"alsa_output.pci-0000_00_1f.3.analog-stereo"* ]]; then
-    echo "Switching to Starship/Matisse output..."
+    echo "Switching to Cisco HS 730-0TG..."
-    wpctl set-default "$STARSHIP_ID"
+    wpctl set-default "$CISCO_ID"
 else
-    echo "Switching to Steinberg UR22mkII output..."
+    echo "Switching to Built-in Audio..."
-    wpctl set-default "$STEINBERG_ID"
+    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"
+

.local/bin/waybar_audio.sh

@@ -9,12 +9,12 @@ muted=$(pamixer --get-mute)
 # Determine alt value for Waybar
 if [ "$muted" = "true" ]; then
   case "$sink_name" in
-    *Steinberg*) alt="headphones-muted" ;;
+    *Cisco*) alt="headphones-muted" ;;
     *)       alt="speaker-muted" ;;
   esac
 else
   case "$sink_name" in
-    *Steinberg*) alt="headphones" ;;
+    *Cisco*) alt="headphones" ;;
     *)       alt="speaker" ;;
   esac
 fi