From 3d8b45dbeee1ee85ff9883215c394790357c11bf Mon Sep 17 00:00:00 2001
From: Alex Kelly <alex.kelly@franklin.edu>
Date: Wed, 20 Apr 2022 22:26:32 -0400
Subject: [PATCH] update all the changes that have been made outside of chezmoi

---
 dot_config/kitty/kitty.conf  | 5 +++--
 dot_config/kmonad/config.kbd | 2 +-
 dot_config/nvim/init.vim     | 3 ++-
 dot_gitconfig.tmpl           | 2 ++
 dot_zshrc                    | 2 ++
 private_dot_mutt/gpg.rc      | 3 ++-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf
index c5f6b8f..6db28f6 100644
--- a/dot_config/kitty/kitty.conf
+++ b/dot_config/kitty/kitty.conf
@@ -6,7 +6,7 @@
 #: individual font faces and even specify special fonts for particular
 #: characters.
 
-font_family      Hasklig
+font_family      FiraCode
 bold_font        auto
 italic_font      auto
 bold_italic_font auto
@@ -87,7 +87,8 @@ disable_ligatures never
 #: implemented using the calt OpenType feature. For disabling general
 #: ligatures, use the font_features setting.
 
-font_features none
+#font_features none
+font_features FiraCode-Regular +zero +ss02 +ss03 +cv14
 
 #: Choose exactly which OpenType features to enable or disable. This
 #: is useful as some fonts might have features worthwhile in a
diff --git a/dot_config/kmonad/config.kbd b/dot_config/kmonad/config.kbd
index ecd216a..c856212 100644
--- a/dot_config/kmonad/config.kbd
+++ b/dot_config/kmonad/config.kbd
@@ -43,7 +43,7 @@
  )
 
 (deflayer standard_layer
-  esc  @std f2   f3   f4   f5   f6  f7  vold  volu f10  f11  @f12  _   _  _
+  esc  @std f2   f3   f4   f5   f6  f7   f8   f9   f10  f11  f12  _   _  _
   grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc 
   tab  q    w    e    r    t    y    u    i    o    p    [    ]    \
   @cesc a    s    d    f    g    h    j    k    l    ;    '    ret
diff --git a/dot_config/nvim/init.vim b/dot_config/nvim/init.vim
index 0da2a34..c892587 100644
--- a/dot_config/nvim/init.vim
+++ b/dot_config/nvim/init.vim
@@ -37,6 +37,7 @@ call plug#begin(g:plugged_home)
   Plug 'tpope/vim-fugitive'
   Plug 'psf/black', { 'branch': 'main' }
   Plug 'junegunn/fzf.vim'
+  Plug 'navarasu/onedark.nvim'
   " This was fun and all, but getting data out sucked, so if they ever get an
   " update, maybe try again
   "Plugin 'ActivityWatch/aw-watcher-vim'
@@ -73,7 +74,7 @@ if exists('+termguicolors')
       set termguicolors
     endif
 
-   colorscheme spaceduck
+colorscheme spaceduck
 
 " set the number style to hybrid
 set number relativenumber
diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 43a70ed..93a1e07 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -50,3 +50,5 @@
     diffFilter = delta --color-only
 [help]
 	autocorrect = 20
+[merge]
+	conflictstyle = diff3
diff --git a/dot_zshrc b/dot_zshrc
index 6630095..d03a6fc 100644
--- a/dot_zshrc
+++ b/dot_zshrc
@@ -190,3 +190,5 @@ PROG=tea _CLI_ZSH_AUTOCOMPLETE_HACK=1 source /home/kellya/.config/tea/autocomple
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
 
 export PATH="/home/kellya/.deta/bin:$PATH"
+
+eval $(thefuck --alias)
diff --git a/private_dot_mutt/gpg.rc b/private_dot_mutt/gpg.rc
index 407401d..543e596 100644
--- a/private_dot_mutt/gpg.rc
+++ b/private_dot_mutt/gpg.rc
@@ -6,7 +6,8 @@ set crypt_autosign = yes
 set crypt_autoencrypt = no
 set crypt_autopgp = yes 
 set pgp_sign_as=738CA93A2DAD8D06C991CE4E5495537542CF2D94
+set pgp_sign_as=67F19F9C5A33D046A37ABA25B15716AE1B5A699A
 
 send2-hook . unset pgp_sign_as
-send2-hook '~f alex.kelly@franklin.edu' set pgp_sign_as=738CA93A2DAD8D06C991CE4E5495537542CF2D94
+send2-hook '~f alex.kelly@franklin.edu' set pgp_sign_as=67F19F9C5A33D046A37ABA25B15716AE1B5A699A
 send2-hook '~f kellya@arachnitech.com' set pgp_sign_as=15CD8B0B88DD99E8882B7A90DB2139896E9F21BD