diff --git a/hosts/default.nix b/hosts/default.nix index 5281485..52b6b73 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -10,13 +10,10 @@ specialArgs = { inherit inputs self; }; - prependAll = a: b: map (x: a + x) b; - rootPaths = prependAll "${self}/"; - modulePaths = prependAll "${self}/system/"; - profiles = inputs.haumea.lib.load { + systemProfiles = inputs.haumea.lib.load { inputs = {inherit inputs lib;}; - src = "${self}/profiles"; + src = "${self}/systemProfiles"; }; in { flake.colmena = { @@ -33,7 +30,7 @@ in { }; imports = lib.flatten [ ./kidney - (with profiles; [ + (with systemProfiles; [ core.tools core.users core.locale @@ -66,7 +63,7 @@ in { imports = lib.flatten [ ./nixdesk - (with profiles; [ + (with systemProfiles; [ secrets.default secrets.nixdesk.default @@ -131,7 +128,7 @@ in { imports = lib.flatten [ ./hopper - (with profiles; [ + (with systemProfiles; [ secrets.default secrets.hopper.default @@ -151,7 +148,7 @@ in { imports = lib.flatten [ ./liveiso - (with profiles; [ + (with systemProfiles; [ nix.default core.security services.default @@ -162,7 +159,6 @@ in { flake.nixosConfigurations = let l = inputs.nixpkgs.lib; in - ## TODO: make use of nixpkgs.pkgs for per-system pkgs without colmena builtins.mapAttrs (_: v: l.nixosSystem { inherit specialArgs; diff --git a/profiles/core/boot.nix b/systemProfiles/core/boot.nix similarity index 100% rename from profiles/core/boot.nix rename to systemProfiles/core/boot.nix diff --git a/profiles/core/compat.nix b/systemProfiles/core/compat.nix similarity index 100% rename from profiles/core/compat.nix rename to systemProfiles/core/compat.nix diff --git a/profiles/core/default.nix b/systemProfiles/core/default.nix similarity index 100% rename from profiles/core/default.nix rename to systemProfiles/core/default.nix diff --git a/profiles/core/docs.nix b/systemProfiles/core/docs.nix similarity index 100% rename from profiles/core/docs.nix rename to systemProfiles/core/docs.nix diff --git a/profiles/core/gvfs.nix b/systemProfiles/core/gvfs.nix similarity index 100% rename from profiles/core/gvfs.nix rename to systemProfiles/core/gvfs.nix diff --git a/profiles/core/harden.nix b/systemProfiles/core/harden.nix similarity index 100% rename from profiles/core/harden.nix rename to systemProfiles/core/harden.nix diff --git a/profiles/core/locale.nix b/systemProfiles/core/locale.nix similarity index 100% rename from profiles/core/locale.nix rename to systemProfiles/core/locale.nix diff --git a/profiles/core/security.nix b/systemProfiles/core/security.nix similarity index 100% rename from profiles/core/security.nix rename to systemProfiles/core/security.nix diff --git a/profiles/core/ssh.nix b/systemProfiles/core/ssh.nix similarity index 100% rename from profiles/core/ssh.nix rename to systemProfiles/core/ssh.nix diff --git a/profiles/core/tools.nix b/systemProfiles/core/tools.nix similarity index 100% rename from profiles/core/tools.nix rename to systemProfiles/core/tools.nix diff --git a/profiles/core/users.nix b/systemProfiles/core/users.nix similarity index 100% rename from profiles/core/users.nix rename to systemProfiles/core/users.nix diff --git a/profiles/desktop/awesome.nix b/systemProfiles/desktop/awesome.nix similarity index 100% rename from profiles/desktop/awesome.nix rename to systemProfiles/desktop/awesome.nix diff --git a/profiles/desktop/hyprland.nix b/systemProfiles/desktop/hyprland.nix similarity index 100% rename from profiles/desktop/hyprland.nix rename to systemProfiles/desktop/hyprland.nix diff --git a/profiles/desktop/ly.nix b/systemProfiles/desktop/ly.nix similarity index 100% rename from profiles/desktop/ly.nix rename to systemProfiles/desktop/ly.nix diff --git a/profiles/desktop/sway.nix b/systemProfiles/desktop/sway.nix similarity index 100% rename from profiles/desktop/sway.nix rename to systemProfiles/desktop/sway.nix diff --git a/profiles/desktop/x11/default.nix b/systemProfiles/desktop/x11/default.nix similarity index 100% rename from profiles/desktop/x11/default.nix rename to systemProfiles/desktop/x11/default.nix diff --git a/profiles/desktop/x11/nosleep.nix b/systemProfiles/desktop/x11/nosleep.nix similarity index 100% rename from profiles/desktop/x11/nosleep.nix rename to systemProfiles/desktop/x11/nosleep.nix diff --git a/profiles/desktop/x11/xclip.nix b/systemProfiles/desktop/x11/xclip.nix similarity index 100% rename from profiles/desktop/x11/xclip.nix rename to systemProfiles/desktop/x11/xclip.nix diff --git a/profiles/hardware/bluetooth.nix b/systemProfiles/hardware/bluetooth.nix similarity index 100% rename from profiles/hardware/bluetooth.nix rename to systemProfiles/hardware/bluetooth.nix diff --git a/profiles/hardware/graphics.nix b/systemProfiles/hardware/graphics.nix similarity index 100% rename from profiles/hardware/graphics.nix rename to systemProfiles/hardware/graphics.nix diff --git a/profiles/hardware/qmk.nix b/systemProfiles/hardware/qmk.nix similarity index 100% rename from profiles/hardware/qmk.nix rename to systemProfiles/hardware/qmk.nix diff --git a/profiles/hardware/steam-hardware.nix b/systemProfiles/hardware/steam-hardware.nix similarity index 100% rename from profiles/hardware/steam-hardware.nix rename to systemProfiles/hardware/steam-hardware.nix diff --git a/profiles/network/avahi.nix b/systemProfiles/network/avahi.nix similarity index 100% rename from profiles/network/avahi.nix rename to systemProfiles/network/avahi.nix diff --git a/profiles/network/goldberg.nix b/systemProfiles/network/goldberg.nix similarity index 100% rename from profiles/network/goldberg.nix rename to systemProfiles/network/goldberg.nix diff --git a/profiles/network/localsend.nix b/systemProfiles/network/localsend.nix similarity index 100% rename from profiles/network/localsend.nix rename to systemProfiles/network/localsend.nix diff --git a/profiles/network/networkd.nix b/systemProfiles/network/networkd.nix similarity index 100% rename from profiles/network/networkd.nix rename to systemProfiles/network/networkd.nix diff --git a/profiles/network/tailscale.nix b/systemProfiles/network/tailscale.nix similarity index 100% rename from profiles/network/tailscale.nix rename to systemProfiles/network/tailscale.nix diff --git a/profiles/network/wifi.nix b/systemProfiles/network/wifi.nix similarity index 100% rename from profiles/network/wifi.nix rename to systemProfiles/network/wifi.nix diff --git a/profiles/nix/default.nix b/systemProfiles/nix/default.nix similarity index 100% rename from profiles/nix/default.nix rename to systemProfiles/nix/default.nix diff --git a/profiles/nix/gc.nix b/systemProfiles/nix/gc.nix similarity index 100% rename from profiles/nix/gc.nix rename to systemProfiles/nix/gc.nix diff --git a/profiles/nix/substituters.nix b/systemProfiles/nix/substituters.nix similarity index 100% rename from profiles/nix/substituters.nix rename to systemProfiles/nix/substituters.nix diff --git a/profiles/programs/RE/default.nix b/systemProfiles/programs/RE/default.nix similarity index 100% rename from profiles/programs/RE/default.nix rename to systemProfiles/programs/RE/default.nix diff --git a/profiles/programs/RE/il2cppdumper/default.nix b/systemProfiles/programs/RE/il2cppdumper/default.nix similarity index 100% rename from profiles/programs/RE/il2cppdumper/default.nix rename to systemProfiles/programs/RE/il2cppdumper/default.nix diff --git a/profiles/programs/RE/il2cppdumper/deps.nix b/systemProfiles/programs/RE/il2cppdumper/deps.nix similarity index 100% rename from profiles/programs/RE/il2cppdumper/deps.nix rename to systemProfiles/programs/RE/il2cppdumper/deps.nix diff --git a/profiles/programs/RE/ilspy/default.nix b/systemProfiles/programs/RE/ilspy/default.nix similarity index 100% rename from profiles/programs/RE/ilspy/default.nix rename to systemProfiles/programs/RE/ilspy/default.nix diff --git a/profiles/programs/RE/ilspy/deps.nix b/systemProfiles/programs/RE/ilspy/deps.nix similarity index 100% rename from profiles/programs/RE/ilspy/deps.nix rename to systemProfiles/programs/RE/ilspy/deps.nix diff --git a/profiles/programs/adb.nix b/systemProfiles/programs/adb.nix similarity index 100% rename from profiles/programs/adb.nix rename to systemProfiles/programs/adb.nix diff --git a/profiles/programs/default.nix b/systemProfiles/programs/default.nix similarity index 100% rename from profiles/programs/default.nix rename to systemProfiles/programs/default.nix diff --git a/profiles/programs/fonts.nix b/systemProfiles/programs/fonts.nix similarity index 100% rename from profiles/programs/fonts.nix rename to systemProfiles/programs/fonts.nix diff --git a/profiles/programs/gamemode.nix b/systemProfiles/programs/gamemode.nix similarity index 100% rename from profiles/programs/gamemode.nix rename to systemProfiles/programs/gamemode.nix diff --git a/profiles/programs/gamescope.nix b/systemProfiles/programs/gamescope.nix similarity index 100% rename from profiles/programs/gamescope.nix rename to systemProfiles/programs/gamescope.nix diff --git a/profiles/programs/home-manager.nix b/systemProfiles/programs/home-manager.nix similarity index 100% rename from profiles/programs/home-manager.nix rename to systemProfiles/programs/home-manager.nix diff --git a/profiles/programs/qt.nix b/systemProfiles/programs/qt.nix similarity index 100% rename from profiles/programs/qt.nix rename to systemProfiles/programs/qt.nix diff --git a/profiles/programs/steam.nix b/systemProfiles/programs/steam.nix similarity index 100% rename from profiles/programs/steam.nix rename to systemProfiles/programs/steam.nix diff --git a/profiles/programs/tools.nix b/systemProfiles/programs/tools.nix similarity index 100% rename from profiles/programs/tools.nix rename to systemProfiles/programs/tools.nix diff --git a/profiles/programs/zsh.nix b/systemProfiles/programs/zsh.nix similarity index 100% rename from profiles/programs/zsh.nix rename to systemProfiles/programs/zsh.nix diff --git a/profiles/secrets/default.nix b/systemProfiles/secrets/default.nix similarity index 100% rename from profiles/secrets/default.nix rename to systemProfiles/secrets/default.nix diff --git a/profiles/secrets/global/default.nix b/systemProfiles/secrets/global/default.nix similarity index 100% rename from profiles/secrets/global/default.nix rename to systemProfiles/secrets/global/default.nix diff --git a/profiles/secrets/global/tailscale-auth.yaml b/systemProfiles/secrets/global/tailscale-auth.yaml similarity index 100% rename from profiles/secrets/global/tailscale-auth.yaml rename to systemProfiles/secrets/global/tailscale-auth.yaml diff --git a/profiles/secrets/hopper/authelia.yaml b/systemProfiles/secrets/hopper/authelia.yaml similarity index 100% rename from profiles/secrets/hopper/authelia.yaml rename to systemProfiles/secrets/hopper/authelia.yaml diff --git a/profiles/secrets/hopper/betanin b/systemProfiles/secrets/hopper/betanin similarity index 100% rename from profiles/secrets/hopper/betanin rename to systemProfiles/secrets/hopper/betanin diff --git a/profiles/secrets/hopper/brawlstars b/systemProfiles/secrets/hopper/brawlstars similarity index 100% rename from profiles/secrets/hopper/brawlstars rename to systemProfiles/secrets/hopper/brawlstars diff --git a/profiles/secrets/hopper/cloudflare b/systemProfiles/secrets/hopper/cloudflare similarity index 100% rename from profiles/secrets/hopper/cloudflare rename to systemProfiles/secrets/hopper/cloudflare diff --git a/profiles/secrets/hopper/code-server b/systemProfiles/secrets/hopper/code-server similarity index 100% rename from profiles/secrets/hopper/code-server rename to systemProfiles/secrets/hopper/code-server diff --git a/profiles/secrets/hopper/default.nix b/systemProfiles/secrets/hopper/default.nix similarity index 100% rename from profiles/secrets/hopper/default.nix rename to systemProfiles/secrets/hopper/default.nix diff --git a/profiles/secrets/hopper/grafana-pass b/systemProfiles/secrets/hopper/grafana-pass similarity index 100% rename from profiles/secrets/hopper/grafana-pass rename to systemProfiles/secrets/hopper/grafana-pass diff --git a/profiles/secrets/hopper/jackett b/systemProfiles/secrets/hopper/jackett similarity index 100% rename from profiles/secrets/hopper/jackett rename to systemProfiles/secrets/hopper/jackett diff --git a/profiles/secrets/hopper/lldap.yaml b/systemProfiles/secrets/hopper/lldap.yaml similarity index 100% rename from profiles/secrets/hopper/lldap.yaml rename to systemProfiles/secrets/hopper/lldap.yaml diff --git a/profiles/secrets/hopper/serverenv b/systemProfiles/secrets/hopper/serverenv similarity index 100% rename from profiles/secrets/hopper/serverenv rename to systemProfiles/secrets/hopper/serverenv diff --git a/profiles/secrets/hopper/slskd b/systemProfiles/secrets/hopper/slskd similarity index 100% rename from profiles/secrets/hopper/slskd rename to systemProfiles/secrets/hopper/slskd diff --git a/profiles/secrets/hopper/wakapi b/systemProfiles/secrets/hopper/wakapi similarity index 100% rename from profiles/secrets/hopper/wakapi rename to systemProfiles/secrets/hopper/wakapi diff --git a/profiles/secrets/hopper/wireguard b/systemProfiles/secrets/hopper/wireguard similarity index 100% rename from profiles/secrets/hopper/wireguard rename to systemProfiles/secrets/hopper/wireguard diff --git a/profiles/secrets/hopper/wireguard-config b/systemProfiles/secrets/hopper/wireguard-config similarity index 100% rename from profiles/secrets/hopper/wireguard-config rename to systemProfiles/secrets/hopper/wireguard-config diff --git a/profiles/secrets/hopper/wireguard.yaml b/systemProfiles/secrets/hopper/wireguard.yaml similarity index 100% rename from profiles/secrets/hopper/wireguard.yaml rename to systemProfiles/secrets/hopper/wireguard.yaml diff --git a/profiles/secrets/nixdesk/brawlstars b/systemProfiles/secrets/nixdesk/brawlstars similarity index 100% rename from profiles/secrets/nixdesk/brawlstars rename to systemProfiles/secrets/nixdesk/brawlstars diff --git a/profiles/secrets/nixdesk/cloudflare b/systemProfiles/secrets/nixdesk/cloudflare similarity index 100% rename from profiles/secrets/nixdesk/cloudflare rename to systemProfiles/secrets/nixdesk/cloudflare diff --git a/profiles/secrets/nixdesk/default.nix b/systemProfiles/secrets/nixdesk/default.nix similarity index 100% rename from profiles/secrets/nixdesk/default.nix rename to systemProfiles/secrets/nixdesk/default.nix diff --git a/profiles/secrets/nixdesk/samba b/systemProfiles/secrets/nixdesk/samba similarity index 100% rename from profiles/secrets/nixdesk/samba rename to systemProfiles/secrets/nixdesk/samba diff --git a/profiles/secrets/nixdesk/wireguard b/systemProfiles/secrets/nixdesk/wireguard similarity index 100% rename from profiles/secrets/nixdesk/wireguard rename to systemProfiles/secrets/nixdesk/wireguard diff --git a/profiles/secrets/nixdesk/wireguard.yaml b/systemProfiles/secrets/nixdesk/wireguard.yaml similarity index 100% rename from profiles/secrets/nixdesk/wireguard.yaml rename to systemProfiles/secrets/nixdesk/wireguard.yaml diff --git a/profiles/services/containers/experimental/beets.yaml b/systemProfiles/services/containers/experimental/beets.yaml similarity index 100% rename from profiles/services/containers/experimental/beets.yaml rename to systemProfiles/services/containers/experimental/beets.yaml diff --git a/profiles/services/containers/experimental/default.nix b/systemProfiles/services/containers/experimental/default.nix similarity index 100% rename from profiles/services/containers/experimental/default.nix rename to systemProfiles/services/containers/experimental/default.nix diff --git a/profiles/services/containers/experimental/smbshare.nix b/systemProfiles/services/containers/experimental/smbshare.nix similarity index 100% rename from profiles/services/containers/experimental/smbshare.nix rename to systemProfiles/services/containers/experimental/smbshare.nix diff --git a/profiles/services/containers/server/default.nix b/systemProfiles/services/containers/server/default.nix similarity index 100% rename from profiles/services/containers/server/default.nix rename to systemProfiles/services/containers/server/default.nix diff --git a/profiles/services/containers/server/statistics/default.nix b/systemProfiles/services/containers/server/statistics/default.nix similarity index 100% rename from profiles/services/containers/server/statistics/default.nix rename to systemProfiles/services/containers/server/statistics/default.nix diff --git a/profiles/services/containers/server/statistics/loki.yaml b/systemProfiles/services/containers/server/statistics/loki.yaml similarity index 100% rename from profiles/services/containers/server/statistics/loki.yaml rename to systemProfiles/services/containers/server/statistics/loki.yaml diff --git a/profiles/services/default.nix b/systemProfiles/services/default.nix similarity index 100% rename from profiles/services/default.nix rename to systemProfiles/services/default.nix diff --git a/profiles/services/flatpak.nix b/systemProfiles/services/flatpak.nix similarity index 100% rename from profiles/services/flatpak.nix rename to systemProfiles/services/flatpak.nix diff --git a/profiles/services/gnome-services.nix b/systemProfiles/services/gnome-services.nix similarity index 100% rename from profiles/services/gnome-services.nix rename to systemProfiles/services/gnome-services.nix diff --git a/profiles/services/ollama.nix b/systemProfiles/services/ollama.nix similarity index 100% rename from profiles/services/ollama.nix rename to systemProfiles/services/ollama.nix diff --git a/profiles/services/pipewire.nix b/systemProfiles/services/pipewire.nix similarity index 100% rename from profiles/services/pipewire.nix rename to systemProfiles/services/pipewire.nix diff --git a/profiles/services/syncthing.nix b/systemProfiles/services/syncthing.nix similarity index 100% rename from profiles/services/syncthing.nix rename to systemProfiles/services/syncthing.nix diff --git a/profiles/services/virt/distrobox.nix b/systemProfiles/services/virt/distrobox.nix similarity index 100% rename from profiles/services/virt/distrobox.nix rename to systemProfiles/services/virt/distrobox.nix diff --git a/profiles/services/virt/docker.nix b/systemProfiles/services/virt/docker.nix similarity index 100% rename from profiles/services/virt/docker.nix rename to systemProfiles/services/virt/docker.nix diff --git a/profiles/services/virt/podman.nix b/systemProfiles/services/virt/podman.nix similarity index 100% rename from profiles/services/virt/podman.nix rename to systemProfiles/services/virt/podman.nix diff --git a/profiles/services/virt/virt-manager.nix b/systemProfiles/services/virt/virt-manager.nix similarity index 100% rename from profiles/services/virt/virt-manager.nix rename to systemProfiles/services/virt/virt-manager.nix diff --git a/profiles/services/virt/waydroid.nix b/systemProfiles/services/virt/waydroid.nix similarity index 100% rename from profiles/services/virt/waydroid.nix rename to systemProfiles/services/virt/waydroid.nix diff --git a/profiles/services/xdg-portals.nix b/systemProfiles/services/xdg-portals.nix similarity index 100% rename from profiles/services/xdg-portals.nix rename to systemProfiles/services/xdg-portals.nix