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

refactor: pass inputs as attrset to system

Browse source
This commit is contained in:
Ryan Cao 2023-08-17 12:13:29 +08:00
parent b98d7efeec
commit 3255170955
Signed by: ryanccn
SSH key fingerprint: SHA256:NtP/BlVhoQq4xU6BEcZeT8nIPvHntkJ3lIc2yB+F09E
4 changed files with 31 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.lock generated
View file

@ -19,11 +19,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691972610, "lastModified": 1692225040,
"narHash": "sha256-01X6GZ7nGZIvqzjM7zfnRemNXwgx5kneMldbTqRnPTU=", "narHash": "sha256-jbQNvkgWGioiC6S39dZVyn6us8p/DlEvm5hQKEYkzDU=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "attic", "repo": "attic",
"rev": "f4cf5704d64303ad11cc6918fbc6ab3cab6ca333", "rev": "b43d12082e34bceb26038bdad0438fd68804cfcd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -145,11 +145,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1692081771, "lastModified": 1692222899,
"narHash": "sha256-LWhyDz3gi1RzTcW6e6iwfs4VuDWFajOexBKygNIqvQM=", "narHash": "sha256-dHrv+lMUKFXLnzc/yYhEpNr34JYG8gwD4eH6qcrScFI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "18791781ea86cbec6bce8bcb847444b9c73b8b3b", "rev": "2471d965a3522025157a790fc49c3567fd56e26e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -180,11 +180,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1692039634, "lastModified": 1692190437,
"narHash": "sha256-L5ISasJZ5lZFOJ9NdxNj7cdrfO4GYv3tKGrv3eNMVJc=", "narHash": "sha256-yJUZzmzSmDYb9ONPnMQDru66RjZgGQZRvj3tQebkexk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b392b28a47d2103ac422197fde95449651aee458", "rev": "9b2aa98db6b10503666a50f4eb93b2fc0d57bde5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,11 +210,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1692027995, "lastModified": 1692180423,
"narHash": "sha256-x4/8/aBu4naA+24PQhNoUZ6w0leHk1LY9MhSTobom9U=", "narHash": "sha256-rJDaQMzdjtC39mRylTfqEll3zgcpQkCMw5XKo9t1Xhg=",
"owner": "ryanccn", "owner": "ryanccn",
"repo": "nyoom", "repo": "nyoom",
"rev": "9af65efd16ff3f1ac6794099ffe3b2998315ed7b", "rev": "2f360906fc87e622bc53dc183313ff40baf4e4b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -248,11 +248,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1692065371, "lastModified": 1692238117,
"narHash": "sha256-1uKLJT89aDS2IlT5oM9vOe6yL34teNvs+b6DZNA5RAM=", "narHash": "sha256-gOoxig/GBuGOYWqE3+7OMrgPVduxjjsbo4qikRb1h3s=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "4ea85def89eceac6b5e327fd3628dcb9ba5add2e", "rev": "3e0e4ec062706ebba759795ad18ad72ad69d41f3",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -82,7 +82,9 @@
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
]; ];
specialArgs = inputs; specialArgs = {
inherit inputs;
};
}; };
}; };
} }

22
system.nix
View file

@ -1,8 +1,6 @@
{ {
pkgs, pkgs,
attic, inputs,
discord-applemusic-rich-presence,
nyoom,
... ...
}: { }: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -35,8 +33,6 @@
rustfmt rustfmt
clippy clippy
pkgs.nyoom
age age
asciinema asciinema
bat bat
@ -45,7 +41,6 @@
doggo doggo
doppler doppler
du-dust du-dust
exiftool
fd fd
ffmpeg ffmpeg
flyctl flyctl
@ -56,7 +51,6 @@
hyperfine hyperfine
jq jq
just just
spicetify-cli
mkcert mkcert
nerdfix nerdfix
pscale pscale
@ -72,9 +66,11 @@
typst typst
packwiz packwiz
catppuccin-catwalk catppuccin-catwalk
packwiz
nyoom
spicetify-cli
exiftool
]; ];
services.nix-daemon.enable = true; services.nix-daemon.enable = true;
@ -97,9 +93,9 @@
nixpkgs = { nixpkgs = {
overlays = [ overlays = [
attic.overlays.default inputs.attic.overlays.default
discord-applemusic-rich-presence.overlays.default inputs.discord-applemusic-rich-presence.overlays.default
nyoom.overlays.default inputs.nyoom.overlays.default
(import ./overlays/ryan-mono-bin.nix) (import ./overlays/ryan-mono-bin.nix)
]; ];
@ -110,7 +106,7 @@
system.activationScripts.extraActivation = { system.activationScripts.extraActivation = {
text = '' text = ''
set -eo pipefail set -eo pipefail
HOME="/var/root" ${pkgs.lib.getExe pkgs.nvd} --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig" HOME="/var/root" ${pkgs.lib.getExe' pkgs.nvd "nvd"} --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
''; '';
}; };

11
users.nix
View file

@ -1,16 +1,13 @@
{ {inputs, ...}: {
catppuccin,
discord-applemusic-rich-presence,
...
}: {
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { extraSpecialArgs = {
ctpModule = catppuccin.homeManagerModules.catppuccin; ctpModule = inputs.catppuccin.homeManagerModules.catppuccin;
discord-applemusic-rich-presence = discord-applemusic-rich-presence.homeManagerModules.default; discord-applemusic-rich-presence = inputs.discord-applemusic-rich-presence.homeManagerModules.default;
}; };
users.ryanccn = import ./home.nix; users.ryanccn = import ./home.nix;
}; };