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:
parent
132956970f
commit
af074f2756
3 changed files with 26 additions and 21 deletions
11
flake.nix
11
flake.nix
|
|
@ -2,7 +2,10 @@
|
|||
description = "Ryan's MacBook Pro flake";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||
nixpkgs = {
|
||||
url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||
};
|
||||
|
||||
nix-darwin = {
|
||||
url = "github:LnL7/nix-darwin";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -70,17 +73,15 @@
|
|||
nixpkgs,
|
||||
nix-darwin,
|
||||
home-manager,
|
||||
attic,
|
||||
catppuccin,
|
||||
nyoom,
|
||||
discord-applemusic-rich-presence,
|
||||
...
|
||||
} @ inputs: {
|
||||
darwinConfigurations.Ryans-MacBook-Pro = nix-darwin.lib.darwinSystem {
|
||||
modules = [
|
||||
./system.nix
|
||||
./users.nix
|
||||
home-manager.darwinModules.home-manager
|
||||
];
|
||||
|
||||
specialArgs = inputs;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
16
system.nix
16
system.nix
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
pkgs,
|
||||
attic,
|
||||
catppuccin,
|
||||
discord-applemusic-rich-presence,
|
||||
nyoom,
|
||||
...
|
||||
|
|
@ -143,20 +142,5 @@
|
|||
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;
|
||||
}
|
||||
|
|
|
|||
20
users.nix
Normal file
20
users.nix
Normal 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";
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue