From d7d2a131aa7c18b92ec28355eb476dad15c66921 Mon Sep 17 00:00:00 2001 From: Kristian Krsnik Date: Tue, 6 Feb 2024 15:26:29 +0100 Subject: [PATCH] nixpkgs followes to remove dependencies --- flake.lock | 40 ++++++---------------------------------- flake.nix | 36 +++++++++++++++++++++++------------- 2 files changed, 29 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index 5b4af3a..d479781 100644 --- a/flake.lock +++ b/flake.lock @@ -244,38 +244,6 @@ "type": "indirect" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1684570954, - "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1675309347, - "narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "006c3bd4dd2f5d1d2094047f307cbf9e2b73d9c5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { "lastModified": 1701623572, @@ -407,7 +375,9 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1707182119, @@ -426,7 +396,9 @@ "wallpaper": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "pre-commit-hooks": "pre-commit-hooks" }, "locked": { diff --git a/flake.nix b/flake.nix index e0af220..ccf865a 100644 --- a/flake.nix +++ b/flake.nix @@ -11,22 +11,30 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # Nix User Repository - nur.url = "github:nix-community/NUR"; + nur = { + url = "github:nix-community/NUR"; + }; - # Wallpaper - wallpaper.url = "github:lunik1/nix-wallpaper"; + wallpaper = { + url = "github:lunik1/nix-wallpaper"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - # Nix index nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; - # VSCode Extensions - vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; + vscode-extensions = { + url = "github:nix-community/nix-vscode-extensions"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + # prism-launcher = { + # # Commit of the 6.3 Release (The last release with FTB support) + # url = "github:PrismLauncher/PrismLauncher/39bba9cbfadc0aac3ef571a80e78a9fa3f5a0028"; + # }; - # Story Architect starc = { url = "git+https://git.krsnik.at/Kristian/starc-flake.git"; inputs.nixpkgs.follows = "nixpkgs"; @@ -48,6 +56,7 @@ wallpaper, nix-index-database, vscode-extensions, + # prism-launcher, starc, scanned-image-extractor, }: let @@ -72,6 +81,12 @@ { nixpkgs.overlays = [ + vscode-extensions.overlays.default + # prism-launcher.overlay + + starc.overlays.default + scanned-image-extractor.overlays.default + # ( # https://github.com/nix-community/home-manager/issues/1538#issuecomment-706627100 # final: prev: { # unstable = import nixpkgs-unstable { @@ -84,11 +99,6 @@ # }; # } # ) - - vscode-extensions.overlays.default - - starc.overlays.default - scanned-image-extractor.overlays.default ]; } ];