From 2f2d110779d763fdc74c2382d2e98be3edb92398 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Fri, 21 Feb 2025 21:37:02 +0800 Subject: [PATCH] modify flake inputs --- flake.lock | 104 +++++++++-------------------------------------------- flake.nix | 78 +++++++++++++++++++++++++++++++--------- 2 files changed, 78 insertions(+), 104 deletions(-) diff --git a/flake.lock b/flake.lock index 302bc75..8c5a254 100644 --- a/flake.lock +++ b/flake.lock @@ -101,7 +101,9 @@ "dae": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1740074809, @@ -120,7 +122,9 @@ "deploy-rs": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "utils": "utils" }, "locked": { @@ -470,7 +474,9 @@ "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-unstable": [ + "nixpkgs" + ], "zig": "zig", "zig2nix": "zig2nix" }, @@ -681,7 +687,9 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-stable": "nixpkgs-stable_2", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -832,7 +840,7 @@ "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { @@ -994,22 +1002,6 @@ } }, "nixpkgs-unstable": { - "locked": { - "lastModified": 1738136902, - "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable_2": { "locked": { "lastModified": 1731676054, "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", @@ -1041,70 +1033,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1702272962, - "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { "lastModified": 1731941414, @@ -1165,7 +1093,7 @@ "nixpkgs" ], "nixpkgs-darwin": "nixpkgs-darwin", - "nixpkgs-unstable": "nixpkgs-unstable_2", + "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "rust-overlay": "rust-overlay_2", "winapps": "winapps" @@ -1285,7 +1213,9 @@ "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_5", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_8", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", diff --git a/flake.nix b/flake.nix index 52bf7b3..e3dac12 100644 --- a/flake.nix +++ b/flake.nix @@ -11,79 +11,123 @@ }; helix = { - url = "github:helix-editor/helix/master"; + type = "github"; + owner = "helix-editor"; + repo = "helix"; + ref = "master"; inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { - url = "github:nix-community/home-manager"; + type = "github"; + owner = "nix-community"; + repo = "home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; oskars-dotfiles = { - url = "github:oskardotglobal/.dotfiles/nix"; + type = "github"; + owner = "oskardotglobal"; + repo = ".dotfiles"; + ref = "nix"; inputs.nixpkgs.follows = "nixpkgs"; }; niri-flake = { - url = "github:sodiboo/niri-flake"; + type = "github"; + owner = "sodiboo"; + repo = "niri-flake"; + inputs.nixpkgs.follows = "nixpkgs"; }; nixos-cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; + type = "github"; + owner = "lilyinstarlight"; + repo = "nixos-cosmic"; }; ghostty = { - url = "github:ghostty-org/ghostty"; + type = "github"; + owner = "ghostty-org"; + repo = "ghostty"; + inputs.nixpkgs-unstable.follows = "nixpkgs"; }; nixos-hardware = { - url = "github:NixOS/nixos-hardware/master"; + type = "github"; + owner = "NixOS"; + repo = "nixos-hardware"; + ref = "master"; }; dae = { - url = "github:daeuniverse/flake.nix"; + type = "github"; + owner = "daeuniverse"; + repo = "flake.nix"; + inputs.nixpkgs.follows = "nixpkgs"; }; flake-parts = { - url = "github:hercules-ci/flake-parts"; + type = "github"; + owner = "hercules-ci"; + repo = "flake-parts"; }; flake-utils = { - url = "github:numtide/flake-utils"; + type = "github"; + owner = "numtide"; + repo = "flake-utils"; }; nur-xddxdd = { - url = "github:xddxdd/nur-packages/master"; + type = "github"; + owner = "xddxdd"; + repo = "nur-packages"; + ref = "master"; flake = false; }; nur-rycee = { - url = "gitlab:rycee/nur-expressions/master"; + type = "gitlab"; + owner = "rycee"; + repo = "nur-expressions"; + ref = "master"; flake = false; }; sops-nix = { - url = "github:Mic92/sops-nix"; + type = "github"; + owner = "Mic92"; + repo = "sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - url = "github:danth/stylix"; + type = "github"; + owner = "danth"; + repo = "stylix"; + inputs.nixpkgs.follows = "nixpkgs"; }; disko = { - url = "github:nix-community/disko"; + type = "github"; + owner = "nix-community"; + repo = "disko"; inputs.nixpkgs.follows = "nixpkgs"; }; bt-tracker = { - url = "github:XIU2/TrackersListCollection"; + type = "github"; + owner = "XIU2"; + repo = "TrackersListCollection"; flake = false; }; deploy-rs = { - url = "github:serokell/deploy-rs"; + type = "github"; + owner = "serokell"; + repo = "deploy-rs"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; outputs =