Navigation Menu

Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Commit

Permalink
ok
Browse files Browse the repository at this point in the history
  • Loading branch information
robertmeta committed Jul 31, 2018
1 parent ef4d3c6 commit d746a62
Show file tree
Hide file tree
Showing 757 changed files with 29,418 additions and 12,884 deletions.
18 changes: 7 additions & 11 deletions pack/colors/start/robertmeta-nofrils/LICENSE
@@ -1,6 +1,6 @@
Copyright (c) 2016 Robert Melton

MIT License

Copyright (c) 2018 Robert Melton

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -9,17 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:



The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.


The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
39 changes: 20 additions & 19 deletions pack/colors/start/robertmeta-nofrils/README.md
@@ -1,50 +1,50 @@
This is an extremely minimalist vim colorscheme (almost no syntax highlighting).

To use:
- :colo nofrils-dark
- :colo nofrils-light
- :colo nofrils-sepia
- :colo nofrils-acme **NEW**
- `:colo nofrils-dark`
- `:colo nofrils-light`
- `:colo nofrils-sepia`
- `:colo nofrils-acme`

To customize:
- :let g:nofrils\_strbackgrounds=1 to turn highlighted string backgrounds, for languages where strings are a major part of them
- :let g:nofrils\_heavycomments=1 to turn on high contrast comments rather than the default faded style, for projects where the comments are not deceit and lies
- :let g:nofrils\_heavylinenumbers=1 to turn on brighter line numbers, for people who use relative line numbers to hop around
- `:let g:nofrils_strbackgrounds=1` to turn highlighted string backgrounds, for languages where strings are a major part of them
- `:let g:nofrils_heavycomments=1` to turn on high contrast comments rather than the default faded style, for projects where the comments are not deceit and lies
- `:let g:nofrils_heavylinenumbers=1` to turn on brighter line numbers, for people who use relative line numbers to hop around

Commands (once theme is loaded):
- :NofrilsDark use dark theme
- :NofrilsLight use light theme
- :NofrilsSepia use sepia theme
- :NofrilsAcme use acme theme
- :NofrilsFocusNormal reset back to normal settings
- :NofrilsFocusCode focus only code, fade everything else
- :NofrilsFocusComments focus only comments, fade everything else
- `:NofrilsDark` use dark theme
- `:NofrilsLight` use light theme
- `:NofrilsSepia` use sepia theme
- `:NofrilsAcme` use acme theme
- `:NofrilsFocusNormal` reset back to normal settings
- `:NofrilsFocusCode` focus only code, fade everything else
- `:NofrilsFocusComments` focus only comments, fade everything else

The only highlighted elements are spelling, errors, comments, vim features (diff, etc) and *optionally* string backgrounds

**Click for non-fuzzified versions**

