merged branchs

This commit is contained in:
Julien Malka 2021-12-16 17:27:10 +01:00
commit 875e6c9612
4 changed files with 44 additions and 23 deletions

View file

@ -19,7 +19,7 @@
outputs = { self, home-manager, nixpkgs, neovim-nightly-overlay, nur, ... }@inputs: outputs = { self, home-manager, nixpkgs, neovim-nightly-overlay, nur, ... }@inputs:
let let
utils = import ./utils.nix { inherit nixpkgs home-manager inputs; }; utils = import ./utils.nix { inherit nixpkgs home-manager inputs; };
pkgs = import nixpkgs {}; pkgs = import nixpkgs { };
in in
with utils; with utils;
{ {
@ -31,12 +31,6 @@
(builtins.attrNames (builtins.readDir ./modules))); (builtins.attrNames (builtins.readDir ./modules)));
nixosConfigurations = builtins.mapAttrs (name: value: (mkMachine name value self.nixosModules)) (importConfig ./machines); nixosConfigurations = builtins.mapAttrs (name: value: (mkMachine name value self.nixosModules)) (importConfig ./machines);
#legacyPackages."x86_64-linux"."mosh" = import ./packages/mosh/default.nix;
}; };
} }

View file

@ -13,15 +13,22 @@
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
home-manager.users.julien = { # home-manager.users.julien = {
home.username = "julien"; # home.username = "julien";
home.homeDirectory = "/home/julien"; # home.homeDirectory = "/home/julien";
home.stateVersion = "21.11"; # home.stateVersion = "21.11";
imports = [ ../home-manager-modules/mails/default.nix ../home-manager-modules/neovim/default.nix ../home-manager-modules/git/default.nix ]; #imports = [ ../home-manager-modules/mails/default.nix ../home-manager-modules/neovim/default.nix ../home-manager-modules/git/default.nix ];
#luj.programs.neovim.enable = true;
# luj.programs.git.enable = true;
# };
luj.hmgr.julien = {
luj.programs.neovim.enable = true; luj.programs.neovim.enable = true;
luj.programs.git.enable = true; luj.programs.git.enable = true;
}; };
fileSystems."/" = fileSystems."/" =
{ {

View file

@ -4,20 +4,17 @@ let
in in
{ {
home-manager.users.julien = {
home.username = "julien"; luj.hmgr.julien = {
home.homeDirectory = "/home/julien"; luj.programs.neovim.enable = true;
home.stateVersion = "21.11"; luj.programs.git.enable = true;
imports = [ ../home-manager-modules/mails/default.nix ../home-manager-modules/neovim/default.nix ../home-manager-modules/git/default.nix ];
luj.emails = { luj.emails = {
enable = true; enable = true;
backend.enable = true; backend.enable = true;
}; };
luj.programs.neovim.enable = true;
luj.programs.git.enable = true;
}; };
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.version = 2; boot.loader.grub.version = 2;
boot.supportedFilesystems = [ "zfs" ]; boot.supportedFilesystems = [ "zfs" ];
@ -75,7 +72,6 @@ in
# Define a user account. Don't forget to set a password with passwd.
# Open ports in the firewall. # Open ports in the firewall.

24
modules/hmgr/default.nix Normal file
View file

@ -0,0 +1,24 @@
{ config, pkgs, lib, ... }:
let
cfg = config.luj.hmgr;
in
with lib;
{
options.luj.hmgr = mkOption {
type = with types; attrsOf anything;
};
config = {
home-manager.users =
lib.mapAttrs
(name: value:
{
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";
} // value)
cfg;
};
}