diff --git a/bin/bar_bat.sh b/bin/bar_bat.sh index 0a0e8ae..d81485b 100755 --- a/bin/bar_bat.sh +++ b/bin/bar_bat.sh @@ -1,10 +1,11 @@ #!/bin/bash #First we get the capacity -charge=$(cat /sys/class/power_supply/BAT0/capacity) +bat=$1 +charge=$(cat /sys/class/power_supply/$bat/capacity) #Now get the status -bstat=$(cat /sys/class/power_supply/BAT0/status) +bstat=$(cat /sys/class/power_supply/$bat/status) #Get the symbol for the capacity if [ "$bstat" = "Charging" ]; then @@ -14,49 +15,19 @@ else fi if [ "$charge" -gt 90 ]; then bat="$cstat" + charge="" elif [ "$charge" -gt 70 ]; then bat="$cstat" + charge="" elif [ "$charge" -gt 50 ]; then bat="$cstat" + charge="" elif [ "$charge" -gt 20 ]; then bat="$cstat" + charge="" else bat=" $cstat" + charge=" $charge%" fi - - - -battery="$bat $charge%" - -if [ -d /sys/class/power_supply/BAT1 ]; then - - #First we get the capacity - charge=$(cat /sys/class/power_supply/BAT1/capacity) - - #Now get the status - bstat=$(cat /sys/class/power_supply/BAT1/status) - if [ "$bstat" = "Charging" ]; then - cstat="" - else - cstat="" - fi - #Get the symbol for the capacity - if [ "$charge" -gt 90 ]; then - bat="$cstat" - elif [ "$charge" -gt 70 ]; then - bat="$cstat" - elif [ "$charge" -gt 50 ]; then - bat="$cstat" - elif [ "$charge" -gt 20 ]; then - bat="$cstat" - else - bat=" $cstat" - fi - - echo "$bat $charge% $battery" -else - echo $battery -fi - - +echo "$bat$charge " diff --git a/bin/bar_mem.sh b/bin/bar_mem.sh index a64d509..4f4f05c 100755 --- a/bin/bar_mem.sh +++ b/bin/bar_mem.sh @@ -6,10 +6,10 @@ total=$(grep -oP '^MemTotal: *\K[0-9]+' /proc/meminfo) mem=" $(echo "scale=1; 100*($total-$available)/$total"| bc | cut -d '.' -f1 )" if [ $mem -gt 80 ]; then - mem=" $mem" + mem=" $mem %" elif [ $mem -gt 50 ]; then - mem="$mem" + mem="$mem %" else - mem="$mem" + mem=" " fi -echo "$mem%" +echo "$mem" diff --git a/bin/bar_volume.sh b/bin/bar_volume.sh index 757a1f0..b4c774b 100755 --- a/bin/bar_volume.sh +++ b/bin/bar_volume.sh @@ -3,12 +3,16 @@ vol="$(pamixer --get-volume)" -if [ "$vol" -gt "70" ]; then +#if [ "$vol" -gt "70" ]; then +# icon="󰕾" +#elif [ "$vol" -gt "30" ]; then +# icon="󰖀" +#el + +if [ "$vol" -gt "0" ]; then icon="󰕾" -elif [ "$vol" -gt "30" ]; then - icon="󰖀" else - icon="󰕿" + icon="" fi -echo "$icon $vol%" +echo "$icon " diff --git a/bin/bar_wifi.sh b/bin/bar_wifi.sh index 521c941..6e4f6da 100755 --- a/bin/bar_wifi.sh +++ b/bin/bar_wifi.sh @@ -4,5 +4,5 @@ case "$(cat /sys/class/net/w*/operstate 2>/dev/null)" in down) echo " 󰖪 ";; up) percentage="$(awk '/^\s*w/ { print int($3 * 100 / 70) "% " }' /proc/net/wireless)" ssid=$(iwgetid -r) - echo \ $ssid  + echo " " esac diff --git a/bin/search b/bin/search index ac29965..0bbdafe 100755 --- a/bin/search +++ b/bin/search @@ -5,5 +5,5 @@ query=$(eval "$dmenu") if [ -n "$query" ]; then query=${query//+/%2B} query=${query// /+} - ~/.local/bin/zen-x86_64.AppImage --new-window "https://search.brave.com/search?q=$query" + zen-browser --new-window "https://search.brave.com/search?q=$query" fi diff --git a/bin/volume.sh b/bin/volume.sh index bd45ba4..84eef4b 100755 --- a/bin/volume.sh +++ b/bin/volume.sh @@ -68,3 +68,5 @@ case $1 in fi ;; esac + +kill -44 $(pidof dwmblocks) diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc index 4823197..ef7787b 100644 --- a/config/dunst/dunstrc +++ b/config/dunst/dunstrc @@ -69,7 +69,9 @@ # The width can be negative. In this case the actual width is the # screen width minus the width defined in within the geometry option. origin="top-right" - geometry=350x200-25+25 + width=300 + height=250 + offset=+10x+25 # Shrink window if it's smaller than the width. Will be ignored if # width is 0. diff --git a/config/picom/picom.conf b/config/picom/picom.conf index 55bca68..f932c5c 100644 --- a/config/picom/picom.conf +++ b/config/picom/picom.conf @@ -18,7 +18,14 @@ animation-clamping = true; animations =({ triggers = ["open"]; preset = "appear"; + scale = 0.5; + duration = 0.3 }, + { + triggers = ["geometry"]; + preset = "geometry-change"; + duration = 0.2 + } ) @@ -300,4 +307,8 @@ rules = ( triggers = ["close", "hide"]; preset = "disappear"; })}, -{match = "name = 'slop'"; blur-background =false; animations = ()}) +{match = "name = 'slop'"; blur-background =false; animations = ()}, +{match = "class_g = 'dwm'"; corner-radius=0}, +{ match = "fullscreen"; corner-radius = 0; }, +) + diff --git a/config/rofi/aditya_style.rasi b/config/rofi/aditya_style.rasi index 0b5cd13..c958e99 100644 --- a/config/rofi/aditya_style.rasi +++ b/config/rofi/aditya_style.rasi @@ -11,6 +11,7 @@ configuration { modi: "drun,run"; show-icons: false; + font: "CaskaydiaMono Nerd Font 12"; display-drun: ""; display-run: ""; display-filebrowser: ""; diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc index 2389297..77de478 100644 --- a/config/sxhkd/sxhkdrc +++ b/config/sxhkd/sxhkdrc @@ -50,3 +50,6 @@ ctrl+shift+d shift+super+i rofi-connman + +super+e + emojis diff --git a/home/.xinitrc b/home/.xinitrc old mode 100644 new mode 100755 index 657bd2f..f401fcd --- a/home/.xinitrc +++ b/home/.xinitrc @@ -36,7 +36,7 @@ fi export PATH="$PATH:/home/aselimov/bin:/home/aselimov/.local/bin:/home/aselimov/scripts" xinput set-prop "DualPoint Stick" "libinput Accel Speed" 0.8 -export BROWSER=/usr/bin/firefox +export BROWSER=/home/aselimov/bin/zen-browser export EDITOR=/usr/bin/nvim export XDG_RUNTIME_DIR=/tmp/aselimov @@ -51,10 +51,11 @@ xrandr | grep "2560x1440" && dock.sh || mobile.sh xinput --set-prop "TPPS/2 IBM TrackPoint" "libinput Accel Speed" 1.0 xinput --set-prop "TPPS/2 IBM TrackPoint" "libinput Accel Profile Enabled" 0 1 +exec bato & +exec sync_mail.sh & exec xsettingsd & exec sxhkd & exec mpd & -exec mpdnotif.sh & exec picom -b & exec wallpaper_randomizer.sh & exec dwmblocks & diff --git a/home/.zshrc b/home/.zshrc index d27e52e..bff3f37 100644 --- a/home/.zshrc +++ b/home/.zshrc @@ -12,7 +12,7 @@ zstyle :compinstall filename '/home/aselimov/.zshrc' export LS_COLORS='di=1;37:ln=35:so=32:pi=33:ex=1;32:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43' alias ls="ls --classify --group-directories-first --color" -~/bin/daily_scripture.sh +#~/bin/daily_scripture.sh autoload -Uz compinit compinit # End of lines added by compinstall @@ -31,7 +31,7 @@ function addbin(){ } eval "$(starship init zsh)" zstyle -e ':completion:*:hosts' hosts 'reply=( - ${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) 2>/dev/null)"}%%[#| ]*}//,/ } + ${=${${(f)"$(cat {/etc/ssh_,~/ar.ssh/known_}hosts(|2)(N) 2>/dev/null)"}%%[#| ]*}//,/ } ${=${${${${(@M)${(f)"$(cat ~/.ssh/config 2>/dev/null)"}:#Host *}#Host }:#*\**}:#*\?*}} )' @@ -42,17 +42,17 @@ source "/home/aselimov/.config/zsh/zsh-history-substring-search/zsh-history-subs bindkey '^[[A' history-substring-search-up bindkey '^[[B' history-substring-search-down export XKB_DEFAULT_OPTIONS="caps:escape" +export PASSWORD_STORE_CHARACTER_SET='a-zA-Z0-9+\-$!*_=' - - -function panbeamer (){ - pandoc --pdf-engine=xelatex -o "${1/md/pdf}" -t beamer "$1" -} - -export panbeamer +XDEB_PKGROOT=${HOME}/.config/xdeb export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion +# Add cuda to path +export PATH="$PATH:/usr/local/cuda-12.8/bin" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/cuda-12.8/lib64" + [ -f "/home/aselimov/.ghcup/env" ] && . "/home/aselimov/.ghcup/env" # ghcup-env + diff --git a/wallpapers/current_rotation/daniel-leone-v7daTKlZzaw.jpg b/wallpapers/current_rotation/daniel-leone-v7daTKlZzaw.jpg new file mode 120000 index 0000000..1c4a1e3 --- /dev/null +++ b/wallpapers/current_rotation/daniel-leone-v7daTKlZzaw.jpg @@ -0,0 +1 @@ +/home/aselimov/projects/SelimovDE/wallpapers/real-pics/daniel-leone-v7daTKlZzaw.jpg \ No newline at end of file diff --git a/wallpapers/current_rotation/fuji.jpg b/wallpapers/current_rotation/fuji.jpg new file mode 120000 index 0000000..76ac9bf --- /dev/null +++ b/wallpapers/current_rotation/fuji.jpg @@ -0,0 +1 @@ +/home/aselimov/projects/SelimovDE/wallpapers/real-pics/fuji.jpg \ No newline at end of file diff --git a/wallpapers/current_rotation/sequoia.png b/wallpapers/current_rotation/sequoia.png new file mode 120000 index 0000000..235a01a --- /dev/null +++ b/wallpapers/current_rotation/sequoia.png @@ -0,0 +1 @@ +/home/aselimov/projects/SelimovDE/wallpapers/real-pics/sequoia.png \ No newline at end of file diff --git a/wallpapers/current_rotation/thinkpad.png b/wallpapers/current_rotation/thinkpad.png deleted file mode 120000 index e34aca3..0000000 --- a/wallpapers/current_rotation/thinkpad.png +++ /dev/null @@ -1 +0,0 @@ -/home/aselimov/media/wallpapers/misc/thinkpad.png \ No newline at end of file diff --git a/wallpapers/current_rotation/void-linux-minimal.png b/wallpapers/current_rotation/void-linux-minimal.png deleted file mode 120000 index 066db83..0000000 --- a/wallpapers/current_rotation/void-linux-minimal.png +++ /dev/null @@ -1 +0,0 @@ -/home/aselimov/media/wallpapers/linux/void-linux-minimal.png \ No newline at end of file diff --git a/wallpapers/current_rotation/zen-maze.png b/wallpapers/current_rotation/zen-maze.png deleted file mode 120000 index 0cf2855..0000000 --- a/wallpapers/current_rotation/zen-maze.png +++ /dev/null @@ -1 +0,0 @@ -/home/aselimov/media/wallpapers/minimalist/zen-maze.png \ No newline at end of file diff --git a/wallpapers/minimalist/17363861542624331954418290647078.png b/wallpapers/minimalist/17363861542624331954418290647078.png new file mode 100644 index 0000000..addcda1 Binary files /dev/null and b/wallpapers/minimalist/17363861542624331954418290647078.png differ diff --git a/wallpapers/minimalist/_ b/wallpapers/minimalist/_ new file mode 100644 index 0000000..db0b9f1 Binary files /dev/null and b/wallpapers/minimalist/_ differ diff --git a/wallpapers/minimalist/wallhaven-3ld95v.jpg b/wallpapers/minimalist/wallhaven-3ld95v.jpg new file mode 100644 index 0000000..97493fa Binary files /dev/null and b/wallpapers/minimalist/wallhaven-3ld95v.jpg differ diff --git a/wallpapers/real-pics/daniel-leone-v7daTKlZzaw.jpg b/wallpapers/real-pics/daniel-leone-v7daTKlZzaw.jpg new file mode 100644 index 0000000..052f0ff Binary files /dev/null and b/wallpapers/real-pics/daniel-leone-v7daTKlZzaw.jpg differ diff --git a/wallpapers/real-pics/houseonthesideofalake.jpg b/wallpapers/real-pics/houseonthesideofalake.jpg deleted file mode 100644 index 9809165..0000000 Binary files a/wallpapers/real-pics/houseonthesideofalake.jpg and /dev/null differ diff --git a/wallpapers/real-pics/mount.jpg b/wallpapers/real-pics/mount.jpg deleted file mode 100644 index 3209468..0000000 Binary files a/wallpapers/real-pics/mount.jpg and /dev/null differ diff --git a/wallpapers/real-pics/railway_evening_horizon_119944_2560x1440.jpg b/wallpapers/real-pics/railway_evening_horizon_119944_2560x1440.jpg deleted file mode 100644 index 66f91e1..0000000 Binary files a/wallpapers/real-pics/railway_evening_horizon_119944_2560x1440.jpg and /dev/null differ diff --git a/wallpapers/real-pics/sequoia.png b/wallpapers/real-pics/sequoia.png new file mode 100644 index 0000000..13fc3ea Binary files /dev/null and b/wallpapers/real-pics/sequoia.png differ