diff --git a/.gitmodules b/.gitmodules index fd292fe..1e47c5b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,28 +9,28 @@ path = shells/oh-my-zsh/custom/plugins/zsh-autosuggestions url = https://github.com/zsh-users/zsh-autosuggestions.git [submodule "nerdtree"] - path = vim/pack/man/start/nerdtree + path = editors/vim/pack/man/start/nerdtree url = https://github.com/preservim/nerdtree.git [submodule "vim-obsession"] - path = vim/pack/man/start/vim-obsession + path = editors/vim/pack/man/start/vim-obsession url = https://github.com/tpope/vim-obsession [submodule "vim-go"] - path = vim/pack/man/start/vim-go + path = editors/vim/pack/man/start/vim-go url = https://github.com/fatih/vim-go [submodule "vim-commentary"] - path = vim/pack/man/start/vim-commentary + path = editors/vim/pack/man/start/vim-commentary url = https://github.com/tpope/vim-commentary.git [submodule "vim-surround"] - path = vim/pack/man/start/vim-surround + path = editors/vim/pack/man/start/vim-surround url = https://github.com/tpope/vim-surround.git [submodule "vim-airline"] - path = vim/pack/man/start/vim-airline + path = editors/vim/pack/man/start/vim-airline url = https://github.com/vim-airline/vim-airline.git [submodule "vim-fugitive"] - path = vim/pack/man/start/vim-fugitive + path = editors/vim/pack/man/start/vim-fugitive url = https://github.com/tpope/vim-fugitive.git [submodule "vimtex"] - path = vim/pack/man/start/vimtex + path = editors/vim/pack/man/start/vimtex url = https://github.com/lervag/vimtex.git [submodule "tmux-mem-cpu-load"] path = src/tmux-mem-cpu-load @@ -39,10 +39,10 @@ path = src/fzf url = https://github.com/junegunn/fzf.git [submodule "vimwiki"] - path = vim/pack/man/start/vimwiki + path = editors/vim/pack/man/start/vimwiki url = https://github.com/vimwiki/vimwiki.git [submodule "vim-markdown"] - path = vim/pack/man/start/vim-markdown + path = editors/vim/pack/man/start/vim-markdown url = https://github.com/preservim/vim-markdown.git [submodule "i3lock-blur"] path = src/i3lock-blur @@ -59,3 +59,6 @@ [submodule "bluebikes"] path = src/bluebikes url = https://git.keegandeppe.com/kdeppe/bluebikes.git +[submodule "shells/st"] + path = shells/st + url = https://git.keegandeppe.com/kdeppe/st.git diff --git a/vim/.netrwhist b/editors/vim/.netrwhist similarity index 100% rename from vim/.netrwhist rename to editors/vim/.netrwhist diff --git a/vim/colors/hybrid.vim b/editors/vim/colors/hybrid.vim similarity index 100% rename from vim/colors/hybrid.vim rename to editors/vim/colors/hybrid.vim diff --git a/vim/pack/man/start/nerdtree b/editors/vim/pack/man/start/nerdtree similarity index 100% rename from vim/pack/man/start/nerdtree rename to editors/vim/pack/man/start/nerdtree diff --git a/vim/pack/man/start/vim-airline b/editors/vim/pack/man/start/vim-airline similarity index 100% rename from vim/pack/man/start/vim-airline rename to editors/vim/pack/man/start/vim-airline diff --git a/vim/pack/man/start/vim-commentary b/editors/vim/pack/man/start/vim-commentary similarity index 100% rename from vim/pack/man/start/vim-commentary rename to editors/vim/pack/man/start/vim-commentary diff --git a/vim/pack/man/start/vim-fugitive b/editors/vim/pack/man/start/vim-fugitive similarity index 100% rename from vim/pack/man/start/vim-fugitive rename to editors/vim/pack/man/start/vim-fugitive diff --git a/vim/pack/man/start/vim-go b/editors/vim/pack/man/start/vim-go similarity index 100% rename from vim/pack/man/start/vim-go rename to editors/vim/pack/man/start/vim-go diff --git a/vim/pack/man/start/vim-markdown b/editors/vim/pack/man/start/vim-markdown similarity index 100% rename from vim/pack/man/start/vim-markdown rename to editors/vim/pack/man/start/vim-markdown diff --git a/vim/pack/man/start/vim-obsession b/editors/vim/pack/man/start/vim-obsession similarity index 100% rename from vim/pack/man/start/vim-obsession rename to editors/vim/pack/man/start/vim-obsession diff --git a/vim/pack/man/start/vim-surround b/editors/vim/pack/man/start/vim-surround similarity index 100% rename from vim/pack/man/start/vim-surround rename to editors/vim/pack/man/start/vim-surround diff --git a/vim/pack/man/start/vimtex b/editors/vim/pack/man/start/vimtex similarity index 100% rename from vim/pack/man/start/vimtex rename to editors/vim/pack/man/start/vimtex diff --git a/vim/pack/man/start/vimwiki b/editors/vim/pack/man/start/vimwiki similarity index 100% rename from vim/pack/man/start/vimwiki rename to editors/vim/pack/man/start/vimwiki diff --git a/vim/vimrc b/editors/vim/vimrc similarity index 100% rename from vim/vimrc rename to editors/vim/vimrc diff --git a/meta/configs/st.yaml b/meta/configs/st.yaml new file mode 100644 index 0000000..ab163c4 --- /dev/null +++ b/meta/configs/st.yaml @@ -0,0 +1,2 @@ +- shell: + [cd shells/st && sudo make install, Building st] diff --git a/meta/install.conf.yaml b/meta/install.conf.yaml deleted file mode 100644 index de0b10b..0000000 --- a/meta/install.conf.yaml +++ /dev/null @@ -1,57 +0,0 @@ -- defaults: - link: - relink: true - create: true - glob: true - shell: - stdin: true - stdout: true - stderr: true - -- create: - - ~/.local/share - - ~/.local/bin - -- clean: - ~/: - ~/.vim: - recursive: true - ~/.oh-my-zsh/custom: - recursive: true - ~/.local/bin: - -- shell: - - [bin/pre-install.sh] - - [git submodule update --init --recursive, Installing submodules] - - [cd src/tmux-mem-cpu-load && cmake . && make, Building tmux-mem-cpu-load] - - [cd src/fzf && make install, Building fzf] - - [cd src/i3lock-blur && make install, Building i3lock] - -- link: - ~/.vim: - ~/.vimrc: - ~/.zshrc: - ~/.zprofile: - ~/.tmux.conf: - ~/.fzf: src/fzf - ~/.config/i3: i3 - ~/.config/i3status: i3status - ~/.oh-my-zsh/custom: - path: oh-my-zsh/custom - force: true - # linking scripts - ~/.local/bin/ssh_agent_check: bin/ssh_agent_check - ~/.local/bin/display_uptime: bin/display_uptime - ~/.local/bin/docker_check: bin/docker_check - # scripts from seperate repos - ~/.local/bin/timetracker: src/timetracker/timetracker - ~/.local/bin/watertracker: src/watertracker/watertracker - ~/.local/bin/weather: src/weather/weather - ~/.local/bin/bluebikes: src/bluebikes/bluebikes - # fzf - ~/.local/bin/fzf: src/fzf/bin/fzf - ~/.local/bin/fzf-tmux: src/fzf/bin/fzf-tmux - # tmux mem-cpu-load - ~/.local/bin/tmux-mem-cpu-load: src/tmux-mem-cpu-load/tmux-mem-cpu-load - # custom systemd for time tracking - ~/.config/systemd/user/timesheet.service: src/timetracker/timesheet.service diff --git a/meta/profiles/arch b/meta/profiles/arch new file mode 100644 index 0000000..3cbfde1 --- /dev/null +++ b/meta/profiles/arch @@ -0,0 +1,10 @@ +vim +zsh +oh-my-zsh +fzf +tmux-sparse +st +i3 +polybar +picom +scripts diff --git a/meta/profiles/work-arch b/meta/profiles/work-arch new file mode 100644 index 0000000..603f4d3 --- /dev/null +++ b/meta/profiles/work-arch @@ -0,0 +1,11 @@ +vim +zsh +oh-my-zsh +fzf +tmux-sparse +st +i3 +picom +polybar +scripts +timetracker diff --git a/meta/profiles/wsl b/meta/profiles/wsl new file mode 100644 index 0000000..9fa971c --- /dev/null +++ b/meta/profiles/wsl @@ -0,0 +1,6 @@ +vim +tmux-full +zsh +oh-my-zsh +fzf +scripts diff --git a/shells/st b/shells/st new file mode 160000 index 0000000..d698aee --- /dev/null +++ b/shells/st @@ -0,0 +1 @@ +Subproject commit d698aee479f7fd5ce635568aa9892380d80f8ed7