1
0
Fork 0
mirror of https://github.com/ryanccn/flake.git synced 2025-12-06 08:10:43 +01:00
This commit is contained in:
Ryan Cao 2023-07-20 10:36:26 +08:00
parent 2525dc29b9
commit 6dbe355f72
Signed by: ryanccn
SSH key fingerprint: SHA256:NtP/BlVhoQq4xU6BEcZeT8nIPvHntkJ3lIc2yB+F09E
2 changed files with 96 additions and 43 deletions

74
flake.lock generated
View file

@ -49,7 +49,9 @@
"catppuccin": { "catppuccin": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1689265071, "lastModified": 1689265071,
@ -117,6 +119,27 @@
"type": "github" "type": "github"
} }
}, },
"fenix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1689747703,
"narHash": "sha256-abwTXTz2u2P32fN9XRQKV+TUkcRZDfNIQ73mq9fyTxg=",
"owner": "nix-community",
"repo": "fenix",
"rev": "5e70fbab6c431bd8454d336ef06ef609f4d6e6f3",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -227,17 +250,18 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1685655444, "lastModified": 1689631193,
"narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", "narHash": "sha256-AGSkBZaiTODQc8eT1rZDrQIjtb8JtFwJ0wVPzArlrnM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", "rev": "57695599bdc4f7bfe5d28cfa23f14b3d8bdf8a5f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
@ -256,30 +280,32 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1689631193,
"narHash": "sha256-AGSkBZaiTODQc8eT1rZDrQIjtb8JtFwJ0wVPzArlrnM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "57695599bdc4f7bfe5d28cfa23f14b3d8bdf8a5f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"attic": "attic", "attic": "attic",
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
"fenix": "fenix",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1689689012,
"narHash": "sha256-zC4p3/A34hio7uEAHlewOmSZkBWSKReSpplVuVHPrwo=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "3759c41d3c6966eb3aa18ad5916c0da65ff19641",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
} }
}, },
"rust-overlay": { "rust-overlay": {

View file

@ -3,19 +3,35 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nix-darwin.url = "github:LnL7/nix-darwin"; nix-darwin = {
nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; url = "github:LnL7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager.url = "github:nix-community/home-manager"; home-manager = {
home-manager.inputs.nixpkgs.follows = "nixpkgs"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
attic.url = "github:zhaofengli/attic"; attic = {
attic.inputs.nixpkgs.follows = "nixpkgs"; url = "github:zhaofengli/attic";
inputs.nixpkgs.follows = "nixpkgs";
};
agenix.url = "github:ryantm/agenix"; agenix = {
agenix.inputs.nixpkgs.follows = "nixpkgs"; url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs";
};
catppuccin.url = "github:Stonks3141/ctp-nix"; fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
catppuccin = {
url = "github:Stonks3141/ctp-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { outputs = {
@ -23,6 +39,7 @@
nix-darwin, nix-darwin,
home-manager, home-manager,
agenix, agenix,
fenix,
attic, attic,
catppuccin, catppuccin,
... ...
@ -32,18 +49,24 @@
nil nil
alejandra alejandra
attic-client attic-client
exa cachix
direnv
fenix.packages.${system}.stable.defaultToolchain
ccache
ccacheWrapper
deno
fnm
go
bun
pkgs."_1password" pkgs."_1password"
age age
pkgs.agenix pkgs.agenix
asciinema asciinema
bat bat
btop btop
ccache
ccacheWrapper
cloudflared cloudflared
deno
direnv
doggo doggo
doppler doppler
du-dust du-dust
@ -53,9 +76,7 @@
ffmpeg ffmpeg
fish fish
flyctl flyctl
fnm
fzf fzf
go
gh gh
git git
git-lfs git-lfs
@ -68,7 +89,6 @@
mkcert mkcert
nerdfix nerdfix
opencv opencv
bun
pipx pipx
pscale pscale
pyenv pyenv
@ -78,7 +98,6 @@
starship starship
tealdeer tealdeer
tokei tokei
# ttfautohint
vhs vhs
vivid vivid
xh xh
@ -94,13 +113,22 @@
trusted-users = ["ryanccn"]; trusted-users = ["ryanccn"];
auto-optimise-store = true; auto-optimise-store = true;
extra-platforms = ["x86_64-darwin" "aarch64-darwin"]; extra-platforms = ["x86_64-darwin" "aarch64-darwin"];
extra-sandbox-paths = ["/nix/var/cache/ccache"]; extra-sandbox-paths = ["/nix/var/cache/ccache"];
extra-substituters = [
"https://nix-community.cachix.org"
];
extra-trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
}; };
nixpkgs = { nixpkgs = {
overlays = [ overlays = [
attic.overlays.default attic.overlays.default
agenix.overlays.default agenix.overlays.default
fenix.overlays.default
(import ./overlays/ccache-wrapper.nix) (import ./overlays/ccache-wrapper.nix)
]; ];
@ -132,7 +160,6 @@
agenixModule = agenix.homeManagerModules.age; agenixModule = agenix.homeManagerModules.age;
ctpModule = catppuccin.homeManagerModules.catppuccin; ctpModule = catppuccin.homeManagerModules.catppuccin;
}; };
nixpkgs.overlays = [attic.overlays.default];
users.users.ryanccn.home = "/Users/ryanccn"; users.users.ryanccn.home = "/Users/ryanccn";
home-manager.users.ryanccn = import ./home.nix; home-manager.users.ryanccn = import ./home.nix;