From d8ca796ca6ec8c76c2d758df8bc468afa2d1e9dc Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Tue, 3 Sep 2024 22:07:28 -0700 Subject: [PATCH] flake: cleanup and optimize --- flake.lock | 251 +++++-------------------------------------- flake.nix | 28 +++-- overlays/default.nix | 4 +- 3 files changed, 44 insertions(+), 239 deletions(-) diff --git a/flake.lock b/flake.lock index 6278ecb..0516362 100755 --- a/flake.lock +++ b/flake.lock @@ -23,22 +23,6 @@ "type": "github" } }, - "bleedingpkgs": { - "locked": { - "lastModified": 1725423364, - "narHash": "sha256-rsrCypoGgejEuKnkqNZ7ItJ9kgOzwvZNfAnWmAY0K8o=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "da61b0d477d44ffcee7ba9e94f1bdb187ad07f51", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, "brew-src": { "flake": false, "locked": { @@ -92,27 +76,6 @@ "type": "github" } }, - "crane_2": { - "inputs": { - "nixpkgs": [ - "manga-tui", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724006180, - "narHash": "sha256-PVxPj0Ga2fMYMtcT9ARCthF+4U71YkOT7ZjgD/vf1Aw=", - "owner": "ipetkov", - "repo": "crane", - "rev": "7ce92819802bc583b7e82ebc08013a530f22209f", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "devshell": { "inputs": { "nixpkgs": [ @@ -347,24 +310,6 @@ "type": "github" } }, - "flake-utils_6": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -594,27 +539,6 @@ "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz" } }, - "manga-tui": { - "inputs": { - "crane": "crane_2", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay_3" - }, - "locked": { - "lastModified": 1725296113, - "narHash": "sha256-efc0PIjDxo/RkrvfPBYfrcvGpqVhcaSnJ1HNFCLxIiM=", - "owner": "josueBarretogit", - "repo": "manga-tui", - "rev": "5c9129a3406a62378685a57de40ee5ba2ced3cc5", - "type": "github" - }, - "original": { - "owner": "josueBarretogit", - "repo": "manga-tui", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -637,7 +561,7 @@ }, "nix-darwin_2": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1716329735, @@ -678,9 +602,11 @@ "nix-homebrew": { "inputs": { "brew-src": "brew-src", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nix-darwin": "nix-darwin_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1719720211, @@ -698,18 +624,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723991338, - "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8a3354191c0d7144db9756a74755672387b702ba", - "type": "github" + "lastModified": 1687274257, + "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", + "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", + "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", + "type": "path" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-lib": { @@ -757,35 +680,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1687274257, - "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", - "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", - "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1725103162, "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", @@ -801,54 +695,6 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": "devshell", @@ -880,7 +726,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "personal-neovim", "nixvim", @@ -904,7 +750,9 @@ "personal-neovim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": [ + "nixpkgs" + ], "nixvim": "nixvim" }, "locked": { @@ -951,21 +799,18 @@ "root": { "inputs": { "apple-silicon": "apple-silicon", - "bleedingpkgs": "bleedingpkgs", "catppuccin": "catppuccin", "home-manager": "home-manager", "homebrew-cask": "homebrew-cask", "homebrew-core": "homebrew-core", "lanzaboote": "lanzaboote", "lix-module": "lix-module", - "manga-tui": "manga-tui", "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable-small": "nixpkgs-unstable-small", "personal-neovim": "personal-neovim", "spicetify": "spicetify", - "stablepkgs": "stablepkgs", "vesktop-bin": "vesktop-bin", "wallpapers": "wallpapers", "zen-browser": "zen-browser" @@ -1012,27 +857,6 @@ "type": "github" } }, - "rust-overlay_3": { - "inputs": { - "nixpkgs": [ - "manga-tui", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724206841, - "narHash": "sha256-L8dKaX4T3k+TR2fEHCfGbH4UXdspovz/pj87iai9qmc=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "45e98fbd62c32e5927e952d2833fa1ba4fb35a61", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "spicetify": { "inputs": { "flake-compat": "flake-compat_4", @@ -1054,22 +878,6 @@ "type": "github" } }, - "stablepkgs": { - "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -1145,21 +953,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1184,8 +977,10 @@ }, "vesktop-bin": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_6" + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1724592759, @@ -1219,7 +1014,9 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1725425585, diff --git a/flake.nix b/flake.nix index 4652eb6..a265f85 100755 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - bleedingpkgs.url = "github:nixos/nixpkgs/master"; + # stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + # bleedingpkgs.url = "github:nixos/nixpkgs/master"; nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; home-manager = { @@ -17,7 +17,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew"; + nix-homebrew = { + url = "github:zhaofengli-wip/nix-homebrew"; + inputs.nixpkgs.follows = "nixpkgs"; + }; homebrew-core = { url = "github:homebrew/homebrew-core"; @@ -38,8 +41,6 @@ lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.1"; - - # Optional but recommended to limit the size of your system closure. inputs.nixpkgs.follows = "nixpkgs"; }; @@ -58,18 +59,25 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - personal-neovim.url = "github:youwen5/neovim-flake"; + personal-neovim = { + url = "github:youwen5/neovim-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - vesktop-bin.url = "github:youwen5/vesktop-bin-flake"; + vesktop-bin = { + url = "github:youwen5/vesktop-bin-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; wallpapers = { url = "git+https://code.youwen.dev/youwen5/wallpapers"; flake = false; }; - zen-browser.url = "github:youwen5/zen-browser-flake"; - - manga-tui.url = "github:josueBarretogit/manga-tui"; + zen-browser = { + url = "github:youwen5/zen-browser-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = diff --git a/overlays/default.nix b/overlays/default.nix index 9d3bc5c..e5e9fe3 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -4,8 +4,8 @@ ... }: let - stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system}; - bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system}; + # stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system}; + # bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system}; nixpkgs-small = inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system}; in {