Rollback to using stable neovim

sandhose · May 25, 2024 · 4aaf33e · 4aaf33e
1 parent 7ae113b
commit 4aaf33e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 166 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -36,12 +36,6 @@
       url = "https://flakehub.com/f/nix-community/nixos-generators/0.1.390.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    neovim-nightly-overlay = {
-      url = "github:nix-community/neovim-nightly-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-compat.follows = "flake-compat";
-    };
   };
 
   outputs =
@@ -51,7 +45,6 @@
     , flake-utils
     , flake-compat
     , home-manager
-    , neovim-nightly-overlay
     , nix
     , nixos-generators
     , nixpkgs

diff --git a/profiles/base/default.nix b/profiles/base/default.nix
@@ -1,6 +1,6 @@
 { inputs, ... }:
 
-let inherit (inputs) self rycee nixpkgs fenix neovim-nightly-overlay;
+let inherit (inputs) self rycee nixpkgs fenix;
 
 in
 {
@@ -9,7 +9,6 @@ in
   nixpkgs.overlays = [
     self.overlay
     fenix.overlays.default
-    neovim-nightly-overlay.overlay
     (final: prev: {
       inherit ((import rycee { pkgs = prev; })) firefox-addons;
     })

diff --git a/profiles/common/packages.nix b/profiles/common/packages.nix
@@ -80,12 +80,13 @@ with pkgs; [
   # elixir
   # fig2dev
   fontconfig
-  # (texlive.combine {
-  #   inherit (texlive)
-  #     scheme-medium footmisc spreadtab xstring titlesec arydshln enumitem
-  #     fvextra upquote chngcntr cleveref adjustbox collectbox tocbibind titling
-  #     unamth-template bib-fr synttree wrapfig lastpage ifmtarg numprint bophook;
-  # })
+  (texlive.combine {
+    inherit (texlive)
+      scheme-medium footmisc spreadtab xstring titlesec arydshln enumitem
+      fvextra upquote chngcntr cleveref adjustbox collectbox tocbibind titling
+      unamth-template bib-fr synttree wrapfig lastpage ifmtarg numprint bophook
+      beamertheme-metropolis;
+  })
   # gnome.librsvg
 
   # maven

diff --git a/profiles/home-manager/vim/default.nix b/profiles/home-manager/vim/default.nix
@@ -26,7 +26,6 @@ in
   programs = {
     neovim = {
       enable = true;
-      package = pkgs.neovim-nightly;
       vimAlias = true;
 
       extraPackages = with pkgs; [