From b0f07137811d1df70e1963a1f0a4e6452271a626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Sun, 17 Sep 2023 09:25:50 +0200
Subject: [PATCH] feat(nvim)!: remove deprecated codeium extension

---
 flake.lock                                    | 47 ++-----------------
 flake.nix                                     |  2 -
 modules/programs/nvim/plugins/coding.nix      |  4 --
 .../programs/nvim/plugins/lua/nvim-cmp.lua    |  5 +-
 overlays/vimPlugins.nix                       |  2 -
 5 files changed, 6 insertions(+), 54 deletions(-)

diff --git a/flake.lock b/flake.lock
index dafb7f2..a66d563 100644
--- a/flake.lock
+++ b/flake.lock
@@ -71,27 +71,6 @@
         "type": "github"
       }
     },
-    "codeium-nvim": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1693966170,
-        "narHash": "sha256-maRkkUCzjSXK04ts+Io0WFBV1MxR7dCw8I6TV03Dpbs=",
-        "owner": "jcdickinson",
-        "repo": "codeium.nvim",
-        "rev": "6a8cbce54c41e0c305b5f77721f61b2ddd4b6c6d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jcdickinson",
-        "repo": "codeium.nvim",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -224,21 +203,6 @@
       }
     },
     "flake-utils": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
       "inputs": {
         "systems": "systems"
       },
@@ -256,7 +220,7 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
+    "flake-utils_2": {
       "inputs": {
         "systems": "systems_3"
       },
@@ -274,7 +238,7 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
+    "flake-utils_3": {
       "inputs": {
         "systems": "systems_4"
       },
@@ -566,7 +530,7 @@
     },
     "neovim-flake": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "neovim-nightly-overlay",
           "nixpkgs"
@@ -855,7 +819,7 @@
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
         "gitignore": "gitignore",
         "nixpkgs": "nixpkgs_7",
         "nixpkgs-stable": "nixpkgs-stable"
@@ -897,8 +861,7 @@
         "agenix": "agenix",
         "arkenfox-userjs": "arkenfox-userjs",
         "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
-        "codeium-nvim": "codeium-nvim",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "hmts-nvim": "hmts-nvim",
         "home-manager": "home-manager_2",
         "hypr-contrib": "hypr-contrib",
diff --git a/flake.nix b/flake.nix
index f3bc896..5c91c13 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,8 +53,6 @@
     actions-preview-nvim.flake = false;
     actions-preview-nvim.url = "github:aznhe21/actions-preview.nvim";
 
-    codeium-nvim.url = "github:jcdickinson/codeium.nvim";
-    codeium-nvim.inputs.nixpkgs.follows = "nixpkgs";
 
     # Hyprland
     hypr-contrib.url = "github:hyprwm/contrib";
diff --git a/modules/programs/nvim/plugins/coding.nix b/modules/programs/nvim/plugins/coding.nix
index 79a94bc..e44d7ab 100644
--- a/modules/programs/nvim/plugins/coding.nix
+++ b/modules/programs/nvim/plugins/coding.nix
@@ -86,10 +86,6 @@ with builtins;
         { plugin = cmp-cmdline; }
         { plugin = cmp-nvim-lsp; }
         { plugin = cmp_luasnip; }
-        {
-          plugin = codeium-nvim;
-          opts = { };
-        }
         { plugin = friendly-snippets; }
         { plugin = lspkind-nvim; }
         { plugin = luasnip; }
diff --git a/modules/programs/nvim/plugins/lua/nvim-cmp.lua b/modules/programs/nvim/plugins/lua/nvim-cmp.lua
index 1a8a070..437c4e9 100644
--- a/modules/programs/nvim/plugins/lua/nvim-cmp.lua
+++ b/modules/programs/nvim/plugins/lua/nvim-cmp.lua
@@ -8,9 +8,7 @@ cmp.setup({
       mode = "symbol", -- show only symbol annotations
       maxwidth = 50, -- prevent the popup from showing more than provided characters
       ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead
-      symbol_map = {
-        Codeium = "",
-      },
+      symbol_map = {},
     }),
   },
   snippet = {
@@ -48,7 +46,6 @@ cmp.setup({
     { name = "async_path", priority = 1 },
     { name = "buffer", priority = 1 },
     { name = "luasnip", priority = 2 },
-    { name = "codeium", priority = 3 },
     { name = "nvim_lsp", priority = 4 },
   },
 })
diff --git a/overlays/vimPlugins.nix b/overlays/vimPlugins.nix
index 39f81d4..7cafdf5 100644
--- a/overlays/vimPlugins.nix
+++ b/overlays/vimPlugins.nix
@@ -4,8 +4,6 @@ _: prev:
 with lib.my;
 {
   vimPlugins = prev.vimPlugins // {
-    inherit (inputs.codeium-nvim.packages.${prev.system}.vimPlugins) codeium-nvim;
-
     smartcolumn-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
       pname = "smartcolumn-nvim";
       version = mkVersionInput inputs.smartcolumn-nvim;