diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml index ec7a507..1d07d19 100644 --- a/alacritty/alacritty.yml +++ b/alacritty/alacritty.yml @@ -111,7 +111,7 @@ font: #family: Blex Mono Bold Nerd Font Complete family: Comic Code Ligatures style: - size: 6.95 + size: 12 url: # URL launcher diff --git a/i3/config b/i3/config index dadf1e9..d24feb8 100644 --- a/i3/config +++ b/i3/config @@ -203,9 +203,9 @@ bindsym $mod+shift+BackSpace gaps inner all set 0; gaps outer all set 0 #### Programs bindsym $mod+Return exec kitty bindsym $mod+Shift+Return exec alacritty -e ~/.scripts/web -bindsym $mod+Ctrl+Return exec alacritty +bindsym $mod+Ctrl+Return exec alacritty -e ~/.scripts/mc bindsym $mod+x exec xinput-gui -bindsym $mod+c exec gnome-calendar +bindsym $mod+c exec brave https://calendar.google.com/calendar/u/0/r?pli=1 bindsym $mod+Shift+b exec blueman-manager bindsym $mod+p exec bwmenu bindsym $mod+Shift+f exec --no-startup-id nautilus diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 25eb419..11c3cd2 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -7,9 +7,10 @@ #: characters. #font_family Fira Code Regular +font_family SauceCodePro Nerd Font #font_family IBM Plex Mono #font_family BlexMono Nerd Font -font_family Comic Code Ligatures +#font_family Comic Code Ligatures bold_font auto italic_font auto bold_italic_font auto @@ -26,7 +27,7 @@ bold_italic_font auto #: italic_font Operator Mono Book Italic #: bold_italic_font Operator Mono Medium Italic -font_size 12.0 +font_size 13.0 #: Font size (in pts) @@ -567,7 +568,7 @@ enable_audio_bell no #: values set top, horizontal and bottom. Four values set top, right, #: bottom and left. -window_padding_width 20 +window_padding_width 0 #: The window padding (in pts) (blank area between the text and the #: window border). A single value sets all four sides. Two values set @@ -756,9 +757,8 @@ tab_bar_style powerline #: }}} #: Color scheme {{{ - -foreground #eeeeee -background #282828 +# foreground #eeeeee +# background #282828 #: The foreground and background colors @@ -832,46 +832,46 @@ background #282828 #: dull and bright version, for the first 16 colors. You can set the #: remaining 240 colors as color16 to color255. # Cursor -cursor #abb2bf -cursor_text_color #282c34 +# cursor #abb2bf +# cursor_text_color #282c34 # Colors -foreground #abb2bf -background #282c34 -selection_foreground #282c34 -selection_background #abb2bf +# foreground #abb2bf +# background #282c34 +# selection_foreground #282c34 +# selection_background #abb2bf # black -color0 #282c34 -color8 #3e4452 +# color0 #282c34 +# color8 #3e4452 # red -color1 #e06c75 -color9 #be5046 +# color1 #e06c75 +# color9 #be5046 # green -color2 #98c379 -color10 #98c379 +# color2 #98c379 +# color10 #98c379 # yellow -color3 #e5c07b -color11 #d19a66 +# color3 #e5c07b +# color11 #d19a66 # blue -color4 #61afef -color12 #61afef +# color4 #61afef +# color12 #61afef # magenta -color5 #c678dd -color13 #c678dd +# color5 #c678dd +# color13 #c678dd # cyan -color7 #56b6c2 -color14 #56b6c2 +# color7 #56b6c2 +# color14 #56b6c2 # white -color7 #abb2bf -color15 #5c6370 +# color7 #abb2bf +# color15 #5c6370 # mark1_foreground black #: Color for marks of type 1 @@ -1510,4 +1510,10 @@ listen_on unix:/tmp/kitty #: }}} #: }}} -include dracula.conf +include frappe.conf + + +# BEGIN_KITTY_THEME +# Dracula +include current-theme.conf +# END_KITTY_THEME diff --git a/nvim/init.vim b/nvim/init.vim index 9067ef7..a8d5c82 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -46,10 +46,35 @@ Plug 'gko/vim-coloresque' Plug 'dracula/vim', { 'as': 'dracula' } Plug 'joshdick/onedark.vim' Plug 'Mofiqul/dracula.nvim' - " Lang. Support -Plug 'fatih/vim-go' +"""""""""""""""""""""""""""""""GO""""""""""""""""""""""""""""""""""""""" +Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } +Plug 'deoplete-plugins/deoplete-go', { 'do': 'make'} +set completeopt-=preview +" Go related keybinds +autocmd FileType go nmap r (go-run) +" Move through errors easier! +map :cnext +map :cprevious +nnoremap a :cclose + +" run :GoBuild or :GoTestCompile based on the go file +function! s:build_go_files() + let l:file = expand('%') + if l:file =~# '^\f\+_test\.go$' + call go#test#Test(0, 1) + elseif l:file =~# '^\f\+\.go$' + call go#cmd#Build(0) + endif +endfunction +autocmd FileType go nmap b :call build_go_files() +let g:go_def_mode='gopls' +let g:go_info_mode='gopls' +let g:go_list_type = "quickfix" +""""""""""""""""""""""""""""""GO"""""""""""""""""""""""""""""""""""""""" + +" JAVA Plug 'artur-shaik/vim-javacomplete2' autocmd FileType java setlocal omnifunc=javacomplete#Complete @@ -59,10 +84,11 @@ Plug 'zchee/deoplete-jedi' Plug 'deoplete-plugins/deoplete-clang' Plug 'davidhalter/jedi-vim' +" RUST Plug 'rust-lang/rust.vim' Plug 'simrat39/rust-tools.nvim' -Plug 'neovim/nvim-lspconfig' +Plug 'neovim/nvim-lspconfig' Plug 'preservim/nerdcommenter' Plug 'mattn/emmet-vim' @@ -76,7 +102,7 @@ noremap :Autoformat " Indent Blanklines Plug 'lukas-reineke/indent-blankline.nvim' -" Writing +" Writing in LaTeX Plug 'junegunn/goyo.vim' Plug 'lervag/vimtex' Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' } @@ -90,14 +116,15 @@ let g:livepreview_engine = 'xelatex' set conceallevel=1 let g:tex_conceal='abdmg' -"Ultisnips +" Ultisnips Plug 'sirver/ultisnips' Plug 'honza/vim-snippets' let g:UltiSnipsExpandTrigger = '' let g:UltiSnipsJumpForwardTrigger="" let g:UltiSnipsJumpBackwardTrigger="" let g:UltiSnipsListSnippets="" -"Zoxide + +" Zoxide Plug 'nanotee/zoxide.vim' " Vim Wiki @@ -121,17 +148,21 @@ Plug 'ryanoasis/vim-devicons' " Lightspeed Plug 'ggandor/lightspeed.nvim' +" Markdown Preview +Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': 'markdown' } + call plug#end() "let g:molokai_original = 1 "let g:airline_theme='onedark' "let g:airline_theme='dracula' -let g:ale_enable=1 +let g:ale_enable=0 let g:ale_linters = { \ 'python': ['pylint'], \ 'vim': ['vint'], \ 'cpp': ['clang'], - \ 'c': ['clang'] + \ 'c': ['clang'], + \ 'go': ['gopls'], \} syntax on filetype plugin indent on @@ -223,6 +254,9 @@ nnoremap :e nnoremap :tabe nnoremap :vsplit +" Markdown Preview +nnoremap m :MarkdownPreviewToggle + " Screenshot command nnoremap s :!bash /home/simon/.scripts/vscrnpaste diff --git a/nvim/spell/en.utf-8.add b/nvim/spell/en.utf-8.add index 0076ea3..7aa757c 100644 --- a/nvim/spell/en.utf-8.add +++ b/nvim/spell/en.utf-8.add @@ -180,3 +180,17 @@ malloc JVM Naur BNF +src +CSCU9A5 +EBNF +EOL +AST +CSCU9E5 +toString +equals +Powerpoint +slideshow +HTML5 +tannoy +Alexa +YT diff --git a/nvim/spell/en.utf-8.add.spl b/nvim/spell/en.utf-8.add.spl index 4eecc9a..dcaed6b 100644 Binary files a/nvim/spell/en.utf-8.add.spl and b/nvim/spell/en.utf-8.add.spl differ