From 17996f481d54aaacbe83bf7689a6c194f3746b12 Mon Sep 17 00:00:00 2001 From: Francisco Martinez Date: Wed, 25 Oct 2023 09:41:58 -0600 Subject: [PATCH] Kitty --- .config/kitty/atomlight.conf | 22 +++ .config/kitty/nord.conf | 43 ++++++ .config/skhd/skhdrc | 2 +- .config/tmux/com.googlecode.iterm2.plist | 174 ++++------------------- .config/yabai/yabairc | 4 +- .vim/vimrc | 10 +- .zshrc | 6 +- 7 files changed, 109 insertions(+), 152 deletions(-) create mode 100644 .config/kitty/atomlight.conf create mode 100644 .config/kitty/nord.conf diff --git a/.config/kitty/atomlight.conf b/.config/kitty/atomlight.conf new file mode 100644 index 0000000..febd9ad --- /dev/null +++ b/.config/kitty/atomlight.conf @@ -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 + diff --git a/.config/kitty/nord.conf b/.config/kitty/nord.conf new file mode 100644 index 0000000..f43b7f7 --- /dev/null +++ b/.config/kitty/nord.conf @@ -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 diff --git a/.config/skhd/skhdrc b/.config/skhd/skhdrc index 1f79d13..256d60c 100644 --- a/.config/skhd/skhdrc +++ b/.config/skhd/skhdrc @@ -65,5 +65,5 @@ cmd - s : yabai -m window --toggle zoom-fullscreen cmd - d : yabai -m window --toggle float # 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' diff --git a/.config/tmux/com.googlecode.iterm2.plist b/.config/tmux/com.googlecode.iterm2.plist index a0aa3af..c37c00f 100644 --- a/.config/tmux/com.googlecode.iterm2.plist +++ b/.config/tmux/com.googlecode.iterm2.plist @@ -2,12 +2,12 @@ - AlternateMouseScroll - BadgeRightMargin - 10 + 20 BadgeTopMargin - 10 + 30 + CloseBookmarksWindowAfterOpening + Custom Color Presets Nord @@ -366,133 +366,19 @@ Default Bookmark Guid - 7CD15871-71AA-4D36-993C-0D8ABB44F574 - DisableWindowSizeSnap - - GlobalKeyMap - - 0x19-0x60000 - - Action - 39 - Text - - - 0x2c-0x100000-0x2b - - Action - 23 - Label - - Text - - - 0x9-0x40000 - - Action - 32 - Text - - - 0xf700-0x300000 - - Action - 7 - Text - - - 0xf701-0x300000 - - Action - 6 - Text - - - 0xf702-0x300000 - - Action - 2 - Text - - - 0xf702-0x320000 - - Action - 33 - Text - - - 0xf703-0x300000 - - Action - 0 - Text - - - 0xf703-0x320000 - - Action - 34 - Text - - - 0xf729-0x100000 - - Action - 5 - Text - - - 0xf72b-0x100000 - - Action - 4 - Text - - - 0xf72c-0x100000 - - Action - 9 - Text - - - 0xf72c-0x20000 - - Action - 9 - Text - - - 0xf72d-0x100000 - - Action - 8 - Text - - - 0xf72d-0x20000 - - Action - 8 - Text - - - + BA056D2B-D56D-49AC-8CEA-62E223B3C3E2 + ExtraSpaceBeforeCompactTopTabBar + 20 HapticFeedbackForEsc HotkeyMigratedFromSingleToMulti - NeverWarnAboutShortLivedSessions_7CD15871-71AA-4D36-993C-0D8ABB44F574 - - NeverWarnAboutShortLivedSessions_7CD15871-71AA-4D36-993C-0D8ABB44F574_selection - 0 New Bookmarks ASCII Anti Aliased - ASCII Ligatures + Allow Title Setting Ambiguous Double Width @@ -711,13 +597,13 @@ Alpha Component 1 Blue Component - 0.19183900952339172 + 0.24705882352941178 Color Space - Calibrated + sRGB Green Component - 0.15255947411060333 + 0.20000000000000001 Red Component - 0.1357133686542511 + 0.1803921568627451 Background Image Location @@ -734,12 +620,12 @@ Red Component 0.20252507925033569 - Blend - 0.050000000000000003 Blinking Cursor Blur + Blur Radius + 64 Bold Color Alpha Component @@ -758,7 +644,7 @@ Close Sessions On End Columns - 120 + 110 Command Cursor Color @@ -826,11 +712,13 @@ 0.81214725971221924 Guid - 7CD15871-71AA-4D36-993C-0D8ABB44F574 + BA056D2B-D56D-49AC-8CEA-62E223B3C3E2 Horizontal Spacing 1 Idle Code 0 + Initial Use Transparency + Jobs to Ignore rlogin @@ -1134,8 +1022,6 @@ Red Component 0.87367779016494751 - Minimum Contrast - 0.0 Mouse Reporting Name @@ -1145,9 +1031,7 @@ Non-ASCII Anti Aliased Normal Font - FiraCodeNerdFontCompleteM-Regular 12 - Only The Default BG Color Uses Transparency - + FiraCodeNFM-Reg 12 Open Toolbelt Option Key Sends @@ -1232,17 +1116,15 @@ Window Type 0 Working Directory - /Users/xyvs + /Users/fran OpenArrangementAtStartup - OpenNoWindowsAtStartup - - PMPrintingExpandedStateForPrint2 + OpenBookmark + + OpenNoWindowsAtStartup - PasteTabToStringTabStopSize - 4 PointerActions Button,1,1,, @@ -1278,10 +1160,10 @@ Print In Black And White - RetinaInlineImages - SoundForEsc + StatusBarPosition + 0 TabStyleWithAutomaticOption 5 TabViewType @@ -1289,11 +1171,11 @@ TerminalMargin 20 TerminalVMargin - 30 + 20 + TmuxWindowsShouldCloseAfterDetach + VisualIndicatorForEsc - findMode_iTerm - 0 kCPKSelectionViewPreferredModeKey 0 kCPKSelectionViewShowHSBTextFieldsKey diff --git a/.config/yabai/yabairc b/.config/yabai/yabairc index 448f509..5c83701 100755 --- a/.config/yabai/yabairc +++ b/.config/yabai/yabairc @@ -43,11 +43,11 @@ yabai -m config mouse_drop_action swap # general space settings 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 left_padding 10 yabai -m config right_padding 10 -yabai -m config window_gap 20 +yabai -m config window_gap 10 # floating rules yabai -m rule --add app="^System Settings$" manage=off diff --git a/.vim/vimrc b/.vim/vimrc index 76a0a9b..c84a7a0 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -2,6 +2,8 @@ call plug#begin('~/.vim/plugged') Plug 'fxn/vim-monochrome' Plug 'arcticicestudio/nord-vim' +Plug 'owickstrom/vim-colors-paramount' + " autocomplete Plug 'neoclide/coc.nvim', {'branch': 'release'} @@ -13,6 +15,7 @@ Plug 'preservim/nerdcommenter' Plug 'scrooloose/nerdtree' Plug '907th/vim-auto-save' Plug 'szw/vim-maximizer' +Plug 'folke/zen-mode.nvim' " Plugins Plug 'leafOfTree/vim-vue-plugin' @@ -24,7 +27,7 @@ Plug 'nvim-telescope/telescope.nvim' Plug 'fannheyward/telescope-coc.nvim' " debugging -Plug 'puremourning/vimspector' +" Plug 'puremourning/vimspector' call plug#end() @@ -47,7 +50,7 @@ if (empty($TMUX)) endif set background=dark -colorscheme nord +colorscheme monochrome " new leader key nnoremap @@ -92,6 +95,9 @@ vnoremap "hy:%s/h//gc " maximize pane nnoremap m :MaximizerToggle +" enter zen mode +nnoremap z :ZenMode + " emmet key binding let g:user_emmet_leader_key=',' diff --git a/.zshrc b/.zshrc index 05af0b4..377c0bf 100644 --- a/.zshrc +++ b/.zshrc @@ -3,7 +3,7 @@ # Path to your oh-my-zsh installation. 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 # 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 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 +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'