summaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorseth <[email protected]>2024-10-18 03:10:35 -0400
committerGitHub <[email protected]>2024-10-18 07:10:35 +0000
commite6f79b30e620cf7bd5b06e2579e979ff090e925a (patch)
tree1dd2b20126602ef448f77fbb9cdd44ba7f02a58c /dev
parentfdaf8680ef5bbcadb7cece43911beff18f90cdb2 (diff)
more refactors & outsource some things (#477)
* tree-wide: drop flake-parts * drop nixinate * justfile: cleanup * drop treefmt-nix * doc: update READMEs * flake: cleanup * seth: don't use `./.` * modules/nixos,darwin: bundle all modules They all depend on each other anyways so * systems: manually import internal modules * seth: use riff module from nix-exprs * flake: back to flake-parts * Revert "flake: back to flake-parts" This reverts commit 35334882f7c0c23991a4efd65ea08b216006b2b0. Saving the last commit so I can go back if I want * flake: use lib.const this looks better...right? * flake: declare systems like a normal person
Diffstat (limited to 'dev')
-rw-r--r--dev/README.md15
-rw-r--r--dev/default.nix7
-rw-r--r--dev/dev-shells.nix43
-rw-r--r--dev/hydra-jobs.nix50
-rw-r--r--dev/treefmt.nix19
5 files changed, 0 insertions, 134 deletions
diff --git a/dev/README.md b/dev/README.md
deleted file mode 100644
index 58d8360..0000000
--- a/dev/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# ./dev/
-
-## dev-shells.nix
-
-A misnomer - this only contains one shell
-
-## hydra-jobs.nix
-
-Jobs I want to run in CI. Currently built by
-[`nix-fast-build`](https://github.com/Mic92/nix-fast-build)
-
-## treefmt.nix
-
-[treefmt](https://github.com/numtide/treefmt) configuration via
-[treefmt-nix](https://github.com/numtide/treefmt-nix)
diff --git a/dev/default.nix b/dev/default.nix
deleted file mode 100644
index e74789e..0000000
--- a/dev/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- imports = [
- ./dev-shells.nix
- ./hydra-jobs.nix
- ./treefmt.nix
- ];
-}
diff --git a/dev/dev-shells.nix b/dev/dev-shells.nix
deleted file mode 100644
index 9461970..0000000
--- a/dev/dev-shells.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- perSystem =
- {
- lib,
- pkgs,
- inputs',
- self',
- ...
- }:
- let
- nixos-rebuild = pkgs.nixos-rebuild.override { nix = pkgs.lix; };
- darwin-rebuild = inputs'.nix-darwin.packages.darwin-rebuild.override { nix = pkgs.lix; };
- in
- {
- devShells.default = pkgs.mkShellNoCC {
- packages =
- [
- # we want to make sure we have the same
- # nix behavior across machines
- pkgs.lix
-
- # format + lint
- pkgs.actionlint
- self'.formatter
- pkgs.nixfmt-rfc-style
- pkgs.nil
- pkgs.statix
-
- # utils
- pkgs.fzf # for just
- pkgs.just
-
- # terranix
- self'.packages.opentofu
- ]
- ++ lib.optional pkgs.stdenv.isDarwin darwin-rebuild # see above comment about {l,n}ix
- ++ lib.optionals pkgs.stdenv.isLinux [
- nixos-rebuild # ditto
- inputs'.agenix.packages.agenix
- ];
- };
- };
-}
diff --git a/dev/hydra-jobs.nix b/dev/hydra-jobs.nix
deleted file mode 100644
index 7b55f57..0000000
--- a/dev/hydra-jobs.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- lib,
- self,
- withSystem,
- ...
-}:
-let
- # architecture of "main" CI machine
- ciSystem = "x86_64-linux";
-
- /**
- Map a NixOS, nix-darwin, or home-manager configuration to a final derivation
-
- # Type
-
- ```
- derivFromCfg :: AttrSet -> Attrset
- ```
- */
- derivFromCfg = deriv: deriv.config.system.build.toplevel or deriv.activationPackage;
-
- /**
- Map an attribute set of NixOS, nix-darwin, or home-manager configurations to their final derivation
-
- # Type
-
- ```
- mapCfgsToDerivs :: AttrSet -> Attrset
- ```
- */
- mapCfgsToDerivs = lib.mapAttrs (lib.const derivFromCfg);
-in
-{
- flake.hydraJobs = withSystem ciSystem (
- { pkgs, self', ... }:
- {
- # i don't care to run these for each system, as they should be the same
- # and don't need to be cached
- inherit (self') checks;
- inherit (self') devShells;
-
- darwinConfigurations = mapCfgsToDerivs self.darwinConfigurations;
- homeConfigurations = mapCfgsToDerivs self.homeConfigurations;
- nixosConfigurations = mapCfgsToDerivs self.nixosConfigurations // {
- # please add aarch64 runners github...please...
- atlas = lib.deepSeq (derivFromCfg self.nixosConfigurations.atlas).drvPath pkgs.emptyFile;
- };
- }
- );
-}
diff --git a/dev/treefmt.nix b/dev/treefmt.nix
deleted file mode 100644
index f18b391..0000000
--- a/dev/treefmt.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ inputs, ... }:
-{
- imports = [ inputs.treefmt-nix.flakeModule ];
-
- perSystem = {
- treefmt = {
- projectRootFile = ".git/config";
-
- # TODO: add actionlint
- # https://github.com/numtide/treefmt-nix/pull/146
- programs = {
- deadnix.enable = true;
- just.enable = true;
- nixfmt.enable = true;
- statix.enable = true;
- };
- };
- };
-}