diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc deleted file mode 100644 index 76ab01f1..00000000 --- a/.config/shell/aliasrc +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -# sudo not required for some system commands -for command in mount umount sv pacman apt aptitude updatedb su shutdown poweroff reboot; do - command -v $command 1>/dev/null 2>&1 && alias $command="sudo $command" -done -unset command - -# Verbosity and settings that you pretty much just always are going to want. -alias \ - cp="cp -iv" \ - mv="mv -iv" \ - rm="rm -vI" \ - bc="bc -ql" \ - mkd="mkdir -pv" \ - ffmpeg="ffmpeg -hide_banner" \ - ls="ls -alhNF --color=auto --group-directories-first" \ - grep="grep --color=auto" \ - diff="diff --color=auto" \ - nvidia-settings="nvidia-settings --config=$XDG_CONFIG_HOME/nvidia/settings" - -# Colorize commands when possible. -alias \ - ls="ls -hN --color=auto --group-directories-first" \ - grep="grep --color=auto" \ - diff="diff --color=auto" \ - ccat="highlight --out-format=ansi" \ - ip="ip -color=auto" - -# These common commands are just too long! Abbreviate them. -alias \ - ka="killall" \ - e="$EDITOR" \ - z="zathura" \ - p="pacman" \ - ar="apt remove" \ - are="apt reinstall" \ - ai="apt install" \ - aur="apt autoremove" \ - au="apt upgrade" \ - kssh="kitty +kitten ssh" - -# Misc. -alias \ - subpush="git push --recurse-submodules=on-demand" \ - ref="shortcuts >/dev/null; source ${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc ; source ${XDG_CONFIG_HOME:-$HOME/.config}/shell/zshnameddirrc" \ - weath="less -S ${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport" \ - remvirt="virt-manager -c 'qemu+ssh://luca@192.168.178.200/system'" \ - vim="nvim" \ - wikidown='rclone sync cloud:files/luca/Notes ~/Documents/vimwiki' \ - wikiup='rclone sync ~/Documents/vimwiki cloud:files/luca/Notes' \ - ahv="export ANSIBLE_VAULT_PASSWORD_FILE=~/.ansible/secrets/ansible-homelab && ansible-vault" \ - xgetkeys="xev | sed -ne '/^KeyPress/,/^$/p'" \ - xpick=" xprop | awk ' - /^WM_CLASS/{sub(/.* =/, \"instance:\"); sub(/,/, \"\nclass:\"); print} - /^WM_NAME/{sub(/.* =/, \"title:\"); print}'" - -# Functions -whed() { - $EDITOR "$(which "$1")" -} diff --git a/.config/shell/profile b/.config/shell/profile deleted file mode 100644 index 8145192a..00000000 --- a/.config/shell/profile +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh - -# profile file. Runs on login. Environmental variables are set here. - -localpath="$(find -L ~/.local/bin -type d -printf %p: | sed 's/.$//')" -export PATH="$PATH:$HOME/.local/share/npm-global/bin:$localpath" -export FPATH="$FPATH:$HOME/.local/share/zsh/functions:$HOME/.local/share/zsh/site-functions" - -# Default programs: -export EDITOR="nvim" -export TERMINAL="kitty" -export BROWSER="librewolf" - -# XDG User Dirs: -export XDG_DESKTOP_DIR="$HOME/Desktop" -export XDG_DOCUMENTS_DIR="$HOME/Documents" -export XDG_DOWNLOAD_DIR="$HOME/Downloads" -export XDG_MUSIC_DIR="$HOME/Music" -export XDG_PICTURES_DIR="$HOME/Pictures" -export XDG_PUBLICSHARE_DIR="$HOME/Public" -export XDG_TEMPLATES_DIR="$HOME/Templates" -export XDG_VIDEOS_DIR="$HOME/Videos" - -# Clean-up: -export XDG_CONFIG_HOME="$HOME/.config" -export XDG_DATA_HOME="$HOME/.local/share" -export XDG_CACHE_HOME="$HOME/.cache" -export PYENVS_DIR="$XDG_DATA_HOME/virtualenv" -export KEYMAPS_DIR="$HOME/.local/bin/keymaps" -export ZSH_COMPDUMP="$XDG_CACHE_HOME/zcompdump" -export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch-config" -export GTK2_RC_FILES="$XDG_CONFIG_HOME/.config}/gtk-2.0/gtkrc-2.0" -export LESSHISTFILE="-" -export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" -export INPUTRC="$XDG_CONFIG_HOME/shell/inputrc" -export ZDOTDIR="$XDG_CONFIG_HOME/zsh" -export GNUPGHOME="$XDG_DATA_HOME/gnupg" -export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default" -export TMUX_TMPDIR="$XDG_RUNTIME_DIR" -export ANDROID_HOME="$XDG_DATA_HOME/android" -export CARGO_HOME="$XDG_DATA_HOME/cargo" -export GOPATH="$XDG_DATA_HOME/go" -export ANSIBLE_CONFIG="$XDG_CONFIG_HOME/ansible/ansible.cfg" -export ANSIBLE_HOME="$XDG_DATA_HOME/ansible" -export UNISON="$XDG_DATA_HOME/unison" -export HISTFILE="$XDG_DATA_HOME/history" -export GRADLE_USER_HOME="$XDG_DATA_HOME/gradle" -export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # WARN: This line can break some display managers -export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc -export NODE_REPL_HISTORY="$XDG_DATA_HOME"/node_repl_history -export CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nv -_JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java - -# Other program settings: -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 ANSIBLE_NOCOWS=1 # Stop those fucking cows in Ansible - -[ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startgraphical diff --git a/.config/shell/shortcutrc b/.config/shell/shortcutrc deleted file mode 100644 index 6c886968..00000000 --- a/.config/shell/shortcutrc +++ /dev/null @@ -1,28 +0,0 @@ -# vim: filetype=sh -alias h="cd /home/luca && tput cuu1;tput el" \ -ch="cd /home/luca/.cache && tput cuu1;tput el" \ -cf="cd /home/luca/.config && tput cuu1;tput el" \ -dt="cd /home/luca/.local/share && tput cuu1;tput el" \ -sr="cd /home/luca/.local/src && tput cuu1;tput el" \ -it="cd /home/luca/.local/src/git && tput cuu1;tput el" \ -sc="cd /home/luca/.local/bin && tput cuu1;tput el" \ -mn="cd /mnt && tput cuu1;tput el" \ -dl="cd /home/luca/Downloads && tput cuu1;tput el" \ -dm="cd /home/luca/Documents && tput cuu1;tput el" \ -ms="cd /home/luca/Music && tput cuu1;tput el" \ -pc="cd /home/luca/Pictures && tput cuu1;tput el" \ -vd="cd /home/luca/Videos && tput cuu1;tput el" \ -dot="cd /home/luca/.dotfiles && tput cuu1;tput el" \ -bf="$EDITOR /home/luca/.config/shell/bm-files" \ -bd="$EDITOR /home/luca/.config/shell/bm-dirs" \ -cfx="$EDITOR /home/luca/.config/x11/xresources" \ -cfX="$EDITOR /home/luca/.config/x11/xprofile" \ -cfb="$EDITOR /home/luca/.local/src/dwmblocks/config.h" \ -cfk="$EDITOR /home/luca/.config/kitty/kitty.conf" \ -cfK="$EDITOR /home/luca/.config/kitty/kittyfullscreen.conf" \ -cfv="$EDITOR /home/luca/.config/lvim/config.lua" \ -cfz="$EDITOR /home/luca/.config/zsh/.zshrc" \ -cfa="$EDITOR /home/luca/.config/shell/aliasrc" \ -cfp="$EDITOR /home/luca/.config/shell/profile" \ -cfl="$EDITOR /home/luca/.config/lf/lfrc" \ -cfL="$EDITOR /home/luca/.config/lf/preview" \ diff --git a/.config/shell/zshnameddirrc b/.config/shell/zshnameddirrc deleted file mode 100644 index 752f5c5b..00000000 --- a/.config/shell/zshnameddirrc +++ /dev/null @@ -1,27 +0,0 @@ -hash -d h=/home/luca -hash -d ch=/home/luca/.cache -hash -d cf=/home/luca/.config -hash -d dt=/home/luca/.local/share -hash -d sr=/home/luca/.local/src -hash -d it=/home/luca/.local/src/git -hash -d sc=/home/luca/.local/bin -hash -d mn=/mnt -hash -d dl=/home/luca/Downloads -hash -d dm=/home/luca/Documents -hash -d ms=/home/luca/Music -hash -d pc=/home/luca/Pictures -hash -d vd=/home/luca/Videos -hash -d dot=/home/luca/.dotfiles -hash -d bf=/home/luca/.config/shell/bm-files -hash -d bd=/home/luca/.config/shell/bm-dirs -hash -d cfx=/home/luca/.config/x11/xresources -hash -d cfX=/home/luca/.config/x11/xprofile -hash -d cfb=/home/luca/.local/src/dwmblocks/config.h -hash -d cfk=/home/luca/.config/kitty/kitty.conf -hash -d cfK=/home/luca/.config/kitty/kittyfullscreen.conf -hash -d cfv=/home/luca/.config/lvim/config.lua -hash -d cfz=/home/luca/.config/zsh/.zshrc -hash -d cfa=/home/luca/.config/shell/aliasrc -hash -d cfp=/home/luca/.config/shell/profile -hash -d cfl=/home/luca/.config/lf/lfrc -hash -d cfL=/home/luca/.config/lf/preview diff --git a/.local/bin/shortcuts b/.local/bin/shortcuts index 389c7df8..d18b1fed 100755 --- a/.local/bin/shortcuts +++ b/.local/bin/shortcuts @@ -1,8 +1,8 @@ #!/bin/sh # Inputs -bmdirs="$XDG_CONFIG_HOME/shell/dir-bookmarks" -bmfiles="$XDG_CONFIG_HOME/shell/file-bookmarks" +bmdirs="$XDG_DATA_HOME/bookmarks/directories" +bmfiles="$XDG_DATA_HOME/bookmarks/files" # Outputs shell_shortcuts="$ZDOTDIR/configs/autogenerated/shortcuts" diff --git a/.config/shell/dir-bookmarks b/.local/share/bookmarks/directories similarity index 100% rename from .config/shell/dir-bookmarks rename to .local/share/bookmarks/directories diff --git a/.config/shell/file-bookmarks b/.local/share/bookmarks/files similarity index 100% rename from .config/shell/file-bookmarks rename to .local/share/bookmarks/files