From 214f6ea5fc12ba5b8dafb4a2e024596141265602 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Sun, 24 Mar 2024 17:17:53 -0700 Subject: [PATCH] Update lix and add system profile --- flake.lock | 24 ++++++++++++++++++++---- flake.nix | 2 +- system-profile.nix | 2 ++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 3598851..8cf556e 100644 --- a/flake.lock +++ b/flake.lock @@ -33,14 +33,29 @@ "type": "github" } }, + "flakey-profile": { + "locked": { + "lastModified": 1711325813, + "narHash": "sha256-ygJR5VikyCfK0CUJHboOKJVr6s9HQ1RXcvFEFnv+KIk=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "3b32c4a71f89b874fe0be2dc125eacb9c3473204", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "lix": { "flake": false, "locked": { - "lastModified": 1710788611, - "narHash": "sha256-nBiCx4mfntmJNv1MxVS3KmDeFzusxWC4ZdwKCT4noQw=", + "lastModified": 1711305922, + "narHash": "sha256-SNeKGjzDQX0W9iC8S3R17MDh+WuErNmE10vQAJv7P68=", "ref": "refs/heads/main", - "rev": "f256e3c5c69c7aa658ff6e8fd9c05063a1e9ace6", - "revCount": 15196, + "rev": "d26eccebfc1f0d3f5b77e781ffc6455f05f8f90c", + "revCount": 15216, "type": "git", "url": "ssh://git@git.lix.systems/lix-project/lix.git" }, @@ -69,6 +84,7 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", + "flakey-profile": "flakey-profile", "lix": "lix", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index 0df20cb..ae5a679 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ }; inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.flake-compat.url = "git+ssh://git@git.lix.systems/lix-project/flake-compat"; - inputs.flakey-profile.url = "https://github.com/lf-/flakey-profile"; + inputs.flakey-profile.url = "github:lf-/flakey-profile"; outputs = inputs@{ self, nixpkgs, lix, flake-utils, flakey-profile, ... }: { inherit inputs; diff --git a/system-profile.nix b/system-profile.nix index e76fcd2..952a74a 100644 --- a/system-profile.nix +++ b/system-profile.nix @@ -5,4 +5,6 @@ flakey-profile.lib.mkProfile { cacert nix ]; + name = "system-profile"; + extraSwitchArgs = [ "--profile" "/nix/var/nix/profiles/default" ]; }