diff --git a/README.md b/README.md index d1295f6..d6e8b7b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ The install script has some options for installing configs for some apps. ``` $ ./install.fish -h -usage: ./install.sh [-h] [--noconfirm] [--spotify] [--vscode] [--discord] [--paru] +usage: ./install.sh [-h] [--noconfirm] [--spotify] [--vscode] [--discord] [--aur-helper] options: -h, --help show this help message and exit @@ -28,7 +28,7 @@ options: --vscode=[codium|code] install VSCodium (or VSCode) --discord install Discord (OpenAsar + Equicord) --zen install Zen browser - --paru use paru instead of yay as AUR helper + --aur-helper=[yay|paru] the AUR helper to use ``` For example: diff --git a/btop/btop.conf b/btop/btop.conf index b24943c..af4b0ee 100644 --- a/btop/btop.conf +++ b/btop/btop.conf @@ -1,4 +1,4 @@ -#? Config file for btop v. 1.4.4 +#? Config file for btop v. 1.4.5 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes. #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes" @@ -115,6 +115,9 @@ cpu_bottom = False #* Shows the system uptime in the CPU box. show_uptime = True +#* Shows the CPU package current power consumption in watts. Requires running `make setcap` or `make setuid` or running with sudo. +show_cpu_watts = True + #* Show cpu temperature. check_temp = True diff --git a/fish/config.fish b/fish/config.fish index 1e8b41d..90e2697 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -10,6 +10,7 @@ if status is-interactive alias ls='eza --icons --group-directories-first -1' # Abbrs + abbr lg 'lazygit' abbr gd 'git diff' abbr ga 'git add .' abbr gc 'git commit -am' diff --git a/hypr/hyprland/rules.conf b/hypr/hyprland/rules.conf index a13687d..85064f4 100644 --- a/hypr/hyprland/rules.conf +++ b/hypr/hyprland/rules.conf @@ -34,7 +34,7 @@ windowrule = center 1, class:nwg-look # Special workspaces windowrule = workspace special:sysmon, class:btop -windowrule = workspace special:music, class:feishin|Spotify|Supersonic +windowrule = workspace special:music, class:feishin|Spotify|Supersonic|Cider windowrule = workspace special:music, initialTitle:Spotify( Free)? # Spotify wayland, it has no class for some reason windowrule = workspace special:communication, class:discord|equibop|vesktop|whatsapp|org.gnome.Fractal windowrule = workspace special:todo, class:Todoist diff --git a/install.fish b/install.fish index 106724a..f9588e9 100755 --- a/install.fish +++ b/install.fish @@ -44,6 +44,10 @@ function input -a text _out blue $text $argv[2..] end +function sh-read + sh -c 'read a && echo -n "$a"' || exit 1 +end + function confirm-overwrite -a path if test -e $path -o -L $path # No prompt if noconfirm @@ -53,7 +57,8 @@ function confirm-overwrite -a path rm -rf $path else # Prompt user - read -l -p "input '$path already exists. Overwrite? [Y/n] ' -n" confirm || exit 1 + input "$path already exists. Overwrite? [Y/n] " -n + set -l confirm (sh-read) if test "$confirm" = 'n' -o "$confirm" = 'N' log 'Skipping...' @@ -92,14 +97,16 @@ log 'Before continuing, please ensure you have made a backup of your config dire # Prompt for backup if ! set -q _flag_noconfirm log '[1] Two steps ahead of you! [2] Make one for me please!' - read -l -p "input '=> ' -n" choice || exit 1 + input '=> ' -n + set -l choice (sh-read) if contains -- "$choice" 1 2 if test $choice = 2 log "Backing up $config..." if test -e $config.bak -o -L $config.bak - read -l -p "input 'Backup already exists. Overwrite? [Y/n] ' -n" overwrite || exit 1 + input 'Backup already exists. Overwrite? [Y/n] ' -n + set -l overwrite (sh-read) if test "$overwrite" = 'n' -o "$overwrite" = 'N' log 'Skipping...' @@ -117,40 +124,17 @@ if ! set -q _flag_noconfirm end end - -# Install AUR helper if not already installed -#if ! pacman -Q $aur_helper &> /dev/null -# log "$aur_helper not installed. Installing..." - - # Install -# sudo pacman -S --needed git base-devel $noconfirm -# cd /tmp -# git clone https://aur.archlinux.org/$aur_helper.git -# cd $aur_helper -# makepkg -si -# cd .. -# rm -rf $aur_helper - -# Setup -#if $aur_helper = yay -# $aur_helper -Y --gendb -# $aur_helper -Y --devel --save -#else -# $aur_helper --gendb -#end - - # Cd into dir cd (dirname (status filename)) || exit 1 # Install metapackage for deps log 'Installing metapackage...' -if $aur_helper = yay +if test $aur_helper = yay $aur_helper -Bi . $noconfirm else $aur_helper -Ui $noconfirm end -rm -f caelestia-meta-*.pkg.tar.zst 2> /dev/null +fish -c 'rm -f caelestia-meta-*.pkg.tar.zst' 2> /dev/null # Install hypr* configs if confirm-overwrite $config/hypr diff --git a/zen/userChrome.css b/zen/userChrome.css index 355ea56..a359a08 100644 --- a/zen/userChrome.css +++ b/zen/userChrome.css @@ -1,4 +1,4 @@ -:root { +/*:root { --c-accent: var(--tab-loading-fill); --c-text: var(--toolbar-color); --c-mantle: var(--lwt-accent-color); @@ -31,17 +31,17 @@ --in-content-primary-button-background: var(--toolbarbutton-hover-background) !important; --in-content-primary-button-background-hover: var(--toolbarbutton-active-background) !important; font-family: Maple Mono NF !important; font-size: 16pt -} +}*/ -tooltip { +/*tooltip { appearance: none !important; background-color: var(--c-mantle) !important; color: var(--c-text) !important; border: 1px solid color-mix(in srgb, var(--c-accent), transparent 70%) !important; border-radius: 8px !important; -} +}*/ -#permissions-granted-icon { +/*#permissions-granted-icon { color: var(--c-mantle) !important; } @@ -89,7 +89,7 @@ toolbar .toolbarbutton-1 { #urlbar-container { background: var(--c-mantle) !important; -} +}*/ /* Center url bar text when not focused */ #urlbar:not([focused]) .urlbar-input { @@ -101,18 +101,18 @@ toolbar .toolbarbutton-1 { 0% { opacity: 0; scale: 0.8; - translate: -10% 0; + /* translate: -10% 0; */ } 70% { scale: 1.02; - translate: 1% 0; + /* translate: 1% 0; */ } 100% { opacity: 1; scale: 1; - translate: 0 0; + /* translate: 0 0; */ } } @@ -121,7 +121,7 @@ toolbar .toolbarbutton-1 { } /* Blur menu popups */ -#commonDialog, +/*#commonDialog, .menupopup-arrowscrollbox { border-radius: 10px !important; border: 1px solid color-mix(in srgb, var(--arrowpanel-border-color), transparent 70%) !important; @@ -131,10 +131,10 @@ toolbar .toolbarbutton-1 { #commonDialog { background: color-mix(in srgb, var(--zen-branding-bg), transparent 15%) !important; -} +}*/ /* Blur floating url bar */ -#urlbar[zen-floating-urlbar][breakout][breakout-extend] > #urlbar-background { +/*#urlbar[zen-floating-urlbar][breakout][breakout-extend] > #urlbar-background { border: 1px solid color-mix(in srgb, var(--zen-colors-border), transparent 70%) !important; border-radius: 10px !important; background: color-mix(in srgb, var(--zen-colors-tertiary), transparent 15%) !important; @@ -148,7 +148,7 @@ toolbar .toolbarbutton-1 { .urlbarView-body-inner { border: none !important; -} +}*/ /* Styles the search options */ .search-one-offs {