diff --git a/flake.nix b/flake.nix index 754cda5..a89ebc1 100644 --- a/flake.nix +++ b/flake.nix @@ -28,41 +28,48 @@ "aarch64-darwin" ]; forAllSystems = f: - nixpkgs.lib.genAttrs systems (system: let - pkgs = import nixpkgs {inherit system;}; - in - f { - inherit pkgs; - inherit (pkgs) lib; - }); + nixpkgs.lib.genAttrs systems ( + system: let + pkgs = import nixpkgs {inherit system;}; + in + f { + inherit pkgs; + inherit (pkgs) lib; + } + ); in { - packages = forAllSystems ({ - pkgs, - lib, - ... - }: { - neovim = import ./package.nix { - inherit pkgs lib; - blink-cmp = inputs.blink-cmp.packages.${pkgs.system}.default; - go-grip = inputs.go-grip.packages.${pkgs.system}.default; - mdfmt = self.packages.${pkgs.system}.mdfmt; - }; - mdfmt = pkgs.buildGoModule { - name = "mdfmt"; - src = inputs.mdfmt; - vendorHash = "sha256-JtYvDgjUoEc1Mp7Eq8lbu9jWI+RR9yBo4ujGY+J70J4="; - }; - default = self.packages."${pkgs.system}".neovim; - }); - devShells = forAllSystems ({pkgs, ...}: { - default = pkgs.mkShell { - buildInputs = with pkgs; [ - stylua - ]; - }; - }); formatter = forAllSystems ({pkgs, ...}: pkgs.alejandra); + packages = forAllSystems ( + { + pkgs, + lib, + ... + }: { + neovim = import ./package.nix { + inherit pkgs lib; + blink-cmp = inputs.blink-cmp.packages.${pkgs.system}.default; + go-grip = inputs.go-grip.packages.${pkgs.system}.default; + mdfmt = self.packages.${pkgs.system}.mdfmt; + }; + mdfmt = pkgs.buildGoModule { + name = "mdfmt"; + src = inputs.mdfmt; + vendorHash = "sha256-JtYvDgjUoEc1Mp7Eq8lbu9jWI+RR9yBo4ujGY+J70J4="; + }; + default = self.packages."${pkgs.system}".neovim; + } + ); + devShells = forAllSystems ( + {pkgs, ...}: { + default = pkgs.mkShell { + buildInputs = with pkgs; [ + stylua + ]; + }; + } + ); + nixosModules = { neovim = import ./nixos.nix {inherit self;}; default = self.nixosModules.neovim; diff --git a/home.nix b/home.nix index 53a3e6d..f98c2b5 100644 --- a/home.nix +++ b/home.nix @@ -27,7 +27,9 @@ in }; }; config = mkIf cfg.enable { - home.sessionVariables = {EDITOR = "nvim";}; + home.sessionVariables = { + EDITOR = "nvim"; + }; home.packages = [cfg.package]; programs.bash.shellAliases = mkIf cfg.vimdiffAlias {vimdiff = "nvim -d";}; diff --git a/nixos.nix b/nixos.nix index aa10e05..f99b130 100644 --- a/nixos.nix +++ b/nixos.nix @@ -23,7 +23,9 @@ in }; }; config = mkIf cfg.enable { - environment.variables = {EDITOR = "nvim";}; + environment.variables = { + EDITOR = "nvim"; + }; environment.systemPackages = [cfg.package]; # Disable NixOS's Neovim diff --git a/package.nix b/package.nix index 26ae485..55868f3 100644 --- a/package.nix +++ b/package.nix @@ -19,11 +19,13 @@ nvim-treesitter-textobjects nvim-treesitter-textsubjects - ((pkgs.vimUtils.buildVimPlugin { + ( + (pkgs.vimUtils.buildVimPlugin { name = "dot013.nvim"; src = ./.; - }) - .overrideAttrs {doCheck = false;}) + }).overrideAttrs + {doCheck = false;} + ) ]) ++ [ blink-cmp