diff --git a/.config/X11/xprofile b/.config/X11/xprofile index f644d3e..522f136 100644 --- a/.config/X11/xprofile +++ b/.config/X11/xprofile @@ -4,20 +4,17 @@ # session launch +xrdb ${XDG_CONFIG_HOME:-$HOME/.config}/X11/xresources xss-lock -- slock & redshift & dunst -follow mouse &> /dev/null & #temp fix # MPD daemon start (if no other user instance exists) [ ! -s ~/.config/mpd/pid ] && mpd +[ -z "$(pgrep -f sb-mpdup)" ] && sb-mpdup & pulsemixer --set-volume 50 -sbacklight set 3 & setbg & dwmblocks & -xrdb ${XDG_CONFIG_HOME:-$HOME/.config}/X11/xresources -xinput set-prop 'Synaptics TM3072-003' 'libinput Tapping Enabled' 1 & -xinput set-prop 'Synaptics TM3072-003' 'libinput Natural Scrolling Enabled' 1 & -xinput set-prop 'Synaptics TM3072-003' 'libinput Accel Speed' 0.4 & setxkbmap 'fr(oss)' -remaps & +xset r rate 300 50 & sxhkd & diff --git a/.config/X11/xresources b/.config/X11/xresources index 46c4727..96de905 100644 --- a/.config/X11/xresources +++ b/.config/X11/xresources @@ -37,8 +37,8 @@ *.cursorColor: #ebdbb2 /* st config */ -st.font: Iosevka Fixed Slab:size=14 -st.symbols: Symbols Nerd Font:size=14 +st.font: Iosevka Fixed Slab:size=13 +st.symbols: Symbols Nerd Font:size=13 st.termname: st-256color st.borderpx: 5 diff --git a/.config/htop/htoprc b/.config/htop/htoprc index cc05b07..b14d55f 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -3,7 +3,8 @@ fields=0 48 38 39 46 47 49 1 sort_key=47 sort_direction=1 -hide_threads=0 +tree_sort_key=0 +tree_sort_direction=1 hide_kernel_threads=1 hide_userland_threads=1 shadow_other_users=1 @@ -12,15 +13,27 @@ show_program_path=0 highlight_base_name=1 highlight_megabytes=1 highlight_threads=1 +highlight_changes=0 +highlight_changes_delay_secs=5 +find_comm_in_cmdline=1 +strip_exe_from_cmdline=1 +show_merged_command=0 tree_view=1 +tree_view_always_by_pid=0 header_margin=1 detailed_cpu_time=0 -cpu_count_from_zero=0 +cpu_count_from_one=1 +show_cpu_usage=1 +show_cpu_frequency=0 +show_cpu_temperature=0 +degree_fahrenheit=0 update_process_names=0 account_guest_in_cpu_meter=0 color_scheme=6 +enable_mouse=1 delay=15 -left_meters=AllCPUs Memory Swap +left_meters=AllCPUs2 Memory Swap left_meter_modes=1 1 1 -right_meters=Tasks LoadAverage Uptime Battery Blank Hostname -right_meter_modes=2 2 2 2 2 2 +right_meters=Tasks LoadAverage Uptime Blank Hostname +right_meter_modes=2 2 2 2 2 +hide_function_bar=0 diff --git a/.config/paru/paru.conf b/.config/paru/paru.conf index fea7ea6..930370c 100644 --- a/.config/paru/paru.conf +++ b/.config/paru/paru.conf @@ -13,17 +13,25 @@ PgpFetch Devel Provides DevelSuffixes = -git -cvs -svn -bzr -darcs -always +#AurOnly BottomUp -RemoveMake -SudoLoop +#RemoveMake +#SudoLoop #UseAsk #CombinedUpgrade #CleanAfter #UpgradeMenu NewsOnUpgrade +#LocalRepo +#Chroot +#Sign +#SignDb + # # Binary OPTIONS # -#[bin] +[bin] #FileManager = vifm +#MFlags = --skippgpcheck +Sudo = doas diff --git a/.config/paru/pkglist.txt b/.config/paru/pkglist.txt index 136a578..d828ae3 100644 --- a/.config/paru/pkglist.txt +++ b/.config/paru/pkglist.txt @@ -1,27 +1,19 @@ -abcde abook -adobe-source-han-sans-cn-fonts -adobe-source-han-sans-jp-fonts -alsa-plugins -alsa-utils -android-tools -android-udev -arandr +adobe-source-han-sans-otc-fonts +amd-ucode autoconf automake -autorandr base beets binutils bison capitaine-cursors -cdparanoia clang cmake cronie dash +dhcpcd dunst -efibootmgr fakeroot file findutils @@ -33,19 +25,14 @@ gettext git grep groff -grub -gsasl gzip htop -imagemagick isync -iwd jedi-language-server libnotify libtool linux linux-firmware -linux-lts lynx m4 make @@ -57,8 +44,11 @@ msmtp ncmpcpp neomutt ninja -nnn notmuch +opendoas +openssh +openvpn +openvpn-update-systemd-resolved pacman pacman-contrib pam-gnupg @@ -66,45 +56,37 @@ paru pass patch pkgconf -pulseaudio-alsa pulsemixer -python-eyed3 python-requests redshift +rust sed shotgun -sox sudo sxhkd sxiv texinfo -texlab texlive-bibtexextra texlive-core -texlive-latexextra +texlive-formatsextra transmission-cli tree-sitter tremc -ttf-dejavu -ttf-fira-sans ttf-iosevka-fixed-slab ttf-nerd-fonts-symbols-mono unzip -upower -usbutils +vi which -xcape xclip -xf86-video-intel +xf86-video-amdgpu xorg-server xorg-xinit -xorg-xinput xorg-xsetroot xss-lock xwallpaper -zathura zathura-pdf-mupdf zip zsh +zsh-completions zsh-history-substring-search zsh-syntax-highlighting diff --git a/.config/root/etc_doas.conf b/.config/root/etc_doas.conf new file mode 100644 index 0000000..dde2edc --- /dev/null +++ b/.config/root/etc_doas.conf @@ -0,0 +1 @@ +permit persist :wheel diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index 7d0d706..ea57d5a 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -2,13 +2,11 @@ # System stuff -super + F1 +XF86AudioMute pulsemixer --toggle-mute; audio-notify -super + {F2, F3} - pulsemixer --change-volume {-5, +5}; audio-notify -super + {F5, F6} - sbacklight {dec,inc} +{XF86AudioLowerVolume, XF86AudioRaiseVolume} + pulsemixer --change-volume {-5, +5}; audio-notify super + u dmenumount @@ -28,12 +26,6 @@ super + shift + r super + shift + d displayselect -super + F9 - kbacklight - -super + shift + o - dmenuopen - # Others super + Return $TERMINAL @@ -44,6 +36,9 @@ super + shift + Return super + d dmenu_run -p "run:" +super + shift + o + dmenuopen + super + shift + {w,z} $BROWSER diff --git a/.local/bin/statusbar/sb-mpdup b/.local/bin/statusbar/sb-mpdup index 8af8d22..90d932c 100755 --- a/.local/bin/statusbar/sb-mpdup +++ b/.local/bin/statusbar/sb-mpdup @@ -13,4 +13,3 @@ while : ; do mpc idle >/dev/null && kill -39 $(pidof dwmblocks) || break done - diff --git a/.local/bin/statusbar/sb-music b/.local/bin/statusbar/sb-music index 0202cb8..32a638f 100755 --- a/.local/bin/statusbar/sb-music +++ b/.local/bin/statusbar/sb-music @@ -20,6 +20,4 @@ artist="$(echo "$mpc" | head -n1 | cut -d'-' -f1 | unicode)" [ "$(echo "$artist" | wc -c)" -gt 18 ] && artist="$(printf "%.15s..." "$artist")" status="$(echo "$mpc" | tail -n2 | format)" -pgrep -f sb-mpdup >/dev/null 2>&1 || sb-mpdup >/dev/null 2>&1 & - [ -n "$status" ] && printf " %s %s-%s " "$status" "$artist" "$title"