From 9d21e238eb5d18a8ad643e4c1764376451fddbee Mon Sep 17 00:00:00 2001 From: simonkellet Date: Sun, 11 Sep 2022 13:56:18 +0100 Subject: [PATCH] changes... --- alacritty/alacritty.yml | 2 +- i3/config | 4 +-- kitty/kitty.conf | 64 ++++++++++++++++++++---------------- nvim/init.vim | 50 +++++++++++++++++++++++----- nvim/spell/en.utf-8.add | 14 ++++++++ nvim/spell/en.utf-8.add.spl | Bin 2452 -> 2622 bytes 6 files changed, 94 insertions(+), 40 deletions(-) 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 4eecc9a0e38d383dad2e5592663f96662b6e7265..dcaed6b3971990d18f1923e6b718dba7188a54f4 100644 GIT binary patch literal 2622 zcmZ8jO>fjz6!m?c0U?&{reZPPMO9Y}K`N!A$|NaF#Xyu$GW0{@jqUL`@mFonR~ChI z)nCwG(Vx%-5u2`>EmBog>Mvl~9X;ndZ77lO*zetY-nr*~JRT26bs42;|Bd5xuU_lh zNf1WUc$ORPXsx7R%n(JO^EPilO zre={Fa5c+eTEWG_X~vz~p-kI2z1XPD0)pJ?+DWunlltHWA2(@>*NgW}ec!yi5kv`A zf6Vdln>kkH{lIKY`0~NTY;f7q*0-iv;NS#Y6GSvsfP!Z{OiE>i*TJC)l=4}lP8lpG z@KA_Xd3QpjDIT8{->C%-p0~SaDLuTP6QwG5i99jS6cTb82l=CH7Jw}Y1@PAD)?Bh- zloXX3UuYgfa~@eq1E%s}!lc9?#Ymk&X5tpaf+H4gTQjMU*Y=zY&Mm13n$NXLG?izp z9VR!@>Vf09axH#7OB<8c|B=>m8RurkY9w!_nb!1NUEmEG&9ih;*U5`ZD0VqXQWO#N zV6C(qShE0)qfS*cvP3Q9um)6~>Uz!m@p zliyjU6`+e&)zjPs1P7A)XQaA}4!hd5IFv->&Ajy-*p3b38f-Y+vd+bxLU&H9%K_t;g9`HuX+B0=+P2=*WXIIZ&sYve8X?i;go=pM`IuBmyT)ls z(ObHXt@I>kG=*YlEG;Yy>Io=lq%R}X$PE1eXsWHH_Kg1Wb7dSxr4_X~g9m3o2};;} z8B-B22zBU>3&rDb#p)n7mYe$FN7^A6)fs9b0d;t%N%w~3^zMAKRF9xdo{!6e)Y`ko z;xNMTx@2NV*j!-?CD@4&Emak3i$qfZ+FQ{Mm?*HI8^6Pv4 zovrP=_wGO3-P=ES62`N%Y&s8uxRPzfcK~s5VebMCuD!Of8yV`?HY~{a;xgVr1-^3` z_i{wQtM@>!UZP}XzmP5Y5?7voXXo(~%GBeP*So2>dgYzJZ|ce>P~W~pw{`Unm@epi zd$@~8HTAtiC3T+$*R4E~5#LVki?1$ycMG4__Lxg;njSNogWTJ_I?_x#y|N4AXL~ln zSbe7*Z?*0C=-+niMQAr3achkZ8^XN(Uj$ZOa7=OM&|nJggOgsvFXqOE$mHiBjNQLe zxp#hS163`IrZQA%wz1s{%?<68-qzcN;>)haH3Vu~C^V9fDEb_0|Eq!?Z!ki$JxNh{ z^a`%Bl#Yjcc#Y)&A&+>&*LZI)J#2q9l)~5;l)s?C*IHA(2Pl9NDzBmN`5^i>!Rh-r NiL+8$p%**+`v;s7*rosg literal 2452 zcmZ8iO^X~w7_O?G-5?5*qsn0GWsl-yA%-x7-rYn;GMi-+(*#d7-8DTu+h6qb%+4f8 zg7^!(_%CwG(VP?s1oV`aY)$q1{XXwU-5re=jVp@5-%9m<`DkD# zN$RHAET5kgWmPxrqFb&`*PGw}(3MWLx{#zB#@W32u0^fl8I`7z&u9u8C;Ai~TU{Fb zJ$eWH_;VhES7Ol>N-r-yet%Ioq#tM;zRJb5LY>dSZJe4Bmf`rtv zf@mulBrpZi)l^S?ZeeCbW(5$g^z3A{A%A%3+_@|F-3vR3%fb7h!Vz^#Q1yF>*_rTi zabk8zwv>&m=~jq8M|?T5n2LegfORWxBobVQbMgF8LVeyrZUT8R@S>t@H0`JuCOub_ z{BD3g%SMcVlu@V$5wXzpzPy5@5O&)(b$Q*2@EM#L;H0rucW|OV$%%Ic?@UMyOOtsc z7QujU)tX6*l6gNRl!Y8Rz`2y#OO>9pBUm>lJpskIm0DaYOtJVcW@&`DGBfrT!)5^~ zOvUw?xnUQms@_J+>LM@D7Jz}(_o1;V^)N?bsi^B1$-rC&ir^QQCRw6EpcW-!l?IBQ zCE4;F}kK-9oYa(Y~{?%@E(u##v)l(1Jc?OH<6 zd$k~D{TN<%=<5{fr!bSD9NtJ8s78RgPRKZG3I^kaDJp0qNk;f;M}~|!suy{XfX7%_ zks7u#56WxGnr)WcJVQe{NJrDMUIi1}_F122ODNnIqblB*ngbequ|isj*pjx286|ZW z@Iq{zfY0~{<(m?O<(ACi6q^ft8H{0JOplrq$X3Xdn%)93!yUX~L)fsCfL-=3PVN*P z53IvhK{TJ1m;$8$#~IpUeC%M30dWCB;zx)6F464-SR}s7(UuO0aE61>8M`!G0^^O? zlJJYQz*PyL3@Er!$i0Sb1oB%NKm#j91;09hVLacG*@O@J)vuN!sUF&%O|u1@b34hP z4V`bdzbwLlnUGT=!Q2pJu|9|lI8WQHB*$7pJ?|p{8Ov~L%KHQ-Dp~gvNriTG!PK?t zyymZ(Deh{Rc+?~8aXR;F-};S(f#;}jpF!JG~Kl2`auMqOZXm9`E%bT~3j&H~J(ri{V zy~8AH^?{gIaD4V$9swjM_I*QkdL&;5kYK=PFXDA{&RZ{Hzd{0h1Y>ywX{9u`YrU_( z!Q&I{-MuHaNb?q6$AotY+W)HE=i5TloG6AU&vCydmEBT}j&aTOAx-8>2rh8<&k@*%BaI%;5c1a) YxF@~SKSZe;Jw_QLa0JtDbH%@Z05@T}(EtDd