From 2754f23f0e7d937210825f282c01e809be3d434c Mon Sep 17 00:00:00 2001 From: Peter Rice Date: Sun, 11 Jan 2026 16:44:44 -0500 Subject: [PATCH] move everything into modules --- flake.nix | 6 +----- modules/{ => desktop}/bluetooth.nix | 0 modules/{ => desktop}/desktop.nix | 0 modules/{ => desktop}/fonts.nix | 0 modules/{ => desktop}/graphical.nix | 0 modules/{ => desktop}/kde.nix | 0 {flake => modules/flake}/appearance.nix | 0 {flake => modules/flake}/default.nix | 0 {flake => modules/flake}/hosts.nix | 0 {flake => modules/flake}/systems.nix | 0 {flake => modules/flake}/vm.nix | 0 {hosts/ruan => modules}/forgejo.nix | 0 {hosts => modules/hosts}/arseille/default.nix | 0 {hosts => modules/hosts}/arseille/system.nix | 0 {hosts => modules/hosts}/crossbell/default.nix | 0 .../hosts}/crossbell/hardware-configuration.nix | 0 {hosts => modules/hosts}/grancel/default.nix | 2 +- {hosts => modules/hosts}/grancel/disks.nix | 0 {hosts => modules/hosts}/grancel/hardware-configuration.nix | 0 {hosts => modules/hosts}/grancel/home.nix | 0 {hosts => modules/hosts}/jurai/default.nix | 0 {hosts => modules/hosts}/jurai/disks.nix | 0 {hosts => modules/hosts}/jurai/hardware-configuration.nix | 0 {hosts => modules/hosts}/macbook.nix | 0 {hosts => modules/hosts}/ruan/default.nix | 0 {hosts => modules/hosts}/ruan/hardware-configuration.nix | 0 {hosts => modules/hosts}/ruan/secrets/_secrets.nix | 0 {hosts => modules/hosts}/ruan/secrets/dns-token.age | 0 .../hosts}/ruan/secrets/miniflux-credentials.age | 0 {hosts => modules/hosts}/ruan/secrets/radicale-users.age | 0 .../hosts}/ruan/secrets/transmission-credentials.json.age | 0 modules/miniflux.nix | 2 +- modules/transmission.nix | 2 +- 33 files changed, 4 insertions(+), 8 deletions(-) rename modules/{ => desktop}/bluetooth.nix (100%) rename modules/{ => desktop}/desktop.nix (100%) rename modules/{ => desktop}/fonts.nix (100%) rename modules/{ => desktop}/graphical.nix (100%) rename modules/{ => desktop}/kde.nix (100%) rename {flake => modules/flake}/appearance.nix (100%) rename {flake => modules/flake}/default.nix (100%) rename {flake => modules/flake}/hosts.nix (100%) rename {flake => modules/flake}/systems.nix (100%) rename {flake => modules/flake}/vm.nix (100%) rename {hosts/ruan => modules}/forgejo.nix (100%) rename {hosts => modules/hosts}/arseille/default.nix (100%) rename {hosts => modules/hosts}/arseille/system.nix (100%) rename {hosts => modules/hosts}/crossbell/default.nix (100%) rename {hosts => modules/hosts}/crossbell/hardware-configuration.nix (100%) rename {hosts => modules/hosts}/grancel/default.nix (96%) rename {hosts => modules/hosts}/grancel/disks.nix (100%) rename {hosts => modules/hosts}/grancel/hardware-configuration.nix (100%) rename {hosts => modules/hosts}/grancel/home.nix (100%) rename {hosts => modules/hosts}/jurai/default.nix (100%) rename {hosts => modules/hosts}/jurai/disks.nix (100%) rename {hosts => modules/hosts}/jurai/hardware-configuration.nix (100%) rename {hosts => modules/hosts}/macbook.nix (100%) rename {hosts => modules/hosts}/ruan/default.nix (100%) rename {hosts => modules/hosts}/ruan/hardware-configuration.nix (100%) rename {hosts => modules/hosts}/ruan/secrets/_secrets.nix (100%) rename {hosts => modules/hosts}/ruan/secrets/dns-token.age (100%) rename {hosts => modules/hosts}/ruan/secrets/miniflux-credentials.age (100%) rename {hosts => modules/hosts}/ruan/secrets/radicale-users.age (100%) rename {hosts => modules/hosts}/ruan/secrets/transmission-credentials.json.age (100%) diff --git a/flake.nix b/flake.nix index 8db4cf7..829f896 100644 --- a/flake.nix +++ b/flake.nix @@ -53,10 +53,6 @@ outputs = inputs@{ flake-parts, import-tree, ... }: flake-parts.lib.mkFlake { inherit inputs; } { - imports = map import-tree [ - ./flake - ./hosts - ./modules - ]; + imports = map import-tree [ ./modules ]; }; } diff --git a/modules/bluetooth.nix b/modules/desktop/bluetooth.nix similarity index 100% rename from modules/bluetooth.nix rename to modules/desktop/bluetooth.nix diff --git a/modules/desktop.nix b/modules/desktop/desktop.nix similarity index 100% rename from modules/desktop.nix rename to modules/desktop/desktop.nix diff --git a/modules/fonts.nix b/modules/desktop/fonts.nix similarity index 100% rename from modules/fonts.nix rename to modules/desktop/fonts.nix diff --git a/modules/graphical.nix b/modules/desktop/graphical.nix similarity index 100% rename from modules/graphical.nix rename to modules/desktop/graphical.nix diff --git a/modules/kde.nix b/modules/desktop/kde.nix similarity index 100% rename from modules/kde.nix rename to modules/desktop/kde.nix diff --git a/flake/appearance.nix b/modules/flake/appearance.nix similarity index 100% rename from flake/appearance.nix rename to modules/flake/appearance.nix diff --git a/flake/default.nix b/modules/flake/default.nix similarity index 100% rename from flake/default.nix rename to modules/flake/default.nix diff --git a/flake/hosts.nix b/modules/flake/hosts.nix similarity index 100% rename from flake/hosts.nix rename to modules/flake/hosts.nix diff --git a/flake/systems.nix b/modules/flake/systems.nix similarity index 100% rename from flake/systems.nix rename to modules/flake/systems.nix diff --git a/flake/vm.nix b/modules/flake/vm.nix similarity index 100% rename from flake/vm.nix rename to modules/flake/vm.nix diff --git a/hosts/ruan/forgejo.nix b/modules/forgejo.nix similarity index 100% rename from hosts/ruan/forgejo.nix rename to modules/forgejo.nix diff --git a/hosts/arseille/default.nix b/modules/hosts/arseille/default.nix similarity index 100% rename from hosts/arseille/default.nix rename to modules/hosts/arseille/default.nix diff --git a/hosts/arseille/system.nix b/modules/hosts/arseille/system.nix similarity index 100% rename from hosts/arseille/system.nix rename to modules/hosts/arseille/system.nix diff --git a/hosts/crossbell/default.nix b/modules/hosts/crossbell/default.nix similarity index 100% rename from hosts/crossbell/default.nix rename to modules/hosts/crossbell/default.nix diff --git a/hosts/crossbell/hardware-configuration.nix b/modules/hosts/crossbell/hardware-configuration.nix similarity index 100% rename from hosts/crossbell/hardware-configuration.nix rename to modules/hosts/crossbell/hardware-configuration.nix diff --git a/hosts/grancel/default.nix b/modules/hosts/grancel/default.nix similarity index 96% rename from hosts/grancel/default.nix rename to modules/hosts/grancel/default.nix index 59d72e9..b65bc2e 100644 --- a/hosts/grancel/default.nix +++ b/modules/hosts/grancel/default.nix @@ -1,4 +1,4 @@ -{ lib, inputs, ... }: +{ inputs, ... }: { local.hosts.grancel = { }; diff --git a/hosts/grancel/disks.nix b/modules/hosts/grancel/disks.nix similarity index 100% rename from hosts/grancel/disks.nix rename to modules/hosts/grancel/disks.nix diff --git a/hosts/grancel/hardware-configuration.nix b/modules/hosts/grancel/hardware-configuration.nix similarity index 100% rename from hosts/grancel/hardware-configuration.nix rename to modules/hosts/grancel/hardware-configuration.nix diff --git a/hosts/grancel/home.nix b/modules/hosts/grancel/home.nix similarity index 100% rename from hosts/grancel/home.nix rename to modules/hosts/grancel/home.nix diff --git a/hosts/jurai/default.nix b/modules/hosts/jurai/default.nix similarity index 100% rename from hosts/jurai/default.nix rename to modules/hosts/jurai/default.nix diff --git a/hosts/jurai/disks.nix b/modules/hosts/jurai/disks.nix similarity index 100% rename from hosts/jurai/disks.nix rename to modules/hosts/jurai/disks.nix diff --git a/hosts/jurai/hardware-configuration.nix b/modules/hosts/jurai/hardware-configuration.nix similarity index 100% rename from hosts/jurai/hardware-configuration.nix rename to modules/hosts/jurai/hardware-configuration.nix diff --git a/hosts/macbook.nix b/modules/hosts/macbook.nix similarity index 100% rename from hosts/macbook.nix rename to modules/hosts/macbook.nix diff --git a/hosts/ruan/default.nix b/modules/hosts/ruan/default.nix similarity index 100% rename from hosts/ruan/default.nix rename to modules/hosts/ruan/default.nix diff --git a/hosts/ruan/hardware-configuration.nix b/modules/hosts/ruan/hardware-configuration.nix similarity index 100% rename from hosts/ruan/hardware-configuration.nix rename to modules/hosts/ruan/hardware-configuration.nix diff --git a/hosts/ruan/secrets/_secrets.nix b/modules/hosts/ruan/secrets/_secrets.nix similarity index 100% rename from hosts/ruan/secrets/_secrets.nix rename to modules/hosts/ruan/secrets/_secrets.nix diff --git a/hosts/ruan/secrets/dns-token.age b/modules/hosts/ruan/secrets/dns-token.age similarity index 100% rename from hosts/ruan/secrets/dns-token.age rename to modules/hosts/ruan/secrets/dns-token.age diff --git a/hosts/ruan/secrets/miniflux-credentials.age b/modules/hosts/ruan/secrets/miniflux-credentials.age similarity index 100% rename from hosts/ruan/secrets/miniflux-credentials.age rename to modules/hosts/ruan/secrets/miniflux-credentials.age diff --git a/hosts/ruan/secrets/radicale-users.age b/modules/hosts/ruan/secrets/radicale-users.age similarity index 100% rename from hosts/ruan/secrets/radicale-users.age rename to modules/hosts/ruan/secrets/radicale-users.age diff --git a/hosts/ruan/secrets/transmission-credentials.json.age b/modules/hosts/ruan/secrets/transmission-credentials.json.age similarity index 100% rename from hosts/ruan/secrets/transmission-credentials.json.age rename to modules/hosts/ruan/secrets/transmission-credentials.json.age diff --git a/modules/miniflux.nix b/modules/miniflux.nix index a833684..ccbf2b2 100644 --- a/modules/miniflux.nix +++ b/modules/miniflux.nix @@ -3,7 +3,7 @@ { config, ... }: { age.secrets."miniflux-credentials" = { - file = ../hosts/ruan/secrets/miniflux-credentials.age; + file = ../modules/hosts/ruan/secrets/miniflux-credentials.age; }; services.miniflux = { diff --git a/modules/transmission.nix b/modules/transmission.nix index d13d66a..6b2e4b8 100644 --- a/modules/transmission.nix +++ b/modules/transmission.nix @@ -3,7 +3,7 @@ { config, pkgs, ... }: { age.secrets."transmission-credentials.json" = { - file = ../hosts/ruan/secrets/transmission-credentials.json.age; + file = ../modules/hosts/ruan/secrets/transmission-credentials.json.age; owner = "transmission"; group = "transmission"; }; -- 2.51.2