https://github.com/jrwrigh/dotfiles2.0

My (new) dotfiles repository
https://github.com/jrwrigh/dotfiles2.0

antibody dotfiles neovim tmux zsh

Last synced: 26 days ago
JSON representation

My (new) dotfiles repository

• Host: GitHub
• URL: https://github.com/jrwrigh/dotfiles2.0
• Owner: jrwrigh
• License: mit
• Created: 2019-09-01T21:03:57.000Z (about 5 years ago)
• Default Branch: master
• Last Pushed: 2024-08-04T15:24:55.000Z (3 months ago)
• Last Synced: 2024-08-04T17:06:52.269Z (3 months ago)
• Topics: antibody, dotfiles, neovim, tmux, zsh
• Language: Shell
• Homepage:
• Size: 40.5 MB
• Stars: 5
• Watchers: 3
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md
  • License: LICENSE

Awesome Lists containing this project

README

        
# dotfiles 2.0

Need to update documentation. Notice the helper scripts `add2dotf.sh` and `symlndotf.sh`.

There are a few "master-esque" branches. The first is obviously `master`. This

holds common items for the other two "master-esque" branches. The other two are

`desktop` and `server`. `desktop` is all configurations related to computers

that I use the desktop on and have more liberal control over. `server` is for

configurations on machines I don't have control over and generally only access

via ssh. The primary goal of this is to have `server` contain as minimal a

dependency list as possible.

## Made a commit on a local computer branch, but it should also go in master

First, find the commit hash that you want to move. Let's say it's `abcd123`.

```sh

git checkout master

git pull

git cherry-pick abcd123

git checkout [local computer branch]

git rebase master

```

If the transfer was successful, you can go back into `master` and push the

result to the remote.

Note that when pushing the resulting branch to remote, this must be done with a

`--force` because this is changing the history. **`master` cannot be force pushed**

### Update my local computer branch with latest master branch

If something goes wrong, simply `git reset --hard ORIG_HEAD` will get you back

to the branches original state.

```sh

git checkout master

git pull

git push

git checkout [local computer branch]

git rebase master

```

## Other Setup Notes

See `SETUP.md` for more detailed notes on setting up a system.

### git alias

If no other `[include]` is in the `~/.config/git/config`, then use:

`git config --global include.path '~/.config/git/gitconfig'`

Otherwise simply add `'~/.config/git/gitconfig'` to `~/.config/git/config`:

```gitconfig

[include]

    path = {EXISTING PATH}

    path = ~/.config/gitconfig.aliases

```

Generally advised to put the includes at the beginning of the

`~/.config/git/config` so that directives in that the local file overrides

these "default" settings.

## List of common packages I use (and should remember)

| Utility Type | Program Name |

|--------------|--------------|

| Screen Shots | Spectacle, flameshot  |

| GIF Screen Recorder | peek  |

| PDF          | Master PDF Editor 4 |

| GUI File Manager | pcmanfm  |

| VNC Client   | tigervnc     |

| G600 Mouse driver | piper |

| Emoji Font for Web | noto-fonts-emoji |