diff --git a/.config/alacritty.yml b/.config/alacritty.yml index b793495..2fa5fad 100644 --- a/.config/alacritty.yml +++ b/.config/alacritty.yml @@ -110,16 +110,16 @@ env: #multiplier: 3 # Font configuration -font: +#font: # Normal (roman) font face - normal: + #normal: # Font family # # Default: # - (macOS) Menlo # - (Linux/BSD) monospace # - (Windows) Consolas - family: DejaVuSansMono Nerd Font + #family: monospace # The `style` can be specified to pick a specific face. #style: Regular diff --git a/.config/conky/conky.conf b/.config/conky/conky.conf new file mode 100644 index 0000000..898a1a4 --- /dev/null +++ b/.config/conky/conky.conf @@ -0,0 +1,14 @@ +conky.config = { + background = false, + out_to_console = true, + out_to_x = false, + short_units = true, + top_cpu_separate = true, + total_run_times = 0, + update_interval = 30, + use_spacer = 'none', +}; + +conky.text = [[ +  ${loadavg 1} |  $memeasyfree |  $acpitemp |  $pa_sink_volume |  ${battery_percent BAT1} | ${time %a %m/%d %R} +]]; diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter index 28baed7..8c71c6c 160000 --- a/.config/nvim/pack/plugins/opt/treesitter +++ b/.config/nvim/pack/plugins/opt/treesitter @@ -1 +1 @@ -Subproject commit 28baed769815c54b243f0df606ccb4114287e772 +Subproject commit 8c71c6c5edfa447aaa867858e2e913340ea964b7 diff --git a/.config/suckless b/.config/suckless index 94e171d..6b02b9c 160000 --- a/.config/suckless +++ b/.config/suckless @@ -1 +1 @@ -Subproject commit 94e171daba4dd76fbf89c6245c69bea949a94b10 +Subproject commit 6b02b9ca54709a98d5e947c24b379037358ba480 diff --git a/.config/zsh/.zsh_aliases b/.config/zsh/.zsh_aliases index 946ae49..0b09169 100644 --- a/.config/zsh/.zsh_aliases +++ b/.config/zsh/.zsh_aliases @@ -1,14 +1,14 @@ # system alias cls='clear && ls -lah' alias tmp='cd $(mktemp -d)' -alias update='paru -Syu; config submodule update --remote --recursive --init' +alias update='sudo pacman -Syu; config submodule update --remote --recursive --init' alias vi='$EDITOR' # conf alias config='git --git-dir=$HOME/.dotfiles --work-tree=$HOME' alias viconf='(cd $XDG_CONFIG_HOME/nvim && $EDITOR .)' alias wconf='(cd $HOME/.config/suckless/dwm* && $EDITOR .)' -alias zconf='(cd $ZDOTDIR/ && $EDITOR . && . $ZDOTDIR/.zshrc)' +alias zconf='(cd $ZDOTDIR/ && $EDITOR .) && . $ZDOTDIR/.zshrc' # dev alias epitest='docker run -it --rm -v $PWD:/usr/app/ epitechcontent/epitest-docker bash' @@ -24,6 +24,6 @@ function coloralias() { $1 $(echo - "${@:2}" | sed 's/--color=\w\+/--color=always/') } -alias sudo='sudo ' +alias sudo='doas ' alias watch='coloralias watch -c -- ' alias xargs='xargs ' diff --git a/.xinitrc b/.xinitrc index e044a38..b2b0afb 100644 --- a/.xinitrc +++ b/.xinitrc @@ -2,6 +2,7 @@ # keyboard setxkbmap us altgr-intl +numlockx # mouse ( @@ -13,9 +14,23 @@ setxkbmap us altgr-intl ) # display -xrandr \ - --output eDP-1 --auto --primary \ - --output DisplayPort-1-2 --auto --pos 1920x0 \ - --output DisplayPort-1-1 --auto --pos 3840x0 +xrandr \ + --output eDP-1 --pos 0x0 --mode 1920x1080 --rate 60 --primary \ + --output DisplayPort-1-2 --pos 1920x0 --auto \ + --output DisplayPort-1-1 --pos 3840x0 --auto + +# startup +/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & +picom & +redshift & +feh --bg-tile "$XDG_CONFIG_HOME/wallpapers/landscape.png" --no-fehbg +nm-applet & +dunst & + +xset dpms 300 15 # dim 5m, lock 5m15s +xss-lock lock & + +#bar +(conky | while read LINE; do xsetroot -name "$LINE"; done) & exec dwm diff --git a/bin/am b/bin/am index de4e5d3..2f6fcb2 100755 --- a/bin/am +++ b/bin/am @@ -24,7 +24,7 @@ function umount_all() { disks=($(mount | grep udisks2 | cut -f1 -d' ')) umount "${disks[@]}" - echo "unmounted ${disks[@]}" + echo "unmounted ${disks[*]}" } while getopts a o; do diff --git a/bin/crypto.sh b/bin/crypto.sh index 8d66d4c..c66ed73 100755 --- a/bin/crypto.sh +++ b/bin/crypto.sh @@ -27,7 +27,7 @@ while read -r line; do QTY="$(echo "$line" | cut -d "$DELIM" -f 2)" MARKET="$(get_value "$TO" "$COIN")" - VALUE="$(echo "$MARKET* $QTY" | bc)" + VALUE="$(echo "$MARKET * $QTY" | bc)" TOTAL="$(echo "$TOTAL + $VALUE" | bc)" printf "${BOLD}${COIN}${NORMAL}=%.2f€ " "$VALUE" diff --git a/bin/dkprune b/bin/dkprune index 8b3501f..34c384b 100755 --- a/bin/dkprune +++ b/bin/dkprune @@ -31,7 +31,8 @@ function add_opt() { } if ! [ -w '/var/run/docker.sock' ] && [ "$EUID" != 0 ]; then - exec sudo -- "$0" "$@" + command -v sudo > /dev/null && exec sudo -- "$0" "$@" + command -v doas > /dev/null && exec doas -- "$0" "$@" fi c=1 diff --git a/bin/lock b/bin/lock new file mode 100755 index 0000000..8ba88c9 --- /dev/null +++ b/bin/lock @@ -0,0 +1,3 @@ +#!/bin/bash + +i3lock -ftni "$XDG_CONFIG_HOME/wallpapers/lock.png" diff --git a/bin/scanpdf b/bin/scanpdf index c5d6b1c..5ec6741 100755 --- a/bin/scanpdf +++ b/bin/scanpdf @@ -6,7 +6,7 @@ usage() { exit } -if [ "$1" != *.pdf ]; then +if [[ "$1" != *.pdf ]]; then usage fi diff --git a/bin/set-ddc-light b/bin/set-ddc-light index fb3b04c..43c5872 100755 --- a/bin/set-ddc-light +++ b/bin/set-ddc-light @@ -1,10 +1,13 @@ #!/bin/bash set -e +command -v sudo > /dev/null && exec SUDO='sudo' +command -v doas > /dev/null && exec SUDO='doas' + CUR_LIGHT="$(set-light "$@")" -SCREENS="$(sudo ddcutil detect | awk '$1 == "Display" {print $2}')" +SCREENS="$($SUDO ddcutil detect | awk '$1 == "Display" {print $2}')" for i in $SCREENS; do - sudo ddcutil -d "$i" setvcp 10 "$CUR_LIGHT" + $SUDO ddcutil -d "$i" setvcp 10 "$CUR_LIGHT" done