treewide: cleanup (#324)

* statix, deadnix, alejandra

* _file

* _module.args

* concatStringsSep "\n" -> concatLines
concatStringsSep "\n" map -> concatMapStringsSep "\n"

* mkShell nativeBuildInputs -> packages
This commit is contained in:
Gerg-L 2024-07-08 21:57:58 +00:00 committed by GitHub
commit 8d5f23035d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
29 changed files with 46 additions and 82 deletions

View file

@ -10,16 +10,15 @@
# provide overridable systems
# https://github.com/nix-systems/nix-systems
systems = import inputs.systems;
imports = [
# add lib to module args
{_module.args = {inherit (nixpkgs) lib;};}
./flake/apps.nix
./flake/legacyPackages.nix
./flake/overlays.nix
./flake/packages.nix
];
_module.args = {inherit (nixpkgs) lib;};
flake = {
lib = {
inherit (import ./lib/stdlib-extended.nix nixpkgs.lib inputs) nvim;
@ -34,9 +33,7 @@
''
self.homeManagerModules.nvf;
nvf = {
imports = [(import ./flake/modules/home-manager.nix self.packages inputs)];
};
nvf = import ./flake/modules/home-manager.nix self.packages inputs;
default = self.homeManagerModules.nvf;
};
@ -49,9 +46,7 @@
''
self.nixosModules.nvf;
nvf = {
imports = [(import ./flake/modules/nixos.nix self.packages inputs)];
};
nvf = import ./flake/modules/nixos.nix self.packages inputs;
default = self.nixosModules.nvf;
};
@ -66,9 +61,9 @@
formatter = pkgs.alejandra;
devShells = {
default = self'.devShells.lsp;
nvim-nix = pkgs.mkShell {nativeBuildInputs = [config.packages.nix];};
nvim-nix = pkgs.mkShell {packages = [config.packages.nix];};
lsp = pkgs.mkShell {
nativeBuildInputs = with pkgs; [nil statix deadnix alejandra];
packages = with pkgs; [nil statix deadnix alejandra];
};
};
};