nvim stuff

flake.nix

@@ -1,91 +1,114 @@
 {
   description = "Configuration for my macOS laptops and NixOS server";
+
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-parts.url = "github:hercules-ci/flake-parts";
     agenix.url = "github:ryantm/agenix";
     home-manager.url = "github:nix-community/home-manager";
     darwin = {
       url = "github:LnL7/nix-darwin/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nix-homebrew = {
-      url = "github:zhaofengli-wip/nix-homebrew";
-    };
-    homebrew-bundle = {
-      url = "github:homebrew/homebrew-bundle";
-      flake = false;
-    };
-    homebrew-core = {
-      url = "github:homebrew/homebrew-core";
-      flake = false;
-    };
-    homebrew-cask = {
-      url = "github:homebrew/homebrew-cask";
-      flake = false;
-    };
+    nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
+    homebrew-bundle.url = "github:homebrew/homebrew-bundle";
+    homebrew-core.url = "github:homebrew/homebrew-core";
+    homebrew-cask.url = "github:homebrew/homebrew-cask";
     disko = {
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixvim = {
-      url = "github:nix-community/nixvim";
-    };
+    nixvim.url = "github:nix-community/nixvim";
     secrets = {
       url = "git+ssh://git@github.com/cschmatzler/nixos-config-secrets.git";
       flake = false;
     };
   };
-  outputs = {
-    agenix,
-    darwin,
-    disko,
-    home-manager,
-    homebrew-bundle,
-    homebrew-cask,
-    homebrew-core,
-    nix-homebrew,
-    nixpkgs,
-    nixvim,
-    secrets,
-    self,
-  } @ inputs: let
-    systemLib = import ./lib/systems.nix inputs;
-    inherit
-      (systemLib)
-      systemConfigs
-      mkDarwinSystem
-      mkNixosSystem
-      mkApps
-      ;
-    inherit (systemConfigs) darwinHosts nixosHosts;
 
-    allSystems = [
-      "x86_64-linux"
-      "aarch64-darwin"
-    ];
-    forAllSystems = f: nixpkgs.lib.genAttrs allSystems f;
-    devShell = system: let
-      pkgs = nixpkgs.legacyPackages.${system};
+  outputs = inputs @ {flake-parts, ...}:
+    flake-parts.lib.mkFlake {inherit inputs;} (let
+      user = "cschmatzler";
+      darwinHosts = builtins.attrNames (builtins.readDir ./hosts/darwin);
+      nixosHosts = builtins.attrNames (builtins.readDir ./hosts/nixos);
     in {
-      default = with pkgs;
-        mkShell {
+      systems = ["x86_64-linux" "aarch64-darwin"];
+
+      flake.darwinConfigurations = inputs.nixpkgs.lib.genAttrs darwinHosts (hostname:
+        inputs.darwin.lib.darwinSystem {
+          system = "aarch64-darwin";
+          specialArgs = inputs // {inherit user hostname;};
+          modules = [
+            inputs.home-manager.darwinModules.home-manager
+            inputs.nix-homebrew.darwinModules.nix-homebrew
+
+            {
+              nix-homebrew = {
+                inherit user;
+                enable = true;
+                taps = {
+                  "homebrew/homebrew-core" = inputs.homebrew-core;
+                  "homebrew/homebrew-cask" = inputs.homebrew-cask;
+                  "homebrew/homebrew-bundle" = inputs.homebrew-bundle;
+                };
+                mutableTaps = false;
+                autoMigrate = true;
+              };
+            }
+            ./hosts/darwin/${hostname}
+          ];
+        });
+
+      flake.nixosConfigurations = inputs.nixpkgs.lib.genAttrs nixosHosts (hostname:
+        inputs.nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          specialArgs = inputs // {inherit user hostname;};
+          modules = [
+            inputs.disko.nixosModules.disko
+            inputs.home-manager.nixosModules.home-manager
+            ./hosts/nixos/${hostname}
+          ];
+        });
+
+      perSystem = {
+        pkgs,
+        system,
+        inputs',
+        ...
+      }: let
+        mkApp = name: {
+          type = "app";
+          program = "${(pkgs.writeShellScriptBin name ''
+            PATH=${pkgs.git}/bin:$PATH
+            echo "Running ${name} for ${system}"
+            exec ${inputs.self}/apps/${system}/${name} "$@"
+          '')}/bin/${name}";
+        };
+
+        appNames = [
+          "apply"
+          "build"
+          "build-switch"
+          "copy-keys"
+          "create-keys"
+          "check-keys"
+          "rollback"
+        ];
+      in {
+        devShells.default = pkgs.mkShell {
           nativeBuildInputs = with pkgs; [
             bashInteractive
             git
             age
             age-plugin-yubikey
           ];
-          shellHook = with pkgs; ''
-            export EDITOR=nvim
-          '';
+          shellHook = ''export EDITOR=nvim'';
         };
-    };
-  in {
-    devShells = forAllSystems devShell;
-    apps = forAllSystems mkApps;
-    darwinConfigurations = nixpkgs.lib.genAttrs darwinHosts mkDarwinSystem;
-    nixosConfigurations = nixpkgs.lib.genAttrs nixosHosts (
-      hostname: mkNixosSystem hostname "x86_64-linux"
-    );
-  };
+
+        apps = builtins.listToAttrs (map (n: {
+            name = n;
+            value = mkApp n;
+          })
+          appNames);
+      };
+    });
 }