diff --git a/flake.lock b/flake.lock index d42dd75..2f3dda7 100644 --- a/flake.lock +++ b/flake.lock @@ -20,38 +20,6 @@ "type": "github" } }, - "attic": { - "inputs": { - "crane": [ - "crane" - ], - "flake-compat": [ - "flake-compat" - ], - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1698258239, - "narHash": "sha256-qnhoYYIJ0L/P7H/f56lQUEvpzNlXh4sxuHpRERV+B44=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "e9918bc6be268da6fa97af6ced15193d8a0421c0", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "repo": "attic", - "type": "github" - } - }, "catppuccin": { "inputs": { "home-manager": [ @@ -75,26 +43,6 @@ "type": "github" } }, - "crane": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1699548976, - "narHash": "sha256-xnpxms0koM8mQpxIup9JnT0F7GrKdvv0QvtxvRuOYR4=", - "owner": "ipetkov", - "repo": "crane", - "rev": "6849911446e18e520970cc6b7a691e64ee90d649", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "darwin-custom-icons": { "locked": { "lastModified": 1693410673, @@ -118,11 +66,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1699770036, - "narHash": "sha256-bZmI7ytPAYLpyFNgj5xirDkKuAniOkj1xHdv5aIJ5GM=", + "lastModified": 1699856538, + "narHash": "sha256-Fr3ehKE3ruGUKDzq/rb48N7oLarA3a5nROMjP8O13/o=", "owner": "nix-community", "repo": "fenix", - "rev": "81ab0b4f7ae9ebb57daa0edf119c4891806e4d3a", + "rev": "6807e7b6e855a095a3d0cb35e6cfa6935f384085", "type": "github" }, "original": { @@ -260,11 +208,11 @@ ] }, "locked": { - "lastModified": 1699704228, - "narHash": "sha256-NApWG385goidsXmsakWgFRjvbH+aw/n1CGGHn/UuXsc=", + "lastModified": 1699867978, + "narHash": "sha256-+arl45HUOcBdKiRGrKXZYXDyBQ6MQGkYPZa/28f6Yzo=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "0f1ad801387445fdda01d080db8ecf169be8e793", + "rev": "e67f2bf515343da378c3f82f098df8ca01bccc5f", "type": "github" }, "original": { @@ -275,11 +223,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699601893, - "narHash": "sha256-9f008k1k5SmEAO1ldjO5sQf+oWHFkeK5jhS3Ji3vFyk=", + "lastModified": 1699725108, + "narHash": "sha256-NTiPW4jRC+9puakU4Vi8WpFEirhp92kTOSThuZke+FA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e06c716ef149f466f25e62a836c30b90476e65e5", + "rev": "911ad1e67f458b6bcf0278fa85e33bb9924fed7e", "type": "github" }, "original": { @@ -296,12 +244,12 @@ ] }, "locked": { - "lastModified": 1695906663, - "narHash": "sha256-6gC3C0sYD9p706XZjRXvrCyH2x5vpLUKehxvbnHKZec=", - "rev": "3bde992e4dd222078ce068a9313a86ff9bafab6e", - "revCount": 130, + "lastModified": 1699875693, + "narHash": "sha256-V17DXtycaj8nhRzMxFZuaILzyC75hpL2l59D2sqY1lY=", + "rev": "364103bcbdc2ba469cb5a21a960fcefeab0f242f", + "revCount": 145, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/ryanccn/nyoom/0.7.1/018adbea-d60d-75ac-bc20-1696443d69c5/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/ryanccn/nyoom/0.7.2/018bc87d-42d6-75f7-bf6c-026c2d605cf7/source.tar.gz" }, "original": { "type": "tarball", @@ -311,9 +259,7 @@ "root": { "inputs": { "am": "am", - "attic": "attic", "catppuccin": "catppuccin", - "crane": "crane", "darwin-custom-icons": "darwin-custom-icons", "fenix": "fenix", "fh": "fh", @@ -331,11 +277,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1699715108, - "narHash": "sha256-yPozsobJU55gj+szgo4Lpcg1lHvGQYAT6Y4MrC80mWE=", + "lastModified": 1699808862, + "narHash": "sha256-gjMqmlCvLVlptL35HHvALrOKrFyxjg5hryXbbpVyoeY=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "5fcf5289e726785d20d3aa4d13d90a43ed248e83", + "rev": "416e9c856a792ce2214c449677ca0a1f38965248", "type": "github" }, "original": { @@ -355,11 +301,11 @@ ] }, "locked": { - "lastModified": 1699755324, - "narHash": "sha256-DJBtQB5VIUXJZwVrhgkKOH8g2wTJFHe+5Dc2oJjpcNs=", + "lastModified": 1699841702, + "narHash": "sha256-EG1Fpw732KmcyFJB0tUNsvreRomwTI/H5ngqlGrfB1Y=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d15b1b2be8daba77c80ee6716616e5c841d3ab14", + "rev": "05c34b45e276a9939d1170b025faafe7a5fab2c8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fb5d5ce..284362b 100644 --- a/flake.nix +++ b/flake.nix @@ -16,15 +16,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - attic = { - url = "github:zhaofengli/attic"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixpkgs-stable.follows = "nixpkgs"; - inputs.crane.follows = "crane"; - inputs.flake-utils.follows = "flake-utils"; - inputs.flake-compat.follows = "flake-compat"; - }; - catppuccin = { url = "github:Stonks3141/ctp-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -70,11 +61,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - crane = { - url = "github:ipetkov/crane"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - darwin-custom-icons = { url = "github:ryanccn/nix-darwin-custom-icons"; }; diff --git a/justfile b/justfile index 6d3811e..6a8e93e 100644 --- a/justfile +++ b/justfile @@ -1,6 +1,6 @@ switch: darwin-rebuild switch --flake . --verbose --show-trace delete-old: - sudo nix-env --profile /nix/var/nix/profiles/system --delete-generations old && nix run home-manager#home-manager -- expire-generations now + sudo nix-env --profile /nix/var/nix/profiles/system --delete-generations old && home-manager expire-generations now gc: nix store gc diff --git a/modules/nix.nix b/modules/nix.nix index a112c79..8410a38 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -29,7 +29,6 @@ in { nixpkgs = { overlays = [ - inputs.attic.overlays.default inputs.nyoom.overlays.default inputs.am.overlays.default inputs.nish.overlays.default diff --git a/modules/packages.nix b/modules/packages.nix index e78507e..a61f051 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -1,5 +1,11 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + ... +}: { environment.systemPackages = with pkgs; [ + inputs.home-manager.packages.${pkgs.system}.home-manager + nil statix deadnix @@ -8,7 +14,6 @@ nix-your-shell nix-melt - attic-client cachix direnv fh