From d4a800971f59aff2986be1b9c22b99c40350e877 Mon Sep 17 00:00:00 2001 From: atagen Date: Tue, 20 Aug 2024 11:50:17 +1000 Subject: [PATCH] meat --- flake.lock | 65 ++++++++++++++++++++++++++++++---------- flake.nix | 1 - flakes/meat/flake.lock | 10 +++---- flakes/meat/meat.nix | 4 +-- flakes/meat/src/meat | 10 ++++--- system/configuration.nix | 9 ++---- 6 files changed, 65 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 885c409..9785049 100644 --- a/flake.lock +++ b/flake.lock @@ -273,7 +273,7 @@ "narHash": "sha256-WkRs8plqBYxIgrcz1jenmxbcLVVpo9Z9Waot9qIlqmI=", "rev": "e727dbc3a3d59d7742a24a2b394b63a04ecb4d24", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e727dbc3a3d59d7742a24a2b394b63a04ecb4d24.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e727dbc3a3d59d7742a24a2b394b63a04ecb4d24.tar.gz?rev=e727dbc3a3d59d7742a24a2b394b63a04ecb4d24" }, "original": { "type": "tarball", @@ -296,7 +296,7 @@ "narHash": "sha256-rT/OkVXKkns2YvyF1nFvl+8Gc3sld1c1sXPtGkbqaDY=", "rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cecf70b77539c1a593f60ec9d0305b5e537ab6a9.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cecf70b77539c1a593f60ec9d0305b5e537ab6a9.tar.gz?rev=cecf70b77539c1a593f60ec9d0305b5e537ab6a9" }, "original": { "type": "tarball", @@ -325,7 +325,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-7X+B0Gt3ns9QlI0sanZm+dst0UIpc3OH7HmbMf/ixE4=", + "narHash": "sha256-rSDpVXibiY1VWt3n0drGhf7G19PbeCoShnzadNLhGLE=", "path": "flakes/meat", "type": "path" }, @@ -334,10 +334,28 @@ "type": "path" } }, - "nix-index-database": { + "nh": { "inputs": { "nixpkgs": "nixpkgs_3" }, + "locked": { + "lastModified": 1723994268, + "narHash": "sha256-3nHuGGBTqUxy1g7sm+1zTNLxbz9fnMr1ZX9etCWlFG8=", + "owner": "viperML", + "repo": "nh", + "rev": "dd8bdc83cfd7d3a8c7167589a03577c21ea015d2", + "type": "github" + }, + "original": { + "owner": "viperML", + "repo": "nh", + "type": "github" + } + }, + "nix-index-database": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, "locked": { "lastModified": 1723950649, "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=", @@ -378,7 +396,7 @@ "inputs": { "flake-parts": "flake-parts", "flake-root": "flake-root", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -398,7 +416,7 @@ "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable_2", "rust-overlay": "rust-overlay_2" }, @@ -499,10 +517,10 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723362943, - "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", - "path": "/nix/store/h60m1fwahjd2mv6gsg77ji3vb4gpj4dk-source", - "rev": "a58bc8ad779655e790115244571758e8de055e3d", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "path": "/nix/store/sfycwi72zfjsspidinx56ajaiffpyh17-source", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "path" }, "original": { @@ -511,6 +529,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1722519197, + "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1723637854, "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", @@ -526,7 +560,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1681303793, "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", @@ -542,7 +576,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1714562304, "narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=", @@ -558,7 +592,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1723637854, "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", @@ -597,7 +631,7 @@ "flake-utils" ], "gitignore": "gitignore", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -623,6 +657,7 @@ "lix-module": "lix-module", "madness": "madness", "meat": "meat", + "nh": "nh", "nix-index-database": "nix-index-database", "nix-rice": "nix-rice", "nixd": "nixd", @@ -688,7 +723,7 @@ "flake": false, "locked": { "lastModified": 1, - "narHash": "sha256-driDd0H33lcvEb5fnsUnLZ9Df+m7MNJvBvqQ7KB4+iA=", + "narHash": "sha256-5ERbpb0KT/FE7MEk0l6cdcoMVN+8w31tCHWzCnRjlZQ=", "path": "src", "type": "path" }, diff --git a/flake.nix b/flake.nix index b7fe29c..872f582 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,6 @@ nix-index-database, madness, lix-module, - nh, meat, ... } @ inputs: let diff --git a/flakes/meat/flake.lock b/flakes/meat/flake.lock index 49bfdc2..4a78fda 100644 --- a/flakes/meat/flake.lock +++ b/flakes/meat/flake.lock @@ -2,10 +2,10 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1723362943, - "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", - "path": "/nix/store/h60m1fwahjd2mv6gsg77ji3vb4gpj4dk-source", - "rev": "a58bc8ad779655e790115244571758e8de055e3d", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "path": "/nix/store/sfycwi72zfjsspidinx56ajaiffpyh17-source", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "path" }, "original": { @@ -23,7 +23,7 @@ "flake": false, "locked": { "lastModified": 1, - "narHash": "sha256-driDd0H33lcvEb5fnsUnLZ9Df+m7MNJvBvqQ7KB4+iA=", + "narHash": "sha256-5ERbpb0KT/FE7MEk0l6cdcoMVN+8w31tCHWzCnRjlZQ=", "path": "src", "type": "path" }, diff --git a/flakes/meat/meat.nix b/flakes/meat/meat.nix index b7f5588..371d8f7 100644 --- a/flakes/meat/meat.nix +++ b/flakes/meat/meat.nix @@ -6,7 +6,6 @@ nix, nh, git, - sudo, makeWrapper, }: let deps = [ @@ -14,7 +13,6 @@ nix nh git - sudo ]; in stdenvNoCC.mkDerivation { @@ -31,7 +29,7 @@ in ''; postFixup = '' wrapProgram $out/bin/meat \ - --set PATH ${lib.makeBinPath deps} + --set PATH /run/wrappers/bin:${lib.makeBinPath deps} ''; meta = { mainProgram = "meat"; diff --git a/flakes/meat/src/meat b/flakes/meat/src/meat index a055ae4..306588f 100755 --- a/flakes/meat/src/meat +++ b/flakes/meat/src/meat @@ -1,5 +1,6 @@ #!/usr/bin/env bash + cmd=${1:help} shift @@ -13,6 +14,7 @@ call_nix() { env NIX_PATH="${nix_path}" nixos-rebuild "$cmd" --fast "$@" } + cd $FLAKE case $cmd in look) @@ -20,21 +22,21 @@ case $cmd in ;; fresh) - nix flake update "$@" + nix flake update $@ ;; yum) - nh os switch -- "$@" + nh os switch -- $@ # call_nix switch "$@" ;; cook) - nh os build "$@" + nh os build $@ # call_nix build "$@" ;; poke) - nh os build -- --show-trace "$@" + nh os build -- --show-trace $@ # call_nix build --show-trace "$@" ;; diff --git a/system/configuration.nix b/system/configuration.nix index 116306e..1544fff 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -2,22 +2,18 @@ inputs, outputs, lib, - config, pkgs, - nix-rice, - nix-std, ... }: { # these settings propagate to home-manager's nixpkgs nixpkgs = { overlays = [ - inputs.nur.overlay - outputs.overlays.additions inputs.nix-rice.overlays.default - outputs.overlays.rice inputs.helix.overlays.default inputs.nixd.overlays.default inputs.nh.overlays.default + outputs.overlays.additions + outputs.overlays.rice ]; config = { allowUnfree = true; @@ -92,6 +88,7 @@ enable = true; clean.enable = true; clean.extraArgs = "--keep-since 3d --keep 3"; + package = inputs.nh.packages.x86_64-linux.default; }; programs.nix-index-database.comma.enable = true;