From 678ccab589ab6ad8f3fe6b626aaa72e0077c8271 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Wed, 27 Dec 2017 22:53:07 -0500
Subject: [PATCH] Move .zshrc includes to .zsh/

---
 dotfiles/{.zsh_aliases => .zsh/aliases.zsh}     | 8 ++++++--
 dotfiles/{.zsh_functions => .zsh/functions.zsh} | 2 +-
 dotfiles/.zshrc                                 | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)
 rename dotfiles/{.zsh_aliases => .zsh/aliases.zsh} (96%)
 rename dotfiles/{.zsh_functions => .zsh/functions.zsh} (99%)

diff --git a/dotfiles/.zsh_aliases b/dotfiles/.zsh/aliases.zsh
similarity index 96%
rename from dotfiles/.zsh_aliases
rename to dotfiles/.zsh/aliases.zsh
index 6f8facc7..487edfee 100644
--- a/dotfiles/.zsh_aliases
+++ b/dotfiles/.zsh/aliases.zsh
@@ -29,7 +29,12 @@ alias rm="rm -i"        # Always confirm before deleting things (use -f to overr
 alias mkdir="mkdir -p"  # Automatically make parent directories that don't exist yet
 
 alias p="pwd | sed -e 's!$HOME!~!g'"    # Same as pwd, but uses ~ instead of $HOME
-alias c="clear"                         # Easily start fresh with a clean terminal
+
+# Easily start fresh with a clean terminal
+# Note that "clear force" (cf) clears the terminal for real and doesn't have
+# any side effects when resizing windows or scrolling up
+alias c="clear"
+alias cf="tput reset"
 
 # Make ls a lot easier to read (print directories first, just like ranger)
 alias ls="ls -hN --color=auto --group-directories-first"
@@ -109,4 +114,3 @@ alias lfox="launch waterfox"    # Launch waterfox separate from the terminal
 alias emacs="vim"       # No need to start another operating system
 alias nano="vim"        # Why nano when you have vim?
 alias vi="vim"          # Vim is vi improved, literally
-
diff --git a/dotfiles/.zsh_functions b/dotfiles/.zsh/functions.zsh
similarity index 99%
rename from dotfiles/.zsh_functions
rename to dotfiles/.zsh/functions.zsh
index 66e6bbc0..cbd39b33 100644
--- a/dotfiles/.zsh_functions
+++ b/dotfiles/.zsh/functions.zsh
@@ -89,7 +89,7 @@ function ss() {
 function readme() {
     local readme=`ls | grep README`
     if [[ $readme ]]; then
-        lvim $readme
+        nvim $readme
     else
         echo "No README found."
     fi
diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc
index 69092d15..4a169959 100644
--- a/dotfiles/.zshrc
+++ b/dotfiles/.zshrc
@@ -58,8 +58,8 @@ zstyle ':completion:*:default' menu 'select=0'
 zstyle ':completion:*' list-colors "=(#b) #([0-9]#)*=36=31"
 
 # Source our aliases first, then our functions (some functions rely on aliases)
-source ~/.zsh_aliases
-source ~/.zsh_functions
+source ~/.zsh/aliases.zsh
+source ~/.zsh/functions.zsh
 
 # Source our dircolors
 eval "$(dircolors ~/.dircolors)"