mirror of
https://github.com/Ahwxorg/nixos-config.git
synced 2025-12-04 15:00:13 +01:00
chore: merge configs
This commit is contained in:
commit
c4d7eb051d
21 changed files with 448 additions and 1226 deletions
|
|
@ -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
7
modules/core/docker.nix
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
{ ... }:
|
||||
{
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
enableOnBoot = false;
|
||||
};
|
||||
}
|
||||
|
|
@ -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}" ];
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue