From 3051d75c5ebe4284a6d50f1ea2b3a2f39e01a38d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 5 May 2023 02:44:22 -0400
Subject: flake: restructure a lot

---
 flake/ci.nix      |  8 ++++++--
 flake/configs.nix | 28 ----------------------------
 flake/default.nix |  1 -
 flake/dev.nix     |  4 ++--
 4 files changed, 8 insertions(+), 33 deletions(-)
 delete mode 100644 flake/configs.nix

(limited to 'flake')

diff --git a/flake/ci.nix b/flake/ci.nix
index 3959260..91dc397 100644
--- a/flake/ci.nix
+++ b/flake/ci.nix
@@ -1,6 +1,6 @@
 {
-  inputs,
   self,
+  inputs,
   ...
 }: let
   inherit (inputs) hercules-ci-effects nixpkgs;
@@ -20,7 +20,11 @@ in {
   };
 
   herculesCI = let
-    inherit (import (hercules-ci-effects + "/vendor/hercules-ci-agent/default-herculesCI-for-flake.nix")) flakeToOutputs;
+    inherit
+      (import
+        (hercules-ci-effects + "/vendor/hercules-ci-agent/default-herculesCI-for-flake.nix"))
+      flakeToOutputs
+      ;
   in rec {
     ciSystems = [
       "x86_64-linux"
diff --git a/flake/configs.nix b/flake/configs.nix
deleted file mode 100644
index 9660616..0000000
--- a/flake/configs.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  inputs,
-  self,
-  ...
-}: let
-  inherit (inputs) nixinate openwrt-imagebuilder;
-  inherit ((inputs.getchoo.lib inputs).configs) mapHMUsers mapHosts;
-in {
-  flake = {
-    nixosConfigurations = mapHosts ../hosts;
-
-    nixosModules.getchoo = import ../modules;
-  };
-
-  perSystem = {
-    pkgs,
-    system,
-    ...
-  }: {
-    apps = (nixinate.nixinate.${system} self).nixinate;
-
-    legacyPackages.homeConfigurations = mapHMUsers system ../users;
-
-    packages = {
-      turret = pkgs.callPackage ../hosts/_turret {inherit openwrt-imagebuilder;};
-    };
-  };
-}
diff --git a/flake/default.nix b/flake/default.nix
index a479898..29c6c63 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -1,6 +1,5 @@
 _: {
   imports = [
-    ./configs.nix
     ./ci.nix
     ./dev.nix
   ];
diff --git a/flake/dev.nix b/flake/dev.nix
index 700c795..223f1d8 100644
--- a/flake/dev.nix
+++ b/flake/dev.nix
@@ -3,7 +3,7 @@
   inputs,
   ...
 }: let
-  inherit (inputs) pre-commit-hooks ragenix;
+  inherit (inputs) pre-commit-hooks;
 in {
   perSystem = {
     pkgs,
@@ -12,7 +12,7 @@ in {
   }: {
     checks = {
       pre-commit-check = pre-commit-hooks.lib.${system}.run {
-        src = ./.;
+        src = ./..;
         hooks = {
           actionlint.enable = true;
           alejandra.enable = true;
-- 
cgit v1.2.3