Modularized + enabled darwin things

This commit is contained in:
Ariel Sosnovsky committed 2024-05-16 13:50:53 -04:00
1 parent b040991a96
commit 274e6d475b
4 files changed
+93 -45

No files matched your search

+30 -45
View File
@@ -1,14 +1,8 @@
{
inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
inputs.home-manager.url = github:nix-community/home-manager;
inputs.modules.url = "path:modules/";
inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
outputs =
{ self
, nixpkgs
, home-manager
, nixos-hardware
}@attrs:
outputs = { self, modules, nixos-hardware }:
let
user = {
name = "ari";
@@ -18,44 +12,35 @@
homeMangerVersion = "24.05";
in
{
nixosConfigurations."fwbook" = nixpkgs.lib.nixosSystem {
nixosConfigurations."fwbook" = modules.lib.makeNixOsModule {
system = "x86_64-linux";
modules = [
nixos-hardware.nixosModules.framework-13-7040-amd
home-manager.nixosModules.default
(import ./hosts/fwbook.nix {
user = user;
})
(import ./modules/main.nix {
user = user;
systemStateVersion = "23.11";
hostName = "fwbook";
home-manager = {
enable = true;
version = homeMangerVersion;
};
desktop = {
enable = true;
user = user;
enableKDE = true;
enableHypr = true;
enableX11 = true;
enableWine = true;
};
os = {
enable = true;
firewall = {
enable = false;
};
enableFonts = true;
enableNetowrking = true;
enableSSH = false;
hardware = {
enable = true;
};
};
})
];
user = user;
systemStateVersion = "23.11";
hostName = "fwbook";
home-manager = {
enable = true;
mode = "nixos";
version = homeMangerVersion;
};
desktop = {
enable = true;
user = user;
enableKDE = true;
enableHypr = true;
enableX11 = true;
enableWine = true;
};
os = {
enable = true;
firewall = { enable = false; };
enableFonts = true;
enableNetowrking = true;
enableSSH = false;
hardware = { enable = true; };
};
configuration = { ... }: {
imports = [ nixos-hardware.nixosModules.framework-13-7040-amd ];
};
};
};
}
+46
View File
@@ -0,0 +1,46 @@
{
description = "Main Flake";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-darwin = {
url = "github:LnL7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, home-manager, nix-darwin, nixpkgs }: {
lib = {
makeImports = { ... }@attrs: [ (import ./main.nix attrs) ];
makeNixOsModule = { system, configuration ? null, ... }@attrs:
nixpkgs.lib.nixosSystem {
system = system;
modules = (self.lib.makeImports attrs)
++ (if attrs.home-manager.enable then
[ home-manager.nixosModules.default ]
else
[ ])
++ (if (isNull configuration) then [ configuration ] else [ ]);
};
makeDarwinModule =
{ system ? "x86_64-darwin", user, configuration ? null, ... }@attrs:
nix-darwin.lib.darwinSystem {
modules = (self.lib.makeImports attrs)
++ (if attrs.home-manager.enable then [
home-manager.darwinModules.home-manager
(import ./macos-home-manager.nix { user = user; })
] else
[ ])
++ (if (isNull configuration) then [ configuration ] else [ ]) ++ [
(import ./macos.nix {
user = user;
system = system;
})
];
darwinPackages = self.darwinConfigurations."default".pkgs;
};
};
};
}
+10
View File
@@ -0,0 +1,10 @@
{ user }:
{ ... }: {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.${user.name} = {
home = {
sessionVariables = { "DOCKER_DEFAULT_PLATFORM" = "linux/amd64"; };
};
};
}
+7
View File
@@ -0,0 +1,7 @@
{ user, system }:
{ pkgs, ... }: {
services.nix-daemon.enable = true;
security.pam.enableSudoTouchIdAuth = true;
users.users.${user.name}.home = user.homepath;
nixpkgs.hostPlatform = system;
}