diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..f5dabb4 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,7 @@ +[*] +end_of_line = lf +insert_final_newline = true + +[*.yaml] +indent_style = space +indent_size = 2 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1af14d0 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "dotbot"] + path = dotbot + url = https://github.com/anishathalye/dotbot + ignore = dirty diff --git a/.gtkrc-2.0 b/.gtkrc-2.0 deleted file mode 100644 index ae8eea6..0000000 --- a/.gtkrc-2.0 +++ /dev/null @@ -1,18 +0,0 @@ -# DO NOT EDIT! This file will be overwritten by LXAppearance. -# Any customization should be done in ~/.gtkrc-2.0.mine instead. - -include "/var/home/nsetyo/.gtkrc-2.0.mine" -gtk-theme-name="Arc-Dark" -gtk-icon-theme-name="Papirus-Dark" -gtk-font-name="Open Sans 10" -gtk-cursor-theme-name="Adwaita" -gtk-cursor-theme-size=0 -gtk-toolbar-style=GTK_TOOLBAR_BOTH -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=0 -gtk-menu-images=0 -gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=1 -gtk-xft-antialias=1 -gtk-xft-hinting=1 -gtk-xft-hintstyle="hintfull" diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 791b642..0000000 --- a/.npmrc +++ /dev/null @@ -1,2 +0,0 @@ -cache=/home/nsetyo/.cache/npm -prefix=/home/nsetyo/.local/ diff --git a/.aliases b/aliases similarity index 100% rename from .aliases rename to aliases diff --git a/.bashrc b/bashrc similarity index 52% rename from .bashrc rename to bashrc index 9eec3b1..9683208 100644 --- a/.bashrc +++ b/bashrc @@ -1,9 +1,7 @@ # .bashrc # Source global definitions -if [ -f /etc/bashrc ]; then - . /etc/bashrc -fi +if [ -f /etc/bashrc ]; then . /etc/bashrc; fi # User specific environment if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]] @@ -15,21 +13,14 @@ export PATH # User specific aliases and functions -if [ -f ~/.aliases ]; then - . ~/.aliases -fi +if [ -f "$HOME/.aliases" ]; then . "$HOME/.aliases"; fi -if [ -f ~/.environment ]; then - . ~/.environment -fi +if [ -f "$HOME/.env" ]; then . "$HOME/.env"; fi -if command -v starship &> /dev/null -then - eval "$(starship init bash)" -fi +if [ -f "$HOME/.cargo/env" ]; then . "$HOME/.cargo/env"; fi + +if command -v starship &> /dev/null; then eval "$(starship init bash)"; fi bind '"\e[1;5A":history-search-backward' bind '"\e[1;5B":history-search-forward' - -. "$HOME/.cargo/env" diff --git a/.config/betterlockscreenrc b/config/betterlockscreenrc similarity index 100% rename from .config/betterlockscreenrc rename to config/betterlockscreenrc diff --git a/.config/gammastep/config.ini b/config/gammastep/config.ini similarity index 100% rename from .config/gammastep/config.ini rename to config/gammastep/config.ini diff --git a/.config/gtk-3.0/bookmarks b/config/gtk-3.0/bookmarks similarity index 100% rename from .config/gtk-3.0/bookmarks rename to config/gtk-3.0/bookmarks diff --git a/.config/gtk-3.0/settings.ini b/config/gtk-3.0/settings.ini similarity index 100% rename from .config/gtk-3.0/settings.ini rename to config/gtk-3.0/settings.ini diff --git a/.config/i3/config b/config/i3/config similarity index 100% rename from .config/i3/config rename to config/i3/config diff --git a/.config/kitty/kitty.conf b/config/kitty/kitty.conf similarity index 100% rename from .config/kitty/kitty.conf rename to config/kitty/kitty.conf diff --git a/.config/mako/config b/config/mako/config similarity index 100% rename from .config/mako/config rename to config/mako/config diff --git a/.config/mpv/.gitignore b/config/mpv/.gitignore similarity index 100% rename from .config/mpv/.gitignore rename to config/mpv/.gitignore diff --git a/.config/mpv/mpv.conf b/config/mpv/mpv.conf similarity index 100% rename from .config/mpv/mpv.conf rename to config/mpv/mpv.conf diff --git a/.config/polybar/cuts/colors.ini b/config/polybar/cuts/colors.ini similarity index 100% rename from .config/polybar/cuts/colors.ini rename to config/polybar/cuts/colors.ini diff --git a/.config/polybar/cuts/config.ini b/config/polybar/cuts/config.ini similarity index 100% rename from .config/polybar/cuts/config.ini rename to config/polybar/cuts/config.ini diff --git a/.config/polybar/cuts/launch.sh b/config/polybar/cuts/launch.sh similarity index 100% rename from .config/polybar/cuts/launch.sh rename to config/polybar/cuts/launch.sh diff --git a/.config/polybar/cuts/modules.ini b/config/polybar/cuts/modules.ini similarity index 100% rename from .config/polybar/cuts/modules.ini rename to config/polybar/cuts/modules.ini diff --git a/.config/polybar/cuts/preview.ini b/config/polybar/cuts/preview.ini similarity index 100% rename from .config/polybar/cuts/preview.ini rename to config/polybar/cuts/preview.ini diff --git a/.config/polybar/cuts/preview.sh b/config/polybar/cuts/preview.sh similarity index 100% rename from .config/polybar/cuts/preview.sh rename to config/polybar/cuts/preview.sh diff --git a/.config/polybar/cuts/scripts/checkupdates b/config/polybar/cuts/scripts/checkupdates similarity index 100% rename from .config/polybar/cuts/scripts/checkupdates rename to config/polybar/cuts/scripts/checkupdates diff --git a/.config/polybar/cuts/scripts/color-switch.sh b/config/polybar/cuts/scripts/color-switch.sh similarity index 100% rename from .config/polybar/cuts/scripts/color-switch.sh rename to config/polybar/cuts/scripts/color-switch.sh diff --git a/.config/polybar/cuts/scripts/colors-dark.sh b/config/polybar/cuts/scripts/colors-dark.sh similarity index 100% rename from .config/polybar/cuts/scripts/colors-dark.sh rename to config/polybar/cuts/scripts/colors-dark.sh diff --git a/.config/polybar/cuts/scripts/colors-light.sh b/config/polybar/cuts/scripts/colors-light.sh similarity index 100% rename from .config/polybar/cuts/scripts/colors-light.sh rename to config/polybar/cuts/scripts/colors-light.sh diff --git a/.config/polybar/cuts/scripts/launcher.sh b/config/polybar/cuts/scripts/launcher.sh similarity index 100% rename from .config/polybar/cuts/scripts/launcher.sh rename to config/polybar/cuts/scripts/launcher.sh diff --git a/.config/polybar/cuts/scripts/powermenu.sh b/config/polybar/cuts/scripts/powermenu.sh similarity index 100% rename from .config/polybar/cuts/scripts/powermenu.sh rename to config/polybar/cuts/scripts/powermenu.sh diff --git a/.config/polybar/cuts/scripts/pywal.sh b/config/polybar/cuts/scripts/pywal.sh similarity index 100% rename from .config/polybar/cuts/scripts/pywal.sh rename to config/polybar/cuts/scripts/pywal.sh diff --git a/.config/polybar/cuts/scripts/random.sh b/config/polybar/cuts/scripts/random.sh similarity index 100% rename from .config/polybar/cuts/scripts/random.sh rename to config/polybar/cuts/scripts/random.sh diff --git a/.config/polybar/cuts/scripts/rofi/colors.rasi b/config/polybar/cuts/scripts/rofi/colors.rasi similarity index 100% rename from .config/polybar/cuts/scripts/rofi/colors.rasi rename to config/polybar/cuts/scripts/rofi/colors.rasi diff --git a/.config/polybar/cuts/scripts/rofi/confirm.rasi b/config/polybar/cuts/scripts/rofi/confirm.rasi similarity index 100% rename from .config/polybar/cuts/scripts/rofi/confirm.rasi rename to config/polybar/cuts/scripts/rofi/confirm.rasi diff --git a/.config/polybar/cuts/scripts/rofi/launcher.rasi b/config/polybar/cuts/scripts/rofi/launcher.rasi similarity index 100% rename from .config/polybar/cuts/scripts/rofi/launcher.rasi rename to config/polybar/cuts/scripts/rofi/launcher.rasi diff --git a/.config/polybar/cuts/scripts/rofi/message.rasi b/config/polybar/cuts/scripts/rofi/message.rasi similarity index 100% rename from .config/polybar/cuts/scripts/rofi/message.rasi rename to config/polybar/cuts/scripts/rofi/message.rasi diff --git a/.config/polybar/cuts/scripts/rofi/networkmenu.rasi b/config/polybar/cuts/scripts/rofi/networkmenu.rasi similarity index 100% rename from .config/polybar/cuts/scripts/rofi/networkmenu.rasi rename to config/polybar/cuts/scripts/rofi/networkmenu.rasi diff --git a/.config/polybar/cuts/scripts/rofi/powermenu.rasi b/config/polybar/cuts/scripts/rofi/powermenu.rasi similarity index 100% rename from .config/polybar/cuts/scripts/rofi/powermenu.rasi rename to config/polybar/cuts/scripts/rofi/powermenu.rasi diff --git a/.config/polybar/cuts/scripts/rofi/styles.rasi b/config/polybar/cuts/scripts/rofi/styles.rasi similarity index 100% rename from .config/polybar/cuts/scripts/rofi/styles.rasi rename to config/polybar/cuts/scripts/rofi/styles.rasi diff --git a/.config/polybar/cuts/scripts/style-switch.sh b/config/polybar/cuts/scripts/style-switch.sh similarity index 100% rename from .config/polybar/cuts/scripts/style-switch.sh rename to config/polybar/cuts/scripts/style-switch.sh diff --git a/.config/polybar/cuts/scripts/styles.sh b/config/polybar/cuts/scripts/styles.sh similarity index 100% rename from .config/polybar/cuts/scripts/styles.sh rename to config/polybar/cuts/scripts/styles.sh diff --git a/.config/polybar/cuts/scripts/updates.sh b/config/polybar/cuts/scripts/updates.sh similarity index 100% rename from .config/polybar/cuts/scripts/updates.sh rename to config/polybar/cuts/scripts/updates.sh diff --git a/.config/polybar/cuts/user_modules.ini b/config/polybar/cuts/user_modules.ini similarity index 100% rename from .config/polybar/cuts/user_modules.ini rename to config/polybar/cuts/user_modules.ini diff --git a/.config/polybar/polybar-spotify/README.md b/config/polybar/polybar-spotify/README.md similarity index 100% rename from .config/polybar/polybar-spotify/README.md rename to config/polybar/polybar-spotify/README.md diff --git a/.config/polybar/polybar-spotify/get_spotify_status.sh b/config/polybar/polybar-spotify/get_spotify_status.sh similarity index 100% rename from .config/polybar/polybar-spotify/get_spotify_status.sh rename to config/polybar/polybar-spotify/get_spotify_status.sh diff --git a/.config/polybar/polybar-spotify/screenshots/demo.gif b/config/polybar/polybar-spotify/screenshots/demo.gif similarity index 100% rename from .config/polybar/polybar-spotify/screenshots/demo.gif rename to config/polybar/polybar-spotify/screenshots/demo.gif diff --git a/.config/polybar/polybar-spotify/screenshots/demo_mini.gif b/config/polybar/polybar-spotify/screenshots/demo_mini.gif similarity index 100% rename from .config/polybar/polybar-spotify/screenshots/demo_mini.gif rename to config/polybar/polybar-spotify/screenshots/demo_mini.gif diff --git a/.config/polybar/polybar-spotify/scroll_spotify_status.sh b/config/polybar/polybar-spotify/scroll_spotify_status.sh similarity index 100% rename from .config/polybar/polybar-spotify/scroll_spotify_status.sh rename to config/polybar/polybar-spotify/scroll_spotify_status.sh diff --git a/.config/polybar/zscroll/.gitignore b/config/polybar/zscroll/.gitignore similarity index 100% rename from .config/polybar/zscroll/.gitignore rename to config/polybar/zscroll/.gitignore diff --git a/.config/polybar/zscroll/.pre-commit-config.yaml b/config/polybar/zscroll/.pre-commit-config.yaml similarity index 100% rename from .config/polybar/zscroll/.pre-commit-config.yaml rename to config/polybar/zscroll/.pre-commit-config.yaml diff --git a/.config/polybar/zscroll/.pylintrc b/config/polybar/zscroll/.pylintrc similarity index 100% rename from .config/polybar/zscroll/.pylintrc rename to config/polybar/zscroll/.pylintrc diff --git a/.config/polybar/zscroll/.style.yapf b/config/polybar/zscroll/.style.yapf similarity index 100% rename from .config/polybar/zscroll/.style.yapf rename to config/polybar/zscroll/.style.yapf diff --git a/.config/polybar/zscroll/.travis.yml b/config/polybar/zscroll/.travis.yml similarity index 100% rename from .config/polybar/zscroll/.travis.yml rename to config/polybar/zscroll/.travis.yml diff --git a/.config/polybar/zscroll/LICENSE b/config/polybar/zscroll/LICENSE similarity index 100% rename from .config/polybar/zscroll/LICENSE rename to config/polybar/zscroll/LICENSE diff --git a/.config/polybar/zscroll/PKGBUILD b/config/polybar/zscroll/PKGBUILD similarity index 100% rename from .config/polybar/zscroll/PKGBUILD rename to config/polybar/zscroll/PKGBUILD diff --git a/.config/polybar/zscroll/README.org b/config/polybar/zscroll/README.org similarity index 100% rename from .config/polybar/zscroll/README.org rename to config/polybar/zscroll/README.org diff --git a/.config/polybar/zscroll/completion/_zscroll b/config/polybar/zscroll/completion/_zscroll similarity index 100% rename from .config/polybar/zscroll/completion/_zscroll rename to config/polybar/zscroll/completion/_zscroll diff --git a/.config/polybar/zscroll/pyproject.toml b/config/polybar/zscroll/pyproject.toml similarity index 100% rename from .config/polybar/zscroll/pyproject.toml rename to config/polybar/zscroll/pyproject.toml diff --git a/.config/polybar/zscroll/setup.py b/config/polybar/zscroll/setup.py similarity index 100% rename from .config/polybar/zscroll/setup.py rename to config/polybar/zscroll/setup.py diff --git a/.config/polybar/zscroll/test_zscroll.py b/config/polybar/zscroll/test_zscroll.py similarity index 100% rename from .config/polybar/zscroll/test_zscroll.py rename to config/polybar/zscroll/test_zscroll.py diff --git a/.config/polybar/zscroll/zscroll b/config/polybar/zscroll/zscroll similarity index 100% rename from .config/polybar/zscroll/zscroll rename to config/polybar/zscroll/zscroll diff --git a/.config/polybar/zscroll/zscroll.1 b/config/polybar/zscroll/zscroll.1 similarity index 100% rename from .config/polybar/zscroll/zscroll.1 rename to config/polybar/zscroll/zscroll.1 diff --git a/.config/redshift/redshift.conf b/config/redshift/redshift.conf similarity index 100% rename from .config/redshift/redshift.conf rename to config/redshift/redshift.conf diff --git a/.config/starship.toml b/config/starship.toml similarity index 100% rename from .config/starship.toml rename to config/starship.toml diff --git a/.config/sway/config b/config/sway/config similarity index 100% rename from .config/sway/config rename to config/sway/config diff --git a/.config/sway/config.d/01-layout-and-style.conf b/config/sway/config.d/01-layout-and-style.conf similarity index 100% rename from .config/sway/config.d/01-layout-and-style.conf rename to config/sway/config.d/01-layout-and-style.conf diff --git a/.config/sway/config.d/02-bar.conf b/config/sway/config.d/02-bar.conf similarity index 100% rename from .config/sway/config.d/02-bar.conf rename to config/sway/config.d/02-bar.conf diff --git a/.config/sway/config.d/03-workspace.conf b/config/sway/config.d/03-workspace.conf similarity index 100% rename from .config/sway/config.d/03-workspace.conf rename to config/sway/config.d/03-workspace.conf diff --git a/.config/sway/config.d/04-input.conf b/config/sway/config.d/04-input.conf similarity index 100% rename from .config/sway/config.d/04-input.conf rename to config/sway/config.d/04-input.conf diff --git a/.config/sway/config.d/05-output.conf b/config/sway/config.d/05-output.conf similarity index 100% rename from .config/sway/config.d/05-output.conf rename to config/sway/config.d/05-output.conf diff --git a/.config/sway/config.d/06-keybindings.conf b/config/sway/config.d/06-keybindings.conf similarity index 100% rename from .config/sway/config.d/06-keybindings.conf rename to config/sway/config.d/06-keybindings.conf diff --git a/.config/sway/config.d/07-idle.conf b/config/sway/config.d/07-idle.conf similarity index 100% rename from .config/sway/config.d/07-idle.conf rename to config/sway/config.d/07-idle.conf diff --git a/.config/sway/config.d/08-window-rules.conf b/config/sway/config.d/08-window-rules.conf similarity index 100% rename from .config/sway/config.d/08-window-rules.conf rename to config/sway/config.d/08-window-rules.conf diff --git a/.config/sway/config.d/09-workspace-assign.conf b/config/sway/config.d/09-workspace-assign.conf similarity index 100% rename from .config/sway/config.d/09-workspace-assign.conf rename to config/sway/config.d/09-workspace-assign.conf diff --git a/.config/sway/config.d/10-autostrat.conf b/config/sway/config.d/10-autostrat.conf similarity index 100% rename from .config/sway/config.d/10-autostrat.conf rename to config/sway/config.d/10-autostrat.conf diff --git a/.config/swaylock/config b/config/swaylock/config similarity index 100% rename from .config/swaylock/config rename to config/swaylock/config diff --git a/.config/waybar/config b/config/waybar/config similarity index 100% rename from .config/waybar/config rename to config/waybar/config diff --git a/.config/waybar/mediaplayer.py b/config/waybar/mediaplayer.py similarity index 100% rename from .config/waybar/mediaplayer.py rename to config/waybar/mediaplayer.py diff --git a/.config/waybar/style.css b/config/waybar/style.css similarity index 100% rename from .config/waybar/style.css rename to config/waybar/style.css diff --git a/.config/wofi/config b/config/wofi/config similarity index 100% rename from .config/wofi/config rename to config/wofi/config diff --git a/.config/wofi/power-menu b/config/wofi/power-menu similarity index 100% rename from .config/wofi/power-menu rename to config/wofi/power-menu diff --git a/.config/wofi/style.css b/config/wofi/style.css similarity index 100% rename from .config/wofi/style.css rename to config/wofi/style.css diff --git a/.config/zathura/zathurarc b/config/zathura/zathurarc similarity index 100% rename from .config/zathura/zathurarc rename to config/zathura/zathurarc diff --git a/dotbot b/dotbot new file mode 160000 index 0000000..3f9e409 --- /dev/null +++ b/dotbot @@ -0,0 +1 @@ +Subproject commit 3f9e409669172ad662e82fca791f0ad16dce5edd diff --git a/etc/sysctl.d/40-swappiness.conf b/etc/sysctl.d/40-swappiness.conf index 409f19a..2aed62c 100644 --- a/etc/sysctl.d/40-swappiness.conf +++ b/etc/sysctl.d/40-swappiness.conf @@ -1 +1 @@ -vm.swappiness = 1 \ No newline at end of file +vm.swappiness=1 \ No newline at end of file diff --git a/.inputrc b/inputrc similarity index 100% rename from .inputrc rename to inputrc diff --git a/install b/install new file mode 100755 index 0000000..5a7e72c --- /dev/null +++ b/install @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +set -e + +CONFIG="install.conf.yaml" +DOTBOT_DIR="dotbot" + +DOTBOT_BIN="bin/dotbot" +BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +cd "${BASEDIR}" +git -C "${DOTBOT_DIR}" submodule sync --quiet --recursive +git submodule update --init --recursive "${DOTBOT_DIR}" + +"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}" diff --git a/install.conf.yaml b/install.conf.yaml new file mode 100644 index 0000000..9100db4 --- /dev/null +++ b/install.conf.yaml @@ -0,0 +1,25 @@ +- defaults: + link: + relink: true + +- clean: ["~"] + +- link: + ~/.aliases: aliases + ~/.bashrc: bashrc + ~/.inputrc: inputrc + ~/.npmrc: npmrc + ~/.vimrc: vimrc + ~/.zshrc: zshrc + ~/.config/starship.toml: + create: true + path: config/starship.toml + ~/.env: + if: "[ -f .env ]" + path: .env + +- create: + - ~/.vim/undo-history + +- shell: + - [git submodule update --init --recursive, Installing submodules] diff --git a/npmrc b/npmrc new file mode 100644 index 0000000..62fffab --- /dev/null +++ b/npmrc @@ -0,0 +1,2 @@ +cache=${HOME}/.cache/npm +prefix=${HOME}/.local/ diff --git a/.vimrc b/vimrc similarity index 100% rename from .vimrc rename to vimrc diff --git a/.zshrc b/zshrc similarity index 88% rename from .zshrc rename to zshrc index 48b1f5a..792e49e 100644 --- a/.zshrc +++ b/zshrc @@ -42,7 +42,7 @@ ZSH_THEME="robbyrussell" # ENABLE_CORRECTION="true" # Uncomment the following line to display red dots whilst waiting for completion. -# COMPLETION_WAITING_DOTS="true" +COMPLETION_WAITING_DOTS="true" # Uncomment the following line if you want to disable marking untracked files # under VCS as dirty. This makes repository status check for large repositories @@ -76,9 +76,11 @@ source $ZSH/oh-my-zsh.sh # You may need to manually set your language environment # export LANG=en_US.UTF-8 -if [ -f ~/.env ]; then - source ~/.env -fi +if [ -f ~/.aliases ]; then source ~/.aliases; fi + +if [ -f ~/.env ]; then source ~/.env; fi + +if [ -f $CARGO_HOME/env ]; then source $CARGO_HOME/env; fi # Compilation flags # export ARCHFLAGS="-arch x86_64" @@ -92,18 +94,6 @@ fi # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" -if command -v starship &> /dev/null; then - eval "$(starship init zsh)" -fi - -if [ -f ~/.aliases ]; then - source ~/.aliases -fi - -if [ -f $CARGO_HOME/env ]; then - source $CARGO_HOME/env -fi - -if [ -e /home/nsetyo/.nix-profile/etc/profile.d/nix.sh ]; then . /home/nsetyo/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer +if command -v starship &> /dev/null; then eval "$(starship init zsh)"; fi