Compare commits

..

No commits in common. "5430ebf93a8df1d64b30f1c66f86ebc0243d618f" and "65a870fe98e04a7ab21517d60612016c28b1bd55" have entirely different histories.

2 changed files with 19 additions and 26 deletions

View File

@ -4,7 +4,6 @@ Plug 'ncm2/ncm2'
Plug 'autozimu/LanguageClient-neovim', {'branch': 'next', 'do': 'bash install.sh' } Plug 'autozimu/LanguageClient-neovim', {'branch': 'next', 'do': 'bash install.sh' }
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' } Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' }
Plug 'junegunn/fzf.vim' Plug 'junegunn/fzf.vim'
Plug 'enomsg/vim-haskellConcealPlus'
Plug 'lervag/vimtex' Plug 'lervag/vimtex'
Plug 'rhysd/vim-crystal' Plug 'rhysd/vim-crystal'
@ -31,14 +30,13 @@ autocmd FileType crystal setlocal shiftwidth=2 " Crystal likes 2-wide indent
set completeopt=noinsert,menuone set completeopt=noinsert,menuone
let g:LanguageClient_serverCommands = { let g:LanguageClient_serverCommands = {
\ 'haskell': ['hie-wrapper', '--lsp'], \ 'haskell': ['hie', '--lsp'],
\ 'rust': ['rustup', 'run', 'stable', 'rls'], \ 'rust': ['rustup', 'run', 'stable', 'rls'],
\ 'c': ['clangd'], \ 'c': ['clangd'],
\ 'crystal': ['scry'], \ 'crystal': ['scry'],
\ 'cpp': ['clangd'], \ 'cpp': ['clangd'],
\ 'javascript': ['javascript-typescript-stdio'], \ 'javascript': ['javascript-typescript-stdio'],
\ 'elm': ['elm-language-server', '--stdio'], \ 'elm': ['elm-language-server', '--stdio']
\ 'python': ['python', '-m', 'pyls']
\ } \ }
let g:deoplete#enable_at_startup = 1 let g:deoplete#enable_at_startup = 1
let g:LanguageClient_diagnosticsDisplay = { let g:LanguageClient_diagnosticsDisplay = {
@ -50,7 +48,4 @@ let g:LanguageClient_rootMarkers = {
\ 'haskell': ['.git'], \ 'haskell': ['.git'],
\ 'elm': ['elm.json'], \ 'elm': ['elm.json'],
\ } \ }
colorscheme nord colorscheme nord
nmap K :call LanguageClient_contextMenu()<CR>
nmap ? :call LanguageClient_textDocument_hover()<CR>

View File

@ -19,21 +19,18 @@ secondary = #a3be8c
alert = #bf616a alert = #bf616a
[bar/example] [bar/example]
dpi-x = 220
dpi-y = 200
;monitor = ${env:MONITOR:HDMI-1} ;monitor = ${env:MONITOR:HDMI-1}
width = 100% width = 100%
height = 3% height = 27
;offset-x = 1% ;offset-x = 1%
;offset-y = 1% ;offset-y = 1%
radius = 20% radius = 6.0
fixed-center = false fixed-center = false
background = ${colors.background} background = ${colors.background}
foreground = ${colors.foreground} foreground = ${colors.foreground}
line-size = 5% line-size = 3
line-color = #f00 line-color = #f00
border-size = 4 border-size = 4
@ -45,10 +42,8 @@ padding-right = 2
module-margin-left = 1 module-margin-left = 1
module-margin-right = 2 module-margin-right = 2
font-0 = Iosevka:pixelsize=9;1 font-0 = fixed:pixelsize=10;1
font-1 = Ionicons:pixelsize=9;1 font-1 = Wuncon Siji:pixelsize=12;1
; font-0 = fixed:pixelsize=10;1
; font-1 = Wuncon Siji:pixelsize=12;1
;font-1 = unifont:fontformat=truetype:size=8:antialias=false;0 ;font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
;font-2 = siji:pixelsize=10;1 ;font-2 = siji:pixelsize=10;1
@ -196,7 +191,7 @@ card = intel_backlight
[module/cpu] [module/cpu]
type = internal/cpu type = internal/cpu
interval = 2 interval = 2
format-prefix = " " format-prefix = " "
format-prefix-foreground = ${colors.foreground-alt} format-prefix-foreground = ${colors.foreground-alt}
format-underline = #f90000 format-underline = #f90000
label = %percentage:2%% label = %percentage:2%%
@ -204,7 +199,7 @@ label = %percentage:2%%
[module/memory] [module/memory]
type = internal/memory type = internal/memory
interval = 2 interval = 2
format-prefix = " " format-prefix = " "
format-prefix-foreground = ${colors.foreground-alt} format-prefix-foreground = ${colors.foreground-alt}
format-underline = #4bffdc format-underline = #4bffdc
label = %percentage_used%% label = %percentage_used%%
@ -254,7 +249,7 @@ interval = 5
date = date =
date-alt = " %Y-%m-%d" date-alt = " %Y-%m-%d"
time = %H:%M time = %H:%M
time-alt = %H:%M:%S time-alt = %H:%M:%S
format-prefix =  format-prefix = 
@ -307,11 +302,14 @@ format-full-prefix = " "
format-full-prefix-foreground = ${colors.foreground-alt} format-full-prefix-foreground = ${colors.foreground-alt}
format-full-underline = ${self.format-charging-underline} format-full-underline = ${self.format-charging-underline}
ramp-capacity-0 =  ramp-capacity-0 = 
ramp-capacity-1 =  ramp-capacity-1 = 
ramp-capacity-2 = 
ramp-capacity-foreground = ${colors.foreground-alt} ramp-capacity-foreground = ${colors.foreground-alt}
animation-charging-0 =  animation-charging-0 = 
animation-charging-1 = 
animation-charging-2 = 
animation-charging-foreground = ${colors.foreground-alt} animation-charging-foreground = ${colors.foreground-alt}
animation-charging-framerate = 750 animation-charging-framerate = 750
@ -329,9 +327,9 @@ label = %temperature%
label-warn = %temperature% label-warn = %temperature%
label-warn-foreground = ${colors.secondary} label-warn-foreground = ${colors.secondary}
ramp-0 = ramp-0 =
ramp-1 = ramp-1 =
ramp-2 = ramp-2 =
ramp-foreground = ${colors.foreground-alt} ramp-foreground = ${colors.foreground-alt}
[module/powermenu] [module/powermenu]