Merge remote-tracking branch 'Jidbo/master'

install.conf.yaml

@@ -15,6 +15,8 @@
       path: vim/vim
     ~/.config/nvim:
       path: nvim
+    ~/.config/kitty:
+      path: kitty
 
 - shell:
   # install ohmyzsh

kitty/colors.conf

@@ -0,0 +1,63 @@
+background 						#1D1D19
+foreground 						#F8F8F2
+cursor     							#F8F8F2
+
+# Black
+color0								#1D1D19
+color8								#1D1D19
+
+# Red
+color1								#EE4F84
+color9								#F48FB1
+
+# Green
+color2								#53E2AE
+color10								#A1EFD3
+
+# Yellow
+color3								#F1FF52
+color11								#F1FA8C
+
+# Blue
+color4								#6498EF
+color12								#92B6F4
+
+# Magenta
+color5								#985EFF
+color13								#BD99FF
+
+# Cyan
+color6								#24D1E7
+color14								#87DFEB
+
+# White
+color7								#E5E5E5
+color15								#F8F8F2
+
+
+
+# The foreground for selections
+selection_foreground			#F8F8F2
+
+# The background for selections
+selection_background		#8ab4f2
+
+# Emacs terminal background
+color17								#323F4E
+
+# Emacs terminal modeline
+color23								#1a1a1a
+
+# The color for the border of the active window
+active_border_color			#F1FA8C
+
+# The color for the border of inactive windows
+inactive_border_color		#56687E
+
+url_color							#6498EF
+
+active_tab_foreground		#F8F8F2
+active_tab_background		#24D1E7
+inactive_tab_foreground 	#F8F8F2
+inactive_tab_background	#1a1a1a
+

kitty/kitty.conf

@@ -0,0 +1,103 @@
+# Colors
+include colors.conf
+
+startup_session startup_session
+
+# Fonts
+font_family									MesloLGS NF
+italic_font      						   	auto
+bold_font        						   	auto
+bold_italic_font 						   	auto
+font_size        						   	10.5
+
+adjust_line_height 							0
+adjust_column_width 						0
+box_drawing_scale 							0.001, 1, 1.5, 2
+
+# Cursor
+cursor_shape     							block
+cursor_blink_interval     					-1
+cursor_stop_blinking_after 					15.0
+
+# Scrollback
+scrollback_lines 							10000
+scrollback_pager 							usr/bin/less
+wheel_scroll_multiplier 					5.0
+
+# URLs
+url_style 									double
+open_url_modifiers 							ctrl+shift
+open_url_with 								default
+copy_on_select 								yes
+
+# Selection
+rectangle_select_modifiers 					ctrl+shift
+select_by_word_characters 					:@-./_~?&=%+#
+
+# Mouse
+click_interval 								0.5
+mouse_hide_wait 							0.5
+focus_follows_mouse 						no
+
+# Performance
+repaint_delay    							20
+input_delay 									2
+sync_to_monitor 							no
+
+# Bell
+visual_bell_duration 						0.0
+enable_audio_bell 							no
+bell_on_tab									no
+
+# Window
+remember_window_size   						no
+initial_window_width   						700
+initial_window_height  						400
+window_border_width 						0
+window_margin_width 						0
+window_padding_width 						0
+inactive_text_alpha 							1.0
+background_opacity 							1
+placement_strategy 							center
+hide_window_decorations 					yes
+
+# Layouts
+enabled_layouts 							*
+
+# Tabs
+tab_bar_edge 								bottom
+tab_bar_style 								powerline
+tab_bar_margin_width 						0
+tab_separator 								" ┇ "
+active_tab_font_style 						bold
+inactive_tab_font_style 					normal
+
+# Shell
+shell 										.
+close_on_child_death 						no
+allow_remote_control 						yes
+term 										xterm-kitty
+
+# Keys
+map alt+v        							paste_from_clipboard
+map ctrl+shift+s        					paste_from_selection
+map alt+c        							copy_to_clipboard
+map shift+insert					        paste_from_selection
+
+map ctrl+shift+up        					scroll_line_up
+map ctrl+shift+down      					scroll_line_down
+map ctrl+shift+k         					scroll_line_up
+map ctrl+shift+j         					scroll_line_down
+map ctrl+shift+page_up   					scroll_page_up
+map ctrl+shift+page_down 					scroll_page_down
+map ctrl+shift+h         					show_scrollback
+
+map f11										 toggle_fullscreen
+
+map ctrl+shift+enter    					new_window
+map ctrl+shift+n        					new_os_window					
+
+map ctrl+shift+equal    					increase_font_size
+map ctrl+shift+minus    					decrease_font_size
+map ctrl+shift+backspace 					restore_font_size
+

kitty/startup_session

@@ -0,0 +1 @@
+launch tmuxinator random

nvim/pluginoptions.vim

@@ -51,8 +51,25 @@ let g:vimwiki_list = [{'path': '~/.wiki/'}]
 " VIMTEX SETUP
 " =========================
 
-let g:vimtex_compile_progname = 'nvr'
+let g:vimtex_compiler_engine = 'lualatex'
+let g:vimtex_quickfix_mode = 0
 let g:tex_flavor = 'latex'
+let g:vimtex_compiler_method = 'latexmk'
+let g:vimtex_compiler_latexmk = {
+	\ 'backend' : 'nvim',
+	\ 'background' : 1,
+	\ 'build_dir' : '',
+	\ 'callback' : 1,
+	\ 'continuous' : 1,
+	\ 'executable' : 'latexmk',
+	\ 'hooks' : [],
+	\ 'options' : [ 
+	\   '-pdflatex=lualatex',
+	\   '-file-line-error',
+	\   '-synctex=1',
+	\   '-interaction=nonstopmode',
+	\ ],
+	\}
 
 " COLORS.LUA SETUP
 " =========================
