willemml/dotfiles.nix
1
0
Fork 0
mirror of https://github.com/willemml/dotfiles.nix.git synced 2025-04-12 11:17:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Disables flake-parts/nixos/modules.nix autoloading

Browse source
This commit is contained in:
willemml 2023-11-06 11:54:10 -08:00
parent 2ed67013bd
commit d5528d06bd
Signed by: willemml
GPG key ID: C3DE5DF6198DACBD
3 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake-parts/nixos/hosts.nix
View file

@ -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

40
flake-parts/nixos/modules.nix
View file

@ -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;
};
};
}

2
nixos/profiles/linux/base.nix
View file

@ -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"
];