From 4d6ba61f52d5ba0f12cfe42484edfcbc4902912c Mon Sep 17 00:00:00 2001 From: Hektor Misplon Date: Wed, 3 Dec 2025 23:43:43 +0100 Subject: [PATCH] refactor: use 'default.nix' for all modules --- hosts/andromache/default.nix | 16 ++++++++-------- hosts/astyanax/default.nix | 12 ++++++------ hosts/vm/default.nix | 10 +++++----- modules/{audio.nix => audio/default.nix} | 1 + modules/{bluetooth.nix => bluetooth/default.nix} | 0 modules/{common.nix => common/default.nix} | 0 modules/{docker.nix => docker/default.nix} | 0 .../default.nix} | 0 .../{networking.nix => networking/default.nix} | 0 modules/{printing.nix => printing/default.nix} | 0 modules/{users.nix => users/default.nix} | 0 modules/{x.nix => x/default.nix} | 0 12 files changed, 20 insertions(+), 19 deletions(-) rename modules/{audio.nix => audio/default.nix} (73%) rename modules/{bluetooth.nix => bluetooth/default.nix} (100%) rename modules/{common.nix => common/default.nix} (100%) rename modules/{docker.nix => docker/default.nix} (100%) rename modules/{localization.nix => localization/default.nix} (100%) rename modules/{networking.nix => networking/default.nix} (100%) rename modules/{printing.nix => printing/default.nix} (100%) rename modules/{users.nix => users/default.nix} (100%) rename modules/{x.nix => x/default.nix} (100%) diff --git a/hosts/andromache/default.nix b/hosts/andromache/default.nix index e3d957b..ba8b36d 100644 --- a/hosts/andromache/default.nix +++ b/hosts/andromache/default.nix @@ -12,24 +12,24 @@ let in { imports = [ - ../../modules/common.nix + ../../modules/common inputs.disko.nixosModules.disko inputs.sops-nix.nixosModules.sops inputs.home-manager.nixosModules.default ./hard.nix - ../../modules/bootloader.nix + ../../modules/boot/bootloader.nix (import ../../modules/disko/zfs-encrypted-root.nix { device = "/dev/nvme1n1"; inherit lib; inherit config; }) ../../modules/desktops/niri - ../../modules/bluetooth.nix + ../../modules/bluetooth ../../modules/keyboard - (import ../../modules/networking.nix { hostName = "andromache"; }) - ../../modules/users.nix - ../../modules/audio.nix - ../../modules/localization.nix + (import ../../modules/networking { hostName = "andromache"; }) + ../../modules/users + ../../modules/audio + ../../modules/localization ../../modules/fonts ../../modules/ssh/hardened-openssh.nix (import ../../modules/secrets { @@ -37,7 +37,7 @@ in inherit inputs; inherit config; }) - ../../modules/docker.nix + ../../modules/docker ]; secrets.username = username; diff --git a/hosts/astyanax/default.nix b/hosts/astyanax/default.nix index cfd2a07..2dd1264 100644 --- a/hosts/astyanax/default.nix +++ b/hosts/astyanax/default.nix @@ -19,19 +19,19 @@ in inputs.sops-nix.nixosModules.sops inputs.home-manager.nixosModules.default ./hard.nix - ../../modules/bootloader.nix + ../../modules/boot/bootloader.nix (import ../../modules/disko/zfs-encrypted-root.nix { inherit lib; inherit config; device = "/dev/nvme0n1"; }) ../../modules/desktops/niri - ../../modules/bluetooth.nix + ../../modules/bluetooth ../../modules/keyboard - (import ../../modules/networking.nix { hostName = hostName; }) - ../../modules/users.nix - ../../modules/audio.nix - ../../modules/localization.nix + (import ../../modules/networking { hostName = hostName; }) + ../../modules/users + ../../modules/audio + ../../modules/localization ../../modules/fonts ../../modules/ssh/hardened-openssh.nix (import ../../modules/secrets { diff --git a/hosts/vm/default.nix b/hosts/vm/default.nix index 2067242..aa8e5c5 100644 --- a/hosts/vm/default.nix +++ b/hosts/vm/default.nix @@ -17,13 +17,13 @@ in inputs.home-manager.nixosModules.default ./hard.nix ./disk.nix - ../../modules/bootloader.nix + ../../modules/boot/bootloader.nix ../../modules/keyboard (import ../../modules/networking.nix { hostName = "vm"; }) - ../../modules/users.nix - ../../modules/audio.nix - ../../modules/localization.nix - ../../modules/x.nix + ../../modules/users + ../../modules/audio + ../../modules/localization + ../../modules/x ../../modules/fonts ../../modules/ssh/hardened-openssh.nix (import ../../modules/secrets { diff --git a/modules/audio.nix b/modules/audio/default.nix similarity index 73% rename from modules/audio.nix rename to modules/audio/default.nix index 54686a2..581fe04 100644 --- a/modules/audio.nix +++ b/modules/audio/default.nix @@ -9,4 +9,5 @@ alsa.support32Bit = true; pulse.enable = true; }; + services.pulseaudio.extraConfig = "load-module module-switch-on-connect"; } diff --git a/modules/bluetooth.nix b/modules/bluetooth/default.nix similarity index 100% rename from modules/bluetooth.nix rename to modules/bluetooth/default.nix diff --git a/modules/common.nix b/modules/common/default.nix similarity index 100% rename from modules/common.nix rename to modules/common/default.nix diff --git a/modules/docker.nix b/modules/docker/default.nix similarity index 100% rename from modules/docker.nix rename to modules/docker/default.nix diff --git a/modules/localization.nix b/modules/localization/default.nix similarity index 100% rename from modules/localization.nix rename to modules/localization/default.nix diff --git a/modules/networking.nix b/modules/networking/default.nix similarity index 100% rename from modules/networking.nix rename to modules/networking/default.nix diff --git a/modules/printing.nix b/modules/printing/default.nix similarity index 100% rename from modules/printing.nix rename to modules/printing/default.nix diff --git a/modules/users.nix b/modules/users/default.nix similarity index 100% rename from modules/users.nix rename to modules/users/default.nix diff --git a/modules/x.nix b/modules/x/default.nix similarity index 100% rename from modules/x.nix rename to modules/x/default.nix