refactor: rename modules to nixosModules

This commit is contained in:
Romain Paquet 2026-01-27 14:36:11 +01:00
parent 2eb4dc3730
commit 7062c95697
24 changed files with 21 additions and 8 deletions

View file

@ -93,7 +93,7 @@
module.input = "clan-core"; module.input = "clan-core";
module.name = "importer"; module.name = "importer";
roles.default.tags.garage = { }; roles.default.tags.garage = { };
roles.default.extraModules = [ ../modules/garage.nix ]; roles.default.extraModules = [ self.nixosModules.garage ];
}; };
clan.inventory.instances."trusted-nix-caches" = { clan.inventory.instances."trusted-nix-caches" = {
@ -123,7 +123,7 @@
} }
); );
roles.client.extraModules = [ roles.client.extraModules = [
../modules/storagebox.nix self.nixosModules.storagebox
]; ];
roles.server.machines = { }; roles.server.machines = { };
}; };

View file

@ -17,7 +17,7 @@
./devShells/flake-module.nix ./devShells/flake-module.nix
./homeModules/flake-module.nix ./homeModules/flake-module.nix
./infra/flake-module.nix ./infra/flake-module.nix
./modules/flake-module.nix ./nixosModules/flake-module.nix
./packages/flake-module.nix ./packages/flake-module.nix
./flakeModules/flake-module.nix ./flakeModules/flake-module.nix
]; ];

View file

@ -6,7 +6,7 @@
imports = [ imports = [
self.nixosModules.radicle self.nixosModules.radicle
self.nixosModules.nix-defaults self.nixosModules.nix-defaults
../../modules/remote-builder.nix self.nixosModules.remote-builder
self.inputs.srvos.nixosModules.server self.inputs.srvos.nixosModules.server
self.inputs.srvos.nixosModules.hardware-hetzner-cloud self.inputs.srvos.nixosModules.hardware-hetzner-cloud
]; ];

View file

@ -1,6 +1,7 @@
{ self, ... }:
{ {
imports = [ imports = [
../../modules/remote-builder.nix self.nixosModules.remote-builder
]; ];
roles.remote-builder = { roles.remote-builder = {

View file

@ -17,8 +17,7 @@
./pinchflat.nix ./pinchflat.nix
./syncthing.nix ./syncthing.nix
../../modules/acme-home.nix self.nixosModules.lounge
../../modules/lounge.nix
self.nixosModules.nix-defaults self.nixosModules.nix-defaults
self.nixosModules.user-rpqt self.nixosModules.user-rpqt

View file

@ -6,7 +6,7 @@ let
in in
{ {
imports = [ imports = [
./storagebox.nix self.nixosModules.storagebox
self.inputs.clan-core.clanModules.borgbackup self.inputs.clan-core.clanModules.borgbackup
]; ];

View file

@ -25,8 +25,21 @@
terminal = "ghostty"; terminal = "ghostty";
}; };
# services.yubikey-agent.enable = true;
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3;
services.pcscd.enable = true; services.pcscd.enable = true;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
};
hardware.bluetooth.enable = true;
services.displayManager = { services.displayManager = {
sddm.enable = true; sddm.enable = true;
sddm.wayland.enable = true; sddm.wayland.enable = true;