feat(nvim): use nixpkgs nvim and make overlay of dracula-nvim

common/home/neovim/default.nix

@@ -2,16 +2,17 @@
   config,
   pkgs,
   lib,
-  coc-stylelintplus-flake,
+  nvim-theme-src,
-  tree-sitter-hyprlang-flake,
+  coc-stylelintplus,
+  tree-sitter-hyprlang,
   ...
 }: let
   inherit (config.vars) neovimIde;
   inherit (lib) fileContents optionalAttrs optionals;
 
   javaSdk = pkgs.temurin-bin-17;
-  nvim-treesitter-hyprlang = tree-sitter-hyprlang-flake.packages.${pkgs.system}.default;
+  nvim-treesitter-hyprlang = tree-sitter-hyprlang.packages.${pkgs.system}.default;
-  coc-stylelintplus = coc-stylelintplus-flake.packages.${pkgs.system}.default;
+  coc-stylelintplus-flake = coc-stylelintplus.packages.${pkgs.system}.default;
 in {
   home = optionalAttrs neovimIde {
     packages = with pkgs; [
@@ -41,7 +42,6 @@ in {
 
     neovim = {
       enable = true;
-      package = pkgs.neovim-nightly;
       withNodeJs = true;
       withPython3 = true;
       withRuby = false;
@@ -157,7 +157,9 @@ in {
             fugitive
 
             {
-              plugin = dracula-nvim;
+              plugin = dracula-nvim.overrideAttrs {
+                src = nvim-theme-src;
+              };
               type = "viml";
               config = fileContents ./plugins/dracula.vim;
             }
@@ -194,7 +196,7 @@ in {
             coc-eslint
             coc-java
             coc-sh
-            coc-stylelintplus
+            coc-stylelintplus-flake
             {
               plugin = coc-snippets;
               type = "viml";

common/modules/cachix.nix

@@ -8,7 +8,7 @@
         "https://cache.nixos.org"
         "https://nixpkgs-wayland.cachix.org"
         "https://nix-community.cachix.org"
-        # Neovim and stuff
+        # Nix-community
         "https://nix-community.cachix.org"
         # Nh
         "https://viperml.cachix.org"
@@ -23,7 +23,7 @@
         # Nixpkgs-Wayland
         "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
         "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
-        # Neovim and stuff
+        # Nix-community
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         # Nh
         "viperml.cachix.org-1:qZhKBMTfmcLL+OG6fj/hzsMEedgKvZVFRRAhq7j8Vh8="

common/nix-on-droid.nix

@@ -20,16 +20,18 @@
     '';
 
     substituters = [
-      # Neovim and stuff
+      # Nix-community
       "https://nix-community.cachix.org"
+
+      # FIXME: cache doesn't work
       # Personal config cache
-      "https://cache.nelim.org"
+      # "https://cache.nelim.org"
     ];
     trustedPublicKeys = [
-      # Neovim and stuff
+      # Nix-community
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       # Personal config cache
-      "cache.nelim.org:JmFqkUdH11EA9EZOFAGVHuRYp7EbsdJDHvTQzG2pPyY="
+      # "cache.nelim.org:JmFqkUdH11EA9EZOFAGVHuRYp7EbsdJDHvTQzG2pPyY="
     ];
   };
 

common/overlays/default.nix

@@ -1,5 +1,4 @@
 {
-  neovim-flake,
   nixpkgs-wayland,
   ...
 } @ inputs: [
@@ -8,6 +7,5 @@
   (import ./spotifywm inputs)
   (import ./squeekboard)
 
-  neovim-flake.overlay
   nixpkgs-wayland.overlay
 ]