Update dependencies

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1616156829,
-        "narHash": "sha256-UfDBl9DBjPrU3PHg5CS38mLjDMUPBtcaWaTcCTgln6c=",
+        "lastModified": 1616214656,
+        "narHash": "sha256-ceFOGcsbGlP/qtxMBlRGFH5fsbN+uGQYeHUrpgcRS4U=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "fbc910b94b313e821e833f407076a163527fa517",
+        "rev": "d9530a7048f4b1c0f65825202a0ce1d111a1d39a",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1615921413,
-        "narHash": "sha256-pr9UUS52tsKTr5FvOCrY6IErpgWmY7EML/lV6dvKtoU=",
+        "lastModified": 1616244939,
+        "narHash": "sha256-fNadCs2M6/UP41OWxYJ8KxihBoOlqkvyAQ+NG5VbEBA=",
         "owner": "chvp",
         "repo": "nixpkgs",
-        "rev": "e9f42f11e5c43893babbe832a1e835e0eefc5ac8",
+        "rev": "a1a03554af1186669a645609e25a9476f267280b",
         "type": "github"
       },
       "original": {
@@ -68,29 +68,12 @@
         "type": "github"
       }
     },
-    "nixpkgsFor0AD": {
-      "locked": {
-        "lastModified": 1615972400,
-        "narHash": "sha256-NGTJ23KbaX+2AwP5CeHx+lECib14KxnKkB/DbDBzUT0=",
-        "owner": "chvp",
-        "repo": "nixpkgs",
-        "rev": "ec2181692f9868ca1a7cf39ef443b3ef81b4cbaa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "chvp",
-        "ref": "0ad0.24",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "emacs-overlay": "emacs-overlay",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
-        "nixpkgsFor0AD": "nixpkgsFor0AD"
+        "nixpkgs": "nixpkgs"
       }
     }
   },

flake.nix

@@ -9,10 +9,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixpkgs.url = "github:chvp/nixpkgs/master";
-    nixpkgsFor0AD.url = "github:chvp/nixpkgs/0ad0.24";
   };
 
-  outputs = { self, emacs-overlay, nixpkgs, nixpkgsFor0AD, home-manager, flake-utils }:
+  outputs = { self, emacs-overlay, nixpkgs, home-manager, flake-utils }:
     let
       version-suffix = nixpkgs.rev or (builtins.toString nixpkgs.lastModified);
       pkgsFor = system: import nixpkgs {
@@ -20,10 +19,11 @@
       };
       mkSystem = system: hostname: nixpkgs.lib.nixosSystem {
         inherit system;
-        extraArgs = { pkgsFor0AD = import nixpkgsFor0AD { inherit system; }; };
         modules = [
+          ({ pkgs, ... }: { nixpkgs.overlays = [ emacs-overlay.overlay ]; })
           home-manager.nixosModules.home-manager
           (./modules)
+          (./. + "/machines/${hostname}")
           ({ pkgs, ... }: {
             environment.etc."nixpkgs".source = (pkgs.runCommandNoCC "nixpkgs" { } ''
               cp -r ${nixpkgs} $out
@@ -32,10 +32,6 @@
             '');
             nix.nixPath = [ "nixpkgs=/etc/nixpkgs" ];
           })
-          ({ pkgs, ... }: {
-            nixpkgs.overlays = [ emacs-overlay.overlay ];
-          })
-          (./. + "/machines/${hostname}")
         ];
       };
     in

modules/zeroad.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgsFor0AD, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   options = {
@@ -21,7 +21,7 @@
 
     hardware.opengl.enable = true;
     home-manager.users.charlotte = { pkgs, ... }: {
-      home.packages = [ pkgsFor0AD.zeroad ];
+      home.packages = [ pkgs.zeroad ];
     };
 
     networking.firewall = lib.mkIf config.chvp.zeroad.asServer {