update all the changes that have been made outside of chezmoi

This commit is contained in:
Alex Kelly 2022-04-20 22:26:32 -04:00
parent f1784af730
commit 3d8b45dbee
6 changed files with 12 additions and 5 deletions

View file

@ -6,7 +6,7 @@
#: individual font faces and even specify special fonts for particular #: individual font faces and even specify special fonts for particular
#: characters. #: characters.
font_family Hasklig font_family FiraCode
bold_font auto bold_font auto
italic_font auto italic_font auto
bold_italic_font auto bold_italic_font auto
@ -87,7 +87,8 @@ disable_ligatures never
#: implemented using the calt OpenType feature. For disabling general #: implemented using the calt OpenType feature. For disabling general
#: ligatures, use the font_features setting. #: 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 #: Choose exactly which OpenType features to enable or disable. This
#: is useful as some fonts might have features worthwhile in a #: is useful as some fonts might have features worthwhile in a

View file

@ -43,7 +43,7 @@
) )
(deflayer standard_layer (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 grv 1 2 3 4 5 6 7 8 9 0 - = bspc
tab q w e r t y u i o p [ ] \ tab q w e r t y u i o p [ ] \
@cesc a s d f g h j k l ; ' ret @cesc a s d f g h j k l ; ' ret

View file

@ -37,6 +37,7 @@ call plug#begin(g:plugged_home)
Plug 'tpope/vim-fugitive' Plug 'tpope/vim-fugitive'
Plug 'psf/black', { 'branch': 'main' } Plug 'psf/black', { 'branch': 'main' }
Plug 'junegunn/fzf.vim' Plug 'junegunn/fzf.vim'
Plug 'navarasu/onedark.nvim'
" This was fun and all, but getting data out sucked, so if they ever get an " This was fun and all, but getting data out sucked, so if they ever get an
" update, maybe try again " update, maybe try again
"Plugin 'ActivityWatch/aw-watcher-vim' "Plugin 'ActivityWatch/aw-watcher-vim'
@ -73,7 +74,7 @@ if exists('+termguicolors')
set termguicolors set termguicolors
endif endif
colorscheme spaceduck colorscheme spaceduck
" set the number style to hybrid " set the number style to hybrid
set number relativenumber set number relativenumber

View file

@ -50,3 +50,5 @@
diffFilter = delta --color-only diffFilter = delta --color-only
[help] [help]
autocorrect = 20 autocorrect = 20
[merge]
conflictstyle = diff3

View file

@ -190,3 +190,5 @@ PROG=tea _CLI_ZSH_AUTOCOMPLETE_HACK=1 source /home/kellya/.config/tea/autocomple
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
export PATH="/home/kellya/.deta/bin:$PATH" export PATH="/home/kellya/.deta/bin:$PATH"
eval $(thefuck --alias)

View file

@ -6,7 +6,8 @@ set crypt_autosign = yes
set crypt_autoencrypt = no set crypt_autoencrypt = no
set crypt_autopgp = yes set crypt_autopgp = yes
set pgp_sign_as=738CA93A2DAD8D06C991CE4E5495537542CF2D94 set pgp_sign_as=738CA93A2DAD8D06C991CE4E5495537542CF2D94
set pgp_sign_as=67F19F9C5A33D046A37ABA25B15716AE1B5A699A
send2-hook . unset pgp_sign_as 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 send2-hook '~f kellya@arachnitech.com' set pgp_sign_as=15CD8B0B88DD99E8882B7A90DB2139896E9F21BD