From cfd96387edf69b2e05b54b1c57d9a8903a0b80bd Mon Sep 17 00:00:00 2001 From: Yigit Sever Date: Sat, 30 Mar 2019 19:53:52 +0300 Subject: Migrate from gruvbox to nord --- .Xresources | 85 ++++++++++++++++++++++++++---------------------- .config/kitty/kitty.conf | 62 +++++++++++++---------------------- .config/nvim/init.vim | 37 +++++---------------- .tmux.conf | 14 ++++++-- .zshrc | 4 +-- 5 files changed, 89 insertions(+), 113 deletions(-) diff --git a/.Xresources b/.Xresources index e3bb46f..f4eb976 100644 --- a/.Xresources +++ b/.Xresources @@ -1,7 +1,3 @@ -#if __has_include(".extend.Xresources") -#include ".extend.Xresources" -#endif - ! ^ The above lines are no comments! ! Leave them as they are if a file ~/.extend.Xresources is being used on your system. ! config can be added there or also here below. @@ -15,39 +11,50 @@ Xft.autohint: false Xft.hintstyle: hintslight Xft.lcdfilter: lcddefault -! ----------------------------------------------------------------------------- -! File: gruvbox-dark.xresources -! Description: Retro groove colorscheme generalized -! Author: morhetz -! Source: https://github.com/morhetz/gruvbox-generalized -! Last Modified: 6 Sep 2014 -! ----------------------------------------------------------------------------- +! Copyright (c) 2016-present Arctic Ice Studio +! Copyright (c) 2016-present Sven Greb + +! Project: Nord XResources +! Version: 0.1.0 +! Repository: https://github.com/arcticicestudio/nord-xresources +! License: MIT + +#define nord0 #2E3440 +#define nord1 #3B4252 +#define nord2 #434C5E +#define nord3 #4C566A +#define nord4 #D8DEE9 +#define nord5 #E5E9F0 +#define nord6 #ECEFF4 +#define nord7 #8FBCBB +#define nord8 #88C0D0 +#define nord9 #81A1C1 +#define nord10 #5E81AC +#define nord11 #BF616A +#define nord12 #D08770 +#define nord13 #EBCB8B +#define nord14 #A3BE8C +#define nord15 #B48EAD + +*.foreground: nord4 +*.background: nord0 +*.cursorColor: nord4 +*fading: 35 +*fadeColor: nord3 -! hard contrast: *background: #1d2021 -*background: #282828 -! soft contrast: *background: #32302f -*foreground: #ebdbb2 -! Black + DarkGrey -*color0: #282828 -*color8: #928374 -! DarkRed + Red -*color1: #cc241d -*color9: #fb4934 -! DarkGreen + Green -*color2: #98971a -*color10: #b8bb26 -! DarkYellow + Yellow -*color3: #d79921 -*color11: #fabd2f -! DarkBlue + Blue -*color4: #458588 -*color12: #83a598 -! DarkMagenta + Magenta -*color5: #b16286 -*color13: #d3869b -! DarkCyan + Cyan -*color6: #689d6a -*color14: #8ec07c -! LightGrey + White -*color7: #a89984 -*color15: #ebdbb2 +*.color0: nord1 +*.color1: nord11 +*.color2: nord14 +*.color3: nord13 +*.color4: nord9 +*.color5: nord15 +*.color6: nord8 +*.color7: nord5 +*.color8: nord3 +*.color9: nord11 +*.color10: nord14 +*.color11: nord13 +*.color12: nord9 +*.color13: nord15 +*.color14: nord7 +*.color15: nord6 diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 8fb681f..b681e2c 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -19,7 +19,7 @@ box_drawing_scale 0.001, 1, 1.5, 2 #: Cursor customization {{{ cursor_shape block -cursor #FDE311 +cursor #d8dee9 cursor_text_color background cursor_blink_interval 0 @@ -75,45 +75,27 @@ inactive_tab_font_style normal #: }}} #: Color scheme {{{ - -foreground #ebdbb2 -background #282828 - -#: The foreground and background for text selected with the mouse -selection_foreground #fbf1c7 -selection_background #d65d0e - -#: black -color0 #282828 -color8 #928374 - -#: red -color1 #cc241d -color9 #fb4934 - -#: green -color2 #97971a -color10 #b8bb26 - -#: yellow -color3 #d79921 -color11 #fabd2f - -#: blue -color4 #458588 -color12 #83a598 - -#: purple -color5 #b16286 -color13 #d3869b - -#: cyan -color6 #689d6a -color14 #8ec07c - -#: white -color7 #a89984 -color15 #ebdbb2 +foreground #d8dee9 +background #2e3440 +selection_foreground #2e3440 +selection_background #d8dee9 + +color0 #3b4252 +color1 #bf616a +color2 #a3be8c +color3 #ebcb8b +color4 #81a1c1 +color5 #b48ead +color6 #88c0d0 +color7 #e5e9f0 +color8 #4c566a +color9 #bf616a +color10 #a3be8c +color11 #ebcb8b +color12 #81a1c1 +color13 #b48ead +color14 #8fbcbb +color15 #eceff4 #: }}} diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 3d4faa7..06992d0 100755 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,4 +1,4 @@ -"{{{ +"{{{ Plugs call plug#begin('~/.local/share/nvim/plugged') @@ -8,8 +8,6 @@ Plug 'Valloric/YouCompleteMe' Plug 'w0rp/ale' "manages tag files Plug 'ludovicchabant/vim-gutentags' -"language pack -"Plug 'sheerun/vim-polyglot' "snippet solution Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' @@ -27,7 +25,7 @@ Plug 'majutsushi/tagbar' Plug 'bling/vim-airline' " color theme. -Plug 'morhetz/gruvbox' +Plug 'arcticicestudio/nord-vim' "Personal wiki Plug 'vimwiki/vimwiki' @@ -120,9 +118,6 @@ set shiftwidth=4 set softtabstop=4 set tabstop=8 -" Visual aid to deter from typing past column 110 -"set colorcolumn=110 - " Use english for spellchecking, but don't spellcheck by default set spell spelllang=en_us set nospell @@ -169,32 +164,18 @@ set cinoptions=l1 "{{{Look and Feel -" Color Scheme -" gruvbox_color_column works as expected IF the order is: -" set termguicolors -" colorscheme gruvbox -" ... -" set background=dark -" Investigate later - -"let $NVIM_TUI_ENABLE_TRUE_COLOR=1 set termguicolors -colorscheme gruvbox - -let g:gruvbox_bold=1 -let g:gruvbox_color_column='red' -let g:gruvbox_underline=1 -let g:gruvbox_contrast_dark='medium' -let g:gruvbox_contrast_light='hard' -let g:gruvbox_vert_split='aqua' - set background=dark " Setting dark mode -"highlight ColorColumn guibg='DarkRed' -highlight NormalNC guibg='Black' -"highlight NormalNC guifg='Cyan' +"highlight NormalNC guibg='Black' + +let g:nord_underline = 1 +let g:nord_italic = 1 +let g:nord_italic_comments = 1 +let g:nord_cursor_line_number_background = 1 +colorscheme nord " }}} diff --git a/.tmux.conf b/.tmux.conf index a798aa3..df2b81d 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -32,7 +32,7 @@ setw -g window-status-bg black setw -g window-status-attr dim setw -g window-status-format ' #I#[fg=cyan]:#[fg=white]#W#[fg=white]#F ' -# Don't prompt to kill panes/windows. TODO you will fuck this up +# Don't prompt to kill panes/windows. bind-key x kill-pane bind-key & kill-window @@ -50,8 +50,6 @@ bind-key z resize-pane -Z # Use vim keybindings in copy mode setw -g mode-keys vi -set -g default-terminal "tmux-256color" -set -g default-command "${SHELL}" set -g set-titles on set -g mouse on @@ -82,3 +80,13 @@ set -g visual-activity on # Example of using a shell command in the status line #set -g status-right "#[fg=yellow]#(uptime | cut -d ',' -f 2-)" + +set -g default-terminal "xterm-256color" +set-option -ga terminal-overrides ",xterm-256color:Tc" + +# List of plugins +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'tmux-plugins/tmux-sensible' + +# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) +run -b '~/.tmux/plugins/tpm/tpm' diff --git a/.zshrc b/.zshrc index e2a2392..734a5da 100644 --- a/.zshrc +++ b/.zshrc @@ -31,7 +31,7 @@ ZSH_THEME="spaceship" # Uncomment the following line to disable colors in ls. # DISABLE_LS_COLORS="true" -export LS_COLORS="$(vivid generate snazzy)" +#export LS_COLORS="$(vivid generate snazzy)" # Uncomment the following line to disable auto-setting terminal title. # DISABLE_AUTO_TITLE="true" @@ -165,6 +165,4 @@ alias tp='trash-put' [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -source /home/yigit/.local/share/nvim/plugged/gruvbox/gruvbox_256palette.sh - export GOOGLE_APPLICATION_CREDENTIALS="/home/yigit/translation/DanNet-152c89acaeb0.json" -- cgit v1.2.3-70-g09d2