diff --git a/dot_config/bash/dot_bash_aliases b/dot_config/bash/dot_bash_aliases index 39be2c4..1379368 100644 --- a/dot_config/bash/dot_bash_aliases +++ b/dot_config/bash/dot_bash_aliases @@ -21,50 +21,138 @@ hash nvim 2>/dev/null && alias vim="nvim" && alias vi="nvim" hash trash-put 2>/dev/null && alias rm="trash-put" && alias tp="trash-put" hash gallery-dl 2>/dev/null && alias gallery-dl="gallery-dl --cookies-from-browser firefox" -if hash lsb_release 2>/dev/null; then - if [[ $(lsb_release -si) =~ "Arch" ]]; then - alias update-mirrors="rate-mirrors arch | sudo tee /etc/pacman.d/mirrorlist; rate-mirrors chaotic-aur | sudo tee /etc/pacman.d/chaotic-mirrorlist" - # System package managers +function update-mirrors { + # Termux special case + if [[ "$TERMUX_VERSION" ]]; then + termux-change-repo + return $? + fi - hash pacman 2>/dev/null && command="sudo pacman -Syu; sudo pacman -Sc; " - hash pamac 2>/dev/null && command="pamac update; pamac clean; " - hash yay 2>/dev/null && command="yay; yay -Sc; " - hash paru 2>/dev/null && command="paru; paru -c; " + if [[ $(lsb_release -si) =~ "Arch" ]]; then + if hash rate-mirrors 2>/dev/null; then + rate-mirrors arch | sudo tee /etc/pacman.d/mirrorlist + rate-mirrors chaotic-aur | sudo tee /etc/pacman.d/chaotic-mirrorlist + else + echo "rate-mirrors not found, cannot update mirrors." + return 1 + fi elif [[ $(lsb_release -si) =~ "Debian" || $(lsb_release -si) =~ "Ubuntu" ]]; then - alias update-mirrors="sudo nala fetch --auto -c US -c CA" + if hash nala 2>/dev/null; then + sudo nala fetch --auto -c US -c CA + else + echo "nala not found, cannot update mirrors." + return 1 + fi + else + echo "No supported package manager found for updating mirrors." + return 1 + fi + return 0 +} - # System package managers - hash apt 2>/dev/null && command="sudo apt update && sudo apt upgrade && sudo apt autoremove; " - hash aptitude 2>/dev/null && command="sudo aptitude update && sudo aptitude upgrade && sudo aptitude autoremove; " - hash nala 2>/dev/null && command="sudo nala update && sudo nala upgrade && sudo nala autoremove; " +function update { + # Termux special case + if [[ "$TERMUX_VERSION" ]]; then + pkg upgrade && pkg autoclean + return $? + fi + + # Check if we have at least 10GB of free space before running the update + free_space="$(df --output=avail / | tail -n 1)" + if (( free_space < 10485760 )); then # 10485760 = 10 * 1024 * 1024 (10GB in KB) + # Less than 10GB free space + # Ask user if they want to continue + echo "Warning: Less than 10GB of free space available. Continue? [y/N] " + read -r answer + if [[ $answer =~ ^[Nn]$ ]]; then + echo "Update cancelled." + return 1 + fi + fi + + if [[ $(lsb_release -si) =~ "Arch" ]]; then + if hash paru 2>/dev/null; then + paru; paru -c + elif hash yay 2>/dev/null; then + yay; yay -Sc + elif hash pamac 2>/dev/null; then + pamac update; pamac clean + elif hash pacman 2>/dev/null; then + sudo pacman -Syu; sudo pacman -Sc + else + echo "No supported package manager found for Arch." + return 1 + fi + elif [[ $(lsb_release -si) =~ "Debian" || $(lsb_release -si) =~ "Ubuntu" ]]; then + if hash nala 2>/dev/null; then + sudo nala update && sudo nala upgrade && sudo nala autoremove + elif hash aptitude 2>/dev/null; then + sudo aptitude update && sudo aptitude upgrade && sudo aptitude autoremove + elif hash apt 2>/dev/null; then + sudo apt update && sudo apt upgrade && sudo apt autoremove + else + echo "No supported package manager found for Debian/Ubuntu." + return 1 + fi fi # Non system packages - hash flatpak 2>/dev/null && command+="flatpak update && flatpak uninstall --unused; " - hash snap 2>/dev/null && command+="sudo snap refresh && sudo snap remove --purge $(snap list --all | awk '/^.*disabled/{print $1}'); " - - # Firmware - hash fwupdmgr 2>/dev/null && command+="fwupdmgr refresh && fwupdmgr update; " - - # Return 0 to indicate that the function has finished successfully - command+="return 0" - - # We want this to be expanded to the command, as the command is not very helpful - # shellcheck disable=SC2139 - alias update="$command" -elif [[ "$TERMUX_VERSION" ]]; then - # Termux, special case - alias update-mirrors="termux-change-repo" - alias update="pkg upgrade && pkg autoclean" -# Non privaledged environemnt, have to use local package managers like eget, nix, etc -else - alias update-mirrors="echo 'No mirrors to update'" - alias update='eget -D; . "$HOME"/.config/eget/post_install.sh' - alias nix-shell-local="nix-user-chroot ~/.local/share/nix bash" - - if [ -e ~/.nix-profile/etc/profile.d/nix.sh ]; then - . ~/.nix-profile/etc/profile.d/nix.sh + if hash flatpak 2>/dev/null; then + flatpak update && flatpak uninstall --unused fi -fi + if hash snap 2>/dev/null; then + sudo snap refresh && sudo snap remove --purge "$(snap list --all | awk '/^.*disabled/{print $1}')" + fi + # Firmware + if hash fwupdmgr 2>/dev/null; then + fwupdmgr refresh && fwupdmgr update + fi + return 0 +} + +# if hash lsb_release 2>/dev/null; then +# if [[ $(lsb_release -si) =~ "Arch" ]]; then +# alias update-mirrors="rate-mirrors arch | sudo tee /etc/pacman.d/mirrorlist; rate-mirrors chaotic-aur | sudo tee /etc/pacman.d/chaotic-mirrorlist" +# # System package managers + +# hash pacman 2>/dev/null && command="sudo pacman -Syu; sudo pacman -Sc; " +# hash pamac 2>/dev/null && command="pamac update; pamac clean; " +# hash yay 2>/dev/null && command="yay; yay -Sc; " +# hash paru 2>/dev/null && command="paru; paru -c; " +# elif [[ $(lsb_release -si) =~ "Debian" || $(lsb_release -si) =~ "Ubuntu" ]]; then +# alias update-mirrors="sudo nala fetch --auto -c US -c CA" + +# # System package managers +# hash apt 2>/dev/null && command="sudo apt update && sudo apt upgrade && sudo apt autoremove; " +# hash aptitude 2>/dev/null && command="sudo aptitude update && sudo aptitude upgrade && sudo aptitude autoremove; " +# hash nala 2>/dev/null && command="sudo nala update && sudo nala upgrade && sudo nala autoremove; " +# fi +# # Non system packages +# hash flatpak 2>/dev/null && command+="flatpak update && flatpak uninstall --unused; " +# hash snap 2>/dev/null && command+="sudo snap refresh && sudo snap remove --purge $(snap list --all | awk '/^.*disabled/{print $1}'); " + +# # Firmware +# hash fwupdmgr 2>/dev/null && command+="fwupdmgr refresh && fwupdmgr update; " + +# # Return 0 to indicate that the function has finished successfully +# command+="return 0" + +# # We want this to be expanded to the command, as the command is not very helpful +# # shellcheck disable=SC2139 +# alias update="$command" +# elif [[ "$TERMUX_VERSION" ]]; then +# # Termux, special case +# alias update-mirrors="termux-change-repo" +# alias update="pkg upgrade && pkg autoclean" +# # Non privaledged environemnt, have to use local package managers like eget, nix, etc +# else +# alias update-mirrors="echo 'No mirrors to update'" +# alias update='eget -D; . "$HOME"/.config/eget/post_install.sh' +# alias nix-shell-local="nix-user-chroot ~/.local/share/nix bash" + +# if [ -e ~/.nix-profile/etc/profile.d/nix.sh ]; then +# . ~/.nix-profile/etc/profile.d/nix.sh +# fi +# fi if hash eza 2>/dev/null; then function ls { @@ -150,7 +238,8 @@ fi alias rce='xdg-open $HOME/.bashrc && xdg-open $HOME/.zshrc && xdg-open $XDG_CONFIG_HOME/bash/.bash_aliases' # Open bash and zsh config files in editor alias ftpd-simple='python -m pyftpdlib' # Simple FTP server, useful for transferring files between devices alias obs-save='obs-cmd replay save' # obs-cmd from aur (https://github.com/grigio/obs-cmd) required. Also bound to Alt + Z -alias plasma-restart='systemctl --user restart plasma-plasmashell.service' # Sometimes plasma is buggy and needs a restart, bound to Alt + Shift + Ctrl + R +alias plasma-restart='systemctl --user restart plasma-plasmashell.service' # Sometimes plasma is buggy and needs a restart, bound to Alt + Shift + Ctrl + +alias arch-fix-broken='paru -S $(paru -Qk 2>/dev/null | grep -v " 0 missing files" | cut -d: -f1) --overwrite "*" --noconfirm' # XDG aliases alias wget='wget --hsts-file="$XDG_DATA_HOME"/wget-hsts' diff --git a/dot_config/obs-studio/basic/profiles/Default/basic.ini b/dot_config/obs-studio/basic/profiles/Default/basic.ini index 7bfb0f2..ddc5936 100644 --- a/dot_config/obs-studio/basic/profiles/Default/basic.ini +++ b/dot_config/obs-studio/basic/profiles/Default/basic.ini @@ -30,7 +30,7 @@ Preset=veryfast NVENCPreset2=p5 RecQuality=Small RecRB=true -RecRBTime=60 +RecRBTime=30 RecRBSize=2048 RecRBPrefix=Replay StreamAudioEncoder=aac diff --git a/dot_config/obs-studio/basic/scenes/Gaming.json b/dot_config/obs-studio/basic/scenes/Gaming.json index ba95eeb..f0b9257 100644 --- a/dot_config/obs-studio/basic/scenes/Gaming.json +++ b/dot_config/obs-studio/basic/scenes/Gaming.json @@ -9,7 +9,7 @@ "name": "Gaming", "sources": [ { - "prev_ver": 520159233, + "prev_ver": 536870912, "name": "Display Capture", "uuid": "2a0cda15-1329-4224-96aa-0633210d2dae", "id": "scene", @@ -21,7 +21,7 @@ { "name": "Screen Capture", "source_uuid": "23864929-52b2-4b4a-83f9-10d58a6ea4c9", - "visible": false, + "visible": true, "locked": false, "rot": 0.0, "scale_ref": { @@ -326,7 +326,7 @@ "private_settings": {} }, { - "prev_ver": 520159233, + "prev_ver": 536870912, "name": "Screen Capture", "uuid": "23864929-52b2-4b4a-83f9-10d58a6ea4c9", "id": "pipewire-screen-capture-source", @@ -352,7 +352,7 @@ "private_settings": {} }, { - "prev_ver": 520159233, + "prev_ver": 536870912, "name": "Discord", "uuid": "1f07b61b-b59b-4699-8435-e61d6ff8d8da", "id": "pipewire_audio_application_capture", @@ -385,7 +385,7 @@ "private_settings": {}, "filters": [ { - "prev_ver": 520159233, + "prev_ver": 536870912, "name": "Limiter", "uuid": "d659ba67-4350-446a-a50b-855bc8d4f202", "id": "limiter_filter", @@ -411,7 +411,7 @@ ] }, { - "prev_ver": 520159233, + "prev_ver": 536870912, "name": "Mic", "uuid": "481a2879-3449-4d07-b2c2-812e978a2eab", "id": "pipewire_audio_input_capture", @@ -440,7 +440,7 @@ "private_settings": {}, "filters": [ { - "prev_ver": 520159233, + "prev_ver": 536870912, "name": "Noise Suppression", "uuid": "91e69fad-ada8-43e6-9d13-7aa48fe508dd", "id": "noise_suppress_filter", @@ -464,7 +464,7 @@ "private_settings": {} }, { - "prev_ver": 520159233, + "prev_ver": 536870912, "name": "Noise Gate", "uuid": "dbfba3f9-d478-46ae-824a-6284dcd44cee", "id": "noise_gate_filter", @@ -490,7 +490,7 @@ ] }, { - "prev_ver": 520159233, + "prev_ver": 536870912, "name": "Game Capture", "uuid": "f8481b2c-170c-425b-b259-4cbb2ec12b8b", "id": "vkcapture-source", @@ -516,7 +516,7 @@ "private_settings": {} }, { - "prev_ver": 520159233, + "prev_ver": 536870912, "name": "Game Audio", "uuid": "80c60256-48e7-4397-8163-3bb44480d9ab", "id": "pipewire_audio_application_capture", @@ -607,7 +607,7 @@ "transition_duration": 300, "preview_locked": false, "scaling_enabled": false, - "scaling_level": -69, + "scaling_level": -10, "scaling_off_x": 0.0, "scaling_off_y": 0.0, "virtual-camera": { diff --git a/dot_config/obs-studio/basic/scenes/Webcam.json b/dot_config/obs-studio/basic/scenes/Webcam.json index c5f59ff..f1c61d4 100644 --- a/dot_config/obs-studio/basic/scenes/Webcam.json +++ b/dot_config/obs-studio/basic/scenes/Webcam.json @@ -9,7 +9,7 @@ "name": "Webcam", "sources": [ { - "prev_ver": 520159233, + "prev_ver": 520159234, "name": "Virtual Cam", "uuid": "11ddcc7c-a668-4282-bee5-8847a42155dd", "id": "scene", @@ -47,16 +47,16 @@ "y": -1.0 }, "scale": { - "x": 1.0, - "y": 1.0 + "x": 1.5, + "y": 1.5 }, "scale_rel": { "x": 1.5, "y": 1.5 }, "bounds": { - "x": 1280.0, - "y": 720.0 + "x": 1920.0, + "y": 1080.0 }, "bounds_rel": { "x": 3.555555582046509, @@ -98,7 +98,7 @@ "private_settings": {} }, { - "prev_ver": 520159233, + "prev_ver": 520159234, "name": "Video Capture Device (V4L2)", "uuid": "6d218351-f947-42ca-9772-26e606173df6", "id": "v4l2_input", @@ -135,7 +135,7 @@ "private_settings": {}, "filters": [ { - "prev_ver": 520159233, + "prev_ver": 520159234, "name": "UnFish/Fish Lens", "uuid": "0340a54e-ff5a-4c8e-b132-660a43b45e33", "id": "filter-fish-lens", @@ -194,7 +194,7 @@ "transition_duration": 300, "preview_locked": false, "scaling_enabled": false, - "scaling_level": -4, + "scaling_level": -10, "scaling_off_x": 0.0, "scaling_off_y": 0.0, "virtual-camera": { diff --git a/dot_config/obs-studio/global.ini b/dot_config/obs-studio/global.ini index 290b770..59068d2 100644 --- a/dot_config/obs-studio/global.ini +++ b/dot_config/obs-studio/global.ini @@ -4,7 +4,7 @@ MaxLogs=10 InfoIncrement=-1 ProcessPriority=Normal EnableAutoUpdates=true -LastVersion=520159233 +LastVersion=536870912 BrowserHWAccel=true [Video] @@ -14,6 +14,7 @@ Renderer=OpenGL Configuration=/home/isaac/.config SceneCollections=/home/isaac/.config Profiles=/home/isaac/.config +PluginManagerSettings=/home/isaac/.config [PropertiesWindow] cx=720