This commit is contained in:
2023-10-25 09:41:58 -06:00
parent abe5339afe
commit 17996f481d
7 changed files with 109 additions and 152 deletions

View File

@@ -0,0 +1,22 @@
background #eeeeee
foreground #2a2b33
cursor #bbbbbb
selection_background #ececec
color0 #000000
color8 #000000
color1 #de3d35
color9 #de3d35
color2 #3e953a
color10 #3e953a
color3 #d2b67b
color11 #d2b67b
color4 #2f5af3
color12 #2f5af3
color5 #950095
color13 #a00095
color6 #3e953a
color14 #3e953a
color7 #bbbbbb
color15 #ffffff
selection_foreground #f8f8f8

43
.config/kitty/nord.conf Normal file
View File

@@ -0,0 +1,43 @@
# Nord Colorscheme for Kitty
# Based on:
# - https://gist.github.com/marcusramberg/64010234c95a93d953e8c79fdaf94192
# - https://github.com/arcticicestudio/nord-hyper
background #0F1014
foreground #EEEEEE
selection_foreground #000000
selection_background #FFFACD
url_color #0087BD
cursor #81A1C1
# black
color0 #3B4252
color8 #4C566A
# red
color1 #BF616A
color9 #BF616A
# green
color2 #A3BE8C
color10 #A3BE8C
# yellow
color3 #EBCB8B
color11 #EBCB8B
# blue
color4 #81A1C1
color12 #81A1C1
# magenta
color5 #B48EAD
color13 #B48EAD
# cyan
color6 #88C0D0
color14 #8FBCBB
# white
color7 #E5E9F0
color15 #ECEFF4

View File

@@ -65,5 +65,5 @@ cmd - s : yabai -m window --toggle zoom-fullscreen
cmd - d : yabai -m window --toggle float cmd - d : yabai -m window --toggle float
# open new terminal # open new terminal
cmd - return : osascript -e 'tell application "iterm" to activate' -e 'tell application "system events" to tell process "iterm" to keystroke "n" using command down' cmd - return : osascript -e 'tell application "kitty" to activate' -e 'tell application "system events" to tell process "kitty" to keystroke "n" using command down'

View File

