inline common-darwin into poppy (only one darwin host for now)
- merged common-darwin/default.nix content into hosts/poppy/default.nix - removed hosts/common-darwin/ - removed ./hosts/common-darwin import from mkDarwin in flake.nix linux hosts/common/ stays — already 2 linux hosts (muscari + rosemary)
This commit is contained in:
parent
42fdbeb1a0
commit
c95e4a1488
3 changed files with 19 additions and 22 deletions
|
|
@ -51,7 +51,6 @@
|
||||||
nix-darwin.lib.darwinSystem {
|
nix-darwin.lib.darwinSystem {
|
||||||
system = "aarch64-darwin";
|
system = "aarch64-darwin";
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/common-darwin
|
|
||||||
./hosts/${hostname}
|
./hosts/${hostname}
|
||||||
home-manager.darwinModules.home-manager
|
home-manager.darwinModules.home-manager
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
{ pkgs, ... }:
|
|
||||||
{
|
|
||||||
# flake + nix-command
|
|
||||||
nix.settings.experimental-features = [
|
|
||||||
"nix-command"
|
|
||||||
"flakes"
|
|
||||||
];
|
|
||||||
|
|
||||||
# nix daemon (multi-user install)
|
|
||||||
services.nix-daemon.enable = true;
|
|
||||||
|
|
||||||
users.users.mikl = {
|
|
||||||
home = "/Users/mikl";
|
|
||||||
shell = pkgs.zsh;
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.vim
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
networking.hostName = "poppy";
|
networking.hostName = "poppy";
|
||||||
|
|
||||||
|
|
@ -6,4 +6,22 @@
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
system.primaryUser = "mikl";
|
system.primaryUser = "mikl";
|
||||||
|
|
||||||
|
# nix settings
|
||||||
|
nix.settings.experimental-features = [
|
||||||
|
"nix-command"
|
||||||
|
"flakes"
|
||||||
|
];
|
||||||
|
|
||||||
|
# nix daemon (multi-user install)
|
||||||
|
services.nix-daemon.enable = true;
|
||||||
|
|
||||||
|
users.users.mikl = {
|
||||||
|
home = "/Users/mikl";
|
||||||
|
shell = pkgs.zsh;
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.vim
|
||||||
|
];
|
||||||
}
|
}
|
||||||
Loading…
Reference in a new issue