From 86ce2abd6e7906ba9c11570db1938aefcce413f2 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Thu, 13 Jan 2022 14:47:59 -0800
Subject: [PATCH 01/15] zsh: add ned

---
 .config/shell/bin/ned | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100755 .config/shell/bin/ned

diff --git a/.config/shell/bin/ned b/.config/shell/bin/ned
new file mode 100755
index 0000000..3edf8df
--- /dev/null
+++ b/.config/shell/bin/ned
@@ -0,0 +1,23 @@
+#!/bin/bash
+# NEd: Note Editor (and your best friend!)
+# Ned can edit and create notes in a folder you tell him to!
+
+NOTES_DIR="$HOME/Documents/college/2y/2q/"
+
+[ -d "$NOTES_DIR"/misc ] && mkdir "$NOTES_DIR/misc"
+
+# Create misc note if blank
+if [ -z "$1" ]; then
+   "$EDITOR" "$NOTES_DIR/unsorted/$(date)"
+   zsh
+fi
+
+# Parse arguments
+case "$1" in
+   # create and edit new note
+   'new'|'n') "$EDITOR" "$NOTES_DIR"/*"$2"*/notes/"$3";;
+   # edit ned
+   'e') "$EDITOR" "$(realpath "$0")";;
+   *) echo "no such option";;
+esac
+

From eccae5b2622ba0deb58eaa7189852d54e7c0d924 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Thu, 13 Jan 2022 17:59:21 -0800
Subject: [PATCH 02/15] zsh: add sced (script edit)

---
 .config/shell/bin/sced | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100755 .config/shell/bin/sced

diff --git a/.config/shell/bin/sced b/.config/shell/bin/sced
new file mode 100755
index 0000000..1b12f26
--- /dev/null
+++ b/.config/shell/bin/sced
@@ -0,0 +1,21 @@
+#!/bin/bash
+# sced (script edit) edit a script or function that's somewhere inside the shell configuration
+# Usage: bined <script name>
+# Depends: fd
+
+# start in the directory above the script
+cd "$(dirname "$(realpath "$0")")"/.. || exit 1
+
+# get the path to the file if there was an argument
+if [ -n "$1" ]; then
+  FILE="$(fd --exact-depth 2 --max-results=1 -at f "$1")"
+  if [ "$FILE" = '' ]; then
+    FILE="$(dirname "$(realpath "$0")")/../$1"
+  fi
+else
+  # edit >this< script by default
+  FILE="$(realpath "$0")"
+fi
+
+# edit the file
+"${EDITOR:-$(which nvim)}" "${FILE:-$(realpath "$0")}"

From 90001bef1535e22916df5a63f1ba9a772b64bed0 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Fri, 14 Jan 2022 21:48:53 -0800
Subject: [PATCH 03/15] nvim: brought back yaml ts parser

---
 .config/nvim/lua/blake/lsp.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.config/nvim/lua/blake/lsp.lua b/.config/nvim/lua/blake/lsp.lua
index 2db7353..6aa3598 100644
--- a/.config/nvim/lua/blake/lsp.lua
+++ b/.config/nvim/lua/blake/lsp.lua
@@ -49,6 +49,7 @@ M.treesitter = function()
          "rust",
          "toml",
          "vim",
