From c7da1983e6e394babf1024a623d7f771d236417a Mon Sep 17 00:00:00 2001 From: deadguy Date: Thu, 10 Dec 2020 16:06:52 -0300 Subject: [PATCH] Now on tildegit --- .config/alacritty.yml | 2 +- .config/bspwm/bspwmrc | 4 +- .config/fontconfig/fonts.conf | 22 +---- .config/git/config | 24 +---- .config/lf/lfrc | 23 +++-- .config/neomutt/neomuttrc | 2 +- .../neomutt/neomuttrc.d/bindings.neomuttrc | 8 +- .config/nvim/after/ftplugin/html.vim | 4 +- .config/nvim/after/ftplugin/markdown.vim | 4 +- .config/nvim/init.vim | 4 +- .config/nvim/plugin/fm.vim | 2 +- .config/nvim/plugin/mappings/fzf.vim | 3 +- .config/nvim/plugin/mappings/normal.vim | 3 + .config/zsh/conf/03_aliases.zsh | 10 +- .config/zsh/conf/05_zmarks.zsh | 3 +- .config/zsh/conf/20_autocompletar.zsh | 12 +++ .local/bin/escribir | 27 ++++-- .local/bin/fp | 93 ------------------- .local/bin/postear | 2 +- .local/bin/strim | 19 ++-- .local/bin/strimtext | 4 +- .local/bin/zu | 2 +- .zshenv | 1 + doc/xbpaketes | 12 ++- 24 files changed, 107 insertions(+), 183 deletions(-) delete mode 100755 .local/bin/fp diff --git a/.config/alacritty.yml b/.config/alacritty.yml index 6fbf84c..a1e3a95 100644 --- a/.config/alacritty.yml +++ b/.config/alacritty.yml @@ -5,7 +5,7 @@ window: padding: x: 10 - y: 5 + y: 2 dynamic_title: true diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index f0eb982..4dee133 100755 --- a/.config/bspwm/bspwmrc +++ b/.config/bspwm/bspwmrc @@ -7,10 +7,10 @@ bspc rule -r "*" bspc config border_width 2 bspc config window_gap 6 -bspc config top_padding 5 +bspc config top_padding 3 bspc config left_padding 0 bspc config right_padding 0 -bspc config bottom_padding 15 +bspc config bottom_padding 23 bspc config split_ratio 0.5 # Opciones diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 9476f4e..f7e5415 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -60,33 +60,17 @@ + - Iosevka + Fantasque Sans Mono - cv08 - cv90 - cv43 - cv51 - cv46 - cv65 - cv19 - cv54 + ss01 - - - Iosevka - - - liga off - dlig off - calt off - - diff --git a/.config/git/config b/.config/git/config index d3324c1..321dae1 100644 --- a/.config/git/config +++ b/.config/git/config @@ -2,8 +2,10 @@ st = status fx = commit --fixup=HEAD ci = commit -v + cm = commit -m ri = rebase -i --autosquash wc = whatchanged + ass = add amend = commit --amend -v full = show --format=fuller noed = commit --amend --no-edit @@ -11,25 +13,9 @@ fz = !sha=$( git -c color.ui=always log --oneline -n 1000 | fzf +s --no-multi --prompt 'Fixup> ' ) && git commit --fixup "${sha%% *}" wd = "!f() { git --paginate diff --dirstat=cumulative,files,0 ${1:-HEAD} | awk '{print $2}' | cut -d / -f1-${2:-4} | sort | uniq; }; f" -[hub] - protocol = ssh - [http] sslVerify = true -[user] - name = DeadGit - email = adeadgit@gmail.com - -[sendemail] - smtpserver = smtp.gmail.com - smtpuser = adeadgit@gmail.com - chainreplyto = false - suppresscc = self - confirm = auto - smtpencryption = tls - smtpserverport = 587 - [core] editor = nvr --remote-wait-silent autocrlf = input @@ -65,12 +51,12 @@ [credential] helper = /usr/libexec/git-core/git-credential-libsecret -[mergetool "nvim"] - cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\" - [merge] tool = nvim +[mergetool "nvim"] + cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\" + [mergetool] prompt = false diff --git a/.config/lf/lfrc b/.config/lf/lfrc index 3dc649a..c96eaf9 100644 --- a/.config/lf/lfrc +++ b/.config/lf/lfrc @@ -287,21 +287,26 @@ map / $lf -remote "send $id select \"$(FZF_DEFAULT_COMMAND='fd --max-depth=1' fz map F $find | lf -remote "send $id select $(fzf --reverse --border --margin 2% --inline-info --color border:#005688,bg+:#16252E,fg+:#26c6da,hl+:#ffffff,hl:#26c6da)" #global find # Movement -map gd cd ~/doc/ +map gR cd / map gE cd /etc map gU cd /usr -map ge cd ~/etc +map gM cd /media +map gl cd ~/.local/share +map gg cd ~/.local/share/go +map ga cd ~/.local/apps +map gb cd ~/.local/bin map g. cd ~/.config map gn cd ~/.config/nvim map gz cd ~/.config/zsh -map gl cd ~/.local/share -map gM cd /media map gm cd ~/snd/Albums -map gr cd /mnt/remote -map gc cd /mnt/cel -map gb cd ~/.local/bin -map gR cd / +map gd cd ~/doc +map gp cd ~/doc/paginas +map gv cd ~/vid +map ge cd ~/etc +map gi cd ~/img map gv cd ~/vid/Learning -map gp cd ~/img +map gc cd /mnt/cel +map gr cd /mnt/remote + map cg $$EDITOR ~/.config/lf/lfrc map sg source ~/.config/lf/lfrc diff --git a/.config/neomutt/neomuttrc b/.config/neomutt/neomuttrc index 8a4e2e1..703e3bb 100644 --- a/.config/neomutt/neomuttrc +++ b/.config/neomutt/neomuttrc @@ -71,4 +71,4 @@ reply-hook "~C 2" "set sleep_time=10\;echo 'Warning, original message has multip # https://forums.gentoo.org/viewtopic-t-148115-start-0.html set display_filter="sed -e '/\\[-- Type: text.* --\\]/d' | sed -e '/\\[-- Autoview.* --\\]/d' | sed -e '/\\[-- Type.* --\\]/d' | sed -e '/\\[-- .*unsupported.* --\\]/d' | sed -e '/\\[-- Attachment #[0-9] --\\]/d' | sed -e 's/Attachment #[0-9]: //g' | sed '/./,/^$/!d'" -source accounts/1-alex.muttrc +source accounts/6-dgy@fuckup.club.muttrc diff --git a/.config/neomutt/neomuttrc.d/bindings.neomuttrc b/.config/neomutt/neomuttrc.d/bindings.neomuttrc index 7941755..6348d10 100644 --- a/.config/neomutt/neomuttrc.d/bindings.neomuttrc +++ b/.config/neomutt/neomuttrc.d/bindings.neomuttrc @@ -50,9 +50,9 @@ macro index A "all\n" "show all messages (undo limit)" macro browser h '..' "Go to parent folder" -macro index,pager 'source ~/.config/neomutt/accounts/1-alex.muttrc!;' "switch to vidaar@gmail.com" -macro index,pager 'source ~/.config/neomutt/accounts/2-alejo.muttrc!;' "switch to alejo.jardon@gmail.com" -macro index,pager 'source ~/.config/neomutt/accounts/3-git.muttrc!;' "switch to adeadgit@gmail.com" +macro index,pager 'source ~/.config/neomutt/accounts/1-alex.muttrc!;' "switch to vidaar@gmail.com" +macro index,pager 'source ~/.config/neomutt/accounts/2-alejo.muttrc!;' "switch to alejo.jardon@gmail.com" +macro index,pager 'source ~/.config/neomutt/accounts/3-git.muttrc!;' "switch to adeadgit@gmail.com" macro index,pager 'source ~/.config/neomutt/accounts/4-iamz@airmail.cc.muttrc!;' "switch to iamz@airmail.cc" -macro index,pager 'source /home/deadguy/.config/neomutt/accounts/6-dgy@fuckup.club.muttrc!;' "switch to dgy@fuckup.club" # mw-autogenerated +macro index,pager 'source /home/deadguy/.config/neomutt/accounts/6-dgy@fuckup.club.muttrc!;' "switch to dgy@fuckup.club" # mw-autogenerated macro index,pager a "set my_pipe_decode=\$pipe_decode pipe_decodeabook --add-emailset pipe_decode=\$my_pipe_decode; unset my_pipe_decode" "add the sender address to abook" diff --git a/.config/nvim/after/ftplugin/html.vim b/.config/nvim/after/ftplugin/html.vim index 3c5ab84..6a20171 100644 --- a/.config/nvim/after/ftplugin/html.vim +++ b/.config/nvim/after/ftplugin/html.vim @@ -1,2 +1,2 @@ -let b:ale_linters = ['tidy'] -let b:ale_fixers = ['prettier'] +" let b:ale_linters = ['tidy'] +" let b:ale_fixers = ['prettier'] diff --git a/.config/nvim/after/ftplugin/markdown.vim b/.config/nvim/after/ftplugin/markdown.vim index 975de5b..5abbdae 100644 --- a/.config/nvim/after/ftplugin/markdown.vim +++ b/.config/nvim/after/ftplugin/markdown.vim @@ -1,8 +1,8 @@ setlocal nonumber norelativenumber laststatus=0 showmode setlocal signcolumn=no textwidth=80 wrap sw=2 setlocal tabstop=2 expandtab softtabstop=2 linebreak -setlocal autoindent noruler colorcolumn=80 synmaxcol=0 -setlocal spell spelllang=es_AR,en_us,cjk +setlocal autoindent ruler colorcolumn=80 +setlocal spell spelllang=es,en_us,cjk setlocal formatoptions& setlocal formatoptions+=tqn setlocal formatlistpat=^\\s*\\(\\d\\+\\\|[a-z]\\)[\\].)]\\s* diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 30762bb..83259a5 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -16,7 +16,9 @@ if empty(glob('~/.local/share/nvim/site/autoload/plug.vim')) autocmd VimEnter * PlugInstall --sync | call coc#util#install() | source $MYVIMRC endif -let $GIT_EDITOR = 'nvr -cc split --remote-wait' +if has('nvim') + let $GIT_EDITOR = 'nvr -cc split --remote-wait' +endif let mapleader="\" let maplocalleader=',' diff --git a/.config/nvim/plugin/fm.vim b/.config/nvim/plugin/fm.vim index 3beadac..ac49614 100644 --- a/.config/nvim/plugin/fm.vim +++ b/.config/nvim/plugin/fm.vim @@ -47,7 +47,7 @@ function! s:defx_my_settings() abort nnoremap h defx#do_action('close_tree') nnoremap defx#do_action('multi', ['drop', 'quit']) nnoremap defx#do_action('multi', [['open', 'botright vsplit'], 'quit']) - nnoremap defx#do_action('multi', [['open', 'topleft split'], 'quit']) + nnoremap defx#do_action('multi', [['open', 'botright split'], 'quit']) nnoremap t defx#do_action('multi', [['drop', 'tabnew'], 'quit']) nnoremap D defx#do_action('new_directory') nnoremap F defx#do_action('new_multiple_files') diff --git a/.config/nvim/plugin/mappings/fzf.vim b/.config/nvim/plugin/mappings/fzf.vim index 9b072a3..65d466f 100644 --- a/.config/nvim/plugin/mappings/fzf.vim +++ b/.config/nvim/plugin/mappings/fzf.vim @@ -2,4 +2,5 @@ nnoremap :Helptags nnoremap :Files =expand("%:h")/ nnoremap :Files nnoremap :Buffers -nnoremap :Rg +nnoremap :Rg +nnoremap :Commits diff --git a/.config/nvim/plugin/mappings/normal.vim b/.config/nvim/plugin/mappings/normal.vim index c212e65..a8aa158 100644 --- a/.config/nvim/plugin/mappings/normal.vim +++ b/.config/nvim/plugin/mappings/normal.vim @@ -89,3 +89,6 @@ nnoremap sw " What about the Q nnoremap Q map q + +" Paths +cnoremap =expand("%:p:h") . "/" diff --git a/.config/zsh/conf/03_aliases.zsh b/.config/zsh/conf/03_aliases.zsh index 53188b4..2ddce76 100644 --- a/.config/zsh/conf/03_aliases.zsh +++ b/.config/zsh/conf/03_aliases.zsh @@ -4,16 +4,18 @@ alias \ x='xui' \ m='neomutt' \ z='zathura' \ + b='bombadillo' \ + g='git' \ se='sudoedit' \ am='alsamixer -c 1' \ pm='pulsemixer' \ nb='newsboat -q' \ py='python ' \ + gw='glow -p -w 80' \ + ttx='txtnish timeline' \ vdf='nvim -d' \ - git='lab' \ irc='catgirl' \ play='ncmpcpp' \ - glow='glow -p -w 80' \ pyserv='python -m http.server' # XBPS @@ -78,6 +80,7 @@ alias \ grep='grep --color=tty -d skip' \ dmesg='dmesg --color=always' \ vsv='sudo vsv -c yes' \ + ip='ip -c' \ # Con opciones por defecto alias \ @@ -90,8 +93,9 @@ alias \ ping='ping -c 5' \ dd='dd status=progress' \ dfc='dfc -dmT' \ - # strim='mpv --jack-port="OBS Jack Input"' \ + wget="wget --no-hsts" slrn='slrn -i ~/.config/slrn/rc -f ~/.config/slrn/jnewsrc.club --create' + # strim='mpv --jack-port="OBS Jack Input"' \ # Comandos alias \ diff --git a/.config/zsh/conf/05_zmarks.zsh b/.config/zsh/conf/05_zmarks.zsh index b406ed3..37b4d4c 100644 --- a/.config/zsh/conf/05_zmarks.zsh +++ b/.config/zsh/conf/05_zmarks.zsh @@ -7,8 +7,9 @@ hash -d gn=$XDG_CONFIG_HOME/nvim hash -d gz=$ZDOTDIR hash -d gm=$HOME/snd/Albums hash -d gd=$HOME/doc +hash -d gp=$HOME/doc/paginas hash -d gv=$HOME/vid hash -d ge=$HOME/etc -hash -d gp=$HOME/img +hash -d gi=$HOME/img hash -d gc=/mnt/cel hash -d gr=/mnt/remote diff --git a/.config/zsh/conf/20_autocompletar.zsh b/.config/zsh/conf/20_autocompletar.zsh index 6797c2e..608c81a 100644 --- a/.config/zsh/conf/20_autocompletar.zsh +++ b/.config/zsh/conf/20_autocompletar.zsh @@ -68,3 +68,15 @@ zstyle ':completion:*:default' list-colors '=(#b)*(-- *)=36=33' ' zstyle ':completion:*' rehash true zstyle ':completion:*' list-separator " " zstyle ':completion:*' list-dirs-first true + +zstyle -e ':completion:*:hosts' hosts 'reply=()' + +# Don't complete uninteresting users... +zstyle ':completion:*:*:*:users' ignored-patterns \ + adm amanda apache avahi beaglidx bin cacti canna clamav daemon \ + dbus distcache dovecot fax ftp games gdm gkrellmd gopher \ + hacluster haldaemon halt hsqldb ident junkbust ldap lp mail \ + mailman mailnull mldonkey mysql nagios \ + named netdump news nfsnobody nobody nscd ntp nut nx openvpn \ + operator pcap postfix postgres privoxy pulse pvm quagga radvd \ + rpc rpcuser rpm shutdown squid sshd sync uucp vcsa xfs '_*' diff --git a/.local/bin/escribir b/.local/bin/escribir index fdacb21..e7cb3ad 100755 --- a/.local/bin/escribir +++ b/.local/bin/escribir @@ -1,7 +1,10 @@ #!/bin/sh +MAINDIR="$HOME/doc" +ARTDIR="$MAINDIR/paginas/tilde" + diario() { - cd "$HOME/doc/blog" || exit + cd "$MAINDIR/diario" || exit menuBlog=$(printf "Hoy\\nMañana\\nAyer\\nArchivo" | listar -p " ") case $menuBlog in "Hoy") abrir "$(date -I)".md ;; @@ -12,7 +15,7 @@ diario() { } notas() { - cd "$HOME/doc/notas" || exit + cd "$MAINDIR/notas" || exit menuNota=$(printf "Nueva\\nArchivo" | listar -p " ") case $menuNota in "Nueva") @@ -25,13 +28,25 @@ notas() { } articulo() { - cd "$HOME/doc/dgy.io" || exit + menuArticulo=$(printf "Fuckup\\nMuert.o\\nDotfiles\\nTextArt" | listar -p " ") + case $menuArticulo in + "Fuckup") cd "$ARTDIR/fuckup.club/blog" || exit ;; + "Dotfiles") cd "$ARTDIR/club/the-dot-files" || exit ;; + "TextArt") cd "$ARTDIR/town/textarrrgh" || exit ;; + "Muert.o") cd "$ARTDIR/texto-plano/muert.o" || exit ;; + esac nombre="$(listar -theme dprompt -p "Titulo: ")" 2>/dev/null [ -z "$nombre" ] && exit 0 nombreForm="$(echo "$nombre" | tr ' ' '-')" - hugo new articulos/"$nombreForm".md - sleep 5 - abrir content/articulos/"$nombre".md + if [ "$PWD" = "$ARTDIR/texto-plano/muert.o" ]; then + hugo new articulos/"$nombreForm".md + sleep 5 + abrir content/articulos/"$nombre".md + else + hugo new posts/"$nombreForm".md + sleep 5 + abrir content/posts/"$nombre".md + fi } abrir() { ${TERMINAL:-alacritty} --class=flota -e nvim "$@"; } diff --git a/.local/bin/fp b/.local/bin/fp deleted file mode 100755 index 92537c9..0000000 --- a/.local/bin/fp +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -# Font preview with ueberzug and fzf -# https://github.com/OliverLew/fontpreview-ueberzug -# Dependencies: imagemagick, ueberzug, fzf, fontconfig -# This is inspired by https://github.com/sdushantha/fontpreview - -# Checking for environment variables if available. -# These are compatible with original fontpreview. -SIZE=${FONTPREVIEW_SIZE:-800x800} -FONT_SIZE=${FONTPREVIEW_FONT_SIZE:-50} -BG_COLOR=${FONTPREVIEW_BG_COLOR:-#080808} -FG_COLOR=${FONTPREVIEW_FG_COLOR:-#b3b1ad} -PREVIEW_TEXT=${FONTPREVIEW_PREVIEW_TEXT:-"Jackdaws Love\nMy Big Sphinx\nOf Quartz\n\n1234567890\n¡!@#$\%|^&*\n',.;:_-=+\"\n(){}[]<>¿?ñÑ"} - -# Ueberzug related variables -FIFO="/tmp/fontpreview-ueberzug-fifo" -IMAGE="/tmp/fontpreview-ueberzug-img.png" -ID="fontpreview-ueberzug" -WIDTH=$(tput cols) -HEIGHT=$(tput lines) - -usage() { - echo "Usage: fontpreview [-h] [-s FONT_SIZE] [-b BG] [-f FG] [-t TEXT]" -} - -start_ueberzug() { - mkfifo "$FIFO" || exit 1 - touch "$IMAGE" || exit 1 - ueberzug layer --parser simple --silent <"$FIFO" & - # https://github.com/seebye/ueberzug/issues/54#issuecomment-502869935 - exec 3>"$FIFO" -} - -stop_ueberzug() { - exec 3>&- - rm "$FIFO" "$IMAGE" >/dev/null 2>&1 -} - -preview() { - # In fzf the cols and lines are those of the preview pane - [ -f "$1" ] || fontfile=$(fc-match -f "%{file}" "$1") - convert -size "$SIZE" xc:"$BG_COLOR" -fill "$FG_COLOR" \ - -pointsize "$FONT_SIZE" -font "$fontfile" -gravity center \ - -annotate +0+0 "$PREVIEW_TEXT" "$IMAGE" && - { - printf "action\tadd\tidentifier\t%s\t" "$ID" - printf "x\t%d\ty\t%d\tpath\t%s\t" 2 1 "$IMAGE" - printf "width\t%d\theight\t%d\n" "$WIDTH" "$HEIGHT" - } >"$FIFO" || - printf "action\tremove\tidentifier\t%s\n" "$ID" >"$FIFO" -} - -while getopts "hs:b:f:t:" arg; do - case "$arg" in - s) FONT_SIZE=$OPTARG ;; - b) BG_COLOR=$OPTARG ;; - f) FG_COLOR=$OPTARG ;; - t) PREVIEW_TEXT=$OPTARG ;; - *) - usage - exit - ;; - esac -done -shift $((OPTIND - 1)) - -if [ "$#" = 0 ]; then - trap stop_ueberzug EXIT QUIT INT TERM - # Check if dependencies are installed - for dependency in ueberzug convert fzf fc-list; do - command -v "$dependency" >/dev/null 2>&1 || - { - echo "Please install ${dependency}." >&2 - exit 1 - } - done - # Prepare - start_ueberzug - # Export cli args as environment variables for preview command - export FONTPREVIEW_FONT_SIZE="$FONT_SIZE" - export FONTPREVIEW_BG_COLOR="$BG_COLOR" - export FONTPREVIEW_FG_COLOR="$FG_COLOR" - export FONTPREVIEW_PREVIEW_TEXT="$PREVIEW_TEXT" - # The preview command runs this script again with an argument - fc-list -f "%{family}:%{style}\n" | - while IFS=: read -r family style; do - echo "${family%,*}${style:+:${style%,*}}" - done | sort | uniq | - fzf --reverse --cycle --preview "sh $0 {}" \ - --preview-window "left:$((WIDTH / 2)):noborder:wrap" -elif [ "$#" = 1 ]; then - [ -p "$FIFO" ] && preview "$1" -fi diff --git a/.local/bin/postear b/.local/bin/postear index 02b84d5..464ad21 100755 --- a/.local/bin/postear +++ b/.local/bin/postear @@ -1,5 +1,5 @@ #!/bin/sh -cd "$HOME/doc/dgy.io" || exit +cd "$HOME/doc/paginas/muert.o" || exit git add content/articulos/* && git commit -m "nuevo post" git push diff --git a/.local/bin/strim b/.local/bin/strim index 3397d30..0d8379b 100755 --- a/.local/bin/strim +++ b/.local/bin/strim @@ -10,17 +10,19 @@ GOPMIN="$FPS" CBR="2500k" QUALITY="ultrafast" AUDIO_RATE="44100" -TEXT_X="W-(W+tw)*mod(t,10)/10" -TEXT_Y="5" -TEXT_BORDER_COLOR="black" -TEXT_BORDER="5" -FONT_COLOR="white" -FONT_SIZE="24" -FONT="$XDG_DATA_HOME/fonts/SanFrancisco/SF-Pro-Display-Regular.otf" -TEXT="$HOME/doc/strimtext.txt" +# TEXT_X="W-(W+tw)*mod(t,10)/10" +# TEXT_Y="5" +# TEXT_BORDER_COLOR="black" +# TEXT_BORDER="5" +# FONT_COLOR="white" +# FONT_SIZE="24" +# FONT="$XDG_DATA_HOME/fonts/SanFrancisco/SF-Pro-Display-Regular.otf" +# TEXT="/tmp/strimtext.txt" SERVER="live-sao" STREAM_KEY="$(pass dgy-twitch)" +# -vf "drawtext=fontfile='$FONT':textfile='$TEXT':reload=1:x='$TEXT_X':y='$TEXT_Y':fontsize='$FONT_SIZE':fontcolor='$FONT_COLOR':bordercolor='$TEXT_BORDER_COLOR':borderw='$TEXT_BORDER'" \ + ffmpeg \ -thread_queue_size 4096 \ -f x11grab \ @@ -48,5 +50,4 @@ ffmpeg \ -acodec aac \ -b:a 160k \ -bufsize $CBR \ - -vf "drawtext=fontfile='$FONT':textfile='$TEXT':reload=1:x='$TEXT_X':y='$TEXT_Y':fontsize='$FONT_SIZE':fontcolor='$FONT_COLOR':bordercolor='$TEXT_BORDER_COLOR':borderw='$TEXT_BORDER'" \ "rtmp://$SERVER.twitch.tv/app/$STREAM_KEY" diff --git a/.local/bin/strimtext b/.local/bin/strimtext index c32a675..c908685 100755 --- a/.local/bin/strimtext +++ b/.local/bin/strimtext @@ -1,6 +1,6 @@ #!/bin/sh -FILE="/tmp/strimtemp.txt" +FILE="$HOME/doc/strimtext.txt" printf "%s" "$@" > "$FILE" -mv "$FILE" "$HOME/doc/strimtext.txt" +cp "$FILE" "/tmp/strimtext.txt" diff --git a/.local/bin/zu b/.local/bin/zu index df8fea9..9d8e382 100755 --- a/.local/bin/zu +++ b/.local/bin/zu @@ -17,7 +17,7 @@ if [ -f "$archive" ] ; then *.rar) unrar x -ad "$archive" ;; *.gz) gunzip "$archive" ;; *.tar) tar xvf "$archive" ;; - *.zip) unzip "$archive" ;; + *.zip|*.ZIP) unzip "$archive" ;; *.Z) uncompress "$archive" ;; *.7z) 7z x "$archive" ;; *.xz) unxz "$archive" ;; diff --git a/.zshenv b/.zshenv index 6deb055..6e89f21 100644 --- a/.zshenv +++ b/.zshenv @@ -38,6 +38,7 @@ export NPM_CONFIG_USERCONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/npm/npmrc" export NODE_REPL_HISTORY="${XDG_DATA_HOME:-$HOME/.local/share}/node_repl_history" export RANDFILE="${XDG_DATA_HOME:-$HOME/.local/share}/rnd" export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go" +export ANSIBLE_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/ansible/ansible.cfg" export HISTFILE="${XDG_DATA_HOME:-$HOME/.local/share}/bash/history" export HIGHLIGHT_OPTIONS='--out-format="ansi" --style="pablo"' export GTK2_RC_FILES="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-2.0/gtkrc-2.0" diff --git a/doc/xbpaketes b/doc/xbpaketes index d4c324b..595eefd 100644 --- a/doc/xbpaketes +++ b/doc/xbpaketes @@ -31,13 +31,13 @@ file-roller firefox fluidsynth freepats +fuse-sshfs fzf gcc giada git git-extras git-libsecret -glibc-32bit glow gnome-ssh-askpass gnupg2 @@ -51,7 +51,6 @@ haveged highlight hsetroot htop -hub i3lock-color intel-ucode isync @@ -65,13 +64,13 @@ libopenal libressl-devel librsvg librsvg-utils -libstdc++-32bit libva-intel-driver lm_sensors lynx maim mdadm mlocate +mosh mpc mpd mpv @@ -89,7 +88,9 @@ notmuch noto-fonts-cjk noto-fonts-emoji noto-fonts-ttf +obs p7zip +pandoc pass patch pinentry-gtk @@ -103,7 +104,6 @@ python3 python3-ansible-lint python3-pip qjackctl -revive ripgrep rkhunter rofi @@ -118,6 +118,7 @@ sxhkd sxiv texlive-bin thermald +tidy5 timidity tmux toilet @@ -127,9 +128,10 @@ udevil unclutter-xfixes unrar unzip -void-repo-multilib void-repo-nonfree vsv +weechat +weechat-python xbacklight xclip xcompmgr