Updates

- Update introduction with configuration
- Update README with sources
- Update assignments and fix some typos
- Add information about searching

Author: Kenneth Söderlund

README.md

@@ -1,2 +1,6 @@
 # vim-workshop
-Files used in my vim workshop
+Files used in my vim workshop.
+
+The sources used in this workshop is the awesome posts at 
+[Learn Vim For the Last Time: A Tutorial and Primer - By Daniel Miessler](https://danielmiessler.com/study/vim/) and
+[Vim registers: The basics and beyond - By Brian Storti](https://www.brianstorti.com/vim-registers/)

assignment-1.txt

@@ -7,7 +7,7 @@ Move around this file with the keys "hjkl", then try to go to the end of the fil
 Try to move by words with the "w"/"e" and "b" keys. NOTE: Here you can also use the modifiers, e.g. using a number before the key, you will jump that many words forward or backwards, e.g. "3w" jumps forward 3 words.
 
 
-Here's some text that you can work on. We're going to have some paragraphs, sentences and maybe some lorem ipsum to fill up the space. We'll have enough text so you can try out all the different types of movements, verbs and so on. We'll also have some typos, which you'll want to fix with the "c" key, perhaps something that needs to be removed with the "x" key and so onn.
+Here's some text that you can work on. We're going to have some paragraphs, sentences and maybe some lorem ipsum to fill up the space. We'll have enough text so you can try out all the different types of movements, verbs and so on. We'll also have some typos, which you'll want to fix with the "c" key, perhaps something that needs to be removed with the "x" key and so onn (you see what I did there?).
 
 Coorrecting text is somoetghing that you need too do when using vim to edit either normal text files or markdwn files. Go ahead and fix the issues with this paragraph.
 
@@ -18,10 +18,14 @@ You can also use "yank inside paragraph", which will copy the paragraph you're i
 --- paste here ---
 
 Go ahead and use the change to tag functionality, e.g. let's say that you should change text in the following sentence until the colon-sign (:).
-Place your cursor HERE, and use the change to tag functionality to replace the text until this colon-sign:
+Place your cursor HERE (on the H), and use the change to tag functionality to replace the text until this colon-sign:
 
 Now that you have those basics ready, here's some Samuel L. Ipsum for you to try out the moving on screen and perhaps searching for some words and replacing the words with something else. You may choose to do whatever you want with this text.
 
+Some ideas to work with: 
+- Find all occurences of the word "Lord" and replace it with "Lordi"
+- Move paragraphs around, e.g. cut some paragraphs and paste them somewhere else with just a few keystrokes
+
 
 --- SLIPSUM STARTS ---
 

assignment-3.txt

@@ -2,7 +2,7 @@ In this assignment we're going to be using the visual mode, macros and registers
 
 We will have some text that you can select, modify etc. 
 
-Below you will find a shopping list, that should have a dash (-) at the beginning of the line. The list can be fixed in a few different ways. We'll have the same list here a couple of times, and you should use at least visual selection, the repeatable command and record a macro and apply it to the list.
+Below you will find a shopping list, that should have a dash (-) at the beginning of each line. The list can be fixed in a few different ways. We'll have the same list here a couple of times, and you should use at least visual selection, the repeatable command (.) and record a macro and apply it to the list.
 
 
 Shopping list (visual selection):

introduction.md

@@ -52,4 +52,32 @@ Write your changes and exit vim: `:wq`
 Save your file as: `:saveas /path/where/to`
 Faster way to do `:wq`: `ZZ`
 
+## Configuration
+
+Vim configuration is something of an endless swamp, where once you get into, it's really hard to stop. For this workshop, we'll just start out with a minimalistic configuration. If you have vim already configured to your liking, it's fine, continue using that, but for those who doesn't have a sane configuration file, I'll provide the simple one here.
+
+The vim configuration file exists at `~/.vimrc` or `~/.vim/vimrc`. You can type in `:version` to print out information about the locations.
+Also `:scriptnames` will print out locations of different script files that vim has loaded.
+
+The vim configuration file is just a line by line set up of commands to execute during startup. The double quote (") is a comment, and anything after the quote is ignored.
+
+```
+set nocompatible                " good to have as first line, see :h nocompatible
+set backspace=indent,eol,start  " backspace can move beyond eol, indent and start of line
+set whichwrap+=<,>,h,l          " allow <,> and h, l to move to the previous/next line
+set encoding=utf-8 nobomb       " set the encoding used in vim, no BOM prepended
+set fileformat=unix             " set the file format to unix, e.g. <NL> (newline) is used instead of <CR><NL>
+syntax on                       " syntax highlighting
+set hlsearch                    " highlight all search results
+set ignorecase                  " case insensitive search
+set incsearch                   " show incremental search results
+set number                      " show line numbers
+set relativenumber              " show the line numbering relative to where you are 
+set noswapfile                  " disable swap files
+set showcmd                     " show the command being executed on the status bar
+```
+
+This is a very minimalistic configuration file, and I encourage you to investigate the many, many ways of configuring vim.
+
+
 [Next up, moving around](movement.md)

movement.md

@@ -49,6 +49,18 @@ Bonus:
 Jump to your previous navigation location: `Ctrl-i`\
 Jump back to where you were: `Ctrl-o`
 
+## Searching text
+
+You can search for text by entering the search key `/{word to search}<CR>`, then navigate to the next occurrence with `n` and previous occurrence with `N`. You can start searching backwards by entering `?` instead of `/`.
+
+Search for string: `/{string}`\
+Jump to character: `t`\
+Jump onto character: `f`\
+Search for other instances of the word under your cursor: `*`\
+Go to the next instance when you've jumped to a character (with `f` or `t`): `;`\
+Go to the previous instance when you've jumped to a character (with `f` or `t`): `,`
+
+
 # Assignment 1
 
 Please read the instructions in the `assignment-1.txt` file, and try out the verbs, modifiers and nouns.