From 09004f4517eba8f57d37897e34f6ba56ad3653f1 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 1 Nov 2023 06:42:48 -0400 Subject: stop using neovim.nix i had small, but annoying issues here and i don't care for lazy loading much tbh --- flake.nix | 58 +--------------------------------------------------------- 1 file changed, 1 insertion(+), 57 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 3bb86b4..5ee48a6 100644 --- a/flake.nix +++ b/flake.nix @@ -9,40 +9,20 @@ inputs.nixpkgs-lib.follows = "nixpkgs"; }; - neovim = { - url = "github:neovim/neovim?dir=contrib"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "utils"; - }; - - neovim-nix = { - url = "github:willruggiano/neovim.nix"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-parts.follows = "parts"; - pre-commit-nix.follows = "pre-commit"; - neovim.follows = "neovim"; - }; - }; - pre-commit = { url = "github:cachix/pre-commit-hooks.nix"; inputs = { nixpkgs.follows = "nixpkgs"; nixpkgs-stable.follows = "nixpkgs"; - flake-utils.follows = "utils"; }; }; - - # this is to prevent multiple versions in lockfile - utils.url = "github:numtide/flake-utils"; }; outputs = {parts, ...} @ inputs: parts.lib.mkFlake {inherit inputs;} { imports = [ inputs.pre-commit.flakeModule - inputs.neovim-nix.flakeModule + ./dev.nix ./neovim.nix ]; @@ -52,41 +32,5 @@ "x86_64-darwin" "aarch64-darwin" ]; - - perSystem = { - pkgs, - config, - self', - ... - }: { - packages = { - getchvim = config.neovim.final; - default = self'.packages.getchvim; - }; - - devShells.default = pkgs.mkShell { - shellHook = config.pre-commit.installationScript; - - packages = with pkgs; [ - actionlint - self'.formatter - deadnix - nil - statix - stylua - ]; - }; - - formatter = pkgs.alejandra; - - pre-commit.settings.hooks = { - actionlint.enable = true; - alejandra.enable = true; - deadnix.enable = true; - nil.enable = true; - statix.enable = true; - stylua.enable = true; - }; - }; }; } -- cgit v1.2.3