Skip to content

Commit

Permalink
Merge pull request #1 from SethGower/yadm
Browse files Browse the repository at this point in the history
Moves config management over to YADM
  • Loading branch information
SethGower authored Jul 20, 2021
2 parents cd25c53 + abdf56c commit 0c25888
Show file tree
Hide file tree
Showing 118 changed files with 32 additions and 203 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,5 @@ schemes:
white: '#ffffff'

colors: *dracula

# vim:ft=yaml
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions .custom_omz/plugins/zsh-autopair
Submodule zsh-autopair added at 9d003f
1 change: 1 addition & 0 deletions .custom_omz/plugins/zsh-autosuggestions
Submodule zsh-autosuggestions added at a411ef
1 change: 1 addition & 0 deletions .custom_omz/plugins/zsh-syntax-highlighting
File renamed without changes.
2 changes: 1 addition & 1 deletion git/.gitconfig → .gitconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[include]
path= ~/.personalgitconfig
path= .gitconfig.local
[alias]
stash-all = stash save --include-untracked
showtool = "!f() { git difftool $1^ $1; }; f"
Expand Down
5 changes: 5 additions & 0 deletions .gitconfig.local##default
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[user]
name = Seth Gower
email = [email protected]

# vim:ft=gitconfig
4 changes: 4 additions & 0 deletions .gitconfig.local##hostname.HELUDD-CD77F33
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[user]
name = Seth Gower
email = [email protected]
# vim:ft=gitconfig
2 changes: 0 additions & 2 deletions .gitignore

This file was deleted.

File renamed without changes.
22 changes: 11 additions & 11 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[submodule "zsh/.oh-my-zsh"]
path = zsh/.oh-my-zsh
url = https://github.com/robbyrussell/oh-my-zsh.git
[submodule "zsh/.custom_omz/plugins/zsh-syntax-highlighting"]
path = zsh/.custom_omz/plugins/zsh-syntax-highlighting
url = https://github.com/zsh-users/zsh-syntax-highlighting.git
[submodule "zsh/.custom_omz/plugins/zsh-autosuggestions"]
path = zsh/.custom_omz/plugins/zsh-autosuggestions
url = https://github.com/zsh-users/zsh-autosuggestions.git
[submodule "zsh/.custom_omz/plugins/zsh-autopair"]
path = zsh/.custom_omz/plugins/zsh-autopair
[submodule ".custom_omz/plugins/zsh-autopair"]
path = .custom_omz/plugins/zsh-autopair
url = https://github.com/hlissner/zsh-autopair.git
[submodule ".custom_omz/plugins/zsh-autosuggestions"]
path = .custom_omz/plugins/zsh-autosuggestions
url = https://github.com/zsh-users/zsh-autosuggestions.git
[submodule ".custom_omz/plugins/zsh-syntax-highlighting"]
path = .custom_omz/plugins/zsh-syntax-highlighting
url = https://github.com/zsh-users/zsh-syntax-highlighting.git
[submodule ".oh-my-zsh"]
path = .oh-my-zsh
url = https://github.com/ohmyzsh/ohmyzsh.git
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions .oh-my-zsh
Submodule .oh-my-zsh added at dac331
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
28 changes: 5 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,20 @@

### Installation

I use [GNU Stow](https://www.gnu.org/software/stow/) to install and link my dotfiles.
I use [YADM](https://yadm.io) manage my dotfiles.

Note: If you are looking for when I used [GNU Stow](https://www.gnu.org/software/stow/) checkout [v1.0](https://github.com/SethGower/dotfiles/releases/tag/v1.0)


All you need to do is simply clone this repo (I suggest into `~/.dotfiles`). Because I have some git submodules for `zsh` and `oh-my-zsh`, you need to add the `--recursive` option to the `clone` call. An example of that is below:

```sh
$ git clone --recursive https://github.com/SethGower/dotfiles.git $HOME/.dotfiles #clones repo and submodules to $HOME/.dotfiles
$ cd $HOME/.dotfiles
$ git submodule update --init --recursive --remote # update to the most recent commit on the remote branch of the submodules

# Installs the config files (but doesn't install programs)
$ stow i3 polybar vim # installs the contents of the i3 polybar and vim directories to the parent dir ($HOME/)

# Installs programs and the config files
$ ./install.sh i3 polybar vim # see ./install.d/README.md
$ yadm clone https://github.com/SethGower/dotfiles.git
$ yadm status
```

Or you can use any of the other package folder in this repo.

### Usage

#### Branching

I have started using branches to differentiate between different versions of
my dotfiles. The current version that I am using will be stored in master as
well as its named branch. Other versions are stored in other branches. Current
branches are

- alpha (newest)
- beta (first rice. Naming is reversed because of creation of branches and
stuff)

### License

This software is freely distributed under the terms of the [MIT License](https://opensource.org/licenses/MIT)
6 changes: 0 additions & 6 deletions install.d/README.md

This file was deleted.

7 changes: 0 additions & 7 deletions install.d/arch/README.md

This file was deleted.

3 changes: 0 additions & 3 deletions install.d/arch/alacritty.sh

This file was deleted.

5 changes: 0 additions & 5 deletions install.d/arch/compton.sh

This file was deleted.

2 changes: 0 additions & 2 deletions install.d/arch/dunst.sh

This file was deleted.

10 changes: 0 additions & 10 deletions install.d/arch/functions.sh

This file was deleted.

2 changes: 0 additions & 2 deletions install.d/arch/git.sh

This file was deleted.

3 changes: 0 additions & 3 deletions install.d/arch/i3.sh

This file was deleted.

5 changes: 0 additions & 5 deletions install.d/arch/neovim.sh

This file was deleted.

5 changes: 0 additions & 5 deletions install.d/arch/polybar.sh

This file was deleted.

2 changes: 0 additions & 2 deletions install.d/arch/ranger.sh

This file was deleted.

2 changes: 0 additions & 2 deletions install.d/arch/redshift.sh

This file was deleted.

2 changes: 0 additions & 2 deletions install.d/arch/rofi.sh

This file was deleted.

2 changes: 0 additions & 2 deletions install.d/arch/tmux.sh

This file was deleted.

2 changes: 0 additions & 2 deletions install.d/arch/zsh.sh

This file was deleted.

23 changes: 0 additions & 23 deletions install.sh

This file was deleted.

81 changes: 0 additions & 81 deletions neovim/.local/share/nvim/site/autoload/ld.vim

This file was deleted.

Binary file removed screenshot.png
Diff not rendered.
1 change: 0 additions & 1 deletion zsh/.custom_omz/plugins/zsh-autopair
Submodule zsh-autopair deleted from 4039bf
1 change: 0 additions & 1 deletion zsh/.custom_omz/plugins/zsh-autosuggestions
Submodule zsh-autosuggestions deleted from a7f010
1 change: 0 additions & 1 deletion zsh/.custom_omz/plugins/zsh-syntax-highlighting
Submodule zsh-syntax-highlighting deleted from 3dc74b
1 change: 0 additions & 1 deletion zsh/.oh-my-zsh
Submodule .oh-my-zsh deleted from e4f6f1

0 comments on commit 0c25888

Please sign in to comment.