diff --git a/flake-parts/nixos/hosts.nix b/flake-parts/nixos/hosts.nix index da732b4..10effd5 100644 --- a/flake-parts/nixos/hosts.nix +++ b/flake-parts/nixos/hosts.nix @@ -4,7 +4,7 @@ ... }: { flake = { - nixosModules.base = {...}: { + nixosModules.base = {config, ...}: { imports = [ ../../nixos/profiles/common.nix ../../nixos/profiles/linux/base.nix @@ -17,7 +17,7 @@ home-manager.users.willem = self.homeManagerModules.user-willem-linux; }; - nixosModules.willem-home = {...}: { + nixosModules.willem-home = {config, ...}: { imports = [ inputs.home-manager.nixosModules.home-manager self.nixosModules.home-manager-integration @@ -25,7 +25,7 @@ home-manager.users.willem = self.homeManagerModules.user-willem-linux; }; - darwinModules.base = {...}: { + darwinModules.base = {config, ...}: { imports = [ ../../nixos/profiles/common.nix inputs.home-manager.darwinModules.home-manager diff --git a/flake-parts/nixos/modules.nix b/flake-parts/nixos/modules.nix index 20448eb..4b99fe5 100644 --- a/flake-parts/nixos/modules.nix +++ b/flake-parts/nixos/modules.nix @@ -7,31 +7,25 @@ inputs, ... }: { - flake.nixosModules = let - modules = self.lib.importDirToAttrs ../../nixos/modules; - in - { - default = { - imports = builtins.attrValues modules; - }; + flake.nixosModules = { + default = {}; - appleSilicon = {config, ...}: { - imports = [inputs.nixos-apple-silicon.nixosModules.apple-silicon-support]; - nixpkgs.overlays = [inputs.nixos-apple-silicon.overlays.default]; - }; + appleSilicon = {config, ...}: { + imports = [inputs.nixos-apple-silicon.nixosModules.apple-silicon-support]; + nixpkgs.overlays = [inputs.nixos-apple-silicon.overlays.default]; + }; - nixpkgs-useFlakeNixpkgs = { - nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"]; - nix.registry.nixpkgs.flake = inputs.nixpkgs; - }; + nixpkgs-useFlakeNixpkgs = { + nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"]; + nix.registry.nixpkgs.flake = inputs.nixpkgs; + }; - home-manager-integration = { - config.home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - backupFileExtension = "bak"; - }; + home-manager-integration = { + config.home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + backupFileExtension = "bak"; }; - } - // modules; + }; + }; } diff --git a/nixos/profiles/linux/base.nix b/nixos/profiles/linux/base.nix index a7bbb1a..a780cbc 100644 --- a/nixos/profiles/linux/base.nix +++ b/nixos/profiles/linux/base.nix @@ -22,7 +22,7 @@ users.users.willem = { isNormalUser = true; - extraGroups = ["networkmanager" "wheel"]; + extraGroups = ["networkmanager" "wheel" "video" "udev"]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBx1z962nl87rmOk/vw3EBSgqU/VlCqON8zTeLHQcSBp willem@zeus" ];