From b3c73d211351686c9dc1806c2ecb5d810cb4432c Mon Sep 17 00:00:00 2001 From: Martin Benonisen Date: Sun, 7 Jul 2024 23:34:34 +0200 Subject: [PATCH] nope --- flake.lock | 84 +++++++++++++++++---------------------- flake.nix | 12 +----- system/programs.nix | 1 + user/packages/default.nix | 1 - 4 files changed, 39 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index 3776590..5f12b71 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,14 @@ "nodes": { "flake-parts": { "inputs": { - "nixpkgs-lib": [ - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -42,9 +40,7 @@ }, "nix-citizen": { "inputs": { - "nix-gaming": [ - "nix-gaming" - ], + "nix-gaming": "nix-gaming", "nix-github-actions": "nix-github-actions", "nixpkgs": "nixpkgs", "systems": "systems", @@ -66,17 +62,18 @@ }, "nix-gaming": { "inputs": { - "flake-parts": [ - "flake-parts" - ], - "nixpkgs": "nixpkgs_2" + "flake-parts": "flake-parts", + "nixpkgs": [ + "nix-citizen", + "nixpkgs" + ] }, "locked": { - "lastModified": 1713662031, - "narHash": "sha256-z6BbpvY2QcqDaJnJFBi3BLVwzy5aWZT3nnqzzu/sXD0=", + "lastModified": 1720315345, + "narHash": "sha256-B7CRTjGf0Nll2RouHAzLsOt5L0u04JTN4vetrGXXmUk=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "f37fff222a3abf4deebf7d9388c23da8fc4325c6", + "rev": "96379e6b4d1f234ffd4bbe684d83a3d08a3dd2a7", "type": "github" }, "original": { @@ -122,39 +119,35 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1710628718, - "narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { - "locked": { - "lastModified": 1713596654, - "narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1713537308, "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", @@ -170,7 +163,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1710534455, "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=", @@ -188,31 +181,28 @@ }, "root": { "inputs": { - "flake-parts": "flake-parts", "home-manager": "home-manager", "nix-citizen": "nix-citizen", - "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1710644594, - "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", + "lastModified": 1720321395, + "narHash": "sha256-kcI8q9Nh8/CSj0ygfWq1DLckHl8IHhFarL8ie6g7OEk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", + "rev": "c184aca4db5d71c3db0c8cbfcaaec337a5d065ea", "type": "github" }, "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" + "id": "sops-nix", + "type": "indirect" } }, "systems": { diff --git a/flake.nix b/flake.nix index 137e39c..5407148 100644 --- a/flake.nix +++ b/flake.nix @@ -8,22 +8,12 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - sops-nix.url = "github:Mic92/sops-nix"; - flake-parts = { - url = "github:hercules-ci/flake-parts"; - inputs.nixpkgs-lib.follows = "nixpkgs"; - }; - nix-gaming = { - url = "github:fufexan/nix-gaming"; - inputs.flake-parts.follows = "flake-parts"; - }; # ... nix-citizen.url = "github:LovingMelody/nix-citizen"; # Optional - updates underlying without waiting for nix-citizen to update - nix-citizen.inputs.nix-gaming.follows = "nix-gaming"; }; @@ -41,7 +31,7 @@ nixosConfigurations = { zedd = nixpkgs.lib.nixosSystem { inherit system; - specialArgs = { inherit inputs self user sops-nix; }; + specialArgs = { inherit inputs self user; }; modules = [ ({ config, pkgs, ... }: { }) ./hosts/zedd diff --git a/system/programs.nix b/system/programs.nix index c9a13fc..52e2fa7 100644 --- a/system/programs.nix +++ b/system/programs.nix @@ -57,6 +57,7 @@ nil nixpkgs-fmt curl + jellyfin-media-player git libnotify usbutils diff --git a/user/packages/default.nix b/user/packages/default.nix index 745d1f6..8ddf70f 100644 --- a/user/packages/default.nix +++ b/user/packages/default.nix @@ -6,7 +6,6 @@ discord pdfpc qpwgraph - jellyfin-media-player mixxx imagemagick maim