From 5f848623dff7cbcd21911032e5fd4c77bcf7d413 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 4 Feb 2024 16:40:38 -0500 Subject: tree-wide: better separate/name some things --- dev/checks.nix | 13 ------------- dev/ci.nix | 28 ---------------------------- dev/default.nix | 11 ----------- dev/shell.nix | 34 ---------------------------------- 4 files changed, 86 deletions(-) delete mode 100644 dev/checks.nix delete mode 100644 dev/ci.nix delete mode 100644 dev/default.nix delete mode 100644 dev/shell.nix (limited to 'dev') diff --git a/dev/checks.nix b/dev/checks.nix deleted file mode 100644 index cf2b732..0000000 --- a/dev/checks.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - perSystem = {self', ...}: { - pre-commit = { - settings.hooks = { - actionlint.enable = true; - ${self'.formatter.pname}.enable = true; - deadnix.enable = true; - nil.enable = true; - statix.enable = true; - }; - }; - }; -} diff --git a/dev/ci.nix b/dev/ci.nix deleted file mode 100644 index e33c088..0000000 --- a/dev/ci.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - self, - ... -}: { - flake.hydraJobs = let - ciSystems = ["x86_64-linux"]; - - getOutputs = lib.getAttrs ciSystems; - - mapCfgsToDerivs = lib.mapAttrs (_: cfg: cfg.activationPackage or cfg.config.system.build.toplevel); - getCompatibleCfgs = lib.filterAttrs (_: cfg: lib.elem cfg.pkgs.system ciSystems); - in - builtins.foldl' lib.recursiveUpdate {} [ - ( - lib.genAttrs - ["nixosConfigurations" "homeConfigurations"] - ( - type: mapCfgsToDerivs (getCompatibleCfgs self."${type}") - ) - ) - ( - lib.genAttrs - ["checks" "devShells"] - (type: getOutputs self.${type}) - ) - ]; -} diff --git a/dev/default.nix b/dev/default.nix deleted file mode 100644 index d8da3fe..0000000 --- a/dev/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - imports = [ - ./checks.nix - ./ci.nix - ./shell.nix - ]; - - perSystem = {pkgs, ...}: { - formatter = pkgs.alejandra; - }; -} diff --git a/dev/shell.nix b/dev/shell.nix deleted file mode 100644 index 7442907..0000000 --- a/dev/shell.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - perSystem = { - pkgs, - config, - inputs', - self', - ... - }: { - devShells = { - default = pkgs.mkShellNoCC { - shellHook = config.pre-commit.installationScript; - packages = with pkgs; - [ - nix - - # format + lint - actionlint - self'.formatter - deadnix - nil - statix - - # utils - deploy-rs - fzf - just - config.terranix.package - ] - ++ lib.optional stdenv.isDarwin [inputs'.darwin.packages.darwin-rebuild] - ++ lib.optionals stdenv.isLinux [nixos-rebuild inputs'.agenix.packages.agenix]; - }; - }; - }; -} -- cgit v1.2.3