@@ -123,3 +140,8 @@ let g:UltiSnipsEditSplit="vertical"
 " =========================
 
 let g:user_emmet_leader_key='<C-i>'
+
+" LANGUAGETOOL SETUP
+" =========================
+" autocmd Filetype tex LanguageToolSetUp
+let g:languagetool_cmd='/usr/bin/languagetool'

nvim/plugins.vim

@@ -15,6 +15,9 @@ Plug 'tpope/vim-surround'
 " Snippets
 Plug 'SirVer/ultisnips'
 
+" Lanugage tool
+Plug 'dpelle/vim-LanguageTool'
+
 " WINDOW MANAGEMENT
 " ===================
 

shell/tmux.conf

@@ -13,6 +13,15 @@ bind-key -T copy-mode-vi C-j select-pane -D
 bind-key -T copy-mode-vi C-k select-pane -U
 bind-key -T copy-mode-vi C-l select-pane -R
 
+# copy to system clipboard
+bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -se c -i'
+bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel 'xclip -se c -i'
+
+# enable mouse
+# setw -g mode-mouse on
+# set -g mouse-select-window on
+set -g mouse on
+
 # reload tmux.conf with <prefix>-r
 unbind r
 bind r \
@@ -23,7 +32,6 @@ bind -n M-h previous-window
 bind -n M-l next-window
 bind -n M-j switch-client -n
 bind -n M-k switch-client -p
-bind -n M-k switch-client -p
 
 bind-key -n M-s set-option status
 
@@ -38,26 +46,26 @@ set -g status-interval 10
 set-window-option -g clock-mode-colour green
 
 # bell
-set-window-option -g window-status-bell-style fg=black,bg=red
+set-window-option -g window-status-bell-style fg=color0,bg=red
 
 # default statusbar colors
-set-option -g status-bg black
+set -g status-bg black
 
 # term color
-set -g default-terminal "screen-256color"
+# set -g default-terminal "screen-256color"
-set-option -ga terminal-overrides ",xterm-256color:Tc"
+# set-option -ga terminal-overrides ",xterm-256color:Tc"
 
 # right status
 set -g status-right '#[fg=#51000f]#[bg=#51000f]#[fg=#ffffff] %H:%M %d-%b '
 
 # left status
-set -g status-left '#[bg=#1A202C]#[fg=#ffffff]#{?client_prefix,#[bg=#51000f],} ❐ #[bg=colour8]#[fg=#1A202C]#{?client_prefix,#[fg=#51000f],}#{?window_zoomed_flag, #[fg=colour7]🔍 ,} '
+set -g status-left '#[bg=#1A202C]#[fg=#ffffff]#{?client_prefix,#[bg=#51000f],} ❐ #[bg=#1D1D19]#[fg=#1A202C]#{?client_prefix,#[fg=#51000f],}#{?window_zoomed_flag, #[fg=colour7]🔍 ,} '
 
 # current window status
-set -g window-status-current-format "#[fg=colour8]#[bg=#51000f]#[fg=colour7]#[bg=#51000f] #I #[fg=colour7] #W #[fg=#51000f]#[bg=colour8]"
+set -g window-status-current-format "#[fg=#1D1D19]#[bg=#51000f]#[fg=colour7]#[bg=#51000f] #I #[fg=colour7] #W #[fg=#51000f]#[bg=#1D1D19]"
 
 # normal window status
-set -g window-status-format "#[fg=colour244]#[bg=colour8]#I #[fg=colour240] #W"
+set -g window-status-format "#[fg=colour244]#[bg=#1D1D19]#I #[fg=colour240] #W"
 
 # escape time
 set-option -sg escape-time 10

shell/zshrc

@@ -1,8 +1,6 @@
 # Path to your oh-my-zsh installation.
 export ZSH="$HOME/.oh-my-zsh"
 
-ZSH_THEME="robbyrussell"
-
 # plugins
 if [ -f ~/.dotfiles/shell/plugins ]
 then
@@ -22,6 +20,7 @@ fi
 source $ZSH/oh-my-zsh.sh
 
 
+
 # User configuration
 
 # Helper Functions
@@ -39,12 +38,25 @@ alias la='ls -la'
 alias :q='exit'
 alias fresh="source ~/.zshrc"
 
+# ZSH Theme
+ZSH_THEME=""
+
+PROMPT_COLOR="cyan"
+
 # localcommands
 if [ -f ~/.dotfiles/shell/localcommands ]
 then
 	source ~/.dotfiles/shell/localcommands
 fi
 
+PROMPT="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ )"
+PROMPT+=' %{$fg[${PROMPT_COLOR}]%}%c%{$reset_color%} $(git_prompt_info)'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}git:(%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
+
 # Tmuxinator autocomplete
 if [ -f ~/.bin/tmuxinator.zsh ]; then
     source ~/.bin/tmuxinator.zsh
@@ -61,6 +73,3 @@ if _has ruby;
 then
     export PATH="$PATH:$(ruby -e 'print Gem.user_dir')/bin"
 fi
-
-
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh

vim/vimrc

@@ -52,9 +52,6 @@ Plug 'editorconfig/editorconfig-vim'
 " language packs
 Plug 'sheerun/vim-polyglot'
 
-" latex
-Plug 'lervag/vimtex'
-
 call plug#end()            " required
 filetype plugin indent on    " required