diff --git a/.gitmodules b/.gitmodules index 74e463d..48d0ef4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,3 +8,9 @@ [submodule "dotbot-asdf"] path = dotbot-asdf url = https://github.com/sobolevn/dotbot-asdf.git +[submodule "dotbot-apt-get"] + path = dotbot-apt-get + url = https://github.com/rubenvereecken/dotbot-apt-get +[submodule "dotbot-snap"] + path = dotbot-snap + url = https://github.com/DrDynamic/dotbot-snap.git diff --git a/Makefile b/Makefile index 0361a97..535a308 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,12 @@ bootstrap: _prepare dotfiles _bootstrap ## Bootstrap new machine dotfiles: ## Update dotfiles @./install +linux: + @./install -c config/apt.conf.yml --plugin-dir dotbot-apt-get + +snap: + @./install -c config/snap.conf.yml --plugin-dir dotbot-snap + macos: ## Run macos script @./macos/init_mac.sh diff --git a/README.md b/README.md index d08f6b1..5a72ca4 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,9 @@ Set up using dotbot: git clone git@github.com:einverne/dotfiles.git cd dotfiles # under Linux, install essential packages - sh install.sh - ./install + make linux + # under macOS + make macos ## Overview diff --git a/config/install.conf.yml b/config/install.conf.yml index 24f24f0..13e0da9 100644 --- a/config/install.conf.yml +++ b/config/install.conf.yml @@ -35,6 +35,12 @@ ~/.ideavimrc: if: '[ `uname` = Darwin ]' path: idea/.ideavimrc + ~/.config/espanso: + if: '[ `uname` = Linux ]' + path: espanso + ~/Library/Preferences/espanso: + if: '[ `uname` = Darwin ]' + path: espanso ~/.hammerspoon: if: '[ `uname` = Darwin ]' path: hammerspoon diff --git a/dotbot-apt-get b/dotbot-apt-get new file mode 160000 index 0000000..63078f9 --- /dev/null +++ b/dotbot-apt-get @@ -0,0 +1 @@ +Subproject commit 63078f9af498599e780c2bb6039d6e2156d5a8e8 diff --git a/dotbot-snap b/dotbot-snap new file mode 160000 index 0000000..ad82d74 --- /dev/null +++ b/dotbot-snap @@ -0,0 +1 @@ +Subproject commit ad82d7487a7e92f9f6f6c71046c298d0cfb628c3