Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
315f5824e0 |
@ -5,6 +5,7 @@
|
|||||||
, ...
|
, ...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
|
cfg = config.nixManager;
|
||||||
microcaBin = "${pkgs.microca}/bin/microca";
|
microcaBin = "${pkgs.microca}/bin/microca";
|
||||||
microca = pkgs.writeScriptBin "microca" ''
|
microca = pkgs.writeScriptBin "microca" ''
|
||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
@ -17,7 +18,7 @@ with lib; {
|
|||||||
enable = mkEnableOption "Configure host as nix-conf manager.";
|
enable = mkEnableOption "Configure host as nix-conf manager.";
|
||||||
user = mkOption {
|
user = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "root";
|
default = "mgr";
|
||||||
description = ''
|
description = ''
|
||||||
User who will own the private key.
|
User who will own the private key.
|
||||||
'';
|
'';
|
||||||
@ -27,16 +28,23 @@ with lib; {
|
|||||||
|
|
||||||
#imports = [ ./tailnet.nix ];
|
#imports = [ ./tailnet.nix ];
|
||||||
|
|
||||||
config = mkIf config.nixManager.enable {
|
config = mkIf cfg.enable {
|
||||||
|
users.users.mgr = {
|
||||||
|
isNormalUser = true;
|
||||||
|
description = "Nix Manager";
|
||||||
|
home = "/home/mgr";
|
||||||
|
extraGroups = [ "wheel" ];
|
||||||
|
shell = pkgs.zsh;
|
||||||
|
};
|
||||||
sops.defaultSopsFile = config.xin-secrets.manager;
|
sops.defaultSopsFile = config.xin-secrets.manager;
|
||||||
sops.secrets = {
|
sops.secrets = {
|
||||||
xin_status_key = { owner = config.nixManager.user; };
|
xin_status_key = { owner = cfg.user; };
|
||||||
xin_status_pubkey = { owner = config.nixManager.user; };
|
xin_status_pubkey = { owner = cfg.user; };
|
||||||
manager_key = { owner = config.nixManager.user; };
|
manager_key = { owner = cfg.user; };
|
||||||
manager_pubkey = { owner = config.nixManager.user; };
|
manager_pubkey = { owner = cfg.user; };
|
||||||
ca_key = { owner = config.nixManager.user; };
|
ca_key = { owner = cfg.user; };
|
||||||
ca_cert = { owner = config.nixManager.user; };
|
ca_cert = { owner = cfg.user; };
|
||||||
po_env = { owner = config.nixManager.user; };
|
po_env = { owner = cfg.user; };
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
|
@ -122,7 +122,7 @@ in
|
|||||||
|
|
||||||
nixManager = {
|
nixManager = {
|
||||||
enable = lib.mkDefault true;
|
enable = lib.mkDefault true;
|
||||||
user = "qbit";
|
user = "mgr";
|
||||||
};
|
};
|
||||||
|
|
||||||
kde.enable = lib.mkDefault true;
|
kde.enable = lib.mkDefault true;
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
{ config
|
{ config
|
||||||
, lib
|
, lib
|
||||||
, pkgs
|
, pkgs
|
||||||
, isUnstable
|
|
||||||
, ...
|
, ...
|
||||||
}:
|
}:
|
||||||
with lib; let
|
with lib; let
|
||||||
@ -24,20 +23,16 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf config.defaultUsers.enable {
|
config = mkIf config.defaultUsers.enable
|
||||||
users.users.root = userBase;
|
{
|
||||||
users.users.qbit =
|
users.users = {
|
||||||
userBase
|
root = userBase;
|
||||||
// {
|
qbit = userBase // {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Aaron Bieber";
|
description = "Aaron Bieber";
|
||||||
home = "/home/qbit";
|
home = "/home/qbit";
|
||||||
extraGroups = [ "wheel" ];
|
extraGroups = [ "wheel" ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
environment.systemPackages =
|
|
||||||
if isUnstable
|
|
||||||
then [ pkgs.yash pkgs.go ]
|
|
||||||
else [ pkgs.go ];
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user