ci: use new flake-utils

promhippie · Aug 10, 2023 · 0b2017e · 0b2017e
1 parent 455a472
commit 0b2017e
Show file tree

Hide file tree

Showing 2 changed files with 120 additions and 31 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,26 +3,44 @@
 
   inputs = {
     nixpkgs = {
-      url = "github:nixos/nixpkgs/nixpkgs-unstable";
+      url = "github:NixOS/nixpkgs/nixos-unstable";
     };
 
-    utils = {
-      url = "github:numtide/flake-utils";
+    devshell = {
+      url = "github:numtide/devshell";
     };
   };
 
-  outputs = { self, nixpkgs, utils, ... }@inputs:
-    utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = nixpkgs.legacyPackages.${system};
-      in
-      {
-        devShell = pkgs.mkShell {
-          buildInputs = with pkgs; [
-            gnumake
-            go_1_19
-          ];
+  outputs = inputs@{ flake-parts, ... }:
+    flake-parts.lib.mkFlake { inherit inputs; } {
+      imports = [
+        inputs.devshell.flakeModule
+      ];
+
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+
+      perSystem = { config, self', inputs', pkgs, system, ... }: {
+        devshells = {
+          default = {
+            motd = ''
+              {202}🔨 Welcome to devshell{reset}
+            '';
+
+            commands = [
+
+            ];
+
+            packages = with pkgs; [
+              gnumake
+              go
+            ];
+          };
         };
-      }
-    );
+      };
+    };
 }