refactor: use wrapper from nixpkgs instead of custom one
This commit is contained in:
45
flake.nix
45
flake.nix
@@ -2,10 +2,10 @@
|
||||
description = "My development environment";
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
|
||||
|
||||
go-grip = {
|
||||
url = "github:guz013/go-grip";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
outputs = {
|
||||
@@ -19,40 +19,23 @@
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
overlays = [
|
||||
inputs.neovim-nightly-overlay.overlays.default
|
||||
];
|
||||
forAllSystems = f:
|
||||
nixpkgs.lib.genAttrs systems (system: let
|
||||
pkgs = import nixpkgs {inherit system overlays;};
|
||||
pkgs = import nixpkgs {inherit system;};
|
||||
in
|
||||
f system pkgs);
|
||||
f {
|
||||
inherit pkgs;
|
||||
inherit (pkgs) lib;
|
||||
});
|
||||
in {
|
||||
packages = forAllSystems (system: pkgs: {
|
||||
neovim = pkgs.callPackage ./neovim.nix {
|
||||
go-grip = inputs.go-grip.packages.${system}.default;
|
||||
};
|
||||
default = self.packages.${system}.neovim;
|
||||
});
|
||||
|
||||
legacyPackages = self.packages;
|
||||
|
||||
nixosModules = {
|
||||
neovim = (import ./home-manager.nix) {inherit inputs self;};
|
||||
default = self.nixosModules.neovim;
|
||||
};
|
||||
|
||||
homeManagerModules = {
|
||||
neovim = (import ./home-manager.nix) {inherit inputs self;};
|
||||
default = self.homeManagerModules.neovim;
|
||||
};
|
||||
|
||||
devShells = forAllSystems (system: pkgs: {
|
||||
default = pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
alejandra
|
||||
stylua
|
||||
];
|
||||
packages = forAllSystems ({
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
neovim = import ./package.nix {
|
||||
inherit pkgs lib;
|
||||
go-grip = inputs.go-grip.packages.${pkgs.system}.default;
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user