+         "yaml",
       },
       --ignore_install = { "javascript", "java" }, -- List of parsers to ignore installing
       highlight = {

From 61fee7bacd6d726d4df6dba7bc9c6fbe20ced10a Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Wed, 19 Jan 2022 19:54:24 -0800
Subject: [PATCH 04/15] nvim: formatting (tabs to spaces)

---
 .config/nvim/lua/blake/settings.lua | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.config/nvim/lua/blake/settings.lua b/.config/nvim/lua/blake/settings.lua
index 69cc943..50c2755 100644
--- a/.config/nvim/lua/blake/settings.lua
+++ b/.config/nvim/lua/blake/settings.lua
@@ -148,16 +148,16 @@ vim.cmd [[
 -- Edit *.bin files as binaries rather than text files (if your file isn't a .bin,
 -- make a symlink that points to it with the .bin extension and edit the symlink ;)
 vim.cmd [[
-	augroup Binary
-	   au!
-	   au BufReadPre   *.bin let &bin=1
-	   au BufReadPost  *.bin if &bin | %!xxd
-	   au BufReadPost  *.bin set ft=xxd | endif
-	   au BufWritePre  *.bin if &bin | %!xxd -r
-	   au BufWritePre  *.bin endif
-	   au BufWritePost *.bin if &bin | %!xxd
-	   au BufWritePost *.bin set nomod | endif
-	augroup END
+   augroup Binary
+      au!
+      au BufReadPre   *.bin let &bin=1
+      au BufReadPost  *.bin if &bin | %!xxd
+      au BufReadPost  *.bin set ft=xxd | endif
+      au BufWritePre  *.bin if &bin | %!xxd -r
+      au BufWritePre  *.bin endif
+      au BufWritePost *.bin if &bin | %!xxd
+      au BufWritePost *.bin set nomod | endif
+   augroup END
 ]]
 
 -- 'Visual At' plugin (https://github.com/stoeffel/.dotfiles/blob/master/vim/visual-at.vim)

From 696bda73c7eac2339b2fc7123e5422ac26b33594 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Thu, 20 Jan 2022 03:16:39 -0800
Subject: [PATCH 05/15] nvim: configure zenmode

---
 .config/nvim/lua/blake/other.lua   | 48 ++++++++++++++++++++++++++++++
 .config/nvim/lua/blake/plugins.lua |  3 +-
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/.config/nvim/lua/blake/other.lua b/.config/nvim/lua/blake/other.lua
index 2c97bb3..04e2aa8 100644
--- a/.config/nvim/lua/blake/other.lua
+++ b/.config/nvim/lua/blake/other.lua
@@ -169,6 +169,54 @@ M.neoscroll = function()
 end
 -- <<<
 
+-- ZenMode >>>
+M.zenmode = function()
+   -- map :ZM to :ZenMode
+   vim.cmd 'command! ZM ZenMode'
+   require("zen-mode").setup {
+      window = {
+         backdrop = 0.95, -- shade the backdrop of the Zen window. Set to 1 to keep the same as Normal
+         -- height and width can be:
+         -- * an absolute number of cells when > 1
+         -- * a percentage of the width / height of the editor when <= 1
+         -- * a function that returns the width or the height
+         width = 120, -- width of the Zen window
+         height = 0.95, -- height of the Zen window
+         -- by default, no options are changed for the Zen window
+         -- uncomment any of the options below, or add other vim.wo options you want to apply
+         options = { -- uncomment to do what the sign says
+            -- signcolumn = "no",      -- signcolumn
+            number = false,         -- number column
+            -- relativenumber = false, -- relative numbers
+            -- cursorline = false,     -- cursorline
+            cursorcolumn = false,   -- cursor column
+            -- foldcolumn = "0",       -- fold column
+            -- list = false,           -- whitespace characters
+         },
+      },
+      plugins = {
+         -- disable some global vim options (vim.o...)
+         -- comment the lines to not apply the options
+         options = {
+            enabled = true,
+            ruler = false, -- disables the ruler text in the cmd line area
+            showcmd = false, -- disables the command in the last line of the screen
+         },
+         twilight = { enabled = true }, -- enable to start Twilight when zen mode opens
+         gitsigns = { enabled = true }, -- disables git signs
+         tmux = { enabled = false }, -- disables the tmux statusline
+      },
+      -- Functions I could write but I'm probably not going to use
+      -- -- callback where you can add custom code when the Zen window opens
+      -- on_open = function(win)
+      -- end,
+      -- -- callback where you can add custom code when the Zen window closes
+      -- on_close = function()
+      -- end,
+   }
+end
+-- <<<
+
 -- Autosession >>>
 M.autosession = function()
    local opts = {
diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua
index 16d2a67..284586a 100644
--- a/.config/nvim/lua/blake/plugins.lua
+++ b/.config/nvim/lua/blake/plugins.lua
@@ -206,8 +206,7 @@ return require('packer').startup({function()
    use {                                           -- Zen mode (:ZenMode or :ZM)
       "folke/zen-mode.nvim",
       config = function()
-         vim.cmd 'command! ZM ZenMode'
-         require("zen-mode").setup()
+         require('blake.other').zenmode()
       end,
    }
    use {                                           -- dim text outside paragraph or function

From 635b495e0a388261e64afbf47da6f199e8e4d819 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Thu, 20 Jan 2022 03:18:04 -0800
Subject: [PATCH 06/15] zsh: ned: progress

---
 .config/shell/bin/ned | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.config/shell/bin/ned b/.config/shell/bin/ned
index 3edf8df..ed2e947 100755
--- a/.config/shell/bin/ned
+++ b/.config/shell/bin/ned
@@ -2,20 +2,32 @@
 # NEd: Note Editor (and your best friend!)
 # Ned can edit and create notes in a folder you tell him to!
 
-NOTES_DIR="$HOME/Documents/college/2y/2q/"
+# shellcheck disable=SC2068
+
+# set default value for $NOTES_DIR
+${NOTES_DIR:="$HOME/Documents/college/2y/2q/"}
 
 [ -d "$NOTES_DIR"/misc ] && mkdir "$NOTES_DIR/misc"
 
-# Create misc note if blank
+# Create misc note if no input
 if [ -z "$1" ]; then
    "$EDITOR" "$NOTES_DIR/unsorted/$(date)"
    zsh
 fi
 
+new() {
+   if [ -z "$1" ]; then
+      "$EDITOR" "$NOTES_DIR/unsorted/$(date)"
+      zsh
+   fi
+
+   "$EDITOR" "$NOTES_DIR/$2"*"/notes/$3"
+}
+
 # Parse arguments
 case "$1" in
    # create and edit new note
-   'new'|'n') "$EDITOR" "$NOTES_DIR"/*"$2"*/notes/"$3";;
+   'new'|'n') new $@;;
    # edit ned
    'e') "$EDITOR" "$(realpath "$0")";;
    *) echo "no such option";;

From ec22006f01d657b01ac821e7917fb3b54e989bd0 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Fri, 21 Jan 2022 02:37:05 -0800
Subject: [PATCH 07/15] nvim: zen mode background color adjustment

---
 .config/nvim/lua/blake/other.lua | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.config/nvim/lua/blake/other.lua b/.config/nvim/lua/blake/other.lua
index 04e2aa8..48e092c 100644
--- a/.config/nvim/lua/blake/other.lua
+++ b/.config/nvim/lua/blake/other.lua
@@ -175,7 +175,7 @@ M.zenmode = function()
    vim.cmd 'command! ZM ZenMode'
    require("zen-mode").setup {
       window = {
-         backdrop = 0.95, -- shade the backdrop of the Zen window. Set to 1 to keep the same as Normal
+         backdrop = 1, -- shade the backdrop of the Zen window. Set to 1 to keep the same as Normal
          -- height and width can be:
          -- * an absolute number of cells when > 1
          -- * a percentage of the width / height of the editor when <= 1
@@ -206,13 +206,6 @@ M.zenmode = function()
          gitsigns = { enabled = true }, -- disables git signs
          tmux = { enabled = false }, -- disables the tmux statusline
       },
-      -- Functions I could write but I'm probably not going to use
-      -- -- callback where you can add custom code when the Zen window opens
-      -- on_open = function(win)
-      -- end,
-      -- -- callback where you can add custom code when the Zen window closes
-      -- on_close = function()
-      -- end,
    }
 end
 -- <<<

From 6262283b45eef59000c7da7efe95eea822776f33 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Fri, 21 Jan 2022 11:20:39 -0800
Subject: [PATCH 08/15] zsh: shorten prompt's max directory length

---
 .config/shell/p10k/colorful-angular.p10k.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/shell/p10k/colorful-angular.p10k.zsh b/.config/shell/p10k/colorful-angular.p10k.zsh
index 7828909..ffbccaf 100644
--- a/.config/shell/p10k/colorful-angular.p10k.zsh
+++ b/.config/shell/p10k/colorful-angular.p10k.zsh
@@ -263,7 +263,7 @@
   # directory will be shortened only when prompt doesn't fit or when other parameters demand it
   # (see POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS and POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT below).
   # If set to `0`, directory will always be shortened to its minimum length.
-  typeset -g POWERLEVEL9K_DIR_MAX_LENGTH=80
+  typeset -g POWERLEVEL9K_DIR_MAX_LENGTH=70
   # When `dir` segment is on the last prompt line, try to shorten it enough to leave at least this
   # many columns for typing commands.
   typeset -g POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS=40

From 10a34be1232abeda82610baab1f5f27dbbdba7ce Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Fri, 21 Jan 2022 14:16:52 -0800
Subject: [PATCH 09/15] nvim: formatting and auto-pairs integration

---
 .config/nvim/lua/blake/lsp.lua | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.config/nvim/lua/blake/lsp.lua b/.config/nvim/lua/blake/lsp.lua
index 6aa3598..ea37768 100644
--- a/.config/nvim/lua/blake/lsp.lua
+++ b/.config/nvim/lua/blake/lsp.lua
@@ -108,8 +108,12 @@ M.cmp = function()
    -- nvim-cmp supports additional completion capabilities
    local capabilities = vim.lsp.protocol.make_client_capabilities()
    capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
-   -- nvim-cmp setup
-   local cmp = require 'cmp'
+   -- If you want insert `(` after select function or method item
+   local cmp_autopairs = require('nvim-autopairs.completion.cmp')
+   local cmp = require('cmp')
+   cmp.event:on( 'confirm_done', cmp_autopairs.on_confirm_done({  map_char = { tex = '' } }))
+   -- add a lisp filetype (wrap my-function), FYI: Hardcoded = { "clojure", "clojurescript", "fennel", "janet" }
+   cmp_autopairs.lisp[#cmp_autopairs.lisp+1] = "racket"   -- nvim-cmp setup
    cmp.setup {
       mapping = {
          ['<C-p>'] = cmp.mapping.select_prev_item(),
@@ -159,11 +163,9 @@ M.cmp = function()
       }),
       cmp.setup.cmdline(':', {
          sources = cmp.config.sources({
-               { name = 'path' }
-            },
-            {
-               { name = 'cmdline' }
-            })
+            { name = 'path' },
+            { name = 'cmdline' }
+         }),
       }),
       formatting = {
          format = function(entry, vim_item)

From d61794254cffc44887005cdaa1559ce3a0f34ab3 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Fri, 21 Jan 2022 17:39:22 -0800
Subject: [PATCH 10/15] zsh: ned: big improvements. check the usage() function
 for details

---
 .config/shell/bin/ned | 94 +++++++++++++++++++++++++++++++++----------
 1 file changed, 72 insertions(+), 22 deletions(-)

diff --git a/.config/shell/bin/ned b/.config/shell/bin/ned
index ed2e947..3f75f22 100755
--- a/.config/shell/bin/ned
+++ b/.config/shell/bin/ned
@@ -1,35 +1,85 @@
 #!/bin/bash
 # NEd: Note Editor (and your best friend!)
 # Ned can edit and create notes in a folder you tell him to!
+# Depends: fzf
 
-# shellcheck disable=SC2068
+# shellcheck disable=SC2068,SC2178,SC2128
 
-# set default value for $NOTES_DIR
-${NOTES_DIR:="$HOME/Documents/college/2y/2q/"}
+# set default values if things are unset
+NOTES_DIR="${NOTES_DIR:-"$HOME/Documents/college/current"}"
+EDITOR="${EDITOR:-"nvim"}"
 
-[ -d "$NOTES_DIR"/misc ] && mkdir "$NOTES_DIR/misc"
+usage() {
+   cat <<-EOF
+		Usage:
+		ned <verb>
+		   new <folder> [note name]        create a new note in the matched class folder
+		   edit [folder]                   search for and edit a text document in a folder
+		   help                            print this message
 
-# Create misc note if no input
-if [ -z "$1" ]; then
-   "$EDITOR" "$NOTES_DIR/unsorted/$(date)"
-   zsh
-fi
-
-new() {
-   if [ -z "$1" ]; then
-      "$EDITOR" "$NOTES_DIR/unsorted/$(date)"
-      zsh
-   fi
-
-   "$EDITOR" "$NOTES_DIR/$2"*"/notes/$3"
+		Notes:
+		   Right now, only the first letter of each option is considered, so \`ned n\` and \`ned neww\` do the same thing
+		   Folder and file names are globbed
+		   Current repository path: $NOTES_DIR
+	EOF
 }
 
-# Parse arguments
-case "$1" in
+edit() {
+   check_setup
+
+   NOTE_PATH=("$NOTES_DIR/$2"*)
+   NOTE_PATH="${NOTE_PATH[0]}"
+   if ! [ -d "$NOTE_PATH" ]; then
+      echo "No such directory: '$NOTE_PATH'"
+      exit 1
+   fi
+
+   NOTE_NAME="$(cd "$NOTE_PATH" && fzf --height=10 --layout=reverse)" || exit
+   "$EDITOR" "$NOTES_DIR/$NOTE_NAME"
+}
+
+new() {
+   check_setup
+   if [ -z "$3" ]; then
+      NOTE_NAME="$(date +'%F').md"
+   else
+      NOTE_NAME="$3.md"
+   fi
+
+   NOTE_PATH=("$NOTES_DIR/$2"*/notes)
+   NOTE_PATH="${NOTE_PATH[0]}"
+   if ! [ -d "$NOTE_PATH" ]; then
+      echo "No such directory: '$NOTE_PATH'"
+      exit 1
+   fi
+
+   "$EDITOR" "$NOTE_PATH/$NOTE_NAME"
+}
+
+subshell() {
+   echo 'entering subshell'
+   zsh
+}
+
+check_setup() {
+   # perform preliminary checks to make sure the script can run properly
+   if ! [ -d "$NOTES_DIR" ]; then
+      echo "Error: Notes directory ($NOTES_DIR) does not exist or is not a directory"
+      exit 1
+   fi
+}
+
+# Parse arguments (first character only)
+case "${1:0:1}" in
+   # help
+   'h') usage;;
    # create and edit new note
-   'new'|'n') new $@;;
-   # edit ned
-   'e') "$EDITOR" "$(realpath "$0")";;
+   'n') new $@;;
+   # edit an existing document or file
+   'e') edit $@;;
+   # me: edit ned (the file you are looking at)
+   'm') "$EDITOR" "$(realpath "$0")";;
    *) echo "no such option";;
 esac
 
+# vim: et sw=3 ts=3

From 470741071d6ebbb971198049dfa4950bc63d2d79 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Fri, 21 Jan 2022 17:41:25 -0800
Subject: [PATCH 11/15] nvim: add indent-blankline.nvim, committia,
 conflict-marker, and modify listchars

---
 .config/nvim/lua/blake/other.lua    | 17 +++++++++
 .config/nvim/lua/blake/plugins.lua  | 55 +++++++++++++++--------------
 .config/nvim/lua/blake/settings.lua |  3 +-
 3 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/.config/nvim/lua/blake/other.lua b/.config/nvim/lua/blake/other.lua
index 48e092c..42e4e13 100644
--- a/.config/nvim/lua/blake/other.lua
+++ b/.config/nvim/lua/blake/other.lua
@@ -169,6 +169,23 @@ M.neoscroll = function()
 end
 -- <<<
 
+-- indent_blankline >>>
+M.indent_blankline = function()
+   vim.cmd [[
+      let g:indent_blankline_show_first_indent_level = v:true
+      let g:indent_blankline_show_foldtext = v:false
+      let g:indent_blankline_buftype_exclude = ['terminal']
+      let g:indent_blankline_use_treesitter = v:true
+      let g:indent_blankline_show_current_context = v:true
+   ]]
+   require("indent_blankline").setup {
+      -- for example, context is off by default, use this to turn it on
+      show_current_context = true,
+      show_current_context_start = true,
+   }
+end
+-- <<<
+
 -- ZenMode >>>
 M.zenmode = function()
    -- map :ZM to :ZenMode
diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua
index 284586a..24b9dd5 100644
--- a/.config/nvim/lua/blake/plugins.lua
+++ b/.config/nvim/lua/blake/plugins.lua
@@ -223,19 +223,14 @@ return require('packer').startup({function()
    --    'ggandor/lightspeed.nvim',
    -- }
    use {                                              -- indentline: Line indent indicators
-      'Yggdroot/indentLine',
+      'lukas-reineke/indent-blankline.nvim',
       config = function()
-         vim.cmd [[
-            let g:indentLine_char = '▏'
-            let g:indentLine_conceallevel = 1
-            let g:indentLine_fileTypeExclude = ['markdown', 'help', 'packer']
-            autocmd TermOpen * IndentLinesDisable
-         ]]
+         require('blake.other').indent_blankline()
       end
    }
-   use {                                           -- targets.vim: fix ci' and other things to work right
-      'wellle/targets.vim',
-   }
+   -- use {                                           -- targets.vim: fix ci' and other things to work right
+   --    'wellle/targets.vim',
+   -- }
 
    -- Conveniences
    use {                                           -- Ghost: Web browser integration
@@ -250,26 +245,29 @@ return require('packer').startup({function()
          vim.api.nvim_set_keymap('n', '<F5>', '<cmd>UndotreeToggle<CR>', { noremap = true, silent = true, })
       end
    }
---   use {                                           -- Dim inactive window
---      'sunjon/shade.nvim',
---      config = function()
---         require'shade'.setup({
---            overlay_opacity = 50,
---            opacity_step = 1,
---            keys = {
---               brightness_up    = '<C-Up>',
---               brightness_down  = '<C-Down>',
---               toggle           = '<Leader>s',
---            }
---         })
---      end
---   }
+  --  use {                                           -- Dim inactive window
+  --    'sunjon/shade.nvim',
+  --    config = function()
+  --       require'shade'.setup({
+  --          overlay_opacity = 50,
+  --          opacity_step = 1,
+  --          keys = {
+  --             brightness_up    = '<C-Up>',
+  --             brightness_down  = '<C-Down>',
+  --             toggle           = '<Leader>s',
+  --          }
+  --       })
+  --    end
+  -- }
    use {                                           -- Quote pairing
       'windwp/nvim-autopairs',
       config = function()
          require('nvim-autopairs').setup()
       end
    }
+   use {                                           -- accelerated jk movement
+      'rhysd/accelerated-jk'
+   }
    use {                                           -- Alignment
       'junegunn/vim-easy-align',
    }
@@ -284,10 +282,8 @@ return require('packer').startup({function()
                -- Only calculate commentstring for tsx filetypes
                if vim.bo.filetype == 'typescriptreact' then
                   local U = require('Comment.utils')
-
                   -- Detemine whether to use linewise or blockwise commentstring
                   local type = ctx.ctype == U.ctype.line and '__default' or '__multiline'
-
                   -- Determine the location where to calculate commentstring from
                   local location = nil
                   if ctx.ctype == U.ctype.block then
@@ -295,7 +291,6 @@ return require('packer').startup({function()
                   elseif ctx.cmotion == U.cmotion.v or ctx.cmotion == U.cmotion.V then
                      location = require('ts_context_commentstring.utils').get_visual_start_location()
                   end
-
                   return require('ts_context_commentstring.internal').calculate_commentstring({
                      key = type,
                      location = location,
@@ -305,6 +300,12 @@ return require('packer').startup({function()
           }
        end
     }
+   use {                                              -- rhysd: committia: better commit editing window
+      'rhysd/committia.vim',
+   }
+   use {                                              -- rhysd: conflict-marker: mark git conflicts - [x ]x
+      'rhysd/conflict-marker.vim',
+   }
    -- use {                                           -- lewis6991: spellsitter: Spell checking in treesitter files
    --    'lewis6991/spellsitter.nvim',
    --    config = function()
diff --git a/.config/nvim/lua/blake/settings.lua b/.config/nvim/lua/blake/settings.lua
index 50c2755..e422cc2 100644
--- a/.config/nvim/lua/blake/settings.lua
+++ b/.config/nvim/lua/blake/settings.lua
@@ -38,7 +38,8 @@ set.showcmd = true
 set.signcolumn = 'yes'
 set.makeprg = 'make -j$(nproc)'
 set.ruler = false
-set.listchars = "eol:↴,trail:~,tab:'»',nbsp:␣,space:·"
+set.listchars = "trail:~,tab:│ ,nbsp:␣,lead:·,extends:…,precedes:…"
+set.list = false
 
 ----------------------------------------------
 --- Key bindings (needs to be translated?) ---

From a4bd82a2d98cd15ba6a6ae2d9fc92eced578fb43 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Sun, 23 Jan 2022 03:20:41 -0800
Subject: [PATCH 12/15] ned: automatically activate ZenMode, and assume editor
 is nvim

---
 .config/shell/bin/ned | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.config/shell/bin/ned b/.config/shell/bin/ned
index 3f75f22..d2f2af1 100755
--- a/.config/shell/bin/ned
+++ b/.config/shell/bin/ned
@@ -7,7 +7,8 @@
 
 # set default values if things are unset
 NOTES_DIR="${NOTES_DIR:-"$HOME/Documents/college/current"}"
-EDITOR="${EDITOR:-"nvim"}"
+EDITOR="nvim"
+EDITOR_CMD="nvim -c :ZenMode"
 
 usage() {
    cat <<-EOF
@@ -20,6 +21,7 @@ usage() {
 		Notes:
 		   Right now, only the first letter of each option is considered, so \`ned n\` and \`ned neww\` do the same thing
 		   Folder and file names are globbed
+         Will automatically activate the ZenMode nvim extension
 		   Current repository path: $NOTES_DIR
 	EOF
 }
@@ -34,8 +36,9 @@ edit() {
       exit 1
    fi
 
+   # TODO: change fzf for `fd`, `fzy`, and ($3) to allow for more ergonomic use
    NOTE_NAME="$(cd "$NOTE_PATH" && fzf --height=10 --layout=reverse)" || exit
-   "$EDITOR" "$NOTES_DIR/$NOTE_NAME"
+   $EDITOR_CMD "$NOTE_PATH/$NOTE_NAME"
 }
 
 new() {
@@ -53,7 +56,7 @@ new() {
       exit 1
    fi
 
-   "$EDITOR" "$NOTE_PATH/$NOTE_NAME"
+   $EDITOR_CMD "$NOTE_PATH/$NOTE_NAME"
 }
 
 subshell() {
@@ -78,7 +81,7 @@ case "${1:0:1}" in
    # edit an existing document or file
    'e') edit $@;;
    # me: edit ned (the file you are looking at)
-   'm') "$EDITOR" "$(realpath "$0")";;
+   'm') $EDITOR "$(realpath "$0")";;
    *) echo "no such option";;
 esac
 

From a437f5a1dd2f1b1c3756fd1e57a9a5b7201e92e9 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Sun, 23 Jan 2022 03:22:28 -0800
Subject: [PATCH 13/15] nvim: enabled ghost_text in nvim-cmp

I finally found out how to do this!
---
 .config/nvim/lua/blake/lsp.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.config/nvim/lua/blake/lsp.lua b/.config/nvim/lua/blake/lsp.lua
index ea37768..0be8b20 100644
--- a/.config/nvim/lua/blake/lsp.lua
+++ b/.config/nvim/lua/blake/lsp.lua
@@ -185,6 +185,9 @@ M.cmp = function()
             return vim_item
          end,
       },
+      experimental = {
+         ghost_text = true,
+      }
    }
 end -- <<<
 

From 6b7e877e6c073003d3e8bb94d2c0a9fb654b3e4c Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Thu, 27 Jan 2022 03:47:07 -0800
Subject: [PATCH 14/15] nvim: set zenmode window to be two shorter than my
 terminal's height

---
 .config/nvim/lua/blake/other.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/nvim/lua/blake/other.lua b/.config/nvim/lua/blake/other.lua
index 42e4e13..decbbde 100644
--- a/.config/nvim/lua/blake/other.lua
+++ b/.config/nvim/lua/blake/other.lua
@@ -198,7 +198,7 @@ M.zenmode = function()
          -- * a percentage of the width / height of the editor when <= 1
          -- * a function that returns the width or the height
          width = 120, -- width of the Zen window
-         height = 0.95, -- height of the Zen window
+         height = 51-2, -- height of the Zen window
          -- by default, no options are changed for the Zen window
          -- uncomment any of the options below, or add other vim.wo options you want to apply
          options = { -- uncomment to do what the sign says

From 52c490dcea33bd1c0cd391158a6fd704571a5e29 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Thu, 27 Jan 2022 03:48:06 -0800
Subject: [PATCH 15/15] ned: too much has happened. Lots of things work but
 something is borked

---
 .config/shell/bin/ned | 66 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 50 insertions(+), 16 deletions(-)

diff --git a/.config/shell/bin/ned b/.config/shell/bin/ned
index d2f2af1..8c1b866 100755
--- a/.config/shell/bin/ned
+++ b/.config/shell/bin/ned
@@ -29,39 +29,71 @@ usage() {
 edit() {
    check_setup
 
-   NOTE_PATH=("$NOTES_DIR/$2"*)
-   NOTE_PATH="${NOTE_PATH[0]}"
-   if ! [ -d "$NOTE_PATH" ]; then
-      echo "No such directory: '$NOTE_PATH'"
-      exit 1
+   NOTE_PATH="$(fd -at f "$2" "$NOTES_DIR")"
+   # if there was more than one result
+   if [ "$(echo "$NOTE_PATH" | wc -l)" -gt 1 ]; then
+      NOTE_PATH="$(echo "$NOTE_PATH" | fzy)"
    fi
 
-   # TODO: change fzf for `fd`, `fzy`, and ($3) to allow for more ergonomic use
-   NOTE_NAME="$(cd "$NOTE_PATH" && fzf --height=10 --layout=reverse)" || exit
-   $EDITOR_CMD "$NOTE_PATH/$NOTE_NAME"
+   $EDITOR_CMD "$NOTE_PATH"
 }
 
 new() {
    check_setup
+
+   # Find out note name
    if [ -z "$3" ]; then
       NOTE_NAME="$(date +'%F').md"
    else
       NOTE_NAME="$3.md"
    fi
 
-   NOTE_PATH=("$NOTES_DIR/$2"*/notes)
-   NOTE_PATH="${NOTE_PATH[0]}"
-   if ! [ -d "$NOTE_PATH" ]; then
-      echo "No such directory: '$NOTE_PATH'"
-      exit 1
+   NOTE_PATH="$(fd -ad 1 "^$2" "$NOTES_DIR")"
+   # check if there were no results
+   if [ -z "$NOTE_PATH" ]; then
+      echo "No directories found for '$2'."
+      echo "All possible directories:"
+      (cd "$NOTES_DIR" && fd -d 1 -t d "$NOTES_DIR")
+      exit
+
+   # if there was more than one result
+   elif [ "$(echo "$NOTE_PATH" | wc -l)" -gt 1 ]; then
+      NOTE_PATH="$(echo "$NOTE_PATH" | fzy)" || exit
    fi
 
-   $EDITOR_CMD "$NOTE_PATH/$NOTE_NAME"
+   # TODO: allow setting location for files to go with $3, and $4 for file name
+   # check if there is a notes directory in the note path
+   if [ -d "$NOTE_PATH/notes" ]; then
+      NOTE_PATH="$NOTE_PATH/notes"
+
+   # if there is no notes directory
+   else
+      PROMPT="Place note in… "
+      NOTE_PATH="$(cd "$NOTE_PATH" && fd -ad 1 -t d | fzy -p "$PROMPT")" || exit
+   fi
+
+   if [ -f "$NOTE_PATH/$NOTE_NAME" ]; then
+      echo "File already exists. Opening..."
+      $EDITOR_CMD "$NOTE_PATH/$NOTE_NAME"
+   else
+      cd "$NOTE_PATH" || exit
+      # apply a template for notes
+		cat <<-EOF >> "$NOTE_PATH/$NOTE_NAME"
+
+			<!-- vim: wrap nonu nornu
+			-->
+		EOF
+      $EDITOR_CMD "$NOTE_PATH/$NOTE_NAME"
+   fi
 }
 
 subshell() {
    echo 'entering subshell'
-   zsh
+   $SHELL
+}
+
+shell() {
+   cd "$NOTES_DIR" && subshell
 }
 
 check_setup() {
@@ -80,9 +112,11 @@ case "${1:0:1}" in
    'n') new $@;;
    # edit an existing document or file
    'e') edit $@;;
+   # run a shell (cd to) in the directory
+   'c'|'x'|'s') shell;;
    # me: edit ned (the file you are looking at)
    'm') $EDITOR "$(realpath "$0")";;
    *) echo "no such option";;
 esac
 
-# vim: et sw=3 ts=3
+# vim: et sw=3 ts=3 ft=bash