chore: merge configs

This commit is contained in:
Ahwx 2024-10-07 21:36:05 +02:00
commit c4d7eb051d
21 changed files with 448 additions and 1226 deletions

View file

@ -1,8 +1,9 @@
{ ... }:
{
imports =
# [(import ./bootloader.nix)]
[(import ./hardware.nix)]
[(import ./bootloader.nix)]
++ [(import ./docker.nix)] # enable docker support
++ [(import ./hardware.nix)]
++ [(import ./xserver.nix)]
++ [(import ./network.nix)]
++ [(import ./pipewire.nix)]

7
modules/core/docker.nix Normal file
View file

@ -0,0 +1,7 @@
{ ... }:
{
virtualisation.docker = {
enable = true;
enableOnBoot = false;
};
}

View file

@ -1,4 +1,4 @@
{ pkgs, inputs, username, host, ...}:
{ pkgs, inputs, config, username, host, ...}:
{
imports = [ inputs.home-manager.nixosModules.home-manager ];
home-manager = {
@ -22,9 +22,15 @@
};
users.users.${username} = {
# extraGroups = if (config.virtualisation.docker.enable == true) then
# [ "networkmanager" "wheel" "docker" ]
# else
# [ "networkmanager" "wheel" ];
# if (config.virtualisation.docker.enable = true) then
# extraGroups = [ "docker" ];
isNormalUser = true;
description = "${username}";
extraGroups = [ "networkmanager" "wheel" ];
extraGroups = [ "networkmanager" "wheel" "docker" ];
shell = pkgs.zsh;
};
nix.settings.allowed-users = [ "${username}" ];

View file

@ -16,9 +16,16 @@
greetd.u2fAuth = true;
sudo.u2fAuth = true;
hyprlock.u2fAuth = true;
swaylock.fprintAuth = true;
hyprlock.fprintAuth = true;
# pam.services.swaylock = {}; # Already enabled
};
};
services = {
fprintd.enable = true;
};
environment.systemPackages = with pkgs; [
yubikey-manager
];