From 32a23931eb2a1847c3e5bce4f0487a4e77f43115 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Tue, 29 Sep 2026 01:11:45 +1000 Subject: [PATCH] tweak: tidied modules --- modules/features/{ => media}/gaming.nix | 0 modules/features/{ => media}/multimedia.nix | 0 modules/features/{ => media}/music.nix | 0 .../features/{ => security}/network-proxy.nix | 0 .../{ => security}/virtualisation.nix | 0 modules/hosts/hades/default.nix | 2 -- modules/hosts/live-usb/installer-config.nix | 36 ------------------- modules/hosts/{live-usb => usb}/default.nix | 0 modules/{features => system}/zfs.nix | 0 modules/users/{test.nix => test-user.nix} | 0 10 files changed, 38 deletions(-) rename modules/features/{ => media}/gaming.nix (100%) rename modules/features/{ => media}/multimedia.nix (100%) rename modules/features/{ => media}/music.nix (100%) rename modules/features/{ => security}/network-proxy.nix (100%) rename modules/features/{ => security}/virtualisation.nix (100%) delete mode 100644 modules/hosts/live-usb/installer-config.nix rename modules/hosts/{live-usb => usb}/default.nix (100%) rename modules/{features => system}/zfs.nix (100%) rename modules/users/{test.nix => test-user.nix} (100%) diff --git a/modules/features/gaming.nix b/modules/features/media/gaming.nix similarity index 100% rename from modules/features/gaming.nix rename to modules/features/media/gaming.nix diff --git a/modules/features/multimedia.nix b/modules/features/media/multimedia.nix similarity index 100% rename from modules/features/multimedia.nix rename to modules/features/media/multimedia.nix diff --git a/modules/features/music.nix b/modules/features/media/music.nix similarity index 100% rename from modules/features/music.nix rename to modules/features/media/music.nix diff --git a/modules/features/network-proxy.nix b/modules/features/security/network-proxy.nix similarity index 100% rename from modules/features/network-proxy.nix rename to modules/features/security/network-proxy.nix diff --git a/modules/features/virtualisation.nix b/modules/features/security/virtualisation.nix similarity index 100% rename from modules/features/virtualisation.nix rename to modules/features/security/virtualisation.nix diff --git a/modules/hosts/hades/default.nix b/modules/hosts/hades/default.nix index d906af5..c6468f5 100644 --- a/modules/hosts/hades/default.nix +++ b/modules/hosts/hades/default.nix @@ -19,8 +19,6 @@ hades-hardware zfs-hades - installer - # feature modules virtualisation network-proxy diff --git a/modules/hosts/live-usb/installer-config.nix b/modules/hosts/live-usb/installer-config.nix deleted file mode 100644 index 91cc24b..0000000 --- a/modules/hosts/live-usb/installer-config.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ self, inputs, ... }: - -{ - - # install helper module - flake.nixosModules.installer = - - { lib, pkgs, ... }: - - { - - # for home manager functionality - imports = [ inputs.home-manager.nixosModules.home-manager ]; - - # custom calamares - environment.systemPackages = with pkgs; [ - calamares-nixos - calamares-nixos-extensions - ]; - - # home-manager.users.serenity = { - - # home.file."flake-repo" = { - # source = fetchGit { - # url = "https://codeberg.org/serenity-F/SerenityOS.git"; - # # sha256 = sha; - # }; - # target = "/home/serenity/flake-repo"; - # recursive = true; - # }; - - # }; - - }; - -} diff --git a/modules/hosts/live-usb/default.nix b/modules/hosts/usb/default.nix similarity index 100% rename from modules/hosts/live-usb/default.nix rename to modules/hosts/usb/default.nix diff --git a/modules/features/zfs.nix b/modules/system/zfs.nix similarity index 100% rename from modules/features/zfs.nix rename to modules/system/zfs.nix diff --git a/modules/users/test.nix b/modules/users/test-user.nix similarity index 100% rename from modules/users/test.nix rename to modules/users/test-user.nix