From 274e6d475be1e7ab3f7f8f3005558112f07af5d0 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 16 May 2024 13:50:53 -0400 Subject: [PATCH] Modularized + enabled darwin things --- flake.nix | 75 ++++++++++++++-------------------- modules/flake.nix | 46 +++++++++++++++++++++ modules/macos-home-manager.nix | 10 +++++ modules/macos.nix | 7 ++++ 4 files changed, 93 insertions(+), 45 deletions(-) create mode 100644 modules/flake.nix create mode 100644 modules/macos-home-manager.nix create mode 100644 modules/macos.nix diff --git a/flake.nix b/flake.nix index 1a4de16..72ff227 100644 --- a/flake.nix +++ b/flake.nix @@ -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 ]; + }; }; }; } diff --git a/modules/flake.nix b/modules/flake.nix new file mode 100644 index 0000000..c54c746 --- /dev/null +++ b/modules/flake.nix @@ -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; + }; + }; + }; +} diff --git a/modules/macos-home-manager.nix b/modules/macos-home-manager.nix new file mode 100644 index 0000000..a1c5969 --- /dev/null +++ b/modules/macos-home-manager.nix @@ -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"; }; + }; + }; +} diff --git a/modules/macos.nix b/modules/macos.nix new file mode 100644 index 0000000..f72ed1d --- /dev/null +++ b/modules/macos.nix @@ -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; +}