aynish/helm
1
0
Fork 0
Code Pull requests Packages Projects Releases Activity

update conjure

Browse source 
working nvim-navic
back to old lua line with navic
This commit is contained in:
Anish L 2022-07-14 01:59:35 +10:00
parent 77ccca14bf
commit 84c2e3b185
1 changed files with 56 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
users/profiles/nvim/default.nix
View file

@ -68,6 +68,16 @@ let
};
meta.homepage = "https://github.com/folke/which-key.nvim/";
};
my-conjure = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "conjure";
version = "2022-05-04";
src = pkgs.fetchFromGitHub {
owner = "olical";
repo = "conjure";
rev = "2e7f449d06753f2996e186954e96afc60edd5862";
sha256 = "ZV0vPYiZI5/3Isw2l7rrLuiO+kA9G0vrA6OxHFkLTFw=";
};
};
};
my-python-packages = python-packages: with python-packages; [
@ -144,6 +154,8 @@ in
set shortmess+=c
" always show signcolumns
set signcolumn=yes
" highlight row
set cursorline
let mapleader = "\<Space>"
let maplocalleader = ","
@ -480,21 +492,26 @@ in
local format = require("lsp-format")
local navic = require("nvim-navic")
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
require('lspconfig').clojure_lsp.setup {
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
local lspconfig = require('lspconfig')
local servers = { 'clojure_lsp', 'rnix', 'terraform_lsp' }
for _, lsp in ipairs(servers) do
lspconfig[lsp].setup {
on_attach = function(client, bufnr)
format.on_attach()
format.on_attach(client)
navic.attach(client, bufnr)
end,
capabilities = capabilities,
}
end
}
require('lspconfig').rnix.setup {
on_attach = require "lsp-format".on_attach
}
require('lspconfig').terraform_lsp.setup {
on_attach = require "lsp-format".on_attach
}
require('lspconfig').pylsp.setup {
on_attach = require "lsp-format".on_attach,
on_attach = function(client, bufnr)
format.on_attach(client)
navic.attach(client, bufnr)
end,
capabilities = capabilities,
settings = {
pylsp = {
configurationSources = { "flake8", "mypy", "black" },
@ -524,34 +541,33 @@ in
-- 'glsl' needs c++ compiler lol
-- lualine
require('nvim-gps').setup {}
local gps = require('nvim-gps')
local navic = require("nvim-navic")
require('lualine').setup {
options = { theme = 'ayu' },
sections = {
lualine_c = {
'filename', { navic.get_location, condition=navic.is_available },
},
lualine_y = {
function()
local msg = 'No Active Lsp'
local buf_ft = vim.api.nvim_buf_get_option(0, 'filetype')
local clients = vim.lsp.get_active_clients()
if next(clients) == nil then
return msg
end
for _, client in ipairs(clients) do
local filetypes = client.config.filetypes
if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then
return client.name
end
end
return msg
end
},
lualine_x = {'filetype'}
}
}
-- sections = {
-- lualine_c = {
-- 'filename', { gps.get_location, condition=gps.is_available },
-- },
-- lualine_y = {
-- function()
-- local msg = 'No Active Lsp'
-- local buf_ft = vim.api.nvim_buf_get_option(0, 'filetype')
-- local clients = vim.lsp.get_active_clients()
-- if next(clients) == nil then
-- return msg
-- end
-- for _, client in ipairs(clients) do
-- local filetypes = client.config.filetypes
-- if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then
-- return client.name
-- end
-- end
-- return msg
-- end
-- },
-- }
-- }
-- nvim-lint
-- require('lint').linters_by_ft = {
@ -684,7 +700,7 @@ in
fzf-checkout-vim
# Clojure stuff
conjure
# conjure
vim-sexp
vim-sexp-mappings-for-regular-people
fennel-vim
@ -698,6 +714,7 @@ in
# these are here until i upgrade my nixos channnel in the flake
my-which-key-nvim
my-lualine-nvim
my-conjure
# vim-processing
];
withPython3 = true;