we ran it and updated nvim
This commit is contained in:
parent
70b8d78eec
commit
6019c6a30f
|
@ -244,7 +244,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
cube = {
|
cube = {
|
||||||
hostname = "anish.lakhwara.com";
|
hostname = "lakhwara.com";
|
||||||
profiles.system = {
|
profiles.system = {
|
||||||
user = "anish";
|
user = "anish";
|
||||||
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.cube;
|
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.cube;
|
||||||
|
|
|
@ -46,17 +46,6 @@ let
|
||||||
sha256 = "vX7ZVJxgatIicmijehtaRvyHxk1i4gFfXrbPM/+VoFc=";
|
sha256 = "vX7ZVJxgatIicmijehtaRvyHxk1i4gFfXrbPM/+VoFc=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
my-lualine-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
|
||||||
pname = "lualine.nvim";
|
|
||||||
version = "2022-05-13";
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "nvim-lualine";
|
|
||||||
repo = "lualine.nvim";
|
|
||||||
rev = "a4e4517ac32441dd92ba869944741f0b5f468531";
|
|
||||||
sha256 = "18q935aicddai7j99ln61wz1di6lhwzs11x8fxgq704kfap1l2fj";
|
|
||||||
};
|
|
||||||
meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";
|
|
||||||
};
|
|
||||||
my-which-key-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
my-which-key-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
||||||
pname = "which-key.nvim";
|
pname = "which-key.nvim";
|
||||||
version = "2022-05-04";
|
version = "2022-05-04";
|
||||||
|
@ -575,7 +564,7 @@ in
|
||||||
local navic = require("nvim-navic")
|
local navic = require("nvim-navic")
|
||||||
|
|
||||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
|
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
|
||||||
|
|
||||||
local lspconfig = require('lspconfig')
|
local lspconfig = require('lspconfig')
|
||||||
local servers = { 'clojure_lsp', 'terraform_lsp', 'zls' }
|
local servers = { 'clojure_lsp', 'terraform_lsp', 'zls' }
|
||||||
|
@ -623,6 +612,7 @@ in
|
||||||
|
|
||||||
-- treesitter
|
-- treesitter
|
||||||
require('nvim-treesitter.configs').setup {
|
require('nvim-treesitter.configs').setup {
|
||||||
|
parser_install_dir = "~/.local/share/nvim/site/parser/",
|
||||||
ensure_installed={'nix', 'clojure', 'python', 'fennel', 'lua', 'html', 'css', 'regex', 'supercollider', 'beancount'},
|
ensure_installed={'nix', 'clojure', 'python', 'fennel', 'lua', 'html', 'css', 'regex', 'supercollider', 'beancount'},
|
||||||
highlight = { enabled = true, additional_vim_regex_highting = true, },
|
highlight = { enabled = true, additional_vim_regex_highting = true, },
|
||||||
textobjects = { enabled = true },
|
textobjects = { enabled = true },
|
||||||
|
@ -764,6 +754,7 @@ in
|
||||||
|
|
||||||
plugins = with pkgs.vimPlugins // customPlugins; [
|
plugins = with pkgs.vimPlugins // customPlugins; [
|
||||||
# ui
|
# ui
|
||||||
|
lualine-nvim
|
||||||
fzf-vim
|
fzf-vim
|
||||||
nerdtree
|
nerdtree
|
||||||
neovim-ayu
|
neovim-ayu
|
||||||
|
@ -782,6 +773,8 @@ in
|
||||||
barbar-nvim
|
barbar-nvim
|
||||||
auto-session
|
auto-session
|
||||||
my-marks
|
my-marks
|
||||||
|
which-key-nvim
|
||||||
|
nvim-peekup
|
||||||
|
|
||||||
# language
|
# language
|
||||||
vim-nix
|
vim-nix
|
||||||
|
@ -790,6 +783,7 @@ in
|
||||||
csv-vim
|
csv-vim
|
||||||
direnv-vim
|
direnv-vim
|
||||||
zig-vim
|
zig-vim
|
||||||
|
conjure
|
||||||
|
|
||||||
# kitaab stuff
|
# kitaab stuff
|
||||||
vimwiki
|
vimwiki
|
||||||
|
@ -834,12 +828,7 @@ in
|
||||||
leap
|
leap
|
||||||
vim-beancount
|
vim-beancount
|
||||||
# vimtex
|
# vimtex
|
||||||
# TODO break with nvim 0.8.0
|
# custom
|
||||||
# these are here until i upgrade my nixos channnel in the flake
|
|
||||||
my-which-key-nvim
|
|
||||||
my-lualine-nvim
|
|
||||||
my-conjure
|
|
||||||
my-nvim-peekup
|
|
||||||
yuck-vim
|
yuck-vim
|
||||||
nvim-parinfer
|
nvim-parinfer
|
||||||
# vim-processing
|
# vim-processing
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{ self, config, pkgs, lib, ... }:
|
||||||
let
|
let
|
||||||
tex = (pkgs.texlive.combine {
|
tex = (pkgs.texlive.combine {
|
||||||
inherit (pkgs.texlive) scheme-basic
|
inherit (pkgs.texlive) scheme-basic
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
# git add flake.lock
|
# git add flake.lock
|
||||||
# git commit -m "update website"
|
# git commit -m "update website"
|
||||||
# git push
|
# git push
|
||||||
deploy .#cube --hostname lakhwara.com
|
deploy .#cube
|
||||||
exit 0
|
exit 0
|
||||||
'';
|
'';
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
|
|
Loading…
Reference in a new issue