From 70faca076a4a908a99a9a777994e3dcd0c749df1 Mon Sep 17 00:00:00 2001 From: Sam Willcocks Date: Mon, 26 Sep 2022 15:12:26 +0100 Subject: [PATCH] flake: expose profiles as flake output, fmt --- flake.nix | 13 ++++++------- home/default.nix | 2 +- home/profiles.nix | 2 +- home/vscode.nix | 3 +-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index d146399..aa7a869 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,7 @@ }) ]; in (rec { + profiles = import ./home/profiles.nix; lib = { mkHome = { profiles, @@ -42,23 +43,21 @@ # In home-manager 22.11 configuration/extraModules go away and are replaced # by a single "modules". So let's get ready for that. configuration = {...}: {}; - extraSpecialArgs = { inherit system; }; - extraModules = profiles ++ [{ nixpkgs.overlays = overlays; }]; + extraSpecialArgs = {inherit system;}; + extraModules = profiles ++ [{nixpkgs.overlays = overlays;}]; }; }; # Standalone home-manager configurations - homeConfigurations = let - profiles = import ./home/profiles.nix; - in { + homeConfigurations = { boron = lib.mkHome { system = "aarch64-darwin"; - profiles = with profiles; [ default dev sensitive mac docker aws ]; + profiles = with profiles; [default dev sensitive mac docker aws]; username = "samuel.willcocks"; }; zinc = lib.mkHome { system = "aarch64-darwin"; - profiles = with profiles; [ default dev sensitive mac ]; + profiles = with profiles; [default dev sensitive mac]; }; }; } diff --git a/home/default.nix b/home/default.nix index 6c9d634..a47f495 100644 --- a/home/default.nix +++ b/home/default.nix @@ -15,7 +15,7 @@ in { enable = true; package = pkgs.nix; settings.experimental-features = "nix-command flakes"; - settings.max-jobs = "auto"; # Gotta go fast (build derivations in parallel) + settings.max-jobs = "auto"; # Gotta go fast (build derivations in parallel) }; programs = { home-manager.enable = true; diff --git a/home/profiles.nix b/home/profiles.nix index d5da924..e5275ba 100644 --- a/home/profiles.nix +++ b/home/profiles.nix @@ -3,7 +3,7 @@ default = ./default.nix; # A machine for development dev = {...}: { - imports = [ ./git.nix ./rust.nix ./vim.nix ./vim-dev ./vscode.nix ]; + imports = [./git.nix ./rust.nix ./vim.nix ./vim-dev ./vscode.nix]; }; # Sensitive stuff sensitive = {...}: { diff --git a/home/vscode.nix b/home/vscode.nix index de22131..ffbfc19 100644 --- a/home/vscode.nix +++ b/home/vscode.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { programs.vscode = { enable = true; package = pkgs.vscodium;