From 484665b2911cc9b0b4210102fdcf176125e2ef7f Mon Sep 17 00:00:00 2001 From: Georgi Gardev Date: Wed, 22 Jan 2025 19:33:28 +0200 Subject: [PATCH] Switch to dotbot --- .gitmodules | 24 ++++++++ Makefile | 2 + home/.config/tmux/themes/themes | 1 - home/{.bashrc => bashrc} | 0 .../alacritty/alacritty.toml | 0 .../alacritty/tomorrow-night.toml | 0 home/{.config/.aliases => config/aliases} | 2 +- home/{.config => config}/bash/.gitignore | 0 home/config/bash/bash-git-prompt | 1 + .../bash/bash_profile} | 0 .../bash/git-completion.bash | 0 .../bash/git-prompt-colors.sh | 0 home/{.config => config}/btop/btop.conf | 0 .../eww/bar/active-window.yuck | 0 home/{.config => config}/eww/bar/bar.yuck | 0 .../eww/bar/brightness.yuck | 0 home/{.config => config}/eww/bar/clock.yuck | 0 .../eww/bar/kbd-layout.yuck | 0 home/{.config => config}/eww/bar/media.yuck | 0 home/{.config => config}/eww/bar/power.yuck | 0 home/{.config => config}/eww/bar/updates.yuck | 0 home/{.config => config}/eww/bar/weather.yuck | 0 .../eww/bar/workspaces.yuck | 0 home/{.config => config}/eww/eww.scss | 0 home/{.config => config}/eww/eww.yuck | 0 home/{.config => config}/eww/lib/.gitignore | 0 .../eww/lib/change-active-workspace.sh | 0 .../eww/lib/change-brightness.sh | 0 .../eww/lib/change-volume.sh | 0 home/{.config => config}/eww/lib/date-time.sh | 0 .../eww/lib/get-active-window.sh | 0 .../eww/lib/get-active-workspace.sh | 0 .../eww/lib/get-kb-layout.sh | 0 .../eww/lib/get-volume-level.sh | 0 home/{.config => config}/eww/lib/lock.sh | 0 home/{.config => config}/eww/lib/logout.sh | 0 .../eww/lib/media-play-pause.sh | 0 .../eww/lib/media-status.sh | 0 .../eww/lib/pyhyprsocket/debug.py | 0 .../eww/lib/pyhyprsocket/hyprsocket.py | 0 home/{.config => config}/eww/lib/reboot.sh | 0 home/{.config => config}/eww/lib/shutdown.sh | 0 home/{.config => config}/eww/lib/weather.py | 0 .../{.config => config}/eww/lib/workspaces.sh | 0 .../eww/styles/media-menu.scss | 0 .../eww/styles/power-menu.scss | 0 home/{.config => config}/eww/styles/tray.scss | 0 .../eww/styles/updates-menu.scss | 0 home/{.config => config}/hypr/autorun.conf | 0 home/{.config => config}/hypr/binds.conf | 0 home/{.config => config}/hypr/env.conf | 0 home/{.config => config}/hypr/hypridle.conf | 0 home/{.config => config}/hypr/hyprland.conf | 0 home/{.config => config}/hypr/hyprlock.conf | 0 home/{.config => config}/hypr/input.conf | 0 home/{.config => config}/hypr/rules.conf | 0 .../hypr/scripts/game-mode.sh | 0 .../hypr/scripts/run-apps.sh | 0 .../hypr/scripts/run-eww.sh | 0 .../hypr/scripts/screenshots/capture-area.sh | 0 .../scripts/screenshots/capture-screen.sh | 0 .../hypr/scripts/screenshots/copy-area.sh | 0 .../hypr/scripts/screenshots/copy-screen.sh | 0 home/{.config => config}/hypr/style.conf | 0 home/{.config => config}/rofi/config.rasi | 0 home/{.config => config}/rofi/example.rasi | 0 home/config/tmux/plugins/tpm | 1 + .../tmux/themes/tomorrow-night.tmux | 0 home/config/zsh/.gitignore | 3 + home/{.config => config}/zsh/.zprompt | 0 home/{.config => config}/zsh/.zshrc | 3 +- home/config/zsh/plugins/calc.plugin.zsh | 1 + .../zsh/plugins/zsh-better-npm-completion | 1 + home/config/zsh/plugins/zsh-git-prompt | 1 + home/config/zsh/plugins/zsh-ssh | 1 + home/config/zsh/plugins/zsh-vim-mode | 1 + home/{.gitconfig => gitconfig} | 6 ++ home/{.tmux.conf => tmux.conf} | 0 home/{.vim => vim}/README | 0 home/vim/bundle/Vundle.vim | 1 + home/{.vim => vim}/colors/Monokai-Refined.vim | 0 home/{.vim => vim}/colors/Monokai.vim | 0 .../Mustang_Vim_Colorscheme_by_hcalves.vim | 0 .../colors/Tomorrow-Night-Blue.vim | 0 .../colors/Tomorrow-Night-Bright.vim | 0 .../colors/Tomorrow-Night-Eighties.vim | 0 home/{.vim => vim}/colors/Tomorrow-Night.vim | 0 home/{.vim => vim}/colors/Tomorrow.vim | 0 home/{.vim => vim}/colors/blackboard.vim | 0 home/{.vim => vim}/colors/calmar256-dark.vim | 0 home/{.vim => vim}/colors/distinguished.vim | 0 home/{.vim => vim}/colors/espresso-soda.vim | 0 home/{.vim => vim}/colors/freya.vim | 0 home/{.vim => vim}/colors/github.vim | 0 home/{.vim => vim}/colors/grb256.vim | 0 home/{.vim => vim}/colors/guardian.vim | 0 home/{.vim => vim}/colors/hemisu.vim | 0 home/{.vim => vim}/colors/holokai.vim | 0 home/{.vim => vim}/colors/jellybeans.vim | 0 home/{.vim => vim}/colors/kolor.vim | 0 home/{.vim => vim}/colors/molokai.vim | 0 home/{.vim => vim}/colors/railscasts.vim | 0 home/{.vim => vim}/colors/solarized.vim | 0 home/{.vim => vim}/colors/twilight.vim | 0 home/{.vim => vim}/colors/vibrantink.vim | 0 home/{.vim => vim}/colors/zenburn.vim | 0 home/{.vim => vim}/colors/zmrok.vim | 0 home/{.vim => vim}/ftdetect/javascript.vim | 0 home/{.vim => vim}/ftplugin/ruby.vim | 0 home/{.vim => vim}/swapdir/.gitkeep | 0 home/{.vim => vim}/syntax/javascript.vim | 0 home/{.vim => vim}/syntax/ruby.vim | 0 home/{.vimrc => vimrc} | 0 home/{.zshenv => zshenv} | 0 install.conf.yaml | 55 +++++++++++++++++++ macos/{.hushlogin => hushlogin} | 0 116 files changed, 100 insertions(+), 4 deletions(-) delete mode 120000 home/.config/tmux/themes/themes rename home/{.bashrc => bashrc} (100%) rename home/{.config => config}/alacritty/alacritty.toml (100%) rename home/{.config => config}/alacritty/tomorrow-night.toml (100%) rename home/{.config/.aliases => config/aliases} (98%) rename home/{.config => config}/bash/.gitignore (100%) create mode 160000 home/config/bash/bash-git-prompt rename home/{.config/bash/.bash_profile => config/bash/bash_profile} (100%) rename home/{.config => config}/bash/git-completion.bash (100%) rename home/{.config => config}/bash/git-prompt-colors.sh (100%) rename home/{.config => config}/btop/btop.conf (100%) rename home/{.config => config}/eww/bar/active-window.yuck (100%) rename home/{.config => config}/eww/bar/bar.yuck (100%) rename home/{.config => config}/eww/bar/brightness.yuck (100%) rename home/{.config => config}/eww/bar/clock.yuck (100%) rename home/{.config => config}/eww/bar/kbd-layout.yuck (100%) rename home/{.config => config}/eww/bar/media.yuck (100%) rename home/{.config => config}/eww/bar/power.yuck (100%) rename home/{.config => config}/eww/bar/updates.yuck (100%) rename home/{.config => config}/eww/bar/weather.yuck (100%) rename home/{.config => config}/eww/bar/workspaces.yuck (100%) rename home/{.config => config}/eww/eww.scss (100%) rename home/{.config => config}/eww/eww.yuck (100%) rename home/{.config => config}/eww/lib/.gitignore (100%) rename home/{.config => config}/eww/lib/change-active-workspace.sh (100%) rename home/{.config => config}/eww/lib/change-brightness.sh (100%) rename home/{.config => config}/eww/lib/change-volume.sh (100%) rename home/{.config => config}/eww/lib/date-time.sh (100%) rename home/{.config => config}/eww/lib/get-active-window.sh (100%) rename home/{.config => config}/eww/lib/get-active-workspace.sh (100%) rename home/{.config => config}/eww/lib/get-kb-layout.sh (100%) rename home/{.config => config}/eww/lib/get-volume-level.sh (100%) rename home/{.config => config}/eww/lib/lock.sh (100%) rename home/{.config => config}/eww/lib/logout.sh (100%) rename home/{.config => config}/eww/lib/media-play-pause.sh (100%) rename home/{.config => config}/eww/lib/media-status.sh (100%) rename home/{.config => config}/eww/lib/pyhyprsocket/debug.py (100%) rename home/{.config => config}/eww/lib/pyhyprsocket/hyprsocket.py (100%) rename home/{.config => config}/eww/lib/reboot.sh (100%) rename home/{.config => config}/eww/lib/shutdown.sh (100%) rename home/{.config => config}/eww/lib/weather.py (100%) rename home/{.config => config}/eww/lib/workspaces.sh (100%) rename home/{.config => config}/eww/styles/media-menu.scss (100%) rename home/{.config => config}/eww/styles/power-menu.scss (100%) rename home/{.config => config}/eww/styles/tray.scss (100%) rename home/{.config => config}/eww/styles/updates-menu.scss (100%) rename home/{.config => config}/hypr/autorun.conf (100%) rename home/{.config => config}/hypr/binds.conf (100%) rename home/{.config => config}/hypr/env.conf (100%) rename home/{.config => config}/hypr/hypridle.conf (100%) rename home/{.config => config}/hypr/hyprland.conf (100%) rename home/{.config => config}/hypr/hyprlock.conf (100%) rename home/{.config => config}/hypr/input.conf (100%) rename home/{.config => config}/hypr/rules.conf (100%) rename home/{.config => config}/hypr/scripts/game-mode.sh (100%) rename home/{.config => config}/hypr/scripts/run-apps.sh (100%) rename home/{.config => config}/hypr/scripts/run-eww.sh (100%) rename home/{.config => config}/hypr/scripts/screenshots/capture-area.sh (100%) rename home/{.config => config}/hypr/scripts/screenshots/capture-screen.sh (100%) rename home/{.config => config}/hypr/scripts/screenshots/copy-area.sh (100%) rename home/{.config => config}/hypr/scripts/screenshots/copy-screen.sh (100%) rename home/{.config => config}/hypr/style.conf (100%) rename home/{.config => config}/rofi/config.rasi (100%) rename home/{.config => config}/rofi/example.rasi (100%) create mode 160000 home/config/tmux/plugins/tpm rename home/{.config => config}/tmux/themes/tomorrow-night.tmux (100%) create mode 100644 home/config/zsh/.gitignore rename home/{.config => config}/zsh/.zprompt (100%) rename home/{.config => config}/zsh/.zshrc (96%) create mode 160000 home/config/zsh/plugins/calc.plugin.zsh create mode 160000 home/config/zsh/plugins/zsh-better-npm-completion create mode 160000 home/config/zsh/plugins/zsh-git-prompt create mode 160000 home/config/zsh/plugins/zsh-ssh create mode 160000 home/config/zsh/plugins/zsh-vim-mode rename home/{.gitconfig => gitconfig} (92%) rename home/{.tmux.conf => tmux.conf} (100%) rename home/{.vim => vim}/README (100%) create mode 160000 home/vim/bundle/Vundle.vim rename home/{.vim => vim}/colors/Monokai-Refined.vim (100%) rename home/{.vim => vim}/colors/Monokai.vim (100%) rename home/{.vim => vim}/colors/Mustang_Vim_Colorscheme_by_hcalves.vim (100%) rename home/{.vim => vim}/colors/Tomorrow-Night-Blue.vim (100%) rename home/{.vim => vim}/colors/Tomorrow-Night-Bright.vim (100%) rename home/{.vim => vim}/colors/Tomorrow-Night-Eighties.vim (100%) rename home/{.vim => vim}/colors/Tomorrow-Night.vim (100%) rename home/{.vim => vim}/colors/Tomorrow.vim (100%) rename home/{.vim => vim}/colors/blackboard.vim (100%) rename home/{.vim => vim}/colors/calmar256-dark.vim (100%) rename home/{.vim => vim}/colors/distinguished.vim (100%) rename home/{.vim => vim}/colors/espresso-soda.vim (100%) rename home/{.vim => vim}/colors/freya.vim (100%) rename home/{.vim => vim}/colors/github.vim (100%) rename home/{.vim => vim}/colors/grb256.vim (100%) rename home/{.vim => vim}/colors/guardian.vim (100%) rename home/{.vim => vim}/colors/hemisu.vim (100%) rename home/{.vim => vim}/colors/holokai.vim (100%) rename home/{.vim => vim}/colors/jellybeans.vim (100%) rename home/{.vim => vim}/colors/kolor.vim (100%) rename home/{.vim => vim}/colors/molokai.vim (100%) rename home/{.vim => vim}/colors/railscasts.vim (100%) rename home/{.vim => vim}/colors/solarized.vim (100%) rename home/{.vim => vim}/colors/twilight.vim (100%) rename home/{.vim => vim}/colors/vibrantink.vim (100%) rename home/{.vim => vim}/colors/zenburn.vim (100%) rename home/{.vim => vim}/colors/zmrok.vim (100%) rename home/{.vim => vim}/ftdetect/javascript.vim (100%) rename home/{.vim => vim}/ftplugin/ruby.vim (100%) rename home/{.vim => vim}/swapdir/.gitkeep (100%) rename home/{.vim => vim}/syntax/javascript.vim (100%) rename home/{.vim => vim}/syntax/ruby.vim (100%) rename home/{.vimrc => vimrc} (100%) rename home/{.zshenv => zshenv} (100%) rename macos/{.hushlogin => hushlogin} (100%) diff --git a/.gitmodules b/.gitmodules index 1af14d0..bfc628c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,27 @@ path = dotbot url = https://github.com/anishathalye/dotbot ignore = dirty +[submodule "home/config/tmux/plugins/tpm"] + path = home/config/tmux/plugins/tpm + url = https://github.com/tmux-plugins/tpm +[submodule "home/config/bash/bash-git-prompt"] + path = home/config/bash/bash-git-prompt + url = https://github.com/magicmonty/bash-git-prompt.git +[submodule "home/config/zsh/plugins/zsh-git-prompt"] + path = home/config/zsh/plugins/zsh-git-prompt + url = git@github.com:zsh-git-prompt/zsh-git-prompt.git +[submodule "home/config/zsh/plugins/calc.plugin.zsh"] + path = home/config/zsh/plugins/calc.plugin.zsh + url = git@github.com:arzzen/calc.plugin.zsh.git +[submodule "home/config/zsh/plugins/zsh-vim-mode"] + path = home/config/zsh/plugins/zsh-vim-mode + url = git@github.com:softmoth/zsh-vim-mode.git +[submodule "home/config/zsh/plugins/zsh-better-npm-completion"] + path = home/config/zsh/plugins/zsh-better-npm-completion + url = https://github.com/lukechilds/zsh-better-npm-completion.git +[submodule "home/config/zsh/plugins/zsh-ssh"] + path = home/config/zsh/plugins/zsh-ssh + url = https://github.com/sunlei/zsh-ssh +[submodule "home/vim/bundle/Vundle.vim"] + path = home/vim/bundle/Vundle.vim + url = https://github.com/VundleVim/Vundle.vim.git diff --git a/Makefile b/Makefile index 50f186a..ae87d36 100644 --- a/Makefile +++ b/Makefile @@ -55,6 +55,8 @@ zsh: -git clone git@github.com:softmoth/zsh-vim-mode.git ~/.config/zsh/plugins/zsh-vim-mode -git clone https://github.com/lukechilds/zsh-better-npm-completion.git ~/.config/zsh/plugins/.zsh-better-npm-completion -git clone https://github.com/sunlei/zsh-ssh ~/.config/zsh/plugins/zsh-ssh + + ## dotbot TODO mkdir -p ~/.config/zsh/plugins/bd curl https://raw.githubusercontent.com/Tarrasch/zsh-bd/master/bd.zsh > ~/.config/zsh/plugins/bd/bd.zsh diff --git a/home/.config/tmux/themes/themes b/home/.config/tmux/themes/themes deleted file mode 120000 index caec773..0000000 --- a/home/.config/tmux/themes/themes +++ /dev/null @@ -1 +0,0 @@ -/home/georgi/Git/dotfiles/home/.config/tmux/themes \ No newline at end of file diff --git a/home/.bashrc b/home/bashrc similarity index 100% rename from home/.bashrc rename to home/bashrc diff --git a/home/.config/alacritty/alacritty.toml b/home/config/alacritty/alacritty.toml similarity index 100% rename from home/.config/alacritty/alacritty.toml rename to home/config/alacritty/alacritty.toml diff --git a/home/.config/alacritty/tomorrow-night.toml b/home/config/alacritty/tomorrow-night.toml similarity index 100% rename from home/.config/alacritty/tomorrow-night.toml rename to home/config/alacritty/tomorrow-night.toml diff --git a/home/.config/.aliases b/home/config/aliases similarity index 98% rename from home/.config/.aliases rename to home/config/aliases index 753138e..4681a24 100644 --- a/home/.config/.aliases +++ b/home/config/aliases @@ -12,7 +12,7 @@ alias la='ls -AG' alias l='ls -CFG' # eza aliases, if available -if type ls >/dev/null 2>&1; then +if type eza >/dev/null 2>&1; then eza_params=( '--git' '--icons' '--group' '--group-directories-first' '--time-style=relative' diff --git a/home/.config/bash/.gitignore b/home/config/bash/.gitignore similarity index 100% rename from home/.config/bash/.gitignore rename to home/config/bash/.gitignore diff --git a/home/config/bash/bash-git-prompt b/home/config/bash/bash-git-prompt new file mode 160000 index 0000000..622e337 --- /dev/null +++ b/home/config/bash/bash-git-prompt @@ -0,0 +1 @@ +Subproject commit 622e337d119adcdd5d4bee3ef15f8d81d4eea631 diff --git a/home/.config/bash/.bash_profile b/home/config/bash/bash_profile similarity index 100% rename from home/.config/bash/.bash_profile rename to home/config/bash/bash_profile diff --git a/home/.config/bash/git-completion.bash b/home/config/bash/git-completion.bash similarity index 100% rename from home/.config/bash/git-completion.bash rename to home/config/bash/git-completion.bash diff --git a/home/.config/bash/git-prompt-colors.sh b/home/config/bash/git-prompt-colors.sh similarity index 100% rename from home/.config/bash/git-prompt-colors.sh rename to home/config/bash/git-prompt-colors.sh diff --git a/home/.config/btop/btop.conf b/home/config/btop/btop.conf similarity index 100% rename from home/.config/btop/btop.conf rename to home/config/btop/btop.conf diff --git a/home/.config/eww/bar/active-window.yuck b/home/config/eww/bar/active-window.yuck similarity index 100% rename from home/.config/eww/bar/active-window.yuck rename to home/config/eww/bar/active-window.yuck diff --git a/home/.config/eww/bar/bar.yuck b/home/config/eww/bar/bar.yuck similarity index 100% rename from home/.config/eww/bar/bar.yuck rename to home/config/eww/bar/bar.yuck diff --git a/home/.config/eww/bar/brightness.yuck b/home/config/eww/bar/brightness.yuck similarity index 100% rename from home/.config/eww/bar/brightness.yuck rename to home/config/eww/bar/brightness.yuck diff --git a/home/.config/eww/bar/clock.yuck b/home/config/eww/bar/clock.yuck similarity index 100% rename from home/.config/eww/bar/clock.yuck rename to home/config/eww/bar/clock.yuck diff --git a/home/.config/eww/bar/kbd-layout.yuck b/home/config/eww/bar/kbd-layout.yuck similarity index 100% rename from home/.config/eww/bar/kbd-layout.yuck rename to home/config/eww/bar/kbd-layout.yuck diff --git a/home/.config/eww/bar/media.yuck b/home/config/eww/bar/media.yuck similarity index 100% rename from home/.config/eww/bar/media.yuck rename to home/config/eww/bar/media.yuck diff --git a/home/.config/eww/bar/power.yuck b/home/config/eww/bar/power.yuck similarity index 100% rename from home/.config/eww/bar/power.yuck rename to home/config/eww/bar/power.yuck diff --git a/home/.config/eww/bar/updates.yuck b/home/config/eww/bar/updates.yuck similarity index 100% rename from home/.config/eww/bar/updates.yuck rename to home/config/eww/bar/updates.yuck diff --git a/home/.config/eww/bar/weather.yuck b/home/config/eww/bar/weather.yuck similarity index 100% rename from home/.config/eww/bar/weather.yuck rename to home/config/eww/bar/weather.yuck diff --git a/home/.config/eww/bar/workspaces.yuck b/home/config/eww/bar/workspaces.yuck similarity index 100% rename from home/.config/eww/bar/workspaces.yuck rename to home/config/eww/bar/workspaces.yuck diff --git a/home/.config/eww/eww.scss b/home/config/eww/eww.scss similarity index 100% rename from home/.config/eww/eww.scss rename to home/config/eww/eww.scss diff --git a/home/.config/eww/eww.yuck b/home/config/eww/eww.yuck similarity index 100% rename from home/.config/eww/eww.yuck rename to home/config/eww/eww.yuck diff --git a/home/.config/eww/lib/.gitignore b/home/config/eww/lib/.gitignore similarity index 100% rename from home/.config/eww/lib/.gitignore rename to home/config/eww/lib/.gitignore diff --git a/home/.config/eww/lib/change-active-workspace.sh b/home/config/eww/lib/change-active-workspace.sh similarity index 100% rename from home/.config/eww/lib/change-active-workspace.sh rename to home/config/eww/lib/change-active-workspace.sh diff --git a/home/.config/eww/lib/change-brightness.sh b/home/config/eww/lib/change-brightness.sh similarity index 100% rename from home/.config/eww/lib/change-brightness.sh rename to home/config/eww/lib/change-brightness.sh diff --git a/home/.config/eww/lib/change-volume.sh b/home/config/eww/lib/change-volume.sh similarity index 100% rename from home/.config/eww/lib/change-volume.sh rename to home/config/eww/lib/change-volume.sh diff --git a/home/.config/eww/lib/date-time.sh b/home/config/eww/lib/date-time.sh similarity index 100% rename from home/.config/eww/lib/date-time.sh rename to home/config/eww/lib/date-time.sh diff --git a/home/.config/eww/lib/get-active-window.sh b/home/config/eww/lib/get-active-window.sh similarity index 100% rename from home/.config/eww/lib/get-active-window.sh rename to home/config/eww/lib/get-active-window.sh diff --git a/home/.config/eww/lib/get-active-workspace.sh b/home/config/eww/lib/get-active-workspace.sh similarity index 100% rename from home/.config/eww/lib/get-active-workspace.sh rename to home/config/eww/lib/get-active-workspace.sh diff --git a/home/.config/eww/lib/get-kb-layout.sh b/home/config/eww/lib/get-kb-layout.sh similarity index 100% rename from home/.config/eww/lib/get-kb-layout.sh rename to home/config/eww/lib/get-kb-layout.sh diff --git a/home/.config/eww/lib/get-volume-level.sh b/home/config/eww/lib/get-volume-level.sh similarity index 100% rename from home/.config/eww/lib/get-volume-level.sh rename to home/config/eww/lib/get-volume-level.sh diff --git a/home/.config/eww/lib/lock.sh b/home/config/eww/lib/lock.sh similarity index 100% rename from home/.config/eww/lib/lock.sh rename to home/config/eww/lib/lock.sh diff --git a/home/.config/eww/lib/logout.sh b/home/config/eww/lib/logout.sh similarity index 100% rename from home/.config/eww/lib/logout.sh rename to home/config/eww/lib/logout.sh diff --git a/home/.config/eww/lib/media-play-pause.sh b/home/config/eww/lib/media-play-pause.sh similarity index 100% rename from home/.config/eww/lib/media-play-pause.sh rename to home/config/eww/lib/media-play-pause.sh diff --git a/home/.config/eww/lib/media-status.sh b/home/config/eww/lib/media-status.sh similarity index 100% rename from home/.config/eww/lib/media-status.sh rename to home/config/eww/lib/media-status.sh diff --git a/home/.config/eww/lib/pyhyprsocket/debug.py b/home/config/eww/lib/pyhyprsocket/debug.py similarity index 100% rename from home/.config/eww/lib/pyhyprsocket/debug.py rename to home/config/eww/lib/pyhyprsocket/debug.py diff --git a/home/.config/eww/lib/pyhyprsocket/hyprsocket.py b/home/config/eww/lib/pyhyprsocket/hyprsocket.py similarity index 100% rename from home/.config/eww/lib/pyhyprsocket/hyprsocket.py rename to home/config/eww/lib/pyhyprsocket/hyprsocket.py diff --git a/home/.config/eww/lib/reboot.sh b/home/config/eww/lib/reboot.sh similarity index 100% rename from home/.config/eww/lib/reboot.sh rename to home/config/eww/lib/reboot.sh diff --git a/home/.config/eww/lib/shutdown.sh b/home/config/eww/lib/shutdown.sh similarity index 100% rename from home/.config/eww/lib/shutdown.sh rename to home/config/eww/lib/shutdown.sh diff --git a/home/.config/eww/lib/weather.py b/home/config/eww/lib/weather.py similarity index 100% rename from home/.config/eww/lib/weather.py rename to home/config/eww/lib/weather.py diff --git a/home/.config/eww/lib/workspaces.sh b/home/config/eww/lib/workspaces.sh similarity index 100% rename from home/.config/eww/lib/workspaces.sh rename to home/config/eww/lib/workspaces.sh diff --git a/home/.config/eww/styles/media-menu.scss b/home/config/eww/styles/media-menu.scss similarity index 100% rename from home/.config/eww/styles/media-menu.scss rename to home/config/eww/styles/media-menu.scss diff --git a/home/.config/eww/styles/power-menu.scss b/home/config/eww/styles/power-menu.scss similarity index 100% rename from home/.config/eww/styles/power-menu.scss rename to home/config/eww/styles/power-menu.scss diff --git a/home/.config/eww/styles/tray.scss b/home/config/eww/styles/tray.scss similarity index 100% rename from home/.config/eww/styles/tray.scss rename to home/config/eww/styles/tray.scss diff --git a/home/.config/eww/styles/updates-menu.scss b/home/config/eww/styles/updates-menu.scss similarity index 100% rename from home/.config/eww/styles/updates-menu.scss rename to home/config/eww/styles/updates-menu.scss diff --git a/home/.config/hypr/autorun.conf b/home/config/hypr/autorun.conf similarity index 100% rename from home/.config/hypr/autorun.conf rename to home/config/hypr/autorun.conf diff --git a/home/.config/hypr/binds.conf b/home/config/hypr/binds.conf similarity index 100% rename from home/.config/hypr/binds.conf rename to home/config/hypr/binds.conf diff --git a/home/.config/hypr/env.conf b/home/config/hypr/env.conf similarity index 100% rename from home/.config/hypr/env.conf rename to home/config/hypr/env.conf diff --git a/home/.config/hypr/hypridle.conf b/home/config/hypr/hypridle.conf similarity index 100% rename from home/.config/hypr/hypridle.conf rename to home/config/hypr/hypridle.conf diff --git a/home/.config/hypr/hyprland.conf b/home/config/hypr/hyprland.conf similarity index 100% rename from home/.config/hypr/hyprland.conf rename to home/config/hypr/hyprland.conf diff --git a/home/.config/hypr/hyprlock.conf b/home/config/hypr/hyprlock.conf similarity index 100% rename from home/.config/hypr/hyprlock.conf rename to home/config/hypr/hyprlock.conf diff --git a/home/.config/hypr/input.conf b/home/config/hypr/input.conf similarity index 100% rename from home/.config/hypr/input.conf rename to home/config/hypr/input.conf diff --git a/home/.config/hypr/rules.conf b/home/config/hypr/rules.conf similarity index 100% rename from home/.config/hypr/rules.conf rename to home/config/hypr/rules.conf diff --git a/home/.config/hypr/scripts/game-mode.sh b/home/config/hypr/scripts/game-mode.sh similarity index 100% rename from home/.config/hypr/scripts/game-mode.sh rename to home/config/hypr/scripts/game-mode.sh diff --git a/home/.config/hypr/scripts/run-apps.sh b/home/config/hypr/scripts/run-apps.sh similarity index 100% rename from home/.config/hypr/scripts/run-apps.sh rename to home/config/hypr/scripts/run-apps.sh diff --git a/home/.config/hypr/scripts/run-eww.sh b/home/config/hypr/scripts/run-eww.sh similarity index 100% rename from home/.config/hypr/scripts/run-eww.sh rename to home/config/hypr/scripts/run-eww.sh diff --git a/home/.config/hypr/scripts/screenshots/capture-area.sh b/home/config/hypr/scripts/screenshots/capture-area.sh similarity index 100% rename from home/.config/hypr/scripts/screenshots/capture-area.sh rename to home/config/hypr/scripts/screenshots/capture-area.sh diff --git a/home/.config/hypr/scripts/screenshots/capture-screen.sh b/home/config/hypr/scripts/screenshots/capture-screen.sh similarity index 100% rename from home/.config/hypr/scripts/screenshots/capture-screen.sh rename to home/config/hypr/scripts/screenshots/capture-screen.sh diff --git a/home/.config/hypr/scripts/screenshots/copy-area.sh b/home/config/hypr/scripts/screenshots/copy-area.sh similarity index 100% rename from home/.config/hypr/scripts/screenshots/copy-area.sh rename to home/config/hypr/scripts/screenshots/copy-area.sh diff --git a/home/.config/hypr/scripts/screenshots/copy-screen.sh b/home/config/hypr/scripts/screenshots/copy-screen.sh similarity index 100% rename from home/.config/hypr/scripts/screenshots/copy-screen.sh rename to home/config/hypr/scripts/screenshots/copy-screen.sh diff --git a/home/.config/hypr/style.conf b/home/config/hypr/style.conf similarity index 100% rename from home/.config/hypr/style.conf rename to home/config/hypr/style.conf diff --git a/home/.config/rofi/config.rasi b/home/config/rofi/config.rasi similarity index 100% rename from home/.config/rofi/config.rasi rename to home/config/rofi/config.rasi diff --git a/home/.config/rofi/example.rasi b/home/config/rofi/example.rasi similarity index 100% rename from home/.config/rofi/example.rasi rename to home/config/rofi/example.rasi diff --git a/home/config/tmux/plugins/tpm b/home/config/tmux/plugins/tpm new file mode 160000 index 0000000..99469c4 --- /dev/null +++ b/home/config/tmux/plugins/tpm @@ -0,0 +1 @@ +Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 diff --git a/home/.config/tmux/themes/tomorrow-night.tmux b/home/config/tmux/themes/tomorrow-night.tmux similarity index 100% rename from home/.config/tmux/themes/tomorrow-night.tmux rename to home/config/tmux/themes/tomorrow-night.tmux diff --git a/home/config/zsh/.gitignore b/home/config/zsh/.gitignore new file mode 100644 index 0000000..ec88ea1 --- /dev/null +++ b/home/config/zsh/.gitignore @@ -0,0 +1,3 @@ +.zcompdump +.zsh_history +plugins/bd diff --git a/home/.config/zsh/.zprompt b/home/config/zsh/.zprompt similarity index 100% rename from home/.config/zsh/.zprompt rename to home/config/zsh/.zprompt diff --git a/home/.config/zsh/.zshrc b/home/config/zsh/.zshrc similarity index 96% rename from home/.config/zsh/.zshrc rename to home/config/zsh/.zshrc index 57801d5..3de2b5d 100644 --- a/home/.config/zsh/.zshrc +++ b/home/config/zsh/.zshrc @@ -72,7 +72,7 @@ source "$ZDOTDIR/plugins/zsh-vim-mode/zsh-vim-mode.plugin.zsh" source "$ZDOTDIR/plugins/calc.plugin.zsh/calc.plugin.zsh" # https://github.com/lukechilds/zsh-better-npm-completion -source "$ZDOTDIR/plugins/.zsh-better-npm-completion/zsh-better-npm-completion.plugin.zsh" +source "$ZDOTDIR/plugins/zsh-better-npm-completion/zsh-better-npm-completion.plugin.zsh" # https://github.com/sunlei/zsh-ssh source "$ZDOTDIR/plugins/zsh-ssh/zsh-ssh.zsh" @@ -82,7 +82,6 @@ source "$ZDOTDIR/plugins/bd/bd.zsh" - # Prompt source $ZDOTDIR/.zprompt diff --git a/home/config/zsh/plugins/calc.plugin.zsh b/home/config/zsh/plugins/calc.plugin.zsh new file mode 160000 index 0000000..5b4c859 --- /dev/null +++ b/home/config/zsh/plugins/calc.plugin.zsh @@ -0,0 +1 @@ +Subproject commit 5b4c85977b693c15eb052cde6b5cef0d6610f567 diff --git a/home/config/zsh/plugins/zsh-better-npm-completion b/home/config/zsh/plugins/zsh-better-npm-completion new file mode 160000 index 0000000..02ca404 --- /dev/null +++ b/home/config/zsh/plugins/zsh-better-npm-completion @@ -0,0 +1 @@ +Subproject commit 02ca404a9b585b59788b15af53d4f46fac297153 diff --git a/home/config/zsh/plugins/zsh-git-prompt b/home/config/zsh/plugins/zsh-git-prompt new file mode 160000 index 0000000..2701e8a --- /dev/null +++ b/home/config/zsh/plugins/zsh-git-prompt @@ -0,0 +1 @@ +Subproject commit 2701e8ac3192f198fcaffbc2914d8e145589eb23 diff --git a/home/config/zsh/plugins/zsh-ssh b/home/config/zsh/plugins/zsh-ssh new file mode 160000 index 0000000..f73b78b --- /dev/null +++ b/home/config/zsh/plugins/zsh-ssh @@ -0,0 +1 @@ +Subproject commit f73b78bc8f0b40dc939e2819348b83afada09ba9 diff --git a/home/config/zsh/plugins/zsh-vim-mode b/home/config/zsh/plugins/zsh-vim-mode new file mode 160000 index 0000000..1f9953b --- /dev/null +++ b/home/config/zsh/plugins/zsh-vim-mode @@ -0,0 +1 @@ +Subproject commit 1f9953b7d6f2f0a8d2cb8e8977baa48278a31eab diff --git a/home/.gitconfig b/home/gitconfig similarity index 92% rename from home/.gitconfig rename to home/gitconfig index deb8317..cfccf51 100644 --- a/home/.gitconfig +++ b/home/gitconfig @@ -81,3 +81,9 @@ # Show the user email for the current repository. whoami = config user.email + + # used for dotbot only + cleanall = clean -fdx # this is dangerous, so it's intentionally long to type + + update-submodules = submodule update --init --recursive + upgrade-submodules = submodule update --init --remote diff --git a/home/.tmux.conf b/home/tmux.conf similarity index 100% rename from home/.tmux.conf rename to home/tmux.conf diff --git a/home/.vim/README b/home/vim/README similarity index 100% rename from home/.vim/README rename to home/vim/README diff --git a/home/vim/bundle/Vundle.vim b/home/vim/bundle/Vundle.vim new file mode 160000 index 0000000..5548a1a --- /dev/null +++ b/home/vim/bundle/Vundle.vim @@ -0,0 +1 @@ +Subproject commit 5548a1a937d4e72606520c7484cd384e6c76b565 diff --git a/home/.vim/colors/Monokai-Refined.vim b/home/vim/colors/Monokai-Refined.vim similarity index 100% rename from home/.vim/colors/Monokai-Refined.vim rename to home/vim/colors/Monokai-Refined.vim diff --git a/home/.vim/colors/Monokai.vim b/home/vim/colors/Monokai.vim similarity index 100% rename from home/.vim/colors/Monokai.vim rename to home/vim/colors/Monokai.vim diff --git a/home/.vim/colors/Mustang_Vim_Colorscheme_by_hcalves.vim b/home/vim/colors/Mustang_Vim_Colorscheme_by_hcalves.vim similarity index 100% rename from home/.vim/colors/Mustang_Vim_Colorscheme_by_hcalves.vim rename to home/vim/colors/Mustang_Vim_Colorscheme_by_hcalves.vim diff --git a/home/.vim/colors/Tomorrow-Night-Blue.vim b/home/vim/colors/Tomorrow-Night-Blue.vim similarity index 100% rename from home/.vim/colors/Tomorrow-Night-Blue.vim rename to home/vim/colors/Tomorrow-Night-Blue.vim diff --git a/home/.vim/colors/Tomorrow-Night-Bright.vim b/home/vim/colors/Tomorrow-Night-Bright.vim similarity index 100% rename from home/.vim/colors/Tomorrow-Night-Bright.vim rename to home/vim/colors/Tomorrow-Night-Bright.vim diff --git a/home/.vim/colors/Tomorrow-Night-Eighties.vim b/home/vim/colors/Tomorrow-Night-Eighties.vim similarity index 100% rename from home/.vim/colors/Tomorrow-Night-Eighties.vim rename to home/vim/colors/Tomorrow-Night-Eighties.vim diff --git a/home/.vim/colors/Tomorrow-Night.vim b/home/vim/colors/Tomorrow-Night.vim similarity index 100% rename from home/.vim/colors/Tomorrow-Night.vim rename to home/vim/colors/Tomorrow-Night.vim diff --git a/home/.vim/colors/Tomorrow.vim b/home/vim/colors/Tomorrow.vim similarity index 100% rename from home/.vim/colors/Tomorrow.vim rename to home/vim/colors/Tomorrow.vim diff --git a/home/.vim/colors/blackboard.vim b/home/vim/colors/blackboard.vim similarity index 100% rename from home/.vim/colors/blackboard.vim rename to home/vim/colors/blackboard.vim diff --git a/home/.vim/colors/calmar256-dark.vim b/home/vim/colors/calmar256-dark.vim similarity index 100% rename from home/.vim/colors/calmar256-dark.vim rename to home/vim/colors/calmar256-dark.vim diff --git a/home/.vim/colors/distinguished.vim b/home/vim/colors/distinguished.vim similarity index 100% rename from home/.vim/colors/distinguished.vim rename to home/vim/colors/distinguished.vim diff --git a/home/.vim/colors/espresso-soda.vim b/home/vim/colors/espresso-soda.vim similarity index 100% rename from home/.vim/colors/espresso-soda.vim rename to home/vim/colors/espresso-soda.vim diff --git a/home/.vim/colors/freya.vim b/home/vim/colors/freya.vim similarity index 100% rename from home/.vim/colors/freya.vim rename to home/vim/colors/freya.vim diff --git a/home/.vim/colors/github.vim b/home/vim/colors/github.vim similarity index 100% rename from home/.vim/colors/github.vim rename to home/vim/colors/github.vim diff --git a/home/.vim/colors/grb256.vim b/home/vim/colors/grb256.vim similarity index 100% rename from home/.vim/colors/grb256.vim rename to home/vim/colors/grb256.vim diff --git a/home/.vim/colors/guardian.vim b/home/vim/colors/guardian.vim similarity index 100% rename from home/.vim/colors/guardian.vim rename to home/vim/colors/guardian.vim diff --git a/home/.vim/colors/hemisu.vim b/home/vim/colors/hemisu.vim similarity index 100% rename from home/.vim/colors/hemisu.vim rename to home/vim/colors/hemisu.vim diff --git a/home/.vim/colors/holokai.vim b/home/vim/colors/holokai.vim similarity index 100% rename from home/.vim/colors/holokai.vim rename to home/vim/colors/holokai.vim diff --git a/home/.vim/colors/jellybeans.vim b/home/vim/colors/jellybeans.vim similarity index 100% rename from home/.vim/colors/jellybeans.vim rename to home/vim/colors/jellybeans.vim diff --git a/home/.vim/colors/kolor.vim b/home/vim/colors/kolor.vim similarity index 100% rename from home/.vim/colors/kolor.vim rename to home/vim/colors/kolor.vim diff --git a/home/.vim/colors/molokai.vim b/home/vim/colors/molokai.vim similarity index 100% rename from home/.vim/colors/molokai.vim rename to home/vim/colors/molokai.vim diff --git a/home/.vim/colors/railscasts.vim b/home/vim/colors/railscasts.vim similarity index 100% rename from home/.vim/colors/railscasts.vim rename to home/vim/colors/railscasts.vim diff --git a/home/.vim/colors/solarized.vim b/home/vim/colors/solarized.vim similarity index 100% rename from home/.vim/colors/solarized.vim rename to home/vim/colors/solarized.vim diff --git a/home/.vim/colors/twilight.vim b/home/vim/colors/twilight.vim similarity index 100% rename from home/.vim/colors/twilight.vim rename to home/vim/colors/twilight.vim diff --git a/home/.vim/colors/vibrantink.vim b/home/vim/colors/vibrantink.vim similarity index 100% rename from home/.vim/colors/vibrantink.vim rename to home/vim/colors/vibrantink.vim diff --git a/home/.vim/colors/zenburn.vim b/home/vim/colors/zenburn.vim similarity index 100% rename from home/.vim/colors/zenburn.vim rename to home/vim/colors/zenburn.vim diff --git a/home/.vim/colors/zmrok.vim b/home/vim/colors/zmrok.vim similarity index 100% rename from home/.vim/colors/zmrok.vim rename to home/vim/colors/zmrok.vim diff --git a/home/.vim/ftdetect/javascript.vim b/home/vim/ftdetect/javascript.vim similarity index 100% rename from home/.vim/ftdetect/javascript.vim rename to home/vim/ftdetect/javascript.vim diff --git a/home/.vim/ftplugin/ruby.vim b/home/vim/ftplugin/ruby.vim similarity index 100% rename from home/.vim/ftplugin/ruby.vim rename to home/vim/ftplugin/ruby.vim diff --git a/home/.vim/swapdir/.gitkeep b/home/vim/swapdir/.gitkeep similarity index 100% rename from home/.vim/swapdir/.gitkeep rename to home/vim/swapdir/.gitkeep diff --git a/home/.vim/syntax/javascript.vim b/home/vim/syntax/javascript.vim similarity index 100% rename from home/.vim/syntax/javascript.vim rename to home/vim/syntax/javascript.vim diff --git a/home/.vim/syntax/ruby.vim b/home/vim/syntax/ruby.vim similarity index 100% rename from home/.vim/syntax/ruby.vim rename to home/vim/syntax/ruby.vim diff --git a/home/.vimrc b/home/vimrc similarity index 100% rename from home/.vimrc rename to home/vimrc diff --git a/home/.zshenv b/home/zshenv similarity index 100% rename from home/.zshenv rename to home/zshenv diff --git a/install.conf.yaml b/install.conf.yaml index e69de29..91a06ae 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -0,0 +1,55 @@ +- defaults: + link: + relink: true + +- clean: ['~'] + +- create: + - ~/.config/bash + - ~/.config/tmux + - ~/.vim/undo-history + +- link: + ~/.gitconfig: home/gitconfig + ~/.git-completion.bash: home/config/bash/git-completion.bash + ~/.git-prompt-colors.sh: home/config/bash/git-prompt-colors.sh + + ~/.bashrc: home/bashrc + ~/.config/bash/.bash_profile: home/config/bash/bash_profile + + # apps + ~/.config/alacritty: home/config/alacritty + ~/.config/btop: home/config/btop + + # tmux + ~/.tmux.conf: home/tmux.conf + ~/.config/tmux/themes: home/config/tmux/themes + + ~/.config/.aliases: home/config/aliases + + ~/.vim : home/vim + ~/.vimrc: home/vimrc + + ~/.zshenv: home/zshenv + ~/.config/zsh: home/config/zsh + + # mac os + ~/.hushlogin: + if: '[ `uname` = Darwin ]' + path: macos/hushlogin + + +- shell: + - git submodule sync --recursive + # the following have to run after linking ~/.gitconfig + - git update-submodules + - > + git cleanall -f + home/config/tmux/plugins + home/config/bash/bash-git-prompt + home/config/zsh/plugins + home/vim/bundle/ + + # install BD zsh plugin - this needs to happen after the cleanall + - mkdir -p ~/.config/zsh/plugins/bd + - curl https://raw.githubusercontent.com/Tarrasch/zsh-bd/master/bd.zsh > ~/.config/zsh/plugins/bd/bd.zsh diff --git a/macos/.hushlogin b/macos/hushlogin similarity index 100% rename from macos/.hushlogin rename to macos/hushlogin