*nofrils-dark*: **let g:nofrils_heavylinenumbers=1**, **:let g:nofrils_strbackgrounds=1** and **:let g:nofrils_heavycomments=1**
*nofrils-dark*: **`:let g:nofrils_heavylinenumbers=1`**, **`:let g:nofrils_strbackgrounds=1`** and **`:let g:nofrils_heavycomments=1`**
![Dark Version](http://i.imgur.com/1lUx2hY.png)

----

*nofrils-acme*: **let g:nofrils_heavylinenumbers=0**, **:let g:nofrils_strbackgrounds=0** and **:let g:nofrils_heavycomments=0**
*nofrils-acme*: **`:let g:nofrils_heavylinenumbers=0`**, **`:let g:nofrils_strbackgrounds=0`** and **`:let g:nofrils_heavycomments=0`**
![Acme Version](http://i.imgur.com/yn7OJrY.png)

----

*nofrils-sepia*: **let g:nofrils_heavylinenumbers=1**, **:let g:nofrils_strbackgrounds=0** and **:let g:nofrils_heavycomments=1**
*nofrils-sepia*: **`:let g:nofrils_heavylinenumbers=1`**, **`:let g:nofrils_strbackgrounds=0`** and **`:let g:nofrils_heavycomments=1`**
![Sepia Version](http://i.imgur.com/zwW5kir.png)

----

*nofrils-light*: **let g:nofrils_heavylinenumbers=0**, **:let g:nofrils_strbackgrounds=0** and **:let g:nofrils_heavycomments=1**
*nofrils-light*: **`:let g:nofrils_heavylinenumbers=0`**, **`:let g:nofrils_strbackgrounds=0`** and **`:let g:nofrils_heavycomments=1`**
![Light Version](http://i.imgur.com/XXoxztJ.png)

----

*nofrils-acme*: **let g:nofrils_heavylinenumbers=0**, **:let g:nofrils_strbackgrounds=0** and **:let g:nofrils_heavycomments=0**
*nofrils-acme*: **`:let g:nofrils_heavylinenumbers=0`**, **`:let g:nofrils_strbackgrounds=0`** and **`:let g:nofrils_heavycomments=0`**
![Diffs Arcme Version](http://i.imgur.com/cLcbq7M.png)


Expand All @@ -58,4 +58,5 @@ Why did you even create this thing? https://www.robertmelton.com/2016/03/13/syn

Forks

- [Kakoune](http://kakoune.org/): https://github.com/robertmeta/nofrils-kakoune
- Atom: https://atom.io/themes/nothrill-dark-syntax
30 changes: 23 additions & 7 deletions pack/colors/start/romainl-apprentice/README.md
Expand Up @@ -20,7 +20,7 @@ Some code in iTerm, with `TERM=xterm`, using the Tango color palette:

![image](http://romainl.github.io/Apprentice/images/08termtango.png)

## Preparing your environment.
## Preparing your environment

Apprentice is designed first and foremost to look “good” in terminal emulators supporting 256 colors and in GUI Vim (GVim/MacVim). It supports lesser terminal emulators in the sense that it doesn’t break but it will definitely look “better” in more capable environments.

Expand All @@ -36,7 +36,7 @@ In practice, this new development doesn't change much for Apprentice which uses

:set termguicolors

See [this gist](https://gist.github.com/XVilka/8346728) for more information and support status and, of course, `:help termguicolors`.
See [this gist](https://gist.github.com/XVilka/8346728) for more information and support status and, of course, `:help 'termguicolors'`.

### 256color-ready terminal emulators

Expand Down Expand Up @@ -122,32 +122,48 @@ I recommend to adjust your terminal's background color to the one used in Appren
| hexadecimal | `#262626` |
| rgb | `rgb(38,38,38)` |

## Installing Apprentice.
## Installing Apprentice

Colorschemes must be placed in a directory named `colors` that is somewhere in Vim’s `runtimepath`:

The canonical location is:

~/.vim/colors/apprentice.vim
colors/apprentice.vim

but it could be:

~/.vim/bundle/apprentice/colors/apprentice.vim
bundle/apprentice/colors/apprentice.vim

or whatever works for you.

Arch users may be happy to hear that Apprentice [has landed in AUR](https://aur.archlinux.org/packages/vim-apprentice/). To install it, use an AUR helper — `yaourt -S vim-apprentice` — or download the `PKGBUILD` and do `$ makepkg -i`.

## Enabling Apprentice.
## Enabling Apprentice

To test Apprentice, just type this command from *normal* mode and hit `Enter`:

:colorscheme apprentice

If you like what you see and want to make Apprentice your default colorscheme, add this line to your `~/.vimrc`, preferably near the end, after any `syntax enable`, `syntax on`, `filetype ... on`, `call plug#end()`, or `call vundle#end()` line:
If you like what you see and want to make Apprentice your default colorscheme, add this line to your `vimrc`, preferably near the end, after any `syntax enable`, `syntax on`, `filetype ... on`, `call plug#end()`, or `call vundle#end()` line:

colorscheme apprentice

## Tweaking Apprentice

If you don't want to maintain your own fork of Apprentice you can add something like this to your `vimrc`, before `colorscheme apprentice`:

function! MyHighlights() abort
highlight Comment ctermfg=245
highlight NonText ctermbg=17
endfunction

augroup MyColors
autocmd!
autocmd ColorScheme * call MyHighlights()
augroup END

See [this Gist](https://gist.github.com/romainl/379904f91fa40533175dfaec4c833f2f) for reference.

## Lightline and Airline themes

I removed them from `master` but you can still find them in the "fancylines-and-neovim" branch.
Expand Down
@@ -0,0 +1,8 @@
> What is the latest commit SHA in your installed vim-gitgutter?
> What vim/nvim version are you on?
> If no signs are showing at all, what does `:echo b:gitgutter.path` give?
> If no signs are showing at all, and the `path` value is a path and not `-2`, does it work with `let g:gitgutter_grep=''`?
50 changes: 35 additions & 15 deletions pack/plugins/start/airblade-vim-gitgutter/README.mkd
@@ -1,6 +1,6 @@
## vim-gitgutter

A Vim plugin which shows a git diff in the 'gutter' (sign column). It shows which lines have been added, modified, or removed. You can also preview, stage, and undo individual hunks.
A Vim plugin which shows a git diff in the 'gutter' (sign column). It shows which lines have been added, modified, or removed. You can also preview, stage, and undo individual hunks. The plugin also provides a hunk text object.

The signs are always up to date and the plugin never saves your buffer.

Expand All @@ -23,9 +23,8 @@ Features:

Constraints:

* Supports git only.

If you work with other version control systems, I recommend [vim-signify](https://github.com/mhinz/vim-signify).
* Supports git only. If you work with other version control systems, I recommend [vim-signify](https://github.com/mhinz/vim-signify).
* Relies on the `FocusGained` event. If your terminal doesn't report focus events, either use something like [Terminus][] or set `let g:gitgutter_terminal_reports_focus=0`.


### Screenshot
Expand Down Expand Up @@ -108,7 +107,7 @@ When you make a change to a file tracked by git, the diff markers should appear

You can jump between hunks with `[c` and `]c`. You can preview, stage, and undo hunks with `<leader>hp`, `<leader>hs`, and `<leader>hu` respectively.

You cannot currently unstage a staged hunk.
You cannot unstage a staged hunk.


#### Activation
Expand Down Expand Up @@ -213,6 +212,7 @@ You can customise:
* The signs' colours and symbols
* Line highlights
* The base of the diff
* Extra arguments for `git` when running `git diff`
* Extra arguments for `git diff`
* Key mappings
* Whether or not vim-gitgutter is on initially (defaults to on)
Expand Down Expand Up @@ -298,6 +298,14 @@ let g:gitgutter_diff_base = '<commit SHA>'
```


#### Extra arguments for `git` when running `git diff`

If you want to pass extra arguments to `git` when running `git diff`, do so like this:

```viml
let g:gitgutter_git_args = '--git-dir-""'
```

#### Extra arguments for `git diff`

If you want to pass extra arguments to `git diff`, for example to ignore whitespace, do so like this:
Expand Down Expand Up @@ -462,23 +470,26 @@ nmap <silent> [c :call PrevHunkAllBuffers()<CR>

### FAQ

> Why can't I unstage staged changes?
> How can I turn off realtime updates?
Unstaging staged hunks is feasible but not quite as easy as it sounds. There are three relevant versions of a file at any one time:
Add this to your vim configuration (in an `/after/plugin` directory):

1. The version at HEAD in the repo.
2. The version staged in the index.
3. The version in the working tree, in your vim buffer.
```viml
" .vim/after/plugin/gitgutter.vim
autocmd! gitgutter CursorHold,CursorHoldI
```

`git-diff` without arguments shows you how 2 and 3 differ; this is what vim-gitgutter shows too.
> I turned off realtime updates, how can I have signs updated when I save a file?
`git-diff --staged` shows you how 1 and 2 differ.
If you really want to update the signs when you save a file, add this to your vimrc:

Let's say you are looking at a file in vim which has some unstaged changes. Now you stage a hunk, either via vim-gitgutter or another means. The hunk is no longer marked in vim-gitgutter because it is the same in 2 and 3.
```viml
autocmd BufWritePost * GitGutter
```

Now you want to unstage that hunk. To see it, you need the difference between 1 and 2. For vim-gitgutter to show those differences, it would need to show you 2 instead of 3 in your vim buffer. But 2 is virtual so vim-gitgutter would need to handle it without touching 3.
> Why can't I unstage staged changes?
I intend to implement this but I can't commit to any deadline.
This plugin is for showing changes between the working tree and the index (and staging/undoing those changes). Unstaging a staged hunk would require showing changes between the index and HEAD, which is out of scope.

> Why are the colours in the sign column weird?
Expand All @@ -505,6 +516,14 @@ Here are some things you can check:

* If you use zsh, and you set `CDPATH`, make sure `CDPATH` doesn't include the current directory.

#### When signs take a few seconds to appear

* Try reducing `updatetime`, e.g. `set updatetime=100`.

#### When signs don't update after focusing Vim

* Your terminal probably isn't reporting focus events. Either try installing [Terminus][] or set `let g:gitgutter_terminal_reports_focus=0`.


### Shameless Plug

Expand All @@ -525,3 +544,4 @@ Copyright Andrew Stewart, AirBlade Software Ltd. Released under the MIT licence
[pathogen]: https://github.com/tpope/vim-pathogen
[siv]: http://pluralsight.com/training/Courses/TableOfContents/smash-into-vim
[airblade]: http://airbladesoftware.com/peepcode-vim
[terminus]: https://github.com/wincent/terminus

0 comments on commit d746a62

Please sign in to comment.