extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2024-12-23 23:29:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update README and fix some typos

Browse Source
This commit is contained in:
Donovan Glover 2018-01-20 23:50:50 -05:00
parent 5285c1cc79
commit e87a81db73
No known key found for this signature in database
GPG Key ID: 8FC5F7D90A5D8F4D
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
README.md
View File

@ -45,7 +45,7 @@ Install the packages from your local user account:
git clone https://github.com/GloverDonovan/new-start
cd new-start
makepkg
sudo pacman -U *.pkg.tar.xz
sudo pacman -U *.xz
```
If you don't have one already, install an AUR helper:
@ -60,10 +60,10 @@ sudo pacman -U *.xz
Next, use your AUR helper to install the AUR packages:
```shell
yay shotgun polybar ttf-noto htop-vim-git inox-bin waterfox-bin
yay -S shotgun polybar ttf-noto htop-vim-git inox-bin waterfox-bin
```
Next, choose which dotfiles you want to use:
Then choose which dotfiles you want to use:
```shell
mv dotfiles ~
@ -71,7 +71,7 @@ cd ~/dotfiles
stow bspwm # Change this to whatever you want
```
Now run `startx` and you should have a working system!
Finally run `startx` and you should have a working system!
**NOTE**: Above is just a prototype and is not finalized. Expect changes.
@ -86,7 +86,20 @@ My dotfiles aim to be simple, straight-forward, and to the point. If you want to
- [`userChrome.css`](etc/userChrome.css) - A bare-minimum browser that emphasizes keyboard usage
- [`user.js`](etc/user.js) - Settings to make using the browser a more pleasurable experience
Some of the software I use include (in no particular order): [neovim](https://github.com/neovim/neovim), [ranger](https://github.com/ranger/ranger), [feh](https://github.com/derf/feh), [mpv](https://github.com/mpv-player/mpv), [zathura](https://github.com/pwmt/zathura), [yay](https://github.com/Jguer/yay), [compton](https://github.com/chjj/compton), [polybar](https://github.com/jaagr/polybar), [termite](https://github.com/thestinger/termite), [shotgun](https://github.com/Streetwalrus/shotgun), [waterfox](https://github.com/MrAlex94/Waterfox), [inox](https://github.com/gcarq/inox-patchset), [mpd](https://github.com/MusicPlayerDaemon/MPD), [mpc](https://github.com/MusicPlayerDaemon/mpc), [ncmpcpp](https://github.com/arybczak/ncmpcpp), [bspwm](https://github.com/baskerville/bspwm), [sxhkd](https://github.com/baskerville/sxhkd), and [zsh](https://wiki.archlinux.org/index.php/Zsh).
Some of the software I use include (in no particular order):
- [neovim](https://github.com/neovim/neovim)
- [ranger](https://github.com/ranger/ranger)
- [feh](https://github.com/derf/feh)
- [mpv](https://github.com/mpv-player/mpv)
- [zathura](https://github.com/pwmt/zathura)
- [yay](https://github.com/Jguer/yay)
- [polybar](https://github.com/jaagr/polybar)
- [shotgun](https://github.com/Streetwalrus/shotgun)
- [inox](https://github.com/gcarq/inox-patchset)
- [waterfox](https://github.com/MrAlex94/Waterfox)
- [mpd](https://github.com/MusicPlayerDaemon/MPD) + [mpc](https://github.com/MusicPlayerDaemon/mpc) + [ncmpcpp](https://github.com/arybczak/ncmpcpp)
- [bspwm](https://github.com/baskerville/bspwm) + [sxhkd](https://github.com/baskerville/sxhkd)
For a complete list of the packages included, see the [`PKGBUILD`](PKGBUILD).
@ -107,4 +120,4 @@ If you want to improve the help files or other parts of New Start then please fi
## License
- Code is released under the GPLv3 license.
- Help files are released under the Creative Commons BY-SA license.
- The [`install-guide.sh`](install-guide.sh) and help files are released under the Creative Commons BY-SA license.

6
help/git.md
View File

@ -64,9 +64,9 @@ Note that you should always make changes from an external branch then make a pul
If you need to update your local repository but have local changes, you need to stash them first.
1. Fetch upstream like usual.
2. Use `git stash` to store your changes temporarily.
3. Rebase the branch you want to update with `upstream/<branch>` (usually master).
1. First fetch upstream like usual.
2. Then use `git stash` to store your changes temporarily.
3. Next rebase the branch you want to update with `upstream/<branch>` (usually master).
4. Finally use `git stash pop` to update your repository with the stashed changes.
## Less common commands

2
install-guide.sh
View File

@ -66,7 +66,7 @@ echo "%wheel ALL=(ALL) ALL" >> /mnt/etc/sudoers
sed -i '/GRUB_GFXMODE/c\GRUB_GFXMODE=1280x1024' /mnt/etc/default/grub
# (Important!) Font settings ============
FONTS="/etc/fonts"
FONTS="/mnt/etc/fonts"
# Disable embedded bitmaps for all fonts
ln -s $FONTS/conf.avail/70-no-bitmaps.conf $FONTS/conf.d
# Enable sub-pixel RGB rendering