@@ -2,12 +2,12 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>AlternateMouseScroll</key>
<true/>
<key>BadgeRightMargin</key> <key>BadgeRightMargin</key>
<integer>10</integer> <integer>20</integer>
<key>BadgeTopMargin</key> <key>BadgeTopMargin</key>
<integer>10</integer> <integer>30</integer>
<key>CloseBookmarksWindowAfterOpening</key>
<false/>
<key>Custom Color Presets</key> <key>Custom Color Presets</key>
<dict> <dict>
<key>Nord</key> <key>Nord</key>
@@ -366,133 +366,19 @@
</dict> </dict>
</dict> </dict>
<key>Default Bookmark Guid</key> <key>Default Bookmark Guid</key>
<string>7CD15871-71AA-4D36-993C-0D8ABB44F574</string> <string>BA056D2B-D56D-49AC-8CEA-62E223B3C3E2</string>
<key>DisableWindowSizeSnap</key> <key>ExtraSpaceBeforeCompactTopTabBar</key>
<true/> <real>20</real>
<key>GlobalKeyMap</key>
<dict>
<key>0x19-0x60000</key>
<dict>
<key>Action</key>
<integer>39</integer>
<key>Text</key>
<string></string>
</dict>
<key>0x2c-0x100000-0x2b</key>
<dict>
<key>Action</key>
<integer>23</integer>
<key>Label</key>
<string></string>
<key>Text</key>
<string></string>
</dict>
<key>0x9-0x40000</key>
<dict>
<key>Action</key>
<integer>32</integer>
<key>Text</key>
<string></string>
</dict>
<key>0xf700-0x300000</key>
<dict>
<key>Action</key>
<integer>7</integer>
<key>Text</key>
<string></string>
</dict>
<key>0xf701-0x300000</key>
<dict>
<key>Action</key>
<integer>6</integer>
<key>Text</key>
<string></string>
</dict>
<key>0xf702-0x300000</key>
<dict>
<key>Action</key>
<integer>2</integer>
<key>Text</key>
<string></string>
</dict>
<key>0xf702-0x320000</key>
<dict>
<key>Action</key>
<integer>33</integer>
<key>Text</key>
<string></string>
</dict>
<key>0xf703-0x300000</key>
<dict>
<key>Action</key>
<integer>0</integer>
<key>Text</key>
<string></string>
</dict>
<key>0xf703-0x320000</key>
<dict>
<key>Action</key>
<integer>34</integer>
<key>Text</key>
<string></string>
</dict>
<key>0xf729-0x100000</key>
<dict>
<key>Action</key>
<integer>5</integer>
<key>Text</key>
<string></string>
</dict>
<key>0xf72b-0x100000</key>
<dict>
<key>Action</key>
<integer>4</integer>
<key>Text</key>
<string></string>
</dict>
<key>0xf72c-0x100000</key>
<dict>
<key>Action</key>
<integer>9</integer>
<key>Text</key>
<string></string>
</dict>
<key>0xf72c-0x20000</key>
<dict>
<key>Action</key>
<integer>9</integer>
<key>Text</key>
<string></string>
</dict>
<key>0xf72d-0x100000</key>
<dict>
<key>Action</key>
<integer>8</integer>
<key>Text</key>
<string></string>
</dict>
<key>0xf72d-0x20000</key>
<dict>
<key>Action</key>
<integer>8</integer>
<key>Text</key>
<string></string>
</dict>
</dict>
<key>HapticFeedbackForEsc</key> <key>HapticFeedbackForEsc</key>
<false/> <false/>
<key>HotkeyMigratedFromSingleToMulti</key> <key>HotkeyMigratedFromSingleToMulti</key>
<true/> <true/>
<key>NeverWarnAboutShortLivedSessions_7CD15871-71AA-4D36-993C-0D8ABB44F574</key>
<true/>
<key>NeverWarnAboutShortLivedSessions_7CD15871-71AA-4D36-993C-0D8ABB44F574_selection</key>
<integer>0</integer>
<key>New Bookmarks</key> <key>New Bookmarks</key>
<array> <array>
<dict> <dict>
<key>ASCII Anti Aliased</key> <key>ASCII Anti Aliased</key>
<true/> <true/>
<key>ASCII Ligatures</key> <key>Allow Title Setting</key>
<false/> <false/>
<key>Ambiguous Double Width</key> <key>Ambiguous Double Width</key>
<false/> <false/>
@@ -711,13 +597,13 @@
<key>Alpha Component</key> <key>Alpha Component</key>
<real>1</real> <real>1</real>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.19183900952339172</real> <real>0.24705882352941178</real>
<key>Color Space</key> <key>Color Space</key>
<string>Calibrated</string> <string>sRGB</string>
<key>Green Component</key> <key>Green Component</key>
<real>0.15255947411060333</real> <real>0.20000000000000001</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.1357133686542511</real> <real>0.1803921568627451</real>
</dict> </dict>
<key>Background Image Location</key> <key>Background Image Location</key>
<string></string> <string></string>
@@ -734,12 +620,12 @@
<key>Red Component</key> <key>Red Component</key>
<real>0.20252507925033569</real> <real>0.20252507925033569</real>
</dict> </dict>
<key>Blend</key>
<real>0.050000000000000003</real>
<key>Blinking Cursor</key> <key>Blinking Cursor</key>
<false/> <false/>
<key>Blur</key> <key>Blur</key>
<false/> <false/>
<key>Blur Radius</key>
<real>64</real>
<key>Bold Color</key> <key>Bold Color</key>
<dict> <dict>
<key>Alpha Component</key> <key>Alpha Component</key>
@@ -758,7 +644,7 @@
<key>Close Sessions On End</key> <key>Close Sessions On End</key>
<true/> <true/>
<key>Columns</key> <key>Columns</key>
<integer>120</integer> <integer>110</integer>
<key>Command</key> <key>Command</key>
<string></string> <string></string>
<key>Cursor Color</key> <key>Cursor Color</key>
@@ -826,11 +712,13 @@
<real>0.81214725971221924</real> <real>0.81214725971221924</real>
</dict> </dict>
<key>Guid</key> <key>Guid</key>
<string>7CD15871-71AA-4D36-993C-0D8ABB44F574</string> <string>BA056D2B-D56D-49AC-8CEA-62E223B3C3E2</string>
<key>Horizontal Spacing</key> <key>Horizontal Spacing</key>
<real>1</real> <real>1</real>
<key>Idle Code</key> <key>Idle Code</key>
<integer>0</integer> <integer>0</integer>
<key>Initial Use Transparency</key>
<false/>
<key>Jobs to Ignore</key> <key>Jobs to Ignore</key>
<array> <array>
<string>rlogin</string> <string>rlogin</string>
@@ -1134,8 +1022,6 @@
<key>Red Component</key> <key>Red Component</key>
<real>0.87367779016494751</real> <real>0.87367779016494751</real>
</dict> </dict>
<key>Minimum Contrast</key>
<real>0.0</real>
<key>Mouse Reporting</key> <key>Mouse Reporting</key>
<true/> <true/>
<key>Name</key> <key>Name</key>
@@ -1145,9 +1031,7 @@
<key>Non-ASCII Anti Aliased</key> <key>Non-ASCII Anti Aliased</key>
<true/> <true/>
<key>Normal Font</key> <key>Normal Font</key>
<string>FiraCodeNerdFontCompleteM-Regular 12</string> <string>FiraCodeNFM-Reg 12</string>
<key>Only The Default BG Color Uses Transparency</key>
<false/>
<key>Open Toolbelt</key> <key>Open Toolbelt</key>
<false/> <false/>
<key>Option Key Sends</key> <key>Option Key Sends</key>
@@ -1232,17 +1116,15 @@
<key>Window Type</key> <key>Window Type</key>
<integer>0</integer> <integer>0</integer>
<key>Working Directory</key> <key>Working Directory</key>
<string>/Users/xyvs</string> <string>/Users/fran</string>
</dict> </dict>
</array> </array>
<key>OpenArrangementAtStartup</key> <key>OpenArrangementAtStartup</key>
<false/> <false/>
<key>OpenNoWindowsAtStartup</key> <key>OpenBookmark</key>
<true/> <false/>
<key>PMPrintingExpandedStateForPrint2</key> <key>OpenNoWindowsAtStartup</key>
<false/> <false/>
<key>PasteTabToStringTabStopSize</key>
<integer>4</integer>
<key>PointerActions</key> <key>PointerActions</key>
<dict> <dict>
<key>Button,1,1,,</key> <key>Button,1,1,,</key>
@@ -1278,10 +1160,10 @@
</dict> </dict>
<key>Print In Black And White</key> <key>Print In Black And White</key>
<true/> <true/>
<key>RetinaInlineImages</key>
<false/>
<key>SoundForEsc</key> <key>SoundForEsc</key>
<false/> <false/>
<key>StatusBarPosition</key>
<integer>0</integer>
<key>TabStyleWithAutomaticOption</key> <key>TabStyleWithAutomaticOption</key>
<integer>5</integer> <integer>5</integer>
<key>TabViewType</key> <key>TabViewType</key>
@@ -1289,11 +1171,11 @@
<key>TerminalMargin</key> <key>TerminalMargin</key>
<integer>20</integer> <integer>20</integer>
<key>TerminalVMargin</key> <key>TerminalVMargin</key>
<integer>30</integer> <integer>20</integer>
<key>TmuxWindowsShouldCloseAfterDetach</key>
<true/>
<key>VisualIndicatorForEsc</key> <key>VisualIndicatorForEsc</key>
<false/> <false/>
<key>findMode_iTerm</key>
<integer>0</integer>
<key>kCPKSelectionViewPreferredModeKey</key> <key>kCPKSelectionViewPreferredModeKey</key>
<integer>0</integer> <integer>0</integer>
<key>kCPKSelectionViewShowHSBTextFieldsKey</key> <key>kCPKSelectionViewShowHSBTextFieldsKey</key>

View File

@@ -43,11 +43,11 @@ yabai -m config mouse_drop_action swap
# general space settings # general space settings
yabai -m config layout bsp yabai -m config layout bsp
yabai -m config top_padding 50 yabai -m config top_padding 10
yabai -m config bottom_padding 10 yabai -m config bottom_padding 10
yabai -m config left_padding 10 yabai -m config left_padding 10
yabai -m config right_padding 10 yabai -m config right_padding 10
yabai -m config window_gap 20 yabai -m config window_gap 10
# floating rules # floating rules
yabai -m rule --add app="^System Settings$" manage=off yabai -m rule --add app="^System Settings$" manage=off

View File

@@ -2,6 +2,8 @@ call plug#begin('~/.vim/plugged')
Plug 'fxn/vim-monochrome' Plug 'fxn/vim-monochrome'
Plug 'arcticicestudio/nord-vim' Plug 'arcticicestudio/nord-vim'
Plug 'owickstrom/vim-colors-paramount'
" autocomplete " autocomplete
Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'neoclide/coc.nvim', {'branch': 'release'}
@@ -13,6 +15,7 @@ Plug 'preservim/nerdcommenter'
Plug 'scrooloose/nerdtree' Plug 'scrooloose/nerdtree'
Plug '907th/vim-auto-save' Plug '907th/vim-auto-save'
Plug 'szw/vim-maximizer' Plug 'szw/vim-maximizer'
Plug 'folke/zen-mode.nvim'
" Plugins " Plugins
Plug 'leafOfTree/vim-vue-plugin' Plug 'leafOfTree/vim-vue-plugin'
@@ -24,7 +27,7 @@ Plug 'nvim-telescope/telescope.nvim'
Plug 'fannheyward/telescope-coc.nvim' Plug 'fannheyward/telescope-coc.nvim'
" debugging " debugging
Plug 'puremourning/vimspector' " Plug 'puremourning/vimspector'
call plug#end() call plug#end()
@@ -47,7 +50,7 @@ if (empty($TMUX))
endif endif
set background=dark set background=dark
colorscheme nord colorscheme monochrome
" new leader key " new leader key
nnoremap <SPACE> <Nop> nnoremap <SPACE> <Nop>
@@ -92,6 +95,9 @@ vnoremap <C-r> "hy:%s/<C-r>h//gc<left><left><left>
" maximize pane " maximize pane
nnoremap <leader>m :MaximizerToggle<CR> nnoremap <leader>m :MaximizerToggle<CR>
" enter zen mode
nnoremap <leader>z :ZenMode<CR>
" emmet key binding " emmet key binding
let g:user_emmet_leader_key=',' let g:user_emmet_leader_key=','

6
.zshrc
View File

@@ -3,7 +3,7 @@
# Path to your oh-my-zsh installation. # Path to your oh-my-zsh installation.
ZSH_DISABLE_COMPFIX=true ZSH_DISABLE_COMPFIX=true
export ZSH="/Users/xyvs/.oh-my-zsh" export ZSH="/Users/fran/.oh-my-zsh"
# Set name of the theme to load --- if set to "random", it will # Set name of the theme to load --- if set to "random", it will
# load a random theme each time oh-my-zsh is loaded, in which case, # load a random theme each time oh-my-zsh is loaded, in which case,
@@ -121,3 +121,7 @@ export PATH="/usr/local/opt/openjdk/bin:$PATH"
# nvm config # nvm config
export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
export PYENV_ROOT="$HOME/.pyenv"
command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)"
alias brew='env PATH="${PATH//$(pyenv root)\/shims:/}" brew'