flake.lock

@@ -71,29 +71,6 @@
         "type": "github"
       }
     },
-    "codeium-nvim": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1695327957,
-        "narHash": "sha256-UsofTHPG8K7UqO0rJGHS2Ecbv+oVOYQ23Zk6SnshfOs=",
-        "owner": "jcdickinson",
-        "repo": "codeium.nvim",
-        "rev": "b65443d114d3c3c9dcc59ecd8a7dbb3a35320607",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jcdickinson",
-        "repo": "codeium.nvim",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -281,12 +258,15 @@
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
       "locked": {
-        "lastModified": 1667395993,
+        "lastModified": 1694529238,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
         "type": "github"
       },
       "original": {
@@ -297,7 +277,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1685518550,
@@ -315,7 +295,7 @@
     },
     "flake-utils_3": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1685518550,
@@ -489,7 +469,7 @@
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
         "nixpkgs": "nixpkgs_4",
-        "systems": "systems_2",
+        "systems": "systems_3",
         "wlroots": "wlroots",
         "xdph": "xdph"
       },
@@ -1024,7 +1004,6 @@
         "agenix": "agenix",
         "arkenfox-userjs": "arkenfox-userjs",
         "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
-        "codeium-nvim": "codeium-nvim",
         "devshell": "devshell",
         "disko": "disko",
         "flake-parts": "flake-parts",
@@ -1100,21 +1079,6 @@
       }
     },
     "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_3": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1129,6 +1093,21 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
     "systems_4": {
       "locked": {
         "lastModified": 1681028828,
@@ -1159,6 +1138,21 @@
         "type": "github"
       }
     },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "telekasten-nvim": {
       "flake": false,
       "locked": {
@@ -1213,7 +1207,7 @@
     },
     "utils": {
       "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1692799911,

flake.nix

@@ -27,11 +27,6 @@
     # Neovim
     actions-preview-nvim.flake = false;
     actions-preview-nvim.url = "github:aznhe21/actions-preview.nvim";
-    codeium-nvim = {
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-      url = "github:jcdickinson/codeium.nvim";
-    };
     hmts-nvim.flake = false;
     hmts-nvim.url = "github:calops/hmts.nvim";
     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";

modules/programs/nvim/plugins/coding.nix

@@ -86,13 +86,26 @@ with builtins;
         { plugin = cmp-cmdline; }
         { plugin = cmp-nvim-lsp; }
         { plugin = cmp_luasnip; }
-        {
-          plugin = codeium-nvim;
-          opts = { };
-        }
         { plugin = friendly-snippets; }
         { plugin = lspkind-nvim; }
         { plugin = luasnip; }
+        {
+          plugin = copilot-cmp;
+          opts = { };
+          dependencies = [
+            {
+              plugin = copilot-lua;
+              opts = {
+                suggestion = { enabled = false; };
+                panel = { enabled = false; };
+              };
+              conf = /* lua */ ''
+                require("copilot").setup(opts)
+                vim.cmd("Copilot disable")
+              '';
+            }
+          ];
+        }
       ];
     }
     {

modules/programs/nvim/plugins/lua/nvim-cmp.lua

@@ -17,7 +17,7 @@ cmp.setup({
       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 = "",
+        Copilot = "",
       },
     }),
   },
@@ -56,8 +56,8 @@ cmp.setup({
     { name = "async_path", priority = 1 },
     { name = "buffer", priority = 1 },
     { name = "luasnip", priority = 2 },
-    { name = "codeium", priority = 3 },
+    { name = "copilot", group_index = 3 },
-    { name = "nvim_lsp", priority = 3 },
+    { name = "nvim_lsp", priority = 4 },
   },
 })
 

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;