From c69e735bae3ab02d4645d1456f09cf0da5a1789a Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sat, 9 Apr 2022 09:51:17 -0700 Subject: remove `mkHome` from lib home-manager configuration is used as a module, we don't have two different ways to configure the host anymore. --- README.org | 7 +------ flake.nix | 22 ---------------------- lib/default.nix | 33 --------------------------------- 3 files changed, 1 insertion(+), 61 deletions(-) diff --git a/README.org b/README.org index d35c717..39660ed 100644 --- a/README.org +++ b/README.org @@ -1,12 +1,7 @@ #+TITLE: world - nix configuration * nixos -To rebuild the host: +To rebuild the host and home-manager: #+begin_src sh sudo nixos-rebuild switch --flake . #+end_src -* home manager -To build the configuration for the current user: -#+begin_src sh -home-manager switch --flake . -#+end_src diff --git a/flake.nix b/flake.nix index 8762c80..6e08393 100644 --- a/flake.nix +++ b/flake.nix @@ -44,28 +44,6 @@ system = "x86_64-linux"; }; }; - - homeConfigurations = { - "fcuny@carmel" = lib.mkHome { - username = "fcuny"; - system = "x86_64-linux"; - hostname = "carmel"; - isDesktop = true; - isTrusted = true; - }; - "fcuny@aptos" = lib.mkHome { - username = "fcuny"; - system = "x86_64-linux"; - hostname = "aptos"; - isDesktop = true; - isTrusted = true; - }; - "fcuny@tahoe" = lib.mkHome { - username = "fcuny"; - system = "x86_64-linux"; - hostname = "tahoe"; - }; - }; } // inputs.utils.lib.eachDefaultSystem (system: let pkgs = import inputs.nixpkgs { inherit system; }; diff --git a/lib/default.nix b/lib/default.nix index d0a3d51..26cd954 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -33,37 +33,4 @@ } ]; }; - - mkHome = - { username - , system - , hostname - , isDesktop ? false - , isTrusted ? false - }: - inputs.home-manager.lib.homeManagerConfiguration { - inherit username system; - extraSpecialArgs = { - inherit system hostname isDesktop isTrusted; - }; - homeDirectory = "/home/${username}"; - configuration = ../users/${username}; - extraModules = [ - # Base configuration - { - nixpkgs = { - config.allowUnfree = true; - overlays = [ - inputs.emacs-overlay.overlay - inputs.nur.overlay - ]; - }; - programs = { - home-manager.enable = true; - git.enable = true; - }; - systemd.user.startServices = "sd-switch"; - } - ]; - }; } -- cgit 1.4.1