From 89e617d16bc5a5ed38d05e013809aafa30c42437 Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Fri, 29 Nov 2024 12:03:17 +0100
Subject: [PATCH] misc: cleanup flake

---
 flake.lock | 37 +++----------------------------------
 flake.nix  | 12 +++++-------
 2 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/flake.lock b/flake.lock
index a9e67e1..ddb5d62 100644
--- a/flake.lock
+++ b/flake.lock
@@ -298,24 +298,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "funnel": {
       "inputs": {
         "json-structs": "json-structs",
@@ -359,7 +341,9 @@
     },
     "kindergarten": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": [
+          "flake-utils"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -888,21 +872,6 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "telegram-decoder": {
       "inputs": {
         "naersk": [
diff --git a/flake.nix b/flake.nix
index 5cebcef..4510788 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,4 @@
 {
-  nixConfig = {
-    extra-substituters = [ "https://nix-cache.hq.c3d2.de" ];
-    extra-trusted-public-keys = [ "nix-cache.hq.c3d2.de:KZRGGnwOYzys6pxgM8jlur36RmkJQ/y8y62e52fj1ps=" ];
-  };
-
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     nixpkgs-2311.url = "github:NixOS/nixpkgs/nixos-23.11";
@@ -55,6 +50,7 @@
       url = "github:tlm-solutions/kindergarten";
       inputs = {
         nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
       };
     };
 
@@ -297,8 +293,10 @@
       # here we evaluate over all nixos configurations making this extremely slow
       apps."x86_64-linux" = (import ./pkgs/deployment.nix { inherit self pkgs lib; });
 
-      nixosConfigurations = lib.attrsets.mapAttrs (name: value: 
-      (if (name == "notice-me-senpai") then (nixpkgs-2311.lib.nixosSystem value) else (nixpkgs.lib.nixosSystem value))) unevaluatedNixosConfigurations;
+      nixosConfigurations = lib.attrsets.mapAttrs
+        (name: value:
+          (if (name == "notice-me-senpai") then (nixpkgs-2311.lib.nixosSystem value) else (nixpkgs.lib.nixosSystem value)))
+        unevaluatedNixosConfigurations;
 
       hydraJobs =
         let