From d112fc7141f3a48690f77fd1b59cc6c9fa93312f Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Thu, 16 Dec 2021 17:17:30 +0100 Subject: [PATCH] Improved hmgr --- flake.nix | 8 +------- modules/hmgr/default.nix | 9 +-------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index 390770a..ae7a38a 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ outputs = { self, home-manager, nixpkgs, neovim-nightly-overlay, nur, ... }@inputs: let utils = import ./utils.nix { inherit nixpkgs home-manager inputs; }; - pkgs = import nixpkgs {}; + pkgs = import nixpkgs { }; in with utils; { @@ -31,12 +31,6 @@ (builtins.attrNames (builtins.readDir ./modules))); nixosConfigurations = builtins.mapAttrs (name: value: (mkMachine name value self.nixosModules)) (importConfig ./machines); - - #legacyPackages."x86_64-linux"."mosh" = import ./packages/mosh/default.nix; - }; - - - } diff --git a/modules/hmgr/default.nix b/modules/hmgr/default.nix index 5d3b534..220ec6b 100644 --- a/modules/hmgr/default.nix +++ b/modules/hmgr/default.nix @@ -8,13 +8,12 @@ with lib; type = with types; attrsOf anything; }; - config = { home-manager.users = lib.mapAttrs (name: value: { - imports = [ ../../home-manager-modules/git/default.nix ../../home-manager-modules/neovim/default.nix ]; + imports = with builtins; map (x: ../../home-manager-modules + "/${x}/default.nix") (attrNames (readDir ../../home-manager-modules)); home.username = "${name}"; home.homeDirectory = "/home/${name}"; home.stateVersion = "21.11"; @@ -23,9 +22,3 @@ with lib; }; } - - - - - -