From 29bd3b69f800668f741f5f3e9efa372069ef782a Mon Sep 17 00:00:00 2001
From: Tristan <tristan@tristans.cloud>
Date: Wed, 2 Oct 2024 00:37:09 +0100
Subject: [PATCH] nixbook: gruvbox theme and fix nixvim cmp

---
 home/programs/graphical.nix |  9 ---------
 lib/nixvim.nix              | 27 +++++++++++++++++++++++----
 nixos/workstation.nix       | 16 +++++++++++++++-
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix
index 628070d..468dd24 100644
--- a/home/programs/graphical.nix
+++ b/home/programs/graphical.nix
@@ -44,15 +44,6 @@
 
   gtk = {
     enable = true;
-    iconTheme = {
-      name = "Vimix-Doder";
-      package = pkgs.vimix-icon-theme;
-    };
-    cursorTheme = {
-      name = "Vanilla-DMZ";
-      package = pkgs.vanilla-dmz;
-      size = 24;
-    };
     gtk3.bookmarks = [
       "file:///home/tristan/Documents"
       "file:///home/tristan/Pictures/Screenshots"
diff --git a/lib/nixvim.nix b/lib/nixvim.nix
index 3091902..2d44525 100644
--- a/lib/nixvim.nix
+++ b/lib/nixvim.nix
@@ -59,11 +59,11 @@
       '';
     }
     {
-      key = "<C-n>";
+      key = "<C-Tab>";
       action = "<CMD>tabnext<CR>";
     }
     {
-      key = "<C-p>";
+      key = "<C-S-Tab>";
       action = "<CMD>tabprev<CR>";
     }
     {
@@ -201,11 +201,29 @@
 
     cmp = {
       enable = true;
-      autoEnableSources = true;
+      settings =  {
+        mapping = {
+          "<C-Space>" = "cmp.mapping.complete()";
+          "<C-u>" = "cmp.mapping.scroll_docs(4)";
+          "<C-d>" = "cmp.mapping.scroll_docs(-4)";
+          "<C-e>" = "cmp.mapping.close()";
+          "<CR>" = "cmp.mapping.confirm({ select = true })";
+          "<C-p>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+          "<C-n>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
+        };
+        sources = [
+          { name = "nvim_lsp"; }
+          { name = "path"; }
+          { name = "buffer"; }
+        ];
+      };
     };
-
     cmp-nvim-lsp.enable = true;
+    cmp-nvim-lsp-signature-help.enable = true;
     cmp-path.enable = true;
+    cmp-buffer.enable = true;
+
+    trouble.enable = true;
 
     gitsigns.enable = true;
     git-worktree = {
@@ -246,6 +264,7 @@
 
     oil.enable = true;
     autoclose.enable = true;
+    ts-autotag.enable = true;
     guess-indent.enable = true;
   };
 
diff --git a/nixos/workstation.nix b/nixos/workstation.nix
index 1ab3a81..ebb0c3a 100644
--- a/nixos/workstation.nix
+++ b/nixos/workstation.nix
@@ -52,13 +52,27 @@
   stylix = {
     enable = true;
     image = ../images/nix-soft.png;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/onedark.yaml";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
     opacity = {
       terminal = 0.9;
       applications = 0.9;
       desktop = 0.9;
       popups = 0.9;
     };
+    cursor = {
+      name = "Vanilla-DMZ";
+      package = pkgs.vanilla-dmz;
+      size = 24;
+    };
+    targets = {
+      gtk.enable = false; # fails to switch with cosmic overriding it (grr)
+      grub = {
+        useImage = true;
+      };
+      nixvim = {
+        transparentBackground.main = true;
+      };
+    };
   };
 
   nixpkgs.overlays = [