nix: add neovim nightly

FredeHoey · Mar 12, 2024 · 5df232c · 5df232c
1 parent b93efb4
commit 5df232c
Show file tree

Hide file tree

Showing 4 changed files with 219 additions and 38 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -7,44 +7,49 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
     nixgl.url = "github:nix-community/nixgl";
   };
 
-  outputs = inputs@{ nixpkgs, home-manager, nixgl, ... }: {
-    nixosConfigurations = {
-      dt = nixpkgs.lib.nixosSystem {
-        specialArgs = { inherit inputs; };
-        modules = [ ./systems/base.nix ./systems/desktop.nix ./systems/dt.nix ];
-      };
-      yoga = nixpkgs.lib.nixosSystem {
-        specialArgs = { inherit inputs; };
-        modules =
-          [ ./systems/base.nix ./systems/desktop.nix ./systems/yoga.nix ];
-      };
-      ideapad = nixpkgs.lib.nixosSystem {
-        specialArgs = { inherit inputs; };
-        modules =
-          [ ./systems/base.nix ./systems/desktop.nix ./systems/ideapad.nix ];
-      };
-      server = nixpkgs.lib.nixosSystem {
-        specialArgs = { inherit inputs; };
-        modules = [ ./systems/base.nix ./systems/server.nix ./modules/ssh.nix ];
-      };
-    };
-    homeConfigurations = let
-      system = "x86_64-linux";
-      pkgs = import nixpkgs {
-        inherit system;
-        overlays = [ nixgl.overlay ];
-      };
+  outputs =
+    inputs@{ nixpkgs, home-manager, nixgl, neovim-nightly-overlay, ... }:
+    let
+      overlays = [ neovim-nightly-overlay.overlay ];
+
+      base = [ { nixpkgs.overlays = overlays; } ./systems/base.nix ];
     in {
-      bun = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-        extraSpecialArgs = { inherit inputs; };
-        modules = [ ./users/bun.nix ];
+      nixosConfigurations = {
+        dt = nixpkgs.lib.nixosSystem {
+          specialArgs = { inherit inputs; };
+          modules = base ++ [ ./systems/desktop.nix ./systems/dt.nix ];
+        };
+        yoga = nixpkgs.lib.nixosSystem {
+          specialArgs = { inherit inputs; };
+          modules = base ++ [ ./systems/desktop.nix ./systems/yoga.nix ];
+        };
+        ideapad = nixpkgs.lib.nixosSystem {
+          specialArgs = { inherit inputs; };
+          modules = base ++ [ ./systems/desktop.nix ./systems/ideapad.nix ];
+        };
+        server = nixpkgs.lib.nixosSystem {
+          specialArgs = { inherit inputs; };
+          modules = base ++ [ ./systems/server.nix ./modules/ssh.nix ];
+        };
+      };
+      homeConfigurations = let
+        system = "x86_64-linux";
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [ nixgl.overlay ];
+        };
+      in {
+        bun = home-manager.lib.homeManagerConfiguration {
+          inherit pkgs;
+          extraSpecialArgs = { inherit inputs; };
+          modules = [ ./users/bun.nix ];
+        };
       };
-    };
 
-    formatter."x86_64-linux" = nixpkgs.legacyPackages."x86_64-linux".nixfmt;
-  };
+      formatter."x86_64-linux" = nixpkgs.legacyPackages."x86_64-linux".nixfmt;
+    };
 }
diff --git a/systems/base.nix b/systems/base.nix
@@ -43,6 +43,7 @@
     htop
     openssl
     python311
+    neovim
   ];
 
   # Enable the OpenSSH daemon.

diff --git a/users/bun.nix b/users/bun.nix
@@ -50,7 +50,6 @@ in {
       ansible
       bat
       fzf
-      neovim
       nix
       ripgrep
       rofi
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,6 +43,7 @@ @@
         htop
         openssl
         python311
+        neovim
       ];
       # Enable the OpenSSH daemon.
@@ Expand Down @@