From 0cbc3f025cf5aad554b1c4294e98409748c1fe07 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 19 Jul 2023 16:36:06 -0400 Subject: move flake parts folder --- flake.nix | 2 +- modules/flake/ci.nix | 23 ----------------------- modules/flake/default.nix | 15 --------------- modules/flake/dev.nix | 45 --------------------------------------------- parts/ci.nix | 23 +++++++++++++++++++++++ parts/default.nix | 16 ++++++++++++++++ parts/dev.nix | 45 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 85 insertions(+), 84 deletions(-) delete mode 100644 modules/flake/ci.nix delete mode 100644 modules/flake/default.nix delete mode 100644 modules/flake/dev.nix create mode 100644 parts/ci.nix create mode 100644 parts/default.nix create mode 100644 parts/dev.nix diff --git a/flake.nix b/flake.nix index 2655c87..3763bee 100644 --- a/flake.nix +++ b/flake.nix @@ -99,7 +99,7 @@ { imports = [ ./hosts - ./modules/flake + ./parts ./users inputs.getchoo.flakeModules.homeConfigurations ]; diff --git a/modules/flake/ci.nix b/modules/flake/ci.nix deleted file mode 100644 index c958ed3..0000000 --- a/modules/flake/ci.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - inputs, - myLib, - self, - ... -}: let - ciSystems = [ - "x86_64-linux" - "aarch64-linux" - ]; - - ci = sys: myLib.ci ["${sys}"]; - hm = sys: (ci sys).mkCompatibleHM self.homeConfigurations; - hosts = sys: (ci sys).mkCompatibleCfg self.nixosConfigurations; -in { - flake = { - checks = inputs.nixpkgs.lib.genAttrs ciSystems hosts; - }; - - perSystem = {system, ...}: { - checks = (hm system).${system}; - }; -} diff --git a/modules/flake/default.nix b/modules/flake/default.nix deleted file mode 100644 index 0f95612..0000000 --- a/modules/flake/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{inputs, ...}: { - imports = [ - ./ci.nix - ./dev.nix - ]; - - _module.args.myLib = inputs.getchoo.lib; - - systems = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - "aarch64-darwin" - ]; -} diff --git a/modules/flake/dev.nix b/modules/flake/dev.nix deleted file mode 100644 index 5453286..0000000 --- a/modules/flake/dev.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - inputs, - self, - ... -}: { - perSystem = { - pkgs, - system, - ... - }: { - checks = { - pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run { - src = self; - hooks = { - actionlint.enable = true; - alejandra.enable = true; - deadnix.enable = true; - nil.enable = true; - statix.enable = true; - stylua.enable = true; - }; - }; - }; - - devShells = let - inherit (pkgs) mkShell; - in { - default = mkShell { - inherit (self.checks.${system}.pre-commit-check) shellHook; - packages = with pkgs; - with inputs; [ - actionlint - alejandra - deadnix - just - ragenix.packages.${system}.ragenix - statix - stylua - ]; - }; - }; - - formatter = pkgs.alejandra; - }; -} diff --git a/parts/ci.nix b/parts/ci.nix new file mode 100644 index 0000000..c958ed3 --- /dev/null +++ b/parts/ci.nix @@ -0,0 +1,23 @@ +{ + inputs, + myLib, + self, + ... +}: let + ciSystems = [ + "x86_64-linux" + "aarch64-linux" + ]; + + ci = sys: myLib.ci ["${sys}"]; + hm = sys: (ci sys).mkCompatibleHM self.homeConfigurations; + hosts = sys: (ci sys).mkCompatibleCfg self.nixosConfigurations; +in { + flake = { + checks = inputs.nixpkgs.lib.genAttrs ciSystems hosts; + }; + + perSystem = {system, ...}: { + checks = (hm system).${system}; + }; +} diff --git a/parts/default.nix b/parts/default.nix new file mode 100644 index 0000000..a95d7f0 --- /dev/null +++ b/parts/default.nix @@ -0,0 +1,16 @@ +{inputs, ...}: { + imports = [ + ./ci.nix + ./dev.nix + ./overlays + ]; + + _module.args.myLib = inputs.getchoo.lib; + + systems = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; +} diff --git a/parts/dev.nix b/parts/dev.nix new file mode 100644 index 0000000..5453286 --- /dev/null +++ b/parts/dev.nix @@ -0,0 +1,45 @@ +{ + inputs, + self, + ... +}: { + perSystem = { + pkgs, + system, + ... + }: { + checks = { + pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run { + src = self; + hooks = { + actionlint.enable = true; + alejandra.enable = true; + deadnix.enable = true; + nil.enable = true; + statix.enable = true; + stylua.enable = true; + }; + }; + }; + + devShells = let + inherit (pkgs) mkShell; + in { + default = mkShell { + inherit (self.checks.${system}.pre-commit-check) shellHook; + packages = with pkgs; + with inputs; [ + actionlint + alejandra + deadnix + just + ragenix.packages.${system}.ragenix + statix + stylua + ]; + }; + }; + + formatter = pkgs.alejandra; + }; +} -- cgit v1.2.3