ryanccn/flake
1
0
Fork 0
mirror of https://github.com/ryanccn/flake.git synced 2025-12-06 08:10:43 +01:00
Code Activity

packages: remove attic and add home-manager

Browse source
This commit is contained in:
Ryan Cao 2023-11-13 19:55:46 +08:00
parent f13c9e18a6
commit 6e3d8b2a9f
Signed by: ryanccn
SSH key fingerprint: SHA256:NtP/BlVhoQq4xU6BEcZeT8nIPvHntkJ3lIc2yB+F09E
5 changed files with 28 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

94
flake.lock generated
View file

@ -20,38 +20,6 @@
"type": "github" "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": { "catppuccin": {
"inputs": { "inputs": {
"home-manager": [ "home-manager": [
@ -75,26 +43,6 @@
"type": "github" "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": { "darwin-custom-icons": {
"locked": { "locked": {
"lastModified": 1693410673, "lastModified": 1693410673,
@ -118,11 +66,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1699770036, "lastModified": 1699856538,
"narHash": "sha256-bZmI7ytPAYLpyFNgj5xirDkKuAniOkj1xHdv5aIJ5GM=", "narHash": "sha256-Fr3ehKE3ruGUKDzq/rb48N7oLarA3a5nROMjP8O13/o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "81ab0b4f7ae9ebb57daa0edf119c4891806e4d3a", "rev": "6807e7b6e855a095a3d0cb35e6cfa6935f384085",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -260,11 +208,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699704228, "lastModified": 1699867978,
"narHash": "sha256-NApWG385goidsXmsakWgFRjvbH+aw/n1CGGHn/UuXsc=", "narHash": "sha256-+arl45HUOcBdKiRGrKXZYXDyBQ6MQGkYPZa/28f6Yzo=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "0f1ad801387445fdda01d080db8ecf169be8e793", "rev": "e67f2bf515343da378c3f82f098df8ca01bccc5f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -275,11 +223,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1699601893, "lastModified": 1699725108,
"narHash": "sha256-9f008k1k5SmEAO1ldjO5sQf+oWHFkeK5jhS3Ji3vFyk=", "narHash": "sha256-NTiPW4jRC+9puakU4Vi8WpFEirhp92kTOSThuZke+FA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e06c716ef149f466f25e62a836c30b90476e65e5", "rev": "911ad1e67f458b6bcf0278fa85e33bb9924fed7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -296,12 +244,12 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695906663, "lastModified": 1699875693,
"narHash": "sha256-6gC3C0sYD9p706XZjRXvrCyH2x5vpLUKehxvbnHKZec=", "narHash": "sha256-V17DXtycaj8nhRzMxFZuaILzyC75hpL2l59D2sqY1lY=",
"rev": "3bde992e4dd222078ce068a9313a86ff9bafab6e", "rev": "364103bcbdc2ba469cb5a21a960fcefeab0f242f",
"revCount": 130, "revCount": 145,
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",
@ -311,9 +259,7 @@
"root": { "root": {
"inputs": { "inputs": {
"am": "am", "am": "am",
"attic": "attic",
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
"crane": "crane",
"darwin-custom-icons": "darwin-custom-icons", "darwin-custom-icons": "darwin-custom-icons",
"fenix": "fenix", "fenix": "fenix",
"fh": "fh", "fh": "fh",
@ -331,11 +277,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1699715108, "lastModified": 1699808862,
"narHash": "sha256-yPozsobJU55gj+szgo4Lpcg1lHvGQYAT6Y4MrC80mWE=", "narHash": "sha256-gjMqmlCvLVlptL35HHvALrOKrFyxjg5hryXbbpVyoeY=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "5fcf5289e726785d20d3aa4d13d90a43ed248e83", "rev": "416e9c856a792ce2214c449677ca0a1f38965248",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -355,11 +301,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699755324, "lastModified": 1699841702,
"narHash": "sha256-DJBtQB5VIUXJZwVrhgkKOH8g2wTJFHe+5Dc2oJjpcNs=", "narHash": "sha256-EG1Fpw732KmcyFJB0tUNsvreRomwTI/H5ngqlGrfB1Y=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "d15b1b2be8daba77c80ee6716616e5c841d3ab14", "rev": "05c34b45e276a9939d1170b025faafe7a5fab2c8",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
flake.nix
View file

@ -16,15 +16,6 @@
inputs.nixpkgs.follows = "nixpkgs"; 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 = { catppuccin = {
url = "github:Stonks3141/ctp-nix"; url = "github:Stonks3141/ctp-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -70,11 +61,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
crane = {
url = "github:ipetkov/crane";
inputs.nixpkgs.follows = "nixpkgs";
};
darwin-custom-icons = { darwin-custom-icons = {
url = "github:ryanccn/nix-darwin-custom-icons"; url = "github:ryanccn/nix-darwin-custom-icons";
}; };

2
justfile
View file

@ -1,6 +1,6 @@
switch: switch:
darwin-rebuild switch --flake . --verbose --show-trace darwin-rebuild switch --flake . --verbose --show-trace
delete-old: 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: gc:
nix store gc nix store gc

1
modules/nix.nix
View file

@ -29,7 +29,6 @@ in {
nixpkgs = { nixpkgs = {
overlays = [ overlays = [
inputs.attic.overlays.default
inputs.nyoom.overlays.default inputs.nyoom.overlays.default
inputs.am.overlays.default inputs.am.overlays.default
inputs.nish.overlays.default inputs.nish.overlays.default

9
modules/packages.nix
View file

@ -1,5 +1,11 @@
{pkgs, ...}: { {
pkgs,
inputs,
...
}: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
inputs.home-manager.packages.${pkgs.system}.home-manager
nil nil
statix statix
deadnix deadnix
@ -8,7 +14,6 @@
nix-your-shell nix-your-shell
nix-melt nix-melt
attic-client
cachix cachix
direnv direnv
fh fh