diff --git a/_linux/_cli/htop/htoprc b/_linux/_cli/htop/htoprc deleted file mode 100644 index ea09abd..0000000 --- a/_linux/_cli/htop/htoprc +++ /dev/null @@ -1,39 +0,0 @@ -# Beware! This file is rewritten by htop when settings are changed in the interface. -# The parser is also very primitive, and not human-friendly. -fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=39 -sort_direction=1 -tree_sort_key=0 -tree_sort_direction=1 -hide_kernel_threads=1 -hide_userland_threads=1 -shadow_other_users=1 -show_thread_names=0 -show_program_path=1 -highlight_base_name=0 -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=1 -header_margin=1 -detailed_cpu_time=0 -cpu_count_from_one=0 -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=0 -enable_mouse=1 -delay=15 -left_meters=AllCPUs Memory Swap -left_meter_modes=1 1 1 -right_meters=Tasks LoadAverage Uptime -right_meter_modes=2 2 2 -hide_function_bar=0 diff --git a/_linux/_cli/zsh/.zshenv b/_linux/_cli/zsh/.zshenv deleted file mode 100644 index d7db53c..0000000 --- a/_linux/_cli/zsh/.zshenv +++ /dev/null @@ -1,11 +0,0 @@ -skip_global_compinit=1 -export XDG_CACHE_HOME=/tmp/${USER}-cache -export XDG_CONFIG_HOME=$HOME/.config -export XDG_DATA_HOME=$HOME/.local/share -export XDG_STATE_HOME=$HOME/.local/state -export HISTSIZE=10000 -export SAVEHIST=$HISTSIZE -export HISTFILE=$XDG_DATA_HOME/zsh/history -# if test -z "$XDG_RUNTIME_DIR"; then -# export XDG_RUNTIME_DIR=$(mktemp -d /tmp/$(id -u)-runtime-dir.XXX) -# fi diff --git a/_linux/_cli/zsh/.zshrc b/_linux/_cli/zsh/.zshrc deleted file mode 100644 index fa41f5c..0000000 --- a/_linux/_cli/zsh/.zshrc +++ /dev/null @@ -1,69 +0,0 @@ -if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=$(mktemp -d /tmp/$(id -u)-runtime-dir.XXX) -fi - -# prepare directories -mkdir -p $XDG_CACHE_HOME/zsh -mkdir -p $XDG_DATA_HOME/zsh - -# global exports and options -setopt HIST_IGNORE_ALL_DUPS -setopt HIST_SAVE_NO_DUPS -setopt HIST_REDUCE_BLANKS -setopt SHARE_HISTORY -setopt INC_APPEND_HISTORY - -# set path -path=(~/.local/bin "$path[@]") - -# source configuration -source $ZDOTDIR/aliases.zsh -source $ZDOTDIR/cleanhome.zsh -source $ZDOTDIR/keys.zsh -source $ZDOTDIR/ssh.zsh -source $ZDOTDIR/fzf.zsh - -# source modules -source ~/.local/git/zsh_modules/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh -source ~/.local/git/zsh_modules/wd/wd.plugin.zsh -export WD_CONFIG=$XDG_CONFIG_HOME/wd_list - -# set fpath -fpath=(~/.local/git/zsh_modules/wd $fpath) - -# theme and colors -if [[ $(command -v vivid) ]]; then - export LS_COLORS=$(vivid generate molokai) -else - unset LS_COLORS -fi -tabs 2 -export STARSHIP_CACHE="$XDG_CACHE_HOME"/starship -eval "$(STARSHIP_CACHE="$XDG_CACHE_HOME"/starship starship init zsh)" - -# completion -zstyle ':completion:*' menu select -zstyle ':completion:*' list-colors '' - -autoload -Uz compinit -if [ ! -e $XDG_DATA_HOME/zsh/zcompdump.zwc ]; then - autoload -Uz zrecompile - zrecompile -p -R $XDG_DATA_HOME/zsh/zcompdump -fi -if [[ -n $XDG_DATA_HOME/zsh/zcompdump(#qN.mh+24) ]]; then - compinit -d $XDG_DATA_HOME/zsh/zcompdump -else - compinit -C -d $XDG_DATA_HOME/zsh/zcompdump -fi - -# quick note functionality -if [[ -f ~/.note ]]; then - echo - cat ~/.note - echo -fi - -# local settings -if [[ -f ~/.local/config/zsh ]]; then - source ~/.local/config/zsh -fi diff --git a/_linux/_cli/zsh/aliases.zsh b/_linux/_cli/zsh/aliases.zsh deleted file mode 100644 index cca07a7..0000000 --- a/_linux/_cli/zsh/aliases.zsh +++ /dev/null @@ -1,58 +0,0 @@ -LOCAL_GIT_DIR=${HOME}/.local/git - -alias ga='git add .; git commit --no-edit --amend; git push --force-with-lease' -alias gae='git add .; git commit --amend; git push --force-with-lease' -alias less='less -R' -alias lg="lazygit" -alias qt="dbus-run-session qtile start -b wayland" - -if [[ $(command -v bat) ]]; then - alias cat='bat -pp --color=always --tabs=2 --theme=Monokai\ Extended\ Bright' -fi - -if [[ $(command -v eza) ]]; then - alias ls='eza --git --octal-permissions --no-permissions --group-directories-first' - alias ll='eza --git --octal-permissions --no-permissions --group-directories-first -l' -else - case $(uname -s) in; - Darwin) alias ls='ls -G';; - Linux) alias ls='ls --color';; - esac - alias ll='ls -l' -fi - -if [[ $(command -v fd) ]]; then - if [[ -f ~/.local/config/fd ]]; then - alias fd='fd -H -L --ignore-file ~/.local/config/fd' - else - alias fd='fd -H -L' - fi -fi - -if [ $(command -v nvim) ]; then - export EDITOR=nvim - export MANPAGER="nvim +Man!" - alias vim=nvim - alias vimdiff="nvim -d" -elif [ $(command -v vim) ] ; then - export EDITOR=vim -else - export EDITOR=vi -fi - -if [[ $(command -v rg) ]]; then - alias grep='rg -i' -else - alias grep='grep --color' -fi - -function ud() { - for i in ${LOCAL_GIT_DIR}/dotfiles ${LOCAL_GIT_DIR}/zsh_modules/*; do git -C ${i} pull; done - nvim -c "lua require('lazy').sync({wait = true})" -} -function upgrade() { - case $(lsb_release -si) in - Gentoo) eix-sync && eix-update && emerge -avuNDU @world ;; - VoidLinux) xbps-install -Su && xbps-remove -RoO && xlocate -S ;; - esac -} diff --git a/_linux/_cli/zsh/cleanhome.zsh b/_linux/_cli/zsh/cleanhome.zsh deleted file mode 100644 index abc794e..0000000 --- a/_linux/_cli/zsh/cleanhome.zsh +++ /dev/null @@ -1,3 +0,0 @@ -export GNUPGHOME="$XDG_DATA_HOME/gnupg" -export LESSHISTFILE='/dev/null' -mkdir -p ~/.local/share/tig diff --git a/_linux/_cli/zsh/fzf.zsh b/_linux/_cli/zsh/fzf.zsh deleted file mode 100644 index 441de95..0000000 --- a/_linux/_cli/zsh/fzf.zsh +++ /dev/null @@ -1,17 +0,0 @@ -if [[ $(command -v fzf) ]]; then - case $(lsb_release -si) in - Gentoo) source /usr/share/zsh/site-functions/_fzf ;; - VoidLinux) source /usr/share/fzf/completion.zsh ;; - esac - source /usr/share/fzf/key-bindings.zsh - export FZF_DEFAULT_COMMAND='fd -H -L --ignore-file ~/.local/config/fd' - export FZF_CTRL_T_COMMAND='fd -H -L --ignore-file ~/.local/config/fd' - export FZF_DEFAULT_OPTS="--multi -e --ansi --layout=reverse --preview='bat --color=always --tabs=2 --style=plain --theme=Monokai\ Extended\ Bright {}'" - export FZF_CTRL_R_OPTS="-e --ansi --layout=reverse --preview=''" - _fzf_compgen_path() { - fd -H -L --ignore-file ~/.local/config/fd . "$1" - } - _fzf_compgen_dir() { - fd -H -L --ignore-file ~/.local/config/fd --type d . "$1" - } -fi diff --git a/_linux/_gui/install.sh b/_linux/_gui/install.sh deleted file mode 100644 index 16d6052..0000000 --- a/_linux/_gui/install.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# variables -LOCAL_BIN_DIR=${HOME}/.local/bin -XDG_CONFIG_HOME=${HOME}/.config - -# prepare local dirs -mkdir -p ${XDG_CONFIG_HOME} ${LOCAL_BIN_DIR} - -# install configs -for i in _configs/*; do - rm -rf ${XDG_CONFIG_HOME}/$(basename $i) - ln -sf $(pwd)/${i} ${XDG_CONFIG_HOME} -done - -# install scripts -for i in _scripts/*; do - ln -sf $(pwd)/${i} ${LOCAL_BIN_DIR} -done diff --git a/_linux/_suckless/dmenu/LICENSE b/_saved/_suckless/dmenu/LICENSE similarity index 100% rename from _linux/_suckless/dmenu/LICENSE rename to _saved/_suckless/dmenu/LICENSE diff --git a/_linux/_suckless/dmenu/Makefile b/_saved/_suckless/dmenu/Makefile similarity index 100% rename from _linux/_suckless/dmenu/Makefile rename to _saved/_suckless/dmenu/Makefile diff --git a/_linux/_suckless/dmenu/README.md b/_saved/_suckless/dmenu/README.md similarity index 100% rename from _linux/_suckless/dmenu/README.md rename to _saved/_suckless/dmenu/README.md diff --git a/_linux/_suckless/dmenu/arg.h b/_saved/_suckless/dmenu/arg.h similarity index 100% rename from _linux/_suckless/dmenu/arg.h rename to _saved/_suckless/dmenu/arg.h diff --git a/_linux/_suckless/dmenu/config.def.h b/_saved/_suckless/dmenu/config.def.h similarity index 100% rename from _linux/_suckless/dmenu/config.def.h rename to _saved/_suckless/dmenu/config.def.h diff --git a/_linux/_suckless/dmenu/config.h b/_saved/_suckless/dmenu/config.h similarity index 100% rename from _linux/_suckless/dmenu/config.h rename to _saved/_suckless/dmenu/config.h diff --git a/_linux/_suckless/dmenu/config.mk b/_saved/_suckless/dmenu/config.mk similarity index 100% rename from _linux/_suckless/dmenu/config.mk rename to _saved/_suckless/dmenu/config.mk diff --git a/_linux/_suckless/dmenu/dmenu.1 b/_saved/_suckless/dmenu/dmenu.1 similarity index 100% rename from _linux/_suckless/dmenu/dmenu.1 rename to _saved/_suckless/dmenu/dmenu.1 diff --git a/_linux/_suckless/dmenu/dmenu.c b/_saved/_suckless/dmenu/dmenu.c similarity index 100% rename from _linux/_suckless/dmenu/dmenu.c rename to _saved/_suckless/dmenu/dmenu.c diff --git a/_linux/_suckless/dmenu/dmenu_path b/_saved/_suckless/dmenu/dmenu_path similarity index 100% rename from _linux/_suckless/dmenu/dmenu_path rename to _saved/_suckless/dmenu/dmenu_path diff --git a/_linux/_suckless/dmenu/dmenu_run b/_saved/_suckless/dmenu/dmenu_run similarity index 100% rename from _linux/_suckless/dmenu/dmenu_run rename to _saved/_suckless/dmenu/dmenu_run diff --git a/_linux/_suckless/dmenu/drw.c b/_saved/_suckless/dmenu/drw.c similarity index 100% rename from _linux/_suckless/dmenu/drw.c rename to _saved/_suckless/dmenu/drw.c diff --git a/_linux/_suckless/dmenu/drw.h b/_saved/_suckless/dmenu/drw.h similarity index 100% rename from _linux/_suckless/dmenu/drw.h rename to _saved/_suckless/dmenu/drw.h diff --git a/_linux/_suckless/dmenu/stest.1 b/_saved/_suckless/dmenu/stest.1 similarity index 100% rename from _linux/_suckless/dmenu/stest.1 rename to _saved/_suckless/dmenu/stest.1 diff --git a/_linux/_suckless/dmenu/stest.c b/_saved/_suckless/dmenu/stest.c similarity index 100% rename from _linux/_suckless/dmenu/stest.c rename to _saved/_suckless/dmenu/stest.c diff --git a/_linux/_suckless/dmenu/util.c b/_saved/_suckless/dmenu/util.c similarity index 100% rename from _linux/_suckless/dmenu/util.c rename to _saved/_suckless/dmenu/util.c diff --git a/_linux/_suckless/dmenu/util.h b/_saved/_suckless/dmenu/util.h similarity index 100% rename from _linux/_suckless/dmenu/util.h rename to _saved/_suckless/dmenu/util.h diff --git a/_linux/_suckless/dwm/LICENSE b/_saved/_suckless/dwm/LICENSE similarity index 100% rename from _linux/_suckless/dwm/LICENSE rename to _saved/_suckless/dwm/LICENSE diff --git a/_linux/_suckless/dwm/Makefile b/_saved/_suckless/dwm/Makefile similarity index 100% rename from _linux/_suckless/dwm/Makefile rename to _saved/_suckless/dwm/Makefile diff --git a/_linux/_suckless/dwm/README.md b/_saved/_suckless/dwm/README.md similarity index 100% rename from _linux/_suckless/dwm/README.md rename to _saved/_suckless/dwm/README.md diff --git a/_linux/_suckless/dwm/_patches/dwm-preserveonrestart-6.3.diff b/_saved/_suckless/dwm/_patches/dwm-preserveonrestart-6.3.diff similarity index 100% rename from _linux/_suckless/dwm/_patches/dwm-preserveonrestart-6.3.diff rename to _saved/_suckless/dwm/_patches/dwm-preserveonrestart-6.3.diff diff --git a/_linux/_suckless/dwm/_patches/dwm-tagschemes-1.0.diff b/_saved/_suckless/dwm/_patches/dwm-tagschemes-1.0.diff similarity index 100% rename from _linux/_suckless/dwm/_patches/dwm-tagschemes-1.0.diff rename to _saved/_suckless/dwm/_patches/dwm-tagschemes-1.0.diff diff --git a/_linux/_suckless/dwm/config.def.h b/_saved/_suckless/dwm/config.def.h similarity index 100% rename from _linux/_suckless/dwm/config.def.h rename to _saved/_suckless/dwm/config.def.h diff --git a/_linux/_suckless/dwm/config.h b/_saved/_suckless/dwm/config.h similarity index 100% rename from _linux/_suckless/dwm/config.h rename to _saved/_suckless/dwm/config.h diff --git a/_linux/_suckless/dwm/config.mk b/_saved/_suckless/dwm/config.mk similarity index 100% rename from _linux/_suckless/dwm/config.mk rename to _saved/_suckless/dwm/config.mk diff --git a/_linux/_suckless/dwm/drw.c b/_saved/_suckless/dwm/drw.c similarity index 100% rename from _linux/_suckless/dwm/drw.c rename to _saved/_suckless/dwm/drw.c diff --git a/_linux/_suckless/dwm/drw.h b/_saved/_suckless/dwm/drw.h similarity index 100% rename from _linux/_suckless/dwm/drw.h rename to _saved/_suckless/dwm/drw.h diff --git a/_linux/_suckless/dwm/dwm.1 b/_saved/_suckless/dwm/dwm.1 similarity index 100% rename from _linux/_suckless/dwm/dwm.1 rename to _saved/_suckless/dwm/dwm.1 diff --git a/_linux/_suckless/dwm/dwm.c b/_saved/_suckless/dwm/dwm.c similarity index 100% rename from _linux/_suckless/dwm/dwm.c rename to _saved/_suckless/dwm/dwm.c diff --git a/_linux/_suckless/dwm/transient.c b/_saved/_suckless/dwm/transient.c similarity index 100% rename from _linux/_suckless/dwm/transient.c rename to _saved/_suckless/dwm/transient.c diff --git a/_linux/_suckless/dwm/util.c b/_saved/_suckless/dwm/util.c similarity index 100% rename from _linux/_suckless/dwm/util.c rename to _saved/_suckless/dwm/util.c diff --git a/_linux/_suckless/dwm/util.h b/_saved/_suckless/dwm/util.h similarity index 100% rename from _linux/_suckless/dwm/util.h rename to _saved/_suckless/dwm/util.h diff --git a/_linux/_suckless/dwm/vanitygaps.c b/_saved/_suckless/dwm/vanitygaps.c similarity index 100% rename from _linux/_suckless/dwm/vanitygaps.c rename to _saved/_suckless/dwm/vanitygaps.c diff --git a/_linux/_suckless/dwmblocks/LICENSE b/_saved/_suckless/dwmblocks/LICENSE similarity index 100% rename from _linux/_suckless/dwmblocks/LICENSE rename to _saved/_suckless/dwmblocks/LICENSE diff --git a/_linux/_suckless/dwmblocks/Makefile b/_saved/_suckless/dwmblocks/Makefile similarity index 100% rename from _linux/_suckless/dwmblocks/Makefile rename to _saved/_suckless/dwmblocks/Makefile diff --git a/_linux/_suckless/dwmblocks/_scripts/sb-battery b/_saved/_suckless/dwmblocks/_scripts/sb-battery similarity index 100% rename from _linux/_suckless/dwmblocks/_scripts/sb-battery rename to _saved/_suckless/dwmblocks/_scripts/sb-battery diff --git a/_linux/_suckless/dwmblocks/_scripts/sb-mail b/_saved/_suckless/dwmblocks/_scripts/sb-mail similarity index 100% rename from _linux/_suckless/dwmblocks/_scripts/sb-mail rename to _saved/_suckless/dwmblocks/_scripts/sb-mail diff --git a/_linux/_suckless/dwmblocks/_scripts/sb-network b/_saved/_suckless/dwmblocks/_scripts/sb-network similarity index 100% rename from _linux/_suckless/dwmblocks/_scripts/sb-network rename to _saved/_suckless/dwmblocks/_scripts/sb-network diff --git a/_linux/_suckless/dwmblocks/_scripts/sb-vol-in b/_saved/_suckless/dwmblocks/_scripts/sb-vol-in similarity index 100% rename from _linux/_suckless/dwmblocks/_scripts/sb-vol-in rename to _saved/_suckless/dwmblocks/_scripts/sb-vol-in diff --git a/_linux/_suckless/dwmblocks/_scripts/sb-vol-out b/_saved/_suckless/dwmblocks/_scripts/sb-vol-out similarity index 100% rename from _linux/_suckless/dwmblocks/_scripts/sb-vol-out rename to _saved/_suckless/dwmblocks/_scripts/sb-vol-out diff --git a/_linux/_suckless/dwmblocks/blocks.def.h b/_saved/_suckless/dwmblocks/blocks.def.h similarity index 100% rename from _linux/_suckless/dwmblocks/blocks.def.h rename to _saved/_suckless/dwmblocks/blocks.def.h diff --git a/_linux/_suckless/dwmblocks/blocks.h b/_saved/_suckless/dwmblocks/blocks.h similarity index 100% rename from _linux/_suckless/dwmblocks/blocks.h rename to _saved/_suckless/dwmblocks/blocks.h diff --git a/_linux/_suckless/dwmblocks/dwmblocks.c b/_saved/_suckless/dwmblocks/dwmblocks.c similarity index 100% rename from _linux/_suckless/dwmblocks/dwmblocks.c rename to _saved/_suckless/dwmblocks/dwmblocks.c diff --git a/_linux/_suckless/dwmblocks/install-scripts.sh b/_saved/_suckless/dwmblocks/install-scripts.sh similarity index 100% rename from _linux/_suckless/dwmblocks/install-scripts.sh rename to _saved/_suckless/dwmblocks/install-scripts.sh diff --git a/_linux/_suckless/slock/LICENSE b/_saved/_suckless/slock/LICENSE similarity index 100% rename from _linux/_suckless/slock/LICENSE rename to _saved/_suckless/slock/LICENSE diff --git a/_linux/_suckless/slock/Makefile b/_saved/_suckless/slock/Makefile similarity index 100% rename from _linux/_suckless/slock/Makefile rename to _saved/_suckless/slock/Makefile diff --git a/_linux/_suckless/slock/README.md b/_saved/_suckless/slock/README.md similarity index 100% rename from _linux/_suckless/slock/README.md rename to _saved/_suckless/slock/README.md diff --git a/_linux/_suckless/slock/arg.h b/_saved/_suckless/slock/arg.h similarity index 100% rename from _linux/_suckless/slock/arg.h rename to _saved/_suckless/slock/arg.h diff --git a/_linux/_suckless/slock/config.def.h b/_saved/_suckless/slock/config.def.h similarity index 100% rename from _linux/_suckless/slock/config.def.h rename to _saved/_suckless/slock/config.def.h diff --git a/_linux/_suckless/slock/config.h b/_saved/_suckless/slock/config.h similarity index 100% rename from _linux/_suckless/slock/config.h rename to _saved/_suckless/slock/config.h diff --git a/_linux/_suckless/slock/config.mk b/_saved/_suckless/slock/config.mk similarity index 100% rename from _linux/_suckless/slock/config.mk rename to _saved/_suckless/slock/config.mk diff --git a/_linux/_suckless/slock/explicit_bzero.c b/_saved/_suckless/slock/explicit_bzero.c similarity index 100% rename from _linux/_suckless/slock/explicit_bzero.c rename to _saved/_suckless/slock/explicit_bzero.c diff --git a/_linux/_suckless/slock/slock.1 b/_saved/_suckless/slock/slock.1 similarity index 100% rename from _linux/_suckless/slock/slock.1 rename to _saved/_suckless/slock/slock.1 diff --git a/_linux/_suckless/slock/slock.c b/_saved/_suckless/slock/slock.c similarity index 100% rename from _linux/_suckless/slock/slock.c rename to _saved/_suckless/slock/slock.c diff --git a/_linux/_suckless/slock/util.h b/_saved/_suckless/slock/util.h similarity index 100% rename from _linux/_suckless/slock/util.h rename to _saved/_suckless/slock/util.h diff --git a/_linux/_suckless/st/LICENSE b/_saved/_suckless/st/LICENSE similarity index 100% rename from _linux/_suckless/st/LICENSE rename to _saved/_suckless/st/LICENSE diff --git a/_linux/_suckless/st/Makefile b/_saved/_suckless/st/Makefile similarity index 100% rename from _linux/_suckless/st/Makefile rename to _saved/_suckless/st/Makefile diff --git a/_linux/_suckless/st/README.md b/_saved/_suckless/st/README.md similarity index 100% rename from _linux/_suckless/st/README.md rename to _saved/_suckless/st/README.md diff --git a/_linux/_suckless/st/arg.h b/_saved/_suckless/st/arg.h similarity index 100% rename from _linux/_suckless/st/arg.h rename to _saved/_suckless/st/arg.h diff --git a/_linux/_suckless/st/config.def.h b/_saved/_suckless/st/config.def.h similarity index 100% rename from _linux/_suckless/st/config.def.h rename to _saved/_suckless/st/config.def.h diff --git a/_linux/_suckless/st/config.h b/_saved/_suckless/st/config.h similarity index 100% rename from _linux/_suckless/st/config.h rename to _saved/_suckless/st/config.h diff --git a/_linux/_suckless/st/config.mk b/_saved/_suckless/st/config.mk similarity index 100% rename from _linux/_suckless/st/config.mk rename to _saved/_suckless/st/config.mk diff --git a/_linux/_suckless/st/st.1 b/_saved/_suckless/st/st.1 similarity index 100% rename from _linux/_suckless/st/st.1 rename to _saved/_suckless/st/st.1 diff --git a/_linux/_suckless/st/st.c b/_saved/_suckless/st/st.c similarity index 100% rename from _linux/_suckless/st/st.c rename to _saved/_suckless/st/st.c diff --git a/_linux/_suckless/st/st.h b/_saved/_suckless/st/st.h similarity index 100% rename from _linux/_suckless/st/st.h rename to _saved/_suckless/st/st.h diff --git a/_linux/_suckless/st/st.info b/_saved/_suckless/st/st.info similarity index 100% rename from _linux/_suckless/st/st.info rename to _saved/_suckless/st/st.info diff --git a/_linux/_suckless/st/win.h b/_saved/_suckless/st/win.h similarity index 100% rename from _linux/_suckless/st/win.h rename to _saved/_suckless/st/win.h diff --git a/_linux/_suckless/st/x.c b/_saved/_suckless/st/x.c similarity index 100% rename from _linux/_suckless/st/x.c rename to _saved/_suckless/st/x.c diff --git a/_linux/_unused/autorandr/home-dp0/config b/_saved/autorandr/home-dp0/config similarity index 100% rename from _linux/_unused/autorandr/home-dp0/config rename to _saved/autorandr/home-dp0/config diff --git a/_linux/_unused/autorandr/home-dp0/setup b/_saved/autorandr/home-dp0/setup similarity index 100% rename from _linux/_unused/autorandr/home-dp0/setup rename to _saved/autorandr/home-dp0/setup diff --git a/_linux/_unused/autorandr/home-dp1/config b/_saved/autorandr/home-dp1/config similarity index 100% rename from _linux/_unused/autorandr/home-dp1/config rename to _saved/autorandr/home-dp1/config diff --git a/_linux/_unused/autorandr/home-dp1/setup b/_saved/autorandr/home-dp1/setup similarity index 100% rename from _linux/_unused/autorandr/home-dp1/setup rename to _saved/autorandr/home-dp1/setup diff --git a/_linux/_unused/autorandr/nomad/config b/_saved/autorandr/nomad/config similarity index 100% rename from _linux/_unused/autorandr/nomad/config rename to _saved/autorandr/nomad/config diff --git a/_linux/_unused/autorandr/nomad/setup b/_saved/autorandr/nomad/setup similarity index 100% rename from _linux/_unused/autorandr/nomad/setup rename to _saved/autorandr/nomad/setup diff --git a/_linux/_unused/clipit/clipitrc b/_saved/clipit/clipitrc similarity index 100% rename from _linux/_unused/clipit/clipitrc rename to _saved/clipit/clipitrc diff --git a/_linux/_unused/dunst/dunstrc b/_saved/dunst/dunstrc similarity index 100% rename from _linux/_unused/dunst/dunstrc rename to _saved/dunst/dunstrc diff --git a/_linux/_cli/fastfetch/config.jsonc b/_saved/fastfetch/config.jsonc similarity index 100% rename from _linux/_cli/fastfetch/config.jsonc rename to _saved/fastfetch/config.jsonc diff --git a/_linux/_cli/fastfetch/gentoo.png b/_saved/fastfetch/gentoo.png similarity index 100% rename from _linux/_cli/fastfetch/gentoo.png rename to _saved/fastfetch/gentoo.png diff --git a/_linux/_unused/rofi/config.rasi b/_saved/rofi/config.rasi similarity index 100% rename from _linux/_unused/rofi/config.rasi rename to _saved/rofi/config.rasi diff --git a/_linux/_unused/urxvt.xresources b/_saved/urxvt.xresources similarity index 100% rename from _linux/_unused/urxvt.xresources rename to _saved/urxvt.xresources diff --git a/_linux/_unused/xinitrc b/_saved/xinitrc similarity index 100% rename from _linux/_unused/xinitrc rename to _saved/xinitrc diff --git a/_linux/_unused/zathura/zathurarc b/_saved/zathura/zathurarc similarity index 100% rename from _linux/_unused/zathura/zathurarc rename to _saved/zathura/zathurarc diff --git a/scripts/post-install.sh b/_scripts/post-install.sh similarity index 100% rename from scripts/post-install.sh rename to _scripts/post-install.sh diff --git a/scripts/post-update.sh b/_scripts/post-update.sh similarity index 100% rename from scripts/post-update.sh rename to _scripts/post-update.sh diff --git a/config/atuin/config.toml b/config/common/atuin/config.toml similarity index 100% rename from config/atuin/config.toml rename to config/common/atuin/config.toml diff --git a/config/atuin/default.toml b/config/common/atuin/default.toml similarity index 100% rename from config/atuin/default.toml rename to config/common/atuin/default.toml diff --git a/config/fd/ignore b/config/common/fd/ignore similarity index 100% rename from config/fd/ignore rename to config/common/fd/ignore diff --git a/config/git/config b/config/common/git/config similarity index 100% rename from config/git/config rename to config/common/git/config diff --git a/config/git/ignore b/config/common/git/ignore similarity index 100% rename from config/git/ignore rename to config/common/git/ignore diff --git a/config/glow/glow.yml b/config/common/glow/glow.yml similarity index 100% rename from config/glow/glow.yml rename to config/common/glow/glow.yml diff --git a/config/nvim/.gitignore b/config/common/nvim/.gitignore similarity index 100% rename from config/nvim/.gitignore rename to config/common/nvim/.gitignore diff --git a/config/nvim/.neoconf.json b/config/common/nvim/.neoconf.json similarity index 100% rename from config/nvim/.neoconf.json rename to config/common/nvim/.neoconf.json diff --git a/config/nvim/LICENSE b/config/common/nvim/LICENSE similarity index 100% rename from config/nvim/LICENSE rename to config/common/nvim/LICENSE diff --git a/config/nvim/README.md b/config/common/nvim/README.md similarity index 100% rename from config/nvim/README.md rename to config/common/nvim/README.md diff --git a/config/nvim/init.lua b/config/common/nvim/init.lua similarity index 100% rename from config/nvim/init.lua rename to config/common/nvim/init.lua diff --git a/config/nvim/lua/config/autocmds.lua b/config/common/nvim/lua/config/autocmds.lua similarity index 100% rename from config/nvim/lua/config/autocmds.lua rename to config/common/nvim/lua/config/autocmds.lua diff --git a/config/nvim/lua/config/keymaps.lua b/config/common/nvim/lua/config/keymaps.lua similarity index 100% rename from config/nvim/lua/config/keymaps.lua rename to config/common/nvim/lua/config/keymaps.lua diff --git a/config/nvim/lua/config/lazy.lua b/config/common/nvim/lua/config/lazy.lua similarity index 100% rename from config/nvim/lua/config/lazy.lua rename to config/common/nvim/lua/config/lazy.lua diff --git a/config/nvim/lua/config/options.lua b/config/common/nvim/lua/config/options.lua similarity index 100% rename from config/nvim/lua/config/options.lua rename to config/common/nvim/lua/config/options.lua diff --git a/config/nvim/lua/plugins/init.lua b/config/common/nvim/lua/plugins/init.lua similarity index 100% rename from config/nvim/lua/plugins/init.lua rename to config/common/nvim/lua/plugins/init.lua diff --git a/config/nvim/stylua.toml b/config/common/nvim/stylua.toml similarity index 100% rename from config/nvim/stylua.toml rename to config/common/nvim/stylua.toml diff --git a/config/tmux/tmux.conf b/config/common/tmux/tmux.conf similarity index 100% rename from config/tmux/tmux.conf rename to config/common/tmux/tmux.conf diff --git a/_linux/_cli/zsh/.zlogout b/config/common/zsh/.zlogout similarity index 100% rename from _linux/_cli/zsh/.zlogout rename to config/common/zsh/.zlogout diff --git a/config/zsh/.zshenv b/config/common/zsh/.zshenv similarity index 77% rename from config/zsh/.zshenv rename to config/common/zsh/.zshenv index 2f83654..47d8cce 100644 --- a/config/zsh/.zshenv +++ b/config/common/zsh/.zshenv @@ -11,3 +11,8 @@ export ZDOTDIR="${XDG_CONFIG_HOME}/zsh" export DOCKER_CONFIG="${XDG_CONFIG_HOME}/docker" export GNUPGHOME="${XDG_DATA_HOME}/gnupg" export LESSHISTFILE='/dev/null' + +# linux only +# if test -z "$XDG_RUNTIME_DIR"; then +# export XDG_RUNTIME_DIR=$(mktemp -d /tmp/$(id -u)-runtime-dir.XXX) +# fi diff --git a/config/zsh/.zshrc b/config/common/zsh/.zshrc similarity index 100% rename from config/zsh/.zshrc rename to config/common/zsh/.zshrc diff --git a/config/zsh/aliases.zsh b/config/common/zsh/aliases.zsh similarity index 97% rename from config/zsh/aliases.zsh rename to config/common/zsh/aliases.zsh index fb7614f..457a060 100644 --- a/config/zsh/aliases.zsh +++ b/config/common/zsh/aliases.zsh @@ -65,7 +65,7 @@ fi function ud() { for i in ${LOCAL_GIT_DIR}/dotfiles ${LOCAL_GIT_DIR}/zsh_modules/*; do git -C ${i} pull; done - . "${LOCAL_GIT_DIR}/dotfiles/scripts/post-update.sh" + . "${LOCAL_GIT_DIR}/dotfiles/_scripts/scripts/post-update.sh" } function upgrade() { diff --git a/config/common/zsh/atuin.zsh b/config/common/zsh/atuin.zsh new file mode 100644 index 0000000..287b2b3 --- /dev/null +++ b/config/common/zsh/atuin.zsh @@ -0,0 +1,3 @@ +if [[ $(command -v atuin) ]]; then + eval "$(atuin init zsh --disable-up-arrow)" +fi diff --git a/config/zsh/fzf.zsh b/config/common/zsh/fzf.zsh similarity index 100% rename from config/zsh/fzf.zsh rename to config/common/zsh/fzf.zsh diff --git a/_linux/_cli/zsh/keys.zsh b/config/common/zsh/keys.zsh similarity index 100% rename from _linux/_cli/zsh/keys.zsh rename to config/common/zsh/keys.zsh diff --git a/config/zsh/p10k.zsh b/config/common/zsh/p10k.zsh similarity index 100% rename from config/zsh/p10k.zsh rename to config/common/zsh/p10k.zsh diff --git a/_linux/_cli/zsh/ssh.zsh b/config/common/zsh/ssh.zsh similarity index 100% rename from _linux/_cli/zsh/ssh.zsh rename to config/common/zsh/ssh.zsh diff --git a/_linux/_gui/_configs/foot/foot.ini b/config/linux-gui/_conf/foot/foot.ini similarity index 100% rename from _linux/_gui/_configs/foot/foot.ini rename to config/linux-gui/_conf/foot/foot.ini diff --git a/_linux/_gui/_configs/gammastep/config.ini b/config/linux-gui/_conf/gammastep/config.ini similarity index 100% rename from _linux/_gui/_configs/gammastep/config.ini rename to config/linux-gui/_conf/gammastep/config.ini diff --git a/_linux/_gui/_configs/gtk-3.0/settings.ini b/config/linux-gui/_conf/gtk-3.0/settings.ini similarity index 100% rename from _linux/_gui/_configs/gtk-3.0/settings.ini rename to config/linux-gui/_conf/gtk-3.0/settings.ini diff --git a/_linux/_gui/_configs/qtile/chars/emoji b/config/linux-gui/_conf/qtile/chars/emoji similarity index 100% rename from _linux/_gui/_configs/qtile/chars/emoji rename to config/linux-gui/_conf/qtile/chars/emoji diff --git a/_linux/_gui/_configs/qtile/common.py b/config/linux-gui/_conf/qtile/common.py similarity index 100% rename from _linux/_gui/_configs/qtile/common.py rename to config/linux-gui/_conf/qtile/common.py diff --git a/_linux/_gui/_configs/qtile/config.py b/config/linux-gui/_conf/qtile/config.py similarity index 100% rename from _linux/_gui/_configs/qtile/config.py rename to config/linux-gui/_conf/qtile/config.py diff --git a/_linux/_gui/_configs/qtile/examples/autostart.sh b/config/linux-gui/_conf/qtile/examples/autostart.sh similarity index 100% rename from _linux/_gui/_configs/qtile/examples/autostart.sh rename to config/linux-gui/_conf/qtile/examples/autostart.sh diff --git a/_linux/_gui/_configs/qtile/examples/autostop.sh b/config/linux-gui/_conf/qtile/examples/autostop.sh similarity index 100% rename from _linux/_gui/_configs/qtile/examples/autostop.sh rename to config/linux-gui/_conf/qtile/examples/autostop.sh diff --git a/_linux/_gui/_configs/qtile/examples/custom.py b/config/linux-gui/_conf/qtile/examples/custom.py similarity index 100% rename from _linux/_gui/_configs/qtile/examples/custom.py rename to config/linux-gui/_conf/qtile/examples/custom.py diff --git a/_linux/_gui/_configs/qtile/wallpaper.img b/config/linux-gui/_conf/qtile/wallpaper.img similarity index 100% rename from _linux/_gui/_configs/qtile/wallpaper.img rename to config/linux-gui/_conf/qtile/wallpaper.img diff --git a/_linux/_gui/_configs/xdg-desktop-portal/portals.conf b/config/linux-gui/_conf/xdg-desktop-portal/portals.conf similarity index 100% rename from _linux/_gui/_configs/xdg-desktop-portal/portals.conf rename to config/linux-gui/_conf/xdg-desktop-portal/portals.conf diff --git a/_linux/_gui/_scripts/sb-battery b/config/linux-gui/_scripts/sb-battery similarity index 100% rename from _linux/_gui/_scripts/sb-battery rename to config/linux-gui/_scripts/sb-battery diff --git a/_linux/_gui/_scripts/sb-volume b/config/linux-gui/_scripts/sb-volume similarity index 100% rename from _linux/_gui/_scripts/sb-volume rename to config/linux-gui/_scripts/sb-volume diff --git a/_linux/_gui/_scripts/sb-wireguard b/config/linux-gui/_scripts/sb-wireguard similarity index 100% rename from _linux/_gui/_scripts/sb-wireguard rename to config/linux-gui/_scripts/sb-wireguard diff --git a/_linux/_gui/_scripts/selector-audio b/config/linux-gui/_scripts/selector-audio similarity index 100% rename from _linux/_gui/_scripts/selector-audio rename to config/linux-gui/_scripts/selector-audio diff --git a/_linux/_gui/_scripts/selector-chars b/config/linux-gui/_scripts/selector-chars similarity index 100% rename from _linux/_gui/_scripts/selector-chars rename to config/linux-gui/_scripts/selector-chars diff --git a/config/zsh/atuin.zsh b/config/zsh/atuin.zsh deleted file mode 100644 index 132d103..0000000 --- a/config/zsh/atuin.zsh +++ /dev/null @@ -1,3 +0,0 @@ - if [[ $(command -v atuin) ]]; then - eval "$(atuin init zsh --disable-up-arrow)" - fi diff --git a/config/zsh/keys.zsh b/config/zsh/keys.zsh deleted file mode 100644 index cc9eef1..0000000 --- a/config/zsh/keys.zsh +++ /dev/null @@ -1,22 +0,0 @@ -# key mode -bindkey -e - -# proudly stolen from oh-my-zsh -if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then - function zle-line-init() { - echoti smkx - } - function zle-line-finish() { - echoti rmkx - } - zle -N zle-line-init - zle -N zle-line-finish -fi -if [[ -n "${terminfo[kcuu1]}" ]]; then - autoload -U up-line-or-beginning-search - zle -N up-line-or-beginning-search - - bindkey -M emacs "${terminfo[kcuu1]}" up-line-or-beginning-search - bindkey -M viins "${terminfo[kcuu1]}" up-line-or-beginning-search - bindkey -M vicmd "${terminfo[kcuu1]}" up-line-or-beginning-search -fi diff --git a/install.sh b/install.sh index 41230ac..88cee7e 100644 --- a/install.sh +++ b/install.sh @@ -2,37 +2,55 @@ # shellcheck disable=SC1091 # variables +LOCAL_BIN_DIR=${HOME}/.local/bin LOCAL_GIT_DIR="${HOME}/.local/git" XDG_CACHE_HOME="/tmp/${USER}-cache" XDG_CONFIG_HOME="${HOME}/.config" XDG_DATA_HOME="${HOME}/.local/share" XDG_STATE_HOME="${HOME}/.local/state" -# clean + prepare local dirs -rm -rf ~/.cache ~/.config/_cache ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.hushlogin ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh* -rm -rf "${XDG_CACHE_HOME}" "${XDG_DATA_HOME}/nvim" "${XDG_STATE_HOME}/nvim" -mkdir -p "${XDG_CACHE_HOME}" "${XDG_CONFIG_HOME}" "${XDG_DATA_HOME}" -chmod 700 "${XDG_CACHE_HOME}" +if [ "${1}" = "linux-gui" ]; then -# prepare repository -mkdir -p "${LOCAL_GIT_DIR}" -rm -rf "${LOCAL_GIT_DIR}/dotfiles" -git clone https://git.sr.ht/~ftpd/dotfiles "${LOCAL_GIT_DIR}/dotfiles" + # install configs + for i in "${LOCAL_GIT_DIR}"/dotfiles/config/linux-gui/_conf/*; do + rm -rf "${XDG_CONFIG_HOME:?}/$(basename "${i}")" + ln -sf "${LOCAL_GIT_DIR}/dotfiles/config/linux-gui/_conf/$(basename "${i}")" "${XDG_CONFIG_HOME}/" + done -# zsh modules -mkdir -p "${LOCAL_GIT_DIR}/zsh_modules" -for module in Aloxaf/fzf-tab mfaerevaag/wd romkatv/powerlevel10k zdharma-continuum/fast-syntax-highlighting; do - rm -rf "${LOCAL_GIT_DIR}/zsh_modules/${module#*/}" - git clone https://github.com/${module} "${LOCAL_GIT_DIR}/zsh_modules/${module#*/}" -done + # install scripts + for i in "${LOCAL_GIT_DIR}"/dotfiles/config/linux-gui/_scripts/*; do + ln -sf "${LOCAL_GIT_DIR}/dotfiles/config/linux-gui/_scripts/$(basename "${i}")" "${LOCAL_BIN_DIR}/" + done -# configs -for i in "${LOCAL_GIT_DIR}"/dotfiles/config/*; do - rm -rf "${XDG_CONFIG_HOME:?}/$(basename "${i}")" - ln -sf "${LOCAL_GIT_DIR}/dotfiles/config/$(basename "${i}")" "${XDG_CONFIG_HOME}/" -done +else -# execute post-install script -printf "Running post-install script... " -. "${LOCAL_GIT_DIR}/dotfiles/scripts/post-install.sh" -echo "done." + # clean + prepare local dirs + rm -rf ~/.cache ~/.config/_cache ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.hushlogin ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh* + rm -rf "${XDG_CACHE_HOME}" "${XDG_DATA_HOME}/nvim" "${XDG_STATE_HOME}/nvim" + mkdir -p "${XDG_CACHE_HOME}" "${XDG_CONFIG_HOME}" "${XDG_DATA_HOME}" + chmod 700 "${XDG_CACHE_HOME}" + + # prepare repository + mkdir -p "${LOCAL_GIT_DIR}" + rm -rf "${LOCAL_GIT_DIR}/dotfiles" + git clone https://git.sr.ht/~ftpd/dotfiles "${LOCAL_GIT_DIR}/dotfiles" + + # zsh modules + mkdir -p "${LOCAL_GIT_DIR}/zsh_modules" + for module in Aloxaf/fzf-tab mfaerevaag/wd romkatv/powerlevel10k zdharma-continuum/fast-syntax-highlighting; do + rm -rf "${LOCAL_GIT_DIR}/zsh_modules/${module#*/}" + git clone https://github.com/${module} "${LOCAL_GIT_DIR}/zsh_modules/${module#*/}" + done + + # configs + for i in "${LOCAL_GIT_DIR}"/dotfiles/config/common/*; do + rm -rf "${XDG_CONFIG_HOME:?}/$(basename "${i}")" + ln -sf "${LOCAL_GIT_DIR}/dotfiles/config/common/$(basename "${i}")" "${XDG_CONFIG_HOME}/" + done + + # execute post-install script + printf "Running post-install script... " + . "${LOCAL_GIT_DIR}/dotfiles/_scripts/post-install.sh" + echo "done." + +fi