From 4cd0854592f4743a9d02ec2b1a1bdfd7fe03feb5 Mon Sep 17 00:00:00 2001 From: iceyrazor Date: Wed, 29 Oct 2025 18:23:00 -0500 Subject: [PATCH] Squashed commit of the following: - added private autostart script - removed cmus from backup scripts - separated more req install commands - cava change - i3 and rmpc ricing - added mpd to arch install. removed cmus - added mpv-mpris to autostart --- env/.config/cava/config | 2 +- env/.config/i3/config | 22 +- env/.config/rmpc/config.ron | 369 +++++++----------- env/.config/rmpc/themes/theme.ron | 129 ++++++ env/.local/bin/scripts/backup/backup-tol | 2 +- env/.local/bin/scripts/backup/backup-tol2 | 2 +- env/.local/bin/scripts/backup/bbackup | 2 +- .../bin/system/start-scripts/autostart.sh | 4 + runs-all/get-reqs-arch/audio.sh | 3 +- runs-all/get-reqs-arch/fun.sh | 3 +- runs-all/get-reqs-arch/tools.sh | 3 +- 11 files changed, 296 insertions(+), 245 deletions(-) create mode 100644 env/.config/rmpc/themes/theme.ron diff --git a/env/.config/cava/config b/env/.config/cava/config index af2eb68..74566d4 100644 --- a/env/.config/cava/config +++ b/env/.config/cava/config @@ -22,7 +22,7 @@ # The number of bars (0-512). 0 sets it to auto (fill up console). # Bars' width and space between bars in number of characters. -bars = 512 +bars = 0 bar_width = 1 ; bar_spacing = 0 # bar_height is only used for output in "noritake" format diff --git a/env/.config/i3/config b/env/.config/i3/config index 9ce955a..0946096 100644 --- a/env/.config/i3/config +++ b/env/.config/i3/config @@ -168,16 +168,16 @@ bindsym $mod+minus scratchpad show # Define names for default workspaces for which we configure key bindings later on. # We use variables to avoid repeating the names in multiple places. -set $ws1 "1" -set $ws2 "2" -set $ws3 "3" -set $ws4 "4" -set $ws5 "5" -set $ws6 "6" -set $ws7 "7" -set $ws8 "8" -set $ws9 "9" -set $ws10 "10" +set $ws1 "1: " +set $ws2 "2: " +set $ws3 "3: " +set $ws4 "4: " +set $ws5 "5: " +set $ws6 "6: " +set $ws7 "7: " +set $ws8 "8: " +set $ws9 "9: " +set $ws10 "10: " bindsym $mod+n workspace next bindsym $mod+b workspace prev @@ -283,6 +283,7 @@ set $ws_bord #8568ef bar { separator_symbol "" output primary + strip_workspace_numbers yes status_command SCRIPT_DIR=~/.config/i3blocks i3blocks colors { @@ -301,4 +302,5 @@ bar { bar { separator_symbol "" output nonprimary + strip_workspace_numbers yes } diff --git a/env/.config/rmpc/config.ron b/env/.config/rmpc/config.ron index 25a0b6b..f3553b4 100644 --- a/env/.config/rmpc/config.ron +++ b/env/.config/rmpc/config.ron @@ -1,244 +1,157 @@ #![enable(implicit_some)] - #![enable(unwrap_newtypes)] - #![enable(unwrap_variant_newtypes)] - ( - - default_album_art_path: None, - - draw_borders: false, - - show_song_table_header: false, - - symbols: (song: "🎵", dir: "📁", playlist: "🎼", marker: "\u{e0b0}"), - - layout: Split( - - direction: Vertical, - - panes: [ - - ( - - pane: Pane(Header), - - size: "1", - - ), - - ( - - pane: Pane(TabContent), - - size: "100%", - - ), - - ( - - pane: Pane(ProgressBar), - - size: "1", - - ), - + address: "127.0.0.1:6600", + password: None, + theme: Some("theme"), + cache_dir: None, + on_song_change: None, + volume_step: 5, + max_fps: 30, + scrolloff: 0, + wrap_navigation: false, + enable_mouse: true, + enable_config_hot_reload: true, + status_update_interval_ms: 1000, + rewind_to_start_sec: None, + reflect_changes_to_playlist: false, + select_current_song_on_change: false, + browser_song_sort: [Disc, Track, Artist, Title], + directories_sort: SortFormat(group_by_type: true, reverse: false), + album_art: ( + method: Auto, + max_size_px: (width: 1200, height: 1200), + disabled_protocols: ["http://", "https://"], + vertical_align: Center, + horizontal_align: Center, + ), + keybinds: ( + global: { + ":": CommandMode, + ",": VolumeDown, + "s": Stop, + ".": VolumeUp, + "": NextTab, + "": PreviousTab, + "1": SwitchToTab("Queue"), + "2": SwitchToTab("Directories"), + "3": SwitchToTab("Artists"), + "4": SwitchToTab("Album Artists"), + "5": SwitchToTab("Albums"), + "6": SwitchToTab("Playlists"), + "7": SwitchToTab("Search"), + "q": Quit, + ">": NextTrack, + "p": TogglePause, + "<": PreviousTrack, + "f": SeekForward, + "z": ToggleRepeat, + "x": ToggleRandom, + "c": ToggleConsume, + "v": ToggleSingle, + "b": SeekBack, + "~": ShowHelp, + "u": Update, + "U": Rescan, + "I": ShowCurrentSongInfo, + "O": ShowOutputs, + "P": ShowDecoders, + "R": AddRandom, + }, + navigation: { + "k": Up, + "j": Down, + "h": Left, + "l": Right, + "": Up, + "": Down, + "": Left, + "": Right, + "": PaneUp, + "": PaneDown, + "": PaneLeft, + "": PaneRight, + "": UpHalf, + "N": PreviousResult, + "a": Add, + "A": AddAll, + "r": Rename, + "n": NextResult, + "g": Top, + "": Select, + "": InvertSelection, + "G": Bottom, + "": Confirm, + "i": FocusInput, + "J": MoveDown, + "": DownHalf, + "/": EnterSearch, + "": Close, + "": Close, + "K": MoveUp, + "D": Delete, + "B": ShowInfo, + }, + queue: { + "D": DeleteAll, + "": Play, + "": Save, + "a": AddToPlaylist, + "d": Delete, + "C": JumpToCurrent, + "X": Shuffle, + }, + ), + search: ( + case_sensitive: false, + mode: Contains, + tags: [ + (value: "any", label: "Any Tag"), + (value: "artist", label: "Artist"), + (value: "album", label: "Album"), + (value: "albumartist", label: "Album Artist"), + (value: "title", label: "Title"), + (value: "filename", label: "Filename"), + (value: "genre", label: "Genre"), ], - ), - - progress_bar: ( - - symbols: ["", "", "⭘", " ", " "], - - track_style: (bg: "#1e2030"), - - elapsed_style: (fg: "#c6a0f6", bg: "#1e2030"), - - thumb_style: (fg: "#c6a0f6", bg: "#1e2030"), - + artists: ( + album_display_mode: SplitByDate, + album_sort_by: Date, ), - - scrollbar: ( - - symbols: ["│", "█", "▲", "▼"], - - track_style: (), - - ends_style: (), - - thumb_style: (fg: "#b7bdf8"), - - ), - - browser_column_widths: [20, 38, 42], - - text_color: "#cad3f5", - - background_color: "#24273a", - - header_background_color: "#1e2030", - - modal_background_color: None, - - modal_backdrop: false, - - tab_bar: (active_style: (fg: "black", bg: "#c6a0f6", modifiers: "Bold"), inactive_style: ()), - - borders_style: (fg: "#6e738d"), - - highlighted_item_style: (fg: "#c6a0f6", modifiers: "Bold"), - - current_item_style: (fg: "black", bg: "#b7bdf8", modifiers: "Bold"), - - highlight_border_style: (fg: "#b7bdf8"), - - song_table_format: [ - + tabs: [ ( - - prop: (kind: Property(Artist), style: (fg: "#b7bdf8"), default: (kind: Text("Unknown"))), - - width: "50%", - - alignment: Right, - + name: "Queue", + pane: Split( + direction: Horizontal, + panes: [(size: "20%", pane: Pane(AlbumArt)), (size: "80%", pane: Pane(Queue))], + ), ), - ( - - prop: (kind: Text("-"), style: (fg: "#b7bdf8"), default: (kind: Text("Unknown"))), - - width: "1", - - alignment: Center, - + name: "Directories", + pane: Pane(Directories), ), - ( - - prop: (kind: Property(Title), style: (fg: "#7dc4e4"), default: (kind: Text("Unknown"))), - - width: "50%", - + name: "Artists", + pane: Pane(Artists), + ), + ( + name: "Album Artists", + pane: Pane(AlbumArtists), + ), + ( + name: "Albums", + pane: Pane(Albums), + ), + ( + name: "Playlists", + pane: Pane(Playlists), + ), + ( + name: "Search", + pane: Pane(Search), ), - ], - - header: ( - - rows: [ - - ( - - left: [ - - (kind: Text("["), style: (fg: "#b7bdf8", modifiers: "Bold")), - - (kind: Property(Status(State)), style: (fg: "#b7bdf8", modifiers: "Bold")), - - (kind: Text("]"), style: (fg: "#b7bdf8", modifiers: "Bold")) - - ], - - center: [ - - (kind: Property(Song(Artist)), style: (fg: "#eed49f", modifiers: "Bold"), - - default: (kind: Text("Unknown"), style: (fg: "#eed49f", modifiers: "Bold")) - - ), - - (kind: Text(" - ")), - - (kind: Property(Song(Title)), style: (fg: "#7dc4e4", modifiers: "Bold"), - - default: (kind: Text("No Song"), style: (fg: "#7dc4e4", modifiers: "Bold")) - - ) - - ], - - right: [ - - (kind: Text("Vol: "), style: (fg: "#b7bdf8", modifiers: "Bold")), - - (kind: Property(Status(Volume)), style: (fg: "#b7bdf8", modifiers: "Bold")), - - (kind: Text("% "), style: (fg: "#b7bdf8", modifiers: "Bold")) - - ] - - ) - - ], - - ), - ) -tabs: [ - ( - - name: "Queue", - - pane: Split( - - direction: Horizontal, - - panes: [(size: "60%", pane: Pane(Queue)), (size: "40%", pane: Pane(AlbumArt))], - - ), - - ), - - ( - - name: "Directories", - - pane: Pane(Directories), - - ), - - ( - - name: "Artists", - - pane: Pane(Artists), - - ), - - ( - - name: "Album Artists", - - pane: Pane(AlbumArtists), - - ), - - ( - - name: "Albums", - - pane: Pane(Albums), - - ), - - ( - - name: "Playlists", - - pane: Pane(Playlists), - - ), - - ( - - name: "Search", - - pane: Pane(Search), - - ), - -], diff --git a/env/.config/rmpc/themes/theme.ron b/env/.config/rmpc/themes/theme.ron new file mode 100644 index 0000000..f80d852 --- /dev/null +++ b/env/.config/rmpc/themes/theme.ron @@ -0,0 +1,129 @@ +#![enable(implicit_some)] +#![enable(unwrap_newtypes)] +#![enable(unwrap_variant_newtypes)] + +( + default_album_art_path: None, + show_song_table_header: true, + draw_borders: true, + format_tag_separator: " | ", + browser_column_widths: [20, 38, 42], + background_color: None, + text_color: None, + header_background_color: None, + modal_background_color: None, + preview_label_style: (fg: "yellow"), + preview_metadata_group_style: (fg: "yellow", modifiers: "Bold"), + tab_bar: ( + active_style: (fg: "black", bg: "magenta", modifiers: "Bold"), + inactive_style: (), + ), + highlighted_item_style: (fg: "magenta", modifiers: "Bold"), + current_item_style: (fg: "black", bg: "magenta", modifiers: "Bold"), + borders_style: (fg: "magenta"), + highlight_border_style: (fg: "magenta"), + symbols: (song: "S", dir: "D", playlist: "P", marker: "M", ellipsis: "..."), + progress_bar: ( + symbols: ["", "", "⭘", " ", " "], + track_style: (fg: "#1e2030"), + elapsed_style: (fg: "magenta"), + thumb_style: (fg: "magenta", bg: "#1e2030"), + ), + scrollbar: ( + symbols: ["│", "█", "▲", "▼"], + track_style: (), + ends_style: (), + thumb_style: (fg: "magenta"), + ), + song_table_format: [ + ( + prop: (kind: Property(Artist), + default: (kind: Text("Unknown")) + ), + width: "20%", + ), + ( + prop: (kind: Property(Title), + default: (kind: Text("Unknown")) + ), + width: "35%", + ), + ( + prop: (kind: Property(Album), style: (fg: "white"), + default: (kind: Text("Unknown Album"), style: (fg: "white")) + ), + width: "30%", + ), + ( + prop: (kind: Property(Duration), + default: (kind: Text("-")) + ), + width: "15%", + alignment: Right, + ), + ], + header: ( + rows: [ + ( + left: [ + (kind: Text("["), style: (fg: "yellow", modifiers: "Bold")), + (kind: Property(Status(State)), style: (fg: "yellow", modifiers: "Bold")), + (kind: Text("]"), style: (fg: "yellow", modifiers: "Bold")) + ], + center: [ + (kind: Property(Song(Title)), style: (modifiers: "Bold"), + default: (kind: Text("No Song"), style: (modifiers: "Bold")) + ) + ], + right: [ + (kind: Property(Widget(ScanStatus)), style: (fg: "magenta")), + (kind: Property(Widget(Volume)), style: (fg: "magenta")) + ] + ), + ( + left: [ + (kind: Property(Status(Elapsed))), + (kind: Text(" / ")), + (kind: Property(Status(Duration))), + (kind: Text(" (")), + (kind: Property(Status(Bitrate))), + (kind: Text(" kbps)")) + ], + center: [ + (kind: Property(Song(Artist)), style: (fg: "yellow", modifiers: "Bold"), + default: (kind: Text("Unknown"), style: (fg: "yellow", modifiers: "Bold")) + ), + (kind: Text(" - ")), + (kind: Property(Song(Album)), + default: (kind: Text("Unknown Album")) + ) + ], + right: [ + ( + kind: Property(Widget(States( + active_style: (fg: "white", modifiers: "Bold"), + separator_style: (fg: "white"))) + ), + style: (fg: "dark_gray") + ), + ] + ), + ], + ), + browser_song_format: [ + ( + kind: Group([ + (kind: Property(Track)), + (kind: Text(" ")), + ]) + ), + ( + kind: Group([ + (kind: Property(Artist)), + (kind: Text(" - ")), + (kind: Property(Title)), + ]), + default: (kind: Property(Filename)) + ), + ], +) diff --git a/env/.local/bin/scripts/backup/backup-tol b/env/.local/bin/scripts/backup/backup-tol index 4ea231c..7863493 100755 --- a/env/.local/bin/scripts/backup/backup-tol +++ b/env/.local/bin/scripts/backup/backup-tol @@ -15,7 +15,7 @@ fsyncb () { fi } -syncfile=".surf/styles .urlview .gnupg .local/bin/lf-gadgets .local/share/applications/custom .config/FreeTube .config/newsboat .config/zsh .config/vesktop/themes .keepass .config/Pinta .config/cmus .config/gajim/theme stuff/notes stuff/openvpn-cons stuff/scripts stuff/media/ICE stuff/media/music stuff/manual-programs/mediamtx" +syncfile=".surf/styles .urlview .gnupg .local/bin/lf-gadgets .local/share/applications/custom .config/FreeTube .config/newsboat .config/zsh .config/vesktop/themes .keepass .config/Pinta .config/gajim/theme stuff/notes stuff/openvpn-cons stuff/scripts stuff/media/ICE stuff/media/music stuff/manual-programs/mediamtx" #sync game stuff target="laptop:~" diff --git a/env/.local/bin/scripts/backup/backup-tol2 b/env/.local/bin/scripts/backup/backup-tol2 index 5727028..f1be247 100755 --- a/env/.local/bin/scripts/backup/backup-tol2 +++ b/env/.local/bin/scripts/backup/backup-tol2 @@ -15,7 +15,7 @@ fsyncb () { fi } -syncfile=".surf/styles .urlview .local/bin/lf-gadgets .local/share/applications/custom .config/newsboat .config/zsh .keepass .config/Pinta .config/cmus stuff/notes stuff/openvpn-cons stuff/media/ICE stuff/scripts/iceys-linux-stuffs .config/swapscape.map" +syncfile=".surf/styles .urlview .local/bin/lf-gadgets .local/share/applications/custom .config/newsboat .config/zsh .keepass .config/Pinta stuff/notes stuff/openvpn-cons stuff/media/ICE stuff/scripts/iceys-linux-stuffs .config/swapscape.map" # stuff/scripts .gnupg diff --git a/env/.local/bin/scripts/backup/bbackup b/env/.local/bin/scripts/backup/bbackup index b73f6fb..b59c8ba 100755 --- a/env/.local/bin/scripts/backup/bbackup +++ b/env/.local/bin/scripts/backup/bbackup @@ -15,7 +15,7 @@ fsyncb () { fi } -syncfile="stuff .surf/styles .config/eDEX-UI/ .gnupg .ssh .local/bin/lf-gadgets .config/FreeTube .config/wlxoverlay .config/newsboat .config/zsh .config/vesktop/themes .keepass .config/Pinta .config/cmus .config/cava .config/gajim/theme .local/share/applications/custom .local/share/osu .librewolf" +syncfile="stuff .surf/styles .config/eDEX-UI/ .gnupg .ssh .local/bin/lf-gadgets .config/FreeTube .config/wlxoverlay .config/newsboat .config/zsh .config/vesktop/themes .keepass .config/Pinta .config/cava .config/gajim/theme .local/share/applications/custom .local/share/osu .librewolf" target="/home/iceyrazor/mnt-backups/LINUX FILES/home/iceyrazor" exclude="--exclude node_modules --exclude node_modules_23 --exclude **/target --exclude LinVAM/pyenv" diff --git a/env/.local/bin/system/start-scripts/autostart.sh b/env/.local/bin/system/start-scripts/autostart.sh index 8fe5653..4053bce 100755 --- a/env/.local/bin/system/start-scripts/autostart.sh +++ b/env/.local/bin/system/start-scripts/autostart.sh @@ -68,5 +68,9 @@ if [ "$(cat /etc/hostname)" == "Kasino" ]; then if [ -z "$(pgrep mpd)" ]; then mpd & disown + sleep 0.5s + nohup mpd-mpris -host localhost > /dev/null 2> /dev/null < /dev/null & disown fi fi + +[ -f "./autostart-priv.sh" ] && ./autostart-priv.sh diff --git a/runs-all/get-reqs-arch/audio.sh b/runs-all/get-reqs-arch/audio.sh index 1662941..f5588ab 100755 --- a/runs-all/get-reqs-arch/audio.sh +++ b/runs-all/get-reqs-arch/audio.sh @@ -1 +1,2 @@ -$sudo pacman -S --noconfirm pipewire-pulse pipewire-alsa pipewire-jack qpwgraph +$sudo pacman -S --noconfirm pipewire-pulse pipewire-alsa pipewire-jack +$sudo pacman -S --noconfirm qpwgraph diff --git a/runs-all/get-reqs-arch/fun.sh b/runs-all/get-reqs-arch/fun.sh index 009992b..2299334 100755 --- a/runs-all/get-reqs-arch/fun.sh +++ b/runs-all/get-reqs-arch/fun.sh @@ -1 +1,2 @@ -$sudo pacman -S --noconfirm fastfetch cmus vlc cowsay openrgb steam mpv mpv-mpris +$sudo pacman -S --noconfirm fastfetch steam mpv mpv-mpris mpd +$sudo pacman -S --noconfirm mpd-mpris rmpc cowsay openrgb diff --git a/runs-all/get-reqs-arch/tools.sh b/runs-all/get-reqs-arch/tools.sh index 2c519b3..4ea6b5a 100755 --- a/runs-all/get-reqs-arch/tools.sh +++ b/runs-all/get-reqs-arch/tools.sh @@ -1,2 +1,3 @@ -$sudo pacman -S --noconfirm zsh bat ntfs-3g inetutils doas atuin gvfs-mtp btop htop wezterm rxvt-unicode lf ripgrep rofi-wayland networkmanager +$sudo pacman -S --noconfirm zsh ntfs-3g inetutils doas gvfs-mtp btop htop wezterm rxvt-unicode lf ripgrep rofi-wayland networkmanager +$sudo pacman -S --noconfirm bat atuin $aurm -S librewolf-bin