From 37908b5948a609bfb7450f850d66fb88a807ef3d Mon Sep 17 00:00:00 2001 From: Tobias Ostner Date: Wed, 3 Jul 2024 15:46:38 +0200 Subject: [PATCH] Add TobWork configuration --- nix/flake.nix | 32 ++++++++++++++++--------------- nix/module/home-manager.nix | 4 ++-- nix/system/darwin.nix | 38 +++++++++++++++++++------------------ 3 files changed, 39 insertions(+), 35 deletions(-) diff --git a/nix/flake.nix b/nix/flake.nix index e4b3b60..66ef9f4 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -7,21 +7,23 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; }; - outputs = inputs @ { - self, - darwin, - home-manager, - nixpkgs, - ... - }: let - darwin-system = import ./system/darwin.nix {inherit inputs;}; - in { - darwinConfigurations = { - TobAir = darwin-system { - system = "aarch64-darwin"; - username = "tobi"; - hostname = "TobAir"; + outputs = inputs: + let + darwin-system = import ./system/darwin.nix {inherit inputs;}; + in { + darwinConfigurations = { + TobAir = darwin-system { + system = "aarch64-darwin"; + username = "tobi"; + email = "tobias.ostner@gmail.com"; + hostname = "TobAir"; + }; + TobWork = darwin-system { + system = "aarch64-darwin"; + username = "tostner"; + email = "tobias.ostner@jambit.com"; + hostname = "laptop1042"; + }; }; }; - }; } diff --git a/nix/module/home-manager.nix b/nix/module/home-manager.nix index 8bfd318..0bfd286 100644 --- a/nix/module/home-manager.nix +++ b/nix/module/home-manager.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{email}: {pkgs, ...}: { home.file.".emacs.d/early-init.el".source = ../config/emacs/early-init.el; home.file.".emacs.d/tree-sitter/libtree-sitter-swift.dylib".source = ../config/emacs/tree-sitter/libtree-sitter-swift.dylib; home.file.".clojure/deps.edn".source = ../config/clojure/deps.edn; @@ -143,7 +143,7 @@ git = { enable = true; userName = "Tobias Ostner"; - userEmail = "tobias.ostner@gmail.com"; + userEmail = email; extraConfig = { init.defaultBranch = "main"; pull.rebase = true; diff --git a/nix/system/darwin.nix b/nix/system/darwin.nix index c7ff3e7..02bafe8 100644 --- a/nix/system/darwin.nix +++ b/nix/system/darwin.nix @@ -4,27 +4,29 @@ { system, username, + email, hostname -}: let +}: +let system-config = import ../module/configuration.nix {inherit hostname;}; - home-manager-config = import ../module/home-manager.nix; + home-manager-config = import ../module/home-manager.nix {inherit email;}; in - inputs.darwin.lib.darwinSystem { - inherit system; +inputs.darwin.lib.darwinSystem { + inherit system; - modules = [ - { - services.nix-daemon.enable = true; - users.users.${username}.home = "/Users/${username}"; - } + modules = [ + { + services.nix-daemon.enable = true; + users.users.${username}.home = "/Users/${username}"; + } - system-config + system-config - inputs.home-manager.darwinModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users."${username}" = home-manager-config; - } - ]; - } + inputs.home-manager.darwinModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users."${username}" = home-manager-config; + } + ]; +}