diff --git a/flake.lock b/flake.lock index de9d2512..2d5faa79 100644 --- a/flake.lock +++ b/flake.lock @@ -1,6 +1,37 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { + "locked": { + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -52,6 +83,50 @@ "type": "github" } }, + "naersk": { + "inputs": { + "nixpkgs": [ + "nix-script", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1655042882, + "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=", + "owner": "nix-community", + "repo": "naersk", + "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "nix-script": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "naersk": "naersk", + "nixpkgs": [ + "nixpkgs-unpatched" + ] + }, + "locked": { + "lastModified": 1673349585, + "narHash": "sha256-HmBPYZsk1Qrb5L77/UDRxDpmbNQT9CM+rZw4Ms4UZQg=", + "ref": "refs/heads/main", + "rev": "6f73c79e2c8862d6c74acfc0481a336c533ce39b", + "revCount": 635, + "type": "git", + "url": "https://github.com/BrianHicks/nix-script" + }, + "original": { + "type": "git", + "url": "https://github.com/BrianHicks/nix-script" + } + }, "nixpkgs": { "inputs": { "nixpkgs": [ @@ -119,6 +194,7 @@ "inputs": { "home-manager": "home-manager", "mobile-nixos": "mobile-nixos", + "nix-script": "nix-script", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unpatched": "nixpkgs-unpatched", @@ -149,7 +225,7 @@ }, "uninsane-dot-org": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 6c5993af..3be522b5 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,10 @@ url = "git+https://git.uninsane.org/colin/uninsane"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-script = { + url = "git+https://github.com/BrianHicks/nix-script"; + inputs.nixpkgs.follows = "nixpkgs-unpatched"; + }; }; outputs = { @@ -33,6 +37,7 @@ nixpkgs, nixpkgs-stable, nixpkgs-unpatched, + nix-script, mobile-nixos, home-manager, sops-nix, @@ -105,10 +110,11 @@ stable = nixpkgs-stable.legacyPackages."${prev.stdenv.hostPlatform}"; }; mobile = (import "${mobile-nixos}/overlay/overlay.nix"); + nixscript = nix-script.overlay; uninsane = uninsane-dot-org.overlay; in next: prev: - (stable next prev) // (mobile next prev) // (uninsane next prev); + (stable next prev) // (mobile next prev) // (nixscript next prev) // (uninsane next prev); }; nixosModules = rec { diff --git a/modules/packages.nix b/modules/packages.nix index 7b73ff73..bd74a72d 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -33,6 +33,8 @@ let memtester networkmanager nixpkgs-review + nix-script + nix-script-bash # nixos-generators # nettools nmon