Compare commits

..

1 Commits

Author SHA1 Message Date
74c068a2b8 Switch to CoC for language servers. 2019-06-20 20:37:39 -07:00
4 changed files with 60 additions and 50 deletions

View File

@@ -75,7 +75,7 @@ font:
use_thin_strokes: true
# Should display the render timer
# render_timer: false
render_timer: false
# Colors (Pencil Dark)
# colors:

View File

@@ -0,0 +1,41 @@
{
"languageserver": {
"haskell": {
"command": "hie-wrapper",
"args": ["--lsp"],
"filetypes": [ "haskell" ],
"rootPatterns": [ ".git", "stack.yaml" ]
},
"rust": {
"command": "rustup",
"args": ["run", "stable", "rls" ],
"filetypes": [ "rust" ],
"rootPatterns": [ ".git", "cargo.toml" ]
},
"clangd": {
"command": "clangd",
"filetypes": [ "c", "cpp" ],
"rootPatterns": [".git"]
},
"crystal": {
"command": "scry",
"filetypes": [ "crystal" ],
"rootPatterns": [".git", "shard.yml"]
},
"javascript": {
"command": "javascript-typescript-stdio",
"filetypes": [ "javascript" ],
"rootPatterns": [".git" ]
},
"elm": {
"command": "elm-language-server",
"args": ["--stdio"],
"filetypes": ["elm"],
"rootPatterns": [".git", "elm.json"],
"initializationOptions": {
"runtime": "node",
"elmPath": "elm"
}
}
}
}

View File

@@ -1,10 +1,7 @@
call plug#begin('~/.config/nvim/plugged')
Plug 'roxma/nvim-yarp'
Plug 'ncm2/ncm2'
Plug 'autozimu/LanguageClient-neovim', {'branch': 'next', 'do': 'bash install.sh' }
Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' }
Plug 'junegunn/fzf.vim'
Plug 'enomsg/vim-haskellConcealPlus'
Plug 'lervag/vimtex'
Plug 'rhysd/vim-crystal'
@@ -24,33 +21,7 @@ set number " Set line numbers
set mouse=a " Allow mouse
set signcolumn=yes " Always show extra column
autocmd BufEnter * call ncm2#enable_for_buffer() " Enable ncm2 for all buffers
autocmd BufRead,BufNewFile *.v set filetype=coq " Coq is not Verilog
autocmd FileType crystal setlocal shiftwidth=2 " Crystal likes 2-wide indent
set completeopt=noinsert,menuone
let g:LanguageClient_serverCommands = {
\ 'haskell': ['hie-wrapper', '--lsp'],
\ 'rust': ['rustup', 'run', 'stable', 'rls'],
\ 'c': ['clangd'],
\ 'crystal': ['scry'],
\ 'cpp': ['clangd'],
\ 'javascript': ['javascript-typescript-stdio'],
\ 'elm': ['elm-language-server', '--stdio'],
\ 'python': ['python', '-m', 'pyls']
\ }
let g:deoplete#enable_at_startup = 1
let g:LanguageClient_diagnosticsDisplay = {
\ 1: {"name": "Error","texthl": "ALEError","signText": ">>","signTexthl": "ALEErrorSign",},
\ 2: {"name": "Warning","texthl": "ALEWarning","signText": ">>","signTexthl": "ALEWarningSign",},
\ 3: {"name": "Information","texthl": "ALEInfo","signText": ">>","signTexthl": "ALEInfoSign",},
\ 4: {"name": "Hint","texthl": "ALEInfo","signText": ">>","signTexthl": "ALEInfoSign",},}
let g:LanguageClient_rootMarkers = {
\ 'haskell': ['.git'],
\ 'elm': ['elm.json'],
\ }
colorscheme nord
nmap K :call LanguageClient_contextMenu()<CR>
nmap ? :call LanguageClient_textDocument_hover()<CR>

View File

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