refactor: use 'default.nix' for all modules

This commit is contained in:
2025-12-03 23:43:43 +01:00
parent 683e6e4d10
commit 4d6ba61f52
12 changed files with 20 additions and 19 deletions

View File

@@ -12,24 +12,24 @@ let
in in
{ {
imports = [ imports = [
../../modules/common.nix ../../modules/common
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
./hard.nix ./hard.nix
../../modules/bootloader.nix ../../modules/boot/bootloader.nix
(import ../../modules/disko/zfs-encrypted-root.nix { (import ../../modules/disko/zfs-encrypted-root.nix {
device = "/dev/nvme1n1"; device = "/dev/nvme1n1";
inherit lib; inherit lib;
inherit config; inherit config;
}) })
../../modules/desktops/niri ../../modules/desktops/niri
../../modules/bluetooth.nix ../../modules/bluetooth
../../modules/keyboard ../../modules/keyboard
(import ../../modules/networking.nix { hostName = "andromache"; }) (import ../../modules/networking { hostName = "andromache"; })
../../modules/users.nix ../../modules/users
../../modules/audio.nix ../../modules/audio
../../modules/localization.nix ../../modules/localization
../../modules/fonts ../../modules/fonts
../../modules/ssh/hardened-openssh.nix ../../modules/ssh/hardened-openssh.nix
(import ../../modules/secrets { (import ../../modules/secrets {
@@ -37,7 +37,7 @@ in
inherit inputs; inherit inputs;
inherit config; inherit config;
}) })
../../modules/docker.nix ../../modules/docker
]; ];
secrets.username = username; secrets.username = username;

View File

@@ -19,19 +19,19 @@ in
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
./hard.nix ./hard.nix
../../modules/bootloader.nix ../../modules/boot/bootloader.nix
(import ../../modules/disko/zfs-encrypted-root.nix { (import ../../modules/disko/zfs-encrypted-root.nix {
inherit lib; inherit lib;
inherit config; inherit config;
device = "/dev/nvme0n1"; device = "/dev/nvme0n1";
}) })
../../modules/desktops/niri ../../modules/desktops/niri
../../modules/bluetooth.nix ../../modules/bluetooth
../../modules/keyboard ../../modules/keyboard
(import ../../modules/networking.nix { hostName = hostName; }) (import ../../modules/networking { hostName = hostName; })
../../modules/users.nix ../../modules/users
../../modules/audio.nix ../../modules/audio
../../modules/localization.nix ../../modules/localization
../../modules/fonts ../../modules/fonts
../../modules/ssh/hardened-openssh.nix ../../modules/ssh/hardened-openssh.nix
(import ../../modules/secrets { (import ../../modules/secrets {

View File

@@ -17,13 +17,13 @@ in
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
./hard.nix ./hard.nix
./disk.nix ./disk.nix
../../modules/bootloader.nix ../../modules/boot/bootloader.nix
../../modules/keyboard ../../modules/keyboard
(import ../../modules/networking.nix { hostName = "vm"; }) (import ../../modules/networking.nix { hostName = "vm"; })
../../modules/users.nix ../../modules/users
../../modules/audio.nix ../../modules/audio
../../modules/localization.nix ../../modules/localization
../../modules/x.nix ../../modules/x
../../modules/fonts ../../modules/fonts
../../modules/ssh/hardened-openssh.nix ../../modules/ssh/hardened-openssh.nix
(import ../../modules/secrets { (import ../../modules/secrets {

View File

@@ -9,4 +9,5 @@
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
}; };
services.pulseaudio.extraConfig = "load-module module-switch-on-connect";
} }