From 7cc1271b44bebb6d2b89f36933e89bf443e6bb07 Mon Sep 17 00:00:00 2001 From: Tibeuleu <> Date: Tue, 27 Feb 2024 17:41:53 +0100 Subject: [PATCH] update config --- .config/i3/config | 8 +- .config/i3blocks/config | 66 +++++------- .config/nvim/old_init.vim | 25 ++--- .config/shell/git@git.tibeuleu.xyz | 155 ----------------------------- .config/shell/shortcutrc | 2 +- 5 files changed, 42 insertions(+), 214 deletions(-) delete mode 100755 .config/shell/git@git.tibeuleu.xyz diff --git a/.config/i3/config b/.config/i3/config index 9084219..f2a4996 100755 --- a/.config/i3/config +++ b/.config/i3/config @@ -135,7 +135,7 @@ bindsym $mod+Ctrl+l move workspace to output right bindsym $mod+z gaps outer current plus 5 bindsym $mod+Shift+z gaps outer current minus 5 -bindsym $mod+x exec --no-startup-id xset dpms force off && mpc pause && pauseallmpv && slock & +bindsym $mod+x exec --no-startup-id xset dpms force off && mpc pause || pauseallmpv && slock bindsym $mod+Shift+x exec --no-startup-id sysact bindsym $mod+c exec --no-startup-id vscodium @@ -222,19 +222,19 @@ for_window [title="mpvfloat"] border pixel 0 no_focus [title="mpvfloat"] # #---Function Buttons---# # -bindsym $mod+F1 exec --no-startup-id groff -mom ${XDG_DATA_HOME:-$HOME/.local/share}/larbs/readme.mom -Tpdf | zathura - +bindsym $mod+F1 exec --no-startup-id prompt "Lock computer?" "slock" bindsym $mod+F2 restart bindsym $mod+F3 exec --no-startup-id displayselect bindsym $mod+F4 exec --no-startup-id prompt "Hibernate computer?" "$hibernate" bindsym $mod+F5 exec --no-startup-id $netrefresh bindsym $mod+F6 exec --no-startup-id torwrap bindsym $mod+F7 exec --no-startup-id td-toggle -bindsym $mod+F8 exec --no-startup-id mailsync +bindsym $mod+F8 exec --no-startup-id newsup bindsym $mod+F9 exec --no-startup-id mounter bindsym $mod+F10 exec --no-startup-id unmounter bindsym $mod+F11 exec --no-startup-id ducksearch bindsym $mod+F12 exec $term -e nmtui -bindsym $mod+Shift+F1 exec --no-startup-id toggle-welcome +bindsym $mod+Shift+F1 exec --no-startup-id slock # #---Arrow Keys---# # bindsym $mod+Left focus left diff --git a/.config/i3blocks/config b/.config/i3blocks/config index 0c77f3e..9fc85c1 100755 --- a/.config/i3blocks/config +++ b/.config/i3blocks/config @@ -2,71 +2,59 @@ command=~/.local/bin/statusbar/$BLOCK_NAME separator_block_width=15 markup=pango -#[record] -#command=cat /tmp/recordingicon -#interval=once -#signal=9 - -[music] +[sb-music] interval=30 signal=11 -[news] +[sb-news] interval=once signal=6 -#[iplocate] -#interval=30 +# [sb-iplocate] +# interval=30 -#[nettraf] -#interval=1 +# [sb-nettraf] +# interval=1 -[pacpackages] +[sb-pacpackages] interval=once signal=8 -#[torrent] -#interval=20 -#signal=7 +# [sb-torrent] +# interval=20 +# signal=7 -#[weather] -#interval=18000 -#signal=5 +# [sb-forecast] +# interval=18000 +# signal=5 -#[mailbox] -#interval=180 -#signal=12 - -[memory] +[sb-memory] interval=30 -[cpu] +[sb-cpu] interval=15 -[volume] +[sb-volume] interval=once signal=10 -#[disk] -#interval=60 -#command=disk / +# [sb-disk] +# interval=60 +# command=sb-disk / -#[disk] -#interval=60 -#command=disk /home +# [sb-disk] +# interval=60 +# command=sb-disk /media -[battery] +[sb-battery] +command=sb-battery BAT0 interval=5 -command=battery BAT0 -[clock] +[sb-clock] interval=30 -[kbselect] +[sb-kbselect] interval=10 -[internet] +[sb-internet] interval=10 - -#[help-icon] -#interval=once diff --git a/.config/nvim/old_init.vim b/.config/nvim/old_init.vim index 6ce16fd..76e5e20 100644 --- a/.config/nvim/old_init.vim +++ b/.config/nvim/old_init.vim @@ -18,29 +18,24 @@ autocmd BufRead,BufNewFile *.ms,*.me,*.mom,*.man set filetype=groff autocmd BufRead,BufNewFile *.tex set filetype=tex -" Save file as sudo on files that require root permission - cabbrev w!! execute 'silent! write !sudo tee % >/dev/null' edit! +" Save file as doas on files that require root permission + cabbrev w!! execute 'silent! write !doas tee % >/dev/null' edit! " Automatically deletes all trailing whitespace and newlines at end of file on save. & reset cursor position - autocmd BufWritePre * let currPos = getpos(".") - autocmd BufWritePre * %s/\s\+$//e - autocmd BufWritePre * %s/\n\+\%$//e - autocmd BufWritePre *.[ch] %s/\%$/\r/e " add trailing newline for ANSI C standard - autocmd BufWritePre *neomutt* %s/^--$/-- /e " dash-dash-space signature delimiter in emails - autocmd BufWritePre * cal cursor(currPos[1], currPos[2]) + autocmd BufWritePre * let currPos = getpos(".") + autocmd BufWritePre * %s/\s\+$//e + autocmd BufWritePre * %s/\n\+\%$//e + autocmd BufWritePre *.[ch] %s/\%$/\r/e " add trailing newline for ANSI C standard + autocmd BufWritePre * cal cursor(currPos[1], currPos[2]) " When shortcut files are updated, renew bash and ranger configs with new material: autocmd BufWritePost bm-files,bm-dirs !shortcuts " Run xrdb whenever Xdefaults or Xresources are updated. autocmd BufRead,BufNewFile Xresources,Xdefaults,xresources,xdefaults set filetype=xdefaults autocmd BufWritePost Xresources,Xdefaults,xresources,xdefaults !xrdb % -" Recompile dwmblocks on config edit. - autocmd BufWritePost ~/.local/src/dwmblocks/config.h !cd ~/.local/src/dwmblocks/; sudo make install && { killall -q dwmblocks;setsid -f dwmblocks } - -" Turns off highlighting on the bits of code that are changed, so the line that is changed is highlighted but the actual text that has changed stands out on the line and is readable. -if &diff - highlight! link DiffText MatchParen -endif +" Recompile i3/i3blocks on config edit. + autocmd BufWritePost ~/.config/i3/config !i3 restart + autocmd BufWritePost ~/.config/i3blocks/config !i3 restart " Function for toggling the bottom statusbar: let s:hidden_all = 0 diff --git a/.config/shell/git@git.tibeuleu.xyz b/.config/shell/git@git.tibeuleu.xyz deleted file mode 100755 index e755a49..0000000 --- a/.config/shell/git@git.tibeuleu.xyz +++ /dev/null @@ -1,155 +0,0 @@ -#!/bin/zsh - -# zsh profile file. Runs on login. Environmental variables are set here. - -# If you don't plan on reverting to bash, you can remove the link in ~/.profile -# to clean up. - -# Adds `~/.local/bin` to $PATH -export PATH="$PATH:$(du "$HOME/.local/bin" | cut -f2 | paste -sd ':')" - -# Default programs: -export EDITOR="nvim" -export TERMINAL="st" -export BROWSER="brave" -export READER="zathura" - -# ~/ Clean-up: -export XDG_CONFIG_HOME="$HOME/.config" -export XDG_DATA_HOME="$HOME/.local/share" -export XDG_CACHE_HOME="$HOME/.cache" -#export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # This line will break some DMs. -export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/notmuch-config" -export GTK2_RC_FILES="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-2.0/gtkrc-2.0" -export LESSHISTFILE="-" -export WGETRC="${XDG_CONFIG_HOME:-$HOME/.config}/wget/wgetrc" -export INPUTRC="${XDG_CONFIG_HOME:-$HOME/.config}/shell/inputrc" -export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}/zsh" -#export GNUPGHOME="$XDG_DATA_HOME/gnupg" -export WINEPREFIX="${XDG_DATA_HOME:-$HOME/.local/share}/wineprefixes/default" -export KODI_DATA="${XDG_DATA_HOME:-$HOME/.local/share}/kodi" -export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/password-store" -export TMUX_TMPDIR="$XDG_RUNTIME_DIR" -export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android" -export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo" -export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go" -export ANSIBLE_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/ansible/ansible.cfg" -export UNISON="${XDG_DATA_HOME:-$HOME/.local/share}/unison" -export HISTFILE="${XDG_DATA_HOME:-$HOME/.local/share}/history" - -# Xspec and IXPEobssim -export HEADAS="$HOME/.local/lib/heasoft-6.29/x86_64-pc-linux-gnu-libc2.35/" -export IXPEOBSSIM_ROOT="$HOME/Internship/IXPE/ixpeobssim_latest" -export IXPEOBSSIM_DATA="$HOME/Internship/IXPE/ixpeobssim_latest/ixpeobssimdata" -export IXPEOBSSIM_AUXFILES="$HOME/Internship/IXPE/ixpeobssim_latest/ixpeobssimauxfiles" - -# Other program settings: -export DICS="/usr/share/stardict/dic/" -export SUDO_ASKPASS="$HOME/.local/bin/dmenupass" -export FZF_DEFAULT_OPTS="--layout=reverse --height 40%" -export LESS=-R -export LESS_TERMCAP_mb="$(printf '%b' '')" -export LESS_TERMCAP_md="$(printf '%b' '')" -export LESS_TERMCAP_me="$(printf '%b' '')" -export LESS_TERMCAP_so="$(printf '%b' '')" -export LESS_TERMCAP_se="$(printf '%b' '')" -export LESS_TERMCAP_us="$(printf '%b' '')" -export LESS_TERMCAP_ue="$(printf '%b' '')" -export LESSOPEN="| /usr/bin/highlight -O ansi %s 2>/dev/null" -export QT_QPA_PLATFORMTHEME="gtk2" # Have QT use gtk2 theme. -export MOZ_USE_XINPUT2="1" # Mozilla smooth scrolling/touchpads. -export AWT_TOOLKIT="MToolkit wmname LG3D" #May have to install wmname -export _JAVA_AWT_WM_NONREPARENTING=1 # Fix for Java applications in dwm - -export $(dbus-launch) - -# This is the list for lf icons: -export LF_ICONS="di=📁:\ -fi=📃:\ -tw=🤝:\ -ow=📂:\ -ln=⛓:\ -or=❌:\ -ex=🎯:\ -*.txt=✍:\ -*.mom=✍:\ -*.me=✍:\ -*.ms=✍:\ -*.png=🖼:\ -*.webp=🖼:\ -*.ico=🖼:\ -*.jpg=📸:\ -*.jpe=📸:\ -*.jpeg=📸:\ -*.gif=🖼:\ -*.svg=🗺:\ -*.tif=🖼:\ -*.tiff=🖼:\ -*.xcf=🖌:\ -*.html=🌎:\ -*.xml=📰:\ -*.gpg=🔒:\ -*.css=🎨:\ -*.pdf=📚:\ -*.djvu=📚:\ -*.epub=📚:\ -*.csv=📓:\ -*.xlsx=📓:\ -*.tex=📜:\ -*.md=📘:\ -*.r=📊:\ -*.R=📊:\ -*.rmd=📊:\ -*.Rmd=📊:\ -*.m=📊:\ -*.mp3=🎵:\ -*.opus=🎵:\ -*.ogg=🎵:\ -*.m4a=🎵:\ -*.flac=🎼:\ -*.mkv=🎥:\ -*.mp4=🎥:\ -*.webm=🎥:\ -*.mpeg=🎥:\ -*.avi=🎥:\ -*.zip=📦:\ -*.rar=📦:\ -*.7z=📦:\ -*.tar.gz=📦:\ -*.z64=🎮:\ -*.v64=🎮:\ -*.n64=🎮:\ -*.gba=🎮:\ -*.nes=🎮:\ -*.gdi=🎮:\ -*.1=ℹ:\ -*.nfo=ℹ:\ -*.info=ℹ:\ -*.log=📙:\ -*.iso=📀:\ -*.img=📀:\ -*.bib=🎓:\ -*.ged=👪:\ -*.part=💔:\ -*.torrent=🔽:\ -*.jar=♨:\ -*.java=♨:\ -" - -[ ! -f ${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc ] && shortcuts >/dev/null 2>&1 & - -if pacman -Qs libxft-bgra >/dev/null 2>&1; then - # Start graphical server on tty1 if not already running. - [ "$(tty)" = "/dev/tty1" ] && ! pidof Xorg >/dev/null 2>&1 && exec startx -else - echo "\033[31mIMPORTANT\033[0m: Note that \033[32m\`libxft-bgra\`\033[0m must be installed for this build of dwm. -Please run: - \033[32myay -S libxft-bgra-git\033[0m -and replace \`libxft\`" -fi - -# Switch escape and caps if tty and no passwd required: -sudo -n loadkeys ${XDG_DATA_HOME:-$HOME/.local/share}/larbs/ttymaps.kmap 2>/dev/null - -# modifications by HEALPixAutoConf 3.80 -[ -r /home/tibeuleu/.healpix/3_80_Linux/config ] && . /home/tibeuleu/.healpix/3_80_Linux/config diff --git a/.config/shell/shortcutrc b/.config/shell/shortcutrc index 2639922..ad9f7f7 100755 --- a/.config/shell/shortcutrc +++ b/.config/shell/shortcutrc @@ -1,7 +1,7 @@ # vim: filetype=sh alias cac="cd ${XDG_CACHE_HOME:-$HOME/.cache} && ls -a" \ cf="cd ${XDG_CONFIG_HOME:-$HOME/.config} && ls -a" \ -cfv="cd ${XDG_CONFIG_HOME:-$HOME/.config}/nvim && ls -a" \ +cfv="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/" \ cl="cd ${XDG_LOCAL_HOME:-$HOME/.local} && ls -a" \ dt="cd ${XDG_DATA_HOME:-$HOME/.local/share} && ls -a" \ sc="cd ${XDG_LOCAL_HOME:-$HOME/.local}/bin && ls -a" \