veneficium/sys-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update: modularize users, pam, gnupg, openssh

Browse source
This commit is contained in:
Veneficium 2024-08-14 21:40:54 +02:00
parent 15d7453ff2
commit b708969576
9 changed files with 113 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

73
hosts/main-homelab/configuration.nix
View file

@ -1,13 +1,26 @@
{ pkgs, ... }: {
{ pkgs, lib, ... }: {
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
../../nixosModules/default.nix
];
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
settings = {
users.veneficium.enable = lib.mkForce true;
programs.gnupg.enable = lib.mkForce true;
programs.gnupg.ssh = lib.mkForce true;
services = {
pam = {
enable = lib.mkForce true;
sshd.useGoogleAuth = lib.mkForce true;
sshd.gnupg = lib.mkForce true;
};
openssh.enable = lib.mkForce true;
openssh.usePAM = lib.mkForce true;
};
};
boot.kernelPackages = pkgs.linuxPackages_latest;
@ -18,50 +31,6 @@
networking.networkmanager.enable = true;
services.openssh = {
enable = true;
ports = [ 12342 ];
settings = {
PasswordAuthentication = true;
AllowUsers = null;
UsePAM = true;
X11Forwarding = false;
PermitRootLogin = "prohibit-password"; # "yes", "without-password", "prohibit-password", "forced-commands-only", "no"
};
};
security.pam = {
services.sshd = {
name = "sshd";
unixAuth = true;
googleAuthenticator.enable = true;
gnupg.enable = true;
};
};
time.timeZone = "Europe/Rome";
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "it_IT.UTF-8";
LC_IDENTIFICATION = "it_IT.UTF-8";
LC_MEASUREMENT = "it_IT.UTF-8";
LC_MONETARY = "it_IT.UTF-8";
LC_NAME = "it_IT.UTF-8";
LC_NUMERIC = "it_IT.UTF-8";
LC_PAPER = "it_IT.UTF-8";
LC_TELEPHONE = "it_IT.UTF-8";
LC_TIME = "it_IT.UTF-8";
};
services.xserver.xkb = {
layout = "it";
variant = "";
};
console.keyMap = "it";
environment.systemPackages = with pkgs; [
nano
lshw
@ -73,14 +42,6 @@
google-authenticator
];
users.users.veneficium = {
isNormalUser = true;
description = "Veneficium";
extraGroups = [ "networkmanager" "wheel" ];
packages = with pkgs; [];
};
programs.zsh.enable = true;
# Allow unfree packages

10
hosts/main-laptop/configuration.nix
View file

@ -7,15 +7,13 @@
../../nixosModules/default.nix
];
#todo gnupg
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
};
settings = {
users.fedfer.enable = lib.mkForce true;
programs.docker.enable = lib.mkForce true;
programs.tailscale.enable = lib.mkForce true;
programs.gnupg.enable = lib.mkForce true;
programs.gnupg.ssh = lib.mkForce true;
drivers = {
printer.M2020.enable = lib.mkForce true;

19
nixosModules/default.nix
View file

@ -1,7 +1,8 @@
{ lib, ... }: {
imports =
[
./fedfer.nix
./users/fedfer.nix
./users/veneficium.nix
./drivers/samsung-printer.nix
./drivers/ipod.nix
@ -16,16 +17,24 @@
./services/fstrim.nix
./services/tlp.nix
./services/switcheroo.nix
./services/pam.nix
./services/openssh.nix
./programs/docker.nix
./programs/tailscale.nix
./programs/powertop.nix
./programs/gnupg.nix
];
settings = {
users.fedfer.enable = lib.mkDefault false;
users.veneficium.enable = lib.mkDefault false;
programs.docker.enable = lib.mkDefault false;
programs.tailscale.enable = lib.mkDefault false;
programs.powertop.enable = lib.mkDefault true;
programs.gnupg.enable = lib.mkDefault true;
programs.gnupg.ssh = lib.mkDefault true;
drivers = {
printer.M2020.enable = lib.mkDefault false;
@ -38,6 +47,7 @@
sync = lib.mkDefault false;
offload = lib.mkDefault true;
};
amd.enable = lib.mkDefault false;
};
};
@ -48,6 +58,13 @@
fstrim.enable = lib.mkDefault true;
tlp.enable = lib.mkDefault false;
switcheroo.enable = lib.mkDefault false;
pam = {
enable = lib.mkDefault false;
sshd.useGoogleAuth = lib.mkDefault false;
sshd.gnupg = lib.mkDefault false;
};
openssh.enable = lib.mkDefault false;
openssh.usePAM = lib.mkDefault false;
};
gnome.enable = lib.mkDefault false;

9
nixosModules/fedfer.nix
View file

@ -1,9 +0,0 @@
#need to move stuff to home-manager
{ pkgs, ... }: {
users.users.fedfer = {
isNormalUser = true;
description = "FedFer";
extraGroups = [ "networkmanager" "wheel" ];
shell = pkgs.zsh;
};
}

11
nixosModules/programs/gnupg.nix Normal file
View file

@ -0,0 +1,11 @@
{ config, lib, ... }: {
options.settings = {
programs.gnupg.enable = lib.mkEnableOption "enable gnuPG";
programs.gnupg.ssh = lib.mkEnableOption "enable gnuPG ssh integration";
};
programs.gnupg.agent = lib.mkIf config.settings.programs.gnupg.enable {
enable = true;
enableSSHSupport = config.settings.programs.gnupg.ssh;
};
}

22
nixosModules/services/openssh.nix Normal file
View file

@ -0,0 +1,22 @@
{ config, lib, ... }: {
options.settings = {
services.openssh.enable = lib.mkEnableOption "enable openSSH";
services.openssh.usePAM = lib.mkEnableOption "use PAM for ssh authentication";
};
#further move these options into settings
config = lib.mkIf config.settings.services.openssh.enable {
services.openssh = {
enable = true;
ports = [ 12342 ];
settings = {
UsePAM = config.settings.services.openssh.usePAM;
PasswordAuthentication = true;
AllowUsers = null;
X11Forwarding = false;
PermitRootLogin = "prohibit-password";
};
};
};
}

16
nixosModules/services/pam.nix Normal file
View file

@ -0,0 +1,16 @@
{ config, lib, ... }: {
options.settings = {
services.pam.enable = lib.mkEnableOption "enables PAM";
services.pam.sshd.useGoogleAuth = lib.mkEnableOption "use pam_google_authenticator.so module";
services.pam.sshd.gnupg = lib.mkEnableOption "enable gnuPG integration";
};
security.pam = lib.mkIf config.settings.services.pam.enable {
services.sshd = {
name = "sshd";
unixAuth = true;
googleAuthenticator.enable = config.settings.services.pam.sshd.useGoogleAuth;
gnupg.enable = config.settings.services.pam.sshd.gnupg;
};
};
}

13
nixosModules/users/fedfer.nix Normal file
View file

@ -0,0 +1,13 @@
#need to move stuff to home-manager
{ pkgs, config, lib, ... }: {
options.settings = {
users.fedfer.enable = lib.mkEnableOption "enables user FedFer";
};
users.users.fedfer = lib.mkIf config.settings.users.fedfer.enable {
isNormalUser = true;
description = "FedFer";
extraGroups = [ "networkmanager" "wheel" ];
shell = pkgs.zsh;
};
}

11
nixosModules/users/veneficium.nix Normal file
View file

@ -0,0 +1,11 @@
{ config, lib, ... }: {
options.settings = {
users.veneficium.enable = lib.mkEnableOption "enables user Veneficium";
};
users.users.veneficium = lib.mkIf config.settings.users.veneficium.enable {
isNormalUser = true;
description = "Veneficium";
extraGroups = [ "networkmanager" "wheel" ];
};
}