From 8887ea8c33233e47a5dd4a93773e9f8ad52be541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Wed, 9 Oct 2024 22:13:11 -0400
Subject: [PATCH] get rid of flake-utils

---
 flake.lock | 34 ----------------------------------
 flake.nix  | 33 ++++++++++++---------------------
 2 files changed, 12 insertions(+), 55 deletions(-)

diff --git a/flake.lock b/flake.lock
index 72f8d50..76920c8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,23 +1,5 @@
 {
   "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1728241625,
@@ -36,24 +18,8 @@
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 2860f8a..5c9c680 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,24 +4,14 @@
     trusted-public-keys = "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=";
     extra-experimental-features = "nix-command flakes";
   };
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # TODO 24.11
-    flake-utils.url = "github:numtide/flake-utils";
-  };
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # TODO 24.11
+
   outputs =
-    {
-      self,
-      nixpkgs,
-      flake-utils,
-      ...
-    }:
-    flake-utils.lib.eachDefaultSystem (
-      system:
-      let
-        pkgs = import nixpkgs { inherit system; };
-      in
-      {
-        devShells.default = pkgs.mkShellNoCC {
+    { self, nixpkgs }:
+    let
+      mkShell =
+        pkgs:
+        pkgs.mkShellNoCC {
           LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
           packages = with pkgs; [
             hugo
@@ -31,8 +21,9 @@
             dart-sass
           ];
         };
-
-        formatter = pkgs.nixfmt-rfc-style;
-      }
-    );
+    in
+    {
+      devShells.x86_64-linux.default = mkShell (import nixpkgs { system = "x86_64-linux"; });
+      devShells.aarch64-linux.default = mkShell (import nixpkgs { system = "aarch64-linux"; });
+    };
 }