From 6019c6a30f787fc58ab1bb4756739d333a2e5a4b Mon Sep 17 00:00:00 2001
From: Anish Lakhwara <anish+git@lakhwara.com>
Date: Wed, 7 Dec 2022 14:38:29 +1000
Subject: [PATCH] we ran it and updated nvim

---
 flake.nix                               |  2 +-
 home/profiles/nvim/default.nix          | 25 +++++++------------------
 hosts/profiles/desktop/default.nix      |  2 +-
 hosts/profiles/sync/website/default.nix |  2 +-
 4 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/flake.nix b/flake.nix
index eae92cb8..c417572e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -244,7 +244,7 @@
           };
         };
         cube = {
-          hostname = "anish.lakhwara.com";
+          hostname = "lakhwara.com";
           profiles.system = {
             user = "anish";
             path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.cube;
diff --git a/home/profiles/nvim/default.nix b/home/profiles/nvim/default.nix
index c51d549d..bc2b066e 100644
--- a/home/profiles/nvim/default.nix
+++ b/home/profiles/nvim/default.nix
@@ -46,17 +46,6 @@ let
         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 {
       pname = "which-key.nvim";
       version = "2022-05-04";
@@ -575,7 +564,7 @@ in
       local navic = require("nvim-navic")
 
       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 servers = { 'clojure_lsp', 'terraform_lsp', 'zls' }
@@ -623,6 +612,7 @@ in
 
       -- treesitter
       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'},
         highlight = { enabled = true, additional_vim_regex_highting = true, },
         textobjects = { enabled = true },
@@ -764,6 +754,7 @@ in
 
     plugins = with pkgs.vimPlugins // customPlugins; [
       # ui
+      lualine-nvim
       fzf-vim
       nerdtree
       neovim-ayu
@@ -782,6 +773,8 @@ in
       barbar-nvim
       auto-session
       my-marks
+      which-key-nvim
+      nvim-peekup
 
       # language
       vim-nix
@@ -790,6 +783,7 @@ in
       csv-vim
       direnv-vim
       zig-vim
+      conjure
 
       # kitaab stuff
       vimwiki
@@ -834,12 +828,7 @@ in
       leap
       vim-beancount
       # vimtex
-      # TODO break with nvim 0.8.0
-      # these are here until i upgrade my nixos channnel in the flake
-      my-which-key-nvim
-      my-lualine-nvim
-      my-conjure
-      my-nvim-peekup
+      # custom
       yuck-vim
       nvim-parinfer
       # vim-processing
diff --git a/hosts/profiles/desktop/default.nix b/hosts/profiles/desktop/default.nix
index 73d3d0d2..d382facb 100644
--- a/hosts/profiles/desktop/default.nix
+++ b/hosts/profiles/desktop/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ self, config, pkgs, lib, ... }:
 let
   tex = (pkgs.texlive.combine {
     inherit (pkgs.texlive) scheme-basic
diff --git a/hosts/profiles/sync/website/default.nix b/hosts/profiles/sync/website/default.nix
index 4d547d63..3183b9c7 100644
--- a/hosts/profiles/sync/website/default.nix
+++ b/hosts/profiles/sync/website/default.nix
@@ -18,7 +18,7 @@
       # git add flake.lock
       # git commit -m "update website"
       # git push
-      deploy .#cube --hostname lakhwara.com
+      deploy .#cube
       exit 0
     '';
     serviceConfig = {