use locked versions of musicutil/vaultui

This commit is contained in:
chaos 2023-10-23 22:17:56 +01:00
parent 3f4d26f7e2
commit 15d9bd5483
No known key found for this signature in database
6 changed files with 61 additions and 16 deletions

View file

@ -85,19 +85,17 @@
"flake-compat": [ "flake-compat": [
"flake-compat" "flake-compat"
], ],
"nixpkgs": [ "nixpkgs": "nixpkgs",
"nixpkgs-unstable"
],
"utils": [ "utils": [
"flake-utils" "flake-utils"
] ]
}, },
"locked": { "locked": {
"lastModified": 1696077011, "lastModified": 1697823178,
"narHash": "sha256-kHURhTGXI4/p3yU8AE02f4H3DY6MwVj+kAge3VAV+K0=", "narHash": "sha256-r1yRllaCwq6dGyEJ5tmNfxiYkytmmANXFIEj2XxU/cQ=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "d5f3cdde3a76f437f6910f39e82a0db9c2e73cfe", "rev": "66a83fbbbbf3088acd19ab245015f215f029be2e",
"revCount": 72, "revCount": 97,
"type": "git", "type": "git",
"url": "https://forgejo.owo.monster/chaos/musicutil" "url": "https://forgejo.owo.monster/chaos/musicutil"
}, },
@ -132,6 +130,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs": {
"locked": {
"lastModified": 1697456312,
"narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1697059129, "lastModified": 1697059129,
@ -148,6 +162,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1697456312,
"narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1697470606, "lastModified": 1697470606,
@ -260,9 +290,7 @@
"flake-compat": [ "flake-compat": [
"flake-compat" "flake-compat"
], ],
"nixpkgs": [ "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable"
],
"utils": [ "utils": [
"flake-utils" "flake-utils"
] ]

View file

@ -27,12 +27,12 @@
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
vaultui.url = "git+https://forgejo.owo.monster/chaos/VaultUI"; vaultui.url = "git+https://forgejo.owo.monster/chaos/VaultUI";
vaultui.inputs.nixpkgs.follows = "nixpkgs-unstable"; #vaultui.inputs.nixpkgs.follows = "nixpkgs-unstable";
vaultui.inputs.utils.follows = "flake-utils"; vaultui.inputs.utils.follows = "flake-utils";
vaultui.inputs.flake-compat.follows = "flake-compat"; vaultui.inputs.flake-compat.follows = "flake-compat";
musicutil.url = "git+https://forgejo.owo.monster/chaos/musicutil"; musicutil.url = "git+https://forgejo.owo.monster/chaos/musicutil";
musicutil.inputs.nixpkgs.follows = "nixpkgs-unstable"; #musicutil.inputs.nixpkgs.follows = "nixpkgs-unstable";
musicutil.inputs.utils.follows = "flake-utils"; musicutil.inputs.utils.follows = "flake-utils";
musicutil.inputs.flake-compat.follows = "flake-compat"; musicutil.inputs.flake-compat.follows = "flake-compat";

View file

@ -1 +1,9 @@
{pkgs, ...}: {home.packages = with pkgs; [musicutil];} {
inputs,
pkgs,
...
}: {
home.packages = [
inputs.musicutil.packages.${pkgs.system}.musicutil
];
}

View file

@ -12,6 +12,8 @@
profiles.remoteBuilders profiles.remoteBuilders
profiles.chaosInternalWireGuard profiles.chaosInternalWireGuard
profiles.gaming.steam
./profiles/raspberryExtDrive.nix ./profiles/raspberryExtDrive.nix
./secrets.nix ./secrets.nix
@ -32,6 +34,8 @@
home.programming.editors.vscode home.programming.editors.vscode
home.programming.languages.rust home.programming.languages.rust
home.programming.languages.nix home.programming.languages.nix
home.gaming.platforms.steam
]; ];
home.stateVersion = "23.05"; home.stateVersion = "23.05";
}; };

View file

@ -1,6 +1,11 @@
{...}: { {
inputs,
pkgs,
...
}: {
services.vaultui = { services.vaultui = {
enable = true; enable = true;
package = inputs.vaultui.packages.${pkgs.system}.vaultui;
domain = "vaultui.owo.monster"; domain = "vaultui.owo.monster";
}; };
} }

View file

@ -28,8 +28,8 @@ in {
overlays = [ overlays = [
(import ../../overlay) (import ../../overlay)
inputs.vaultui.overlays.default #inputs.vaultui.overlays.default
inputs.musicutil.overlays.default #inputs.musicutil.overlays.default
inputs.piped-flake.overlays.default inputs.piped-flake.overlays.default
(_prev: final: { (_prev: final: {