diff --git a/configs/neovim.lua b/configs/neovim.lua index d065b99..06ca44c 100644 --- a/configs/neovim.lua +++ b/configs/neovim.lua @@ -2,12 +2,18 @@ local map = vim.api.nvim_set_keymap local o = vim.o local cmd = vim.cmd -cmd("syntax off"); -cmd("set t_Co=0"); -cmd("hi LineNr NONE"); +--cmd("syntax off"); +--cmd("set t_Co=0"); cmd("set nolist"); cmd("set ruler"); cmd("set mouse-=n"); +cmd("set t_Co=256"); +cmd("colorscheme vacme"); +cmd("hi! Normal ctermbg=NONE ctermfg=NONE"); +cmd("hi! Normal ctermbg=NONE ctermfg=NONE"); +cmd("hi! Normal ctermbg=NONE ctermfg=NONE"); +cmd("hi! SignColumn NONE"); +cmd("hi! LineNr NONE"); require("compe").setup { enabled = true; @@ -44,6 +50,7 @@ cmd[[highlight NvimTreeFolderName guifg=default]] local lspc = require("lspconfig") lspc.gopls.setup {}; +lspc.nil_ls.setup {}; o.hlsearch = true; diff --git a/configs/neovim.nix b/configs/neovim.nix index 1244948..0984e33 100644 --- a/configs/neovim.nix +++ b/configs/neovim.nix @@ -1,6 +1,26 @@ { config, lib, pkgs, ... }: with pkgs; let + parchment = pkgs.vimUtils.buildVimPluginFrom2Nix rec { + pname = "parchment"; + version = "0.4.0"; + src = pkgs.fetchFromGitHub { + owner = "ajgrf"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ZphConCGZR3EG6dd8Ji7U9Qtm21SoWMk60XD4X+My1g="; + }; + }; + vacme = pkgs.vimUtils.buildVimPluginFrom2Nix rec { + pname = "vacme"; + version = "2017-01-14"; + src = pkgs.fetchFromGitHub { + owner = "olivertaylor"; + repo = pname; + rev = "2f0b284b5bc1c9dd5b7f0b89ac880959e61b0be4"; + sha256 = "sha256-eea0Ntr3gCmF6iZ0adZaVswWH70K9IJZ4SAyVSdFp3E="; + }; + }; baseVimPackages = with vimPlugins; [ fugitive nvim-compe @@ -12,6 +32,9 @@ let vim-nix vim-ocaml zig-vim + + parchment + vacme ]; myVimPackages = if pkgs.system == "aarch64-linux" then baseVimPackages diff --git a/default.nix b/default.nix index 17576ae..943259f 100644 --- a/default.nix +++ b/default.nix @@ -118,6 +118,7 @@ in { lz4 minisign mosh + nil nix-diff nixfmt nix-index diff --git a/flake.nix b/flake.nix index 31e1275..bbdec17 100644 --- a/flake.nix +++ b/flake.nix @@ -88,6 +88,7 @@ git go jq + nil nix-diff shfmt sops