feat: move roles to user imports, not perfect but best so far; remove unused old code

This commit is contained in:
Ahwx 2024-10-21 22:57:35 +02:00
parent c844c5767a
commit e8d7bcda16
2 changed files with 1 additions and 8 deletions

View file

@ -4,7 +4,6 @@
[(import ./bootloader.nix)] [(import ./bootloader.nix)]
++ [(import ./docker.nix)] ++ [(import ./docker.nix)]
++ [(import ./hardware.nix)] ++ [(import ./hardware.nix)]
++ [(import ../../roles)]
++ [(import ./xserver.nix)] ++ [(import ./xserver.nix)]
++ [(import ./network.nix)] ++ [(import ./network.nix)]
++ [(import ./pipewire.nix)] ++ [(import ./pipewire.nix)]

View file

@ -1,6 +1,6 @@
{ pkgs, inputs, config, username, host, ...}: { pkgs, inputs, config, username, host, ...}:
{ {
imports = [ inputs.home-manager.nixosModules.home-manager ]; imports = [ inputs.home-manager.nixosModules.home-manager ] ++ [ ./../../roles ];
home-manager = { home-manager = {
useUserPackages = true; useUserPackages = true;
useGlobalPkgs = true; useGlobalPkgs = true;
@ -22,12 +22,6 @@
}; };
users.users.${username} = { 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; isNormalUser = true;
description = "${username}"; description = "${username}";
extraGroups = [ "networkmanager" "wheel" "docker" ]; extraGroups = [ "networkmanager" "wheel" "docker" ];