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

refactor: put users in separate file

This commit is contained in:
Ryan Cao 2023-08-15 11:34:20 +08:00
parent 132956970f
commit af074f2756
Signed by: ryanccn
SSH key fingerprint: SHA256:NtP/BlVhoQq4xU6BEcZeT8nIPvHntkJ3lIc2yB+F09E
3 changed files with 26 additions and 21 deletions

View file

@ -2,7 +2,10 @@
description = "Ryan's MacBook Pro flake"; description = "Ryan's MacBook Pro flake";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs = {
url = "github:NixOS/nixpkgs/nixpkgs-unstable";
};
nix-darwin = { nix-darwin = {
url = "github:LnL7/nix-darwin"; url = "github:LnL7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -70,17 +73,15 @@
nixpkgs, nixpkgs,
nix-darwin, nix-darwin,
home-manager, home-manager,
attic,
catppuccin,
nyoom,
discord-applemusic-rich-presence,
... ...
} @ inputs: { } @ inputs: {
darwinConfigurations.Ryans-MacBook-Pro = nix-darwin.lib.darwinSystem { darwinConfigurations.Ryans-MacBook-Pro = nix-darwin.lib.darwinSystem {
modules = [ modules = [
./system.nix ./system.nix
./users.nix
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
]; ];
specialArgs = inputs; specialArgs = inputs;
}; };
}; };

View file

@ -1,7 +1,6 @@
{ {
pkgs, pkgs,
attic, attic,
catppuccin,
discord-applemusic-rich-presence, discord-applemusic-rich-presence,
nyoom, nyoom,
... ...
@ -143,20 +142,5 @@
taps = ["1password/tap"]; taps = ["1password/tap"];
}; };
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {
ctpModule = catppuccin.homeManagerModules.catppuccin;
discord-applemusic-rich-presence = discord-applemusic-rich-presence.homeManagerModules.default;
};
};
users.users.ryanccn = {
home = "/Users/ryanccn";
};
home-manager.users.ryanccn = import ./home.nix;
system.stateVersion = 4; system.stateVersion = 4;
} }

20
users.nix Normal file
View file

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