diff --git a/Justfile b/Justfile index f358520..f5109a5 100644 --- a/Justfile +++ b/Justfile @@ -14,11 +14,11 @@ updatekeys: fd . systemProfiles/secrets -E '*.nix' -t f -x sops updatekeys -remote OPERATION HOST HOSTNAME *FLAGS: +remote OPERATION HOST REMOTEHOST *FLAGS: nixos-rebuild \ --fast \ --flake .#{{HOST}} \ - --target-host xun@{{HOSTNAME}} \ + --target-host {{REMOTEHOST}} \ --use-remote-sudo \ {{FLAGS}} \ {{OPERATION}} diff --git a/home/programs/browsers/firefox/default.nix b/home/programs/browsers/firefox/default.nix index da34c9d..5ad0420 100644 --- a/home/programs/browsers/firefox/default.nix +++ b/home/programs/browsers/firefox/default.nix @@ -95,7 +95,7 @@ "browser.aboutConfig.showWarning" = false; # Warning when opening about:config # "media.videocontrols.picture-in-picture.video-toggle.enabled" = false; "extensions.autoDisableScopes" = "0"; # Automatically enable extensions - "extensions.pocket.enabled" = true; # i actually use pocket + # "extensions.pocket.enabled" = true; "extensions.shield-recipe-client.enabled" = false; #"reader.parse-on-load.enabled" = false; # "reader view" diff --git a/hosts/machines/default.nix b/hosts/machines/default.nix index dc506a4..908efae 100644 --- a/hosts/machines/default.nix +++ b/hosts/machines/default.nix @@ -11,10 +11,11 @@ inherit inputs self; }; - systemProfiles = inputs.haumea.lib.load { + source = inputs.haumea.lib.load { inputs = {inherit inputs lib;}; - src = "${self}/systemProfiles"; + src = "${self}/nix"; }; + systemProfiles = source.systemProfiles; in { flake.colmena = { meta = { @@ -151,12 +152,13 @@ in { core.locale core.tools core.ssh + core.deploy nix.default # TODO slim this down network.tailscale network.avahi network.networkd - services.syncthing + # services.syncthing # TODO make syncthing not rely on having "xun" user #network.avahi #network.networkd diff --git a/hosts/machines/hopper/newlab.nix b/hosts/machines/hopper/newlab.nix index 3cfcbd6..a9fdab8 100644 --- a/hosts/machines/hopper/newlab.nix +++ b/hosts/machines/hopper/newlab.nix @@ -18,6 +18,12 @@ in { ## TODO use impermanence ## TODO setup fail2ban mayb + users.groups.media = {}; + users.users.media = { + isSystemUser = true; + group = "media"; + }; + security.acme = { acceptTerms = true; defaults.email = "xunuwu@gmail.com"; @@ -264,7 +270,8 @@ in { { targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" - # "127.0.0.1:${toString config.services.prometheus.exporters.nextcloud.port}" + "127.0.0.1:${toString config.services.prometheus.exporters.systemd.port}" + # "127.0.0.1:${toString config.services.prometheus.exporters.wireguard.port}" ]; } ]; @@ -277,6 +284,11 @@ in { enable = true; enabledCollectors = ["systemd"]; }; + systemd.enable = true; + # wireguard = { + # enable = true; + # wireguardConfig = config.sops.secrets.wireguard.path; + # }; # nextcloud = { # enable = true; # tokenFile = config.sops.secrets."prometheus/nextcloud".path; @@ -294,6 +306,7 @@ in { environmentFile = config.sops.secrets.slskd.path; domain = null; # why isnt this the default? settings = { + remote_file_management = true; shares.directories = ["/media/library/music"]; soulseek = { listen_port = 14794; @@ -337,7 +350,7 @@ in { users.users.xun = { isSystemUser = true; group = "xun"; - extraGroups = ["transmission" "vault"]; + extraGroups = ["transmission" "vault" "media"]; }; users.groups.vault = {}; @@ -353,12 +366,10 @@ in { "log file" = "/var/log/samba/samba.log"; "server string" = config.networking.hostName; "hosts allow" = "192.168.50.0/24"; - "hosts deny" = "0.0.0.0/0"; - "guest account" = "nobody"; "map to guest" = "bad user"; }; transmission = { - path = "/var/lib/transmission/Downloads"; + path = "/var/lib/transmission"; browseable = "yes"; "read only" = "yes"; "guest ok" = "no"; @@ -372,6 +383,28 @@ in { "guest ok" = "no"; "create mask" = "0660"; "directory mask" = "0770"; + "force user" = "xun"; + "force group" = "xun"; + }; + slskd = { + path = "/var/lib/slskd"; + browseable = "yes"; + "read only" = "no"; + "guest ok" = "no"; + "create mask" = "0660"; + "directory mask" = "0770"; + "force user" = "slskd"; + "force group" = "slskd"; + }; + library = { + path = "media/library"; + browseable = "yes"; + "read only" = "no"; + "guest ok" = "no"; + "create mask" = "0666"; + "directory mask" = "0777"; + "force user" = "media"; + "force group" = "media"; }; }; }; diff --git a/nix/sshKeys/xun_nixdesk.nix b/nix/sshKeys/xun_nixdesk.nix new file mode 100644 index 0000000..496a064 --- /dev/null +++ b/nix/sshKeys/xun_nixdesk.nix @@ -0,0 +1 @@ +"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKqW5ZkBV2XCdF/ZhwC1DOfrgiLxCC2ym6BO7miHi05M xun@nixdesk" diff --git a/systemProfiles/core/boot.nix b/nix/systemProfiles/core/boot.nix similarity index 100% rename from systemProfiles/core/boot.nix rename to nix/systemProfiles/core/boot.nix diff --git a/systemProfiles/core/compat.nix b/nix/systemProfiles/core/compat.nix similarity index 100% rename from systemProfiles/core/compat.nix rename to nix/systemProfiles/core/compat.nix diff --git a/nix/systemProfiles/core/deploy.nix b/nix/systemProfiles/core/deploy.nix new file mode 100644 index 0000000..62e998c --- /dev/null +++ b/nix/systemProfiles/core/deploy.nix @@ -0,0 +1,24 @@ +{ + self, + super, + root, +}: {lib, ...}: { + nix.settings.trusted-users = ["deploy"]; # trust closures created by our user + + users.groups.deploy = {}; + users.users.deploy = { + isSystemUser = true; + useDefaultShell = true; + group = "deploy"; + extraGroups = ["wheel"]; + + hashedPassword = lib.mkForce null; + hashedPasswordFile = lib.mkForce null; + password = lib.mkForce null; + passwordFile = lib.mkForce null; + + openssh.authorizedKeys.keys = with root.sshKeys; [ + xun_nixdesk + ]; + }; +} diff --git a/systemProfiles/core/docs.nix b/nix/systemProfiles/core/docs.nix similarity index 100% rename from systemProfiles/core/docs.nix rename to nix/systemProfiles/core/docs.nix diff --git a/systemProfiles/core/gvfs.nix b/nix/systemProfiles/core/gvfs.nix similarity index 100% rename from systemProfiles/core/gvfs.nix rename to nix/systemProfiles/core/gvfs.nix diff --git a/systemProfiles/core/harden.nix b/nix/systemProfiles/core/harden.nix similarity index 100% rename from systemProfiles/core/harden.nix rename to nix/systemProfiles/core/harden.nix diff --git a/systemProfiles/core/locale.nix b/nix/systemProfiles/core/locale.nix similarity index 100% rename from systemProfiles/core/locale.nix rename to nix/systemProfiles/core/locale.nix diff --git a/systemProfiles/core/security.nix b/nix/systemProfiles/core/security.nix similarity index 100% rename from systemProfiles/core/security.nix rename to nix/systemProfiles/core/security.nix diff --git a/systemProfiles/core/ssh.nix b/nix/systemProfiles/core/ssh.nix similarity index 100% rename from systemProfiles/core/ssh.nix rename to nix/systemProfiles/core/ssh.nix diff --git a/systemProfiles/core/tools.nix b/nix/systemProfiles/core/tools.nix similarity index 100% rename from systemProfiles/core/tools.nix rename to nix/systemProfiles/core/tools.nix diff --git a/systemProfiles/core/users.nix b/nix/systemProfiles/core/users.nix similarity index 100% rename from systemProfiles/core/users.nix rename to nix/systemProfiles/core/users.nix diff --git a/systemProfiles/desktop/awesome.nix b/nix/systemProfiles/desktop/awesome.nix similarity index 100% rename from systemProfiles/desktop/awesome.nix rename to nix/systemProfiles/desktop/awesome.nix diff --git a/systemProfiles/desktop/hyprland.nix b/nix/systemProfiles/desktop/hyprland.nix similarity index 100% rename from systemProfiles/desktop/hyprland.nix rename to nix/systemProfiles/desktop/hyprland.nix diff --git a/systemProfiles/desktop/ly.nix b/nix/systemProfiles/desktop/ly.nix similarity index 100% rename from systemProfiles/desktop/ly.nix rename to nix/systemProfiles/desktop/ly.nix diff --git a/systemProfiles/desktop/sway.nix b/nix/systemProfiles/desktop/sway.nix similarity index 100% rename from systemProfiles/desktop/sway.nix rename to nix/systemProfiles/desktop/sway.nix diff --git a/systemProfiles/desktop/x11/default.nix b/nix/systemProfiles/desktop/x11/default.nix similarity index 100% rename from systemProfiles/desktop/x11/default.nix rename to nix/systemProfiles/desktop/x11/default.nix diff --git a/systemProfiles/desktop/x11/nosleep.nix b/nix/systemProfiles/desktop/x11/nosleep.nix similarity index 100% rename from systemProfiles/desktop/x11/nosleep.nix rename to nix/systemProfiles/desktop/x11/nosleep.nix diff --git a/systemProfiles/desktop/x11/xclip.nix b/nix/systemProfiles/desktop/x11/xclip.nix similarity index 100% rename from systemProfiles/desktop/x11/xclip.nix rename to nix/systemProfiles/desktop/x11/xclip.nix diff --git a/systemProfiles/hardware/bluetooth.nix b/nix/systemProfiles/hardware/bluetooth.nix similarity index 100% rename from systemProfiles/hardware/bluetooth.nix rename to nix/systemProfiles/hardware/bluetooth.nix diff --git a/systemProfiles/hardware/graphics.nix b/nix/systemProfiles/hardware/graphics.nix similarity index 100% rename from systemProfiles/hardware/graphics.nix rename to nix/systemProfiles/hardware/graphics.nix diff --git a/systemProfiles/hardware/qmk.nix b/nix/systemProfiles/hardware/qmk.nix similarity index 100% rename from systemProfiles/hardware/qmk.nix rename to nix/systemProfiles/hardware/qmk.nix diff --git a/systemProfiles/hardware/steam-hardware.nix b/nix/systemProfiles/hardware/steam-hardware.nix similarity index 100% rename from systemProfiles/hardware/steam-hardware.nix rename to nix/systemProfiles/hardware/steam-hardware.nix diff --git a/systemProfiles/network/avahi.nix b/nix/systemProfiles/network/avahi.nix similarity index 100% rename from systemProfiles/network/avahi.nix rename to nix/systemProfiles/network/avahi.nix diff --git a/systemProfiles/network/goldberg.nix b/nix/systemProfiles/network/goldberg.nix similarity index 100% rename from systemProfiles/network/goldberg.nix rename to nix/systemProfiles/network/goldberg.nix diff --git a/systemProfiles/network/localsend.nix b/nix/systemProfiles/network/localsend.nix similarity index 100% rename from systemProfiles/network/localsend.nix rename to nix/systemProfiles/network/localsend.nix diff --git a/systemProfiles/network/networkd.nix b/nix/systemProfiles/network/networkd.nix similarity index 100% rename from systemProfiles/network/networkd.nix rename to nix/systemProfiles/network/networkd.nix diff --git a/systemProfiles/network/tailscale.nix b/nix/systemProfiles/network/tailscale.nix similarity index 100% rename from systemProfiles/network/tailscale.nix rename to nix/systemProfiles/network/tailscale.nix diff --git a/systemProfiles/network/wifi.nix b/nix/systemProfiles/network/wifi.nix similarity index 100% rename from systemProfiles/network/wifi.nix rename to nix/systemProfiles/network/wifi.nix diff --git a/systemProfiles/nix/default.nix b/nix/systemProfiles/nix/default.nix similarity index 100% rename from systemProfiles/nix/default.nix rename to nix/systemProfiles/nix/default.nix diff --git a/systemProfiles/nix/gc.nix b/nix/systemProfiles/nix/gc.nix similarity index 100% rename from systemProfiles/nix/gc.nix rename to nix/systemProfiles/nix/gc.nix diff --git a/systemProfiles/nix/substituters.nix b/nix/systemProfiles/nix/substituters.nix similarity index 100% rename from systemProfiles/nix/substituters.nix rename to nix/systemProfiles/nix/substituters.nix diff --git a/systemProfiles/programs/RE/default.nix b/nix/systemProfiles/programs/RE/default.nix similarity index 100% rename from systemProfiles/programs/RE/default.nix rename to nix/systemProfiles/programs/RE/default.nix diff --git a/systemProfiles/programs/RE/il2cppdumper/default.nix b/nix/systemProfiles/programs/RE/il2cppdumper/default.nix similarity index 100% rename from systemProfiles/programs/RE/il2cppdumper/default.nix rename to nix/systemProfiles/programs/RE/il2cppdumper/default.nix diff --git a/systemProfiles/programs/RE/il2cppdumper/deps.nix b/nix/systemProfiles/programs/RE/il2cppdumper/deps.nix similarity index 100% rename from systemProfiles/programs/RE/il2cppdumper/deps.nix rename to nix/systemProfiles/programs/RE/il2cppdumper/deps.nix diff --git a/systemProfiles/programs/RE/ilspy/default.nix b/nix/systemProfiles/programs/RE/ilspy/default.nix similarity index 100% rename from systemProfiles/programs/RE/ilspy/default.nix rename to nix/systemProfiles/programs/RE/ilspy/default.nix diff --git a/systemProfiles/programs/RE/ilspy/deps.nix b/nix/systemProfiles/programs/RE/ilspy/deps.nix similarity index 100% rename from systemProfiles/programs/RE/ilspy/deps.nix rename to nix/systemProfiles/programs/RE/ilspy/deps.nix diff --git a/systemProfiles/programs/adb.nix b/nix/systemProfiles/programs/adb.nix similarity index 100% rename from systemProfiles/programs/adb.nix rename to nix/systemProfiles/programs/adb.nix diff --git a/systemProfiles/programs/dconf.nix b/nix/systemProfiles/programs/dconf.nix similarity index 100% rename from systemProfiles/programs/dconf.nix rename to nix/systemProfiles/programs/dconf.nix diff --git a/systemProfiles/programs/fonts.nix b/nix/systemProfiles/programs/fonts.nix similarity index 100% rename from systemProfiles/programs/fonts.nix rename to nix/systemProfiles/programs/fonts.nix diff --git a/systemProfiles/programs/gamemode.nix b/nix/systemProfiles/programs/gamemode.nix similarity index 100% rename from systemProfiles/programs/gamemode.nix rename to nix/systemProfiles/programs/gamemode.nix diff --git a/systemProfiles/programs/gamescope.nix b/nix/systemProfiles/programs/gamescope.nix similarity index 100% rename from systemProfiles/programs/gamescope.nix rename to nix/systemProfiles/programs/gamescope.nix diff --git a/systemProfiles/programs/home-manager.nix b/nix/systemProfiles/programs/home-manager.nix similarity index 100% rename from systemProfiles/programs/home-manager.nix rename to nix/systemProfiles/programs/home-manager.nix diff --git a/systemProfiles/programs/qt.nix b/nix/systemProfiles/programs/qt.nix similarity index 100% rename from systemProfiles/programs/qt.nix rename to nix/systemProfiles/programs/qt.nix diff --git a/systemProfiles/programs/steam.nix b/nix/systemProfiles/programs/steam.nix similarity index 100% rename from systemProfiles/programs/steam.nix rename to nix/systemProfiles/programs/steam.nix diff --git a/systemProfiles/programs/thunar.nix b/nix/systemProfiles/programs/thunar.nix similarity index 100% rename from systemProfiles/programs/thunar.nix rename to nix/systemProfiles/programs/thunar.nix diff --git a/systemProfiles/programs/tools.nix b/nix/systemProfiles/programs/tools.nix similarity index 100% rename from systemProfiles/programs/tools.nix rename to nix/systemProfiles/programs/tools.nix diff --git a/systemProfiles/programs/zsh.nix b/nix/systemProfiles/programs/zsh.nix similarity index 100% rename from systemProfiles/programs/zsh.nix rename to nix/systemProfiles/programs/zsh.nix diff --git a/systemProfiles/secrets/default.nix b/nix/systemProfiles/secrets/default.nix similarity index 100% rename from systemProfiles/secrets/default.nix rename to nix/systemProfiles/secrets/default.nix diff --git a/systemProfiles/secrets/global/default.nix b/nix/systemProfiles/secrets/global/default.nix similarity index 100% rename from systemProfiles/secrets/global/default.nix rename to nix/systemProfiles/secrets/global/default.nix diff --git a/systemProfiles/secrets/global/tailscale-auth.yaml b/nix/systemProfiles/secrets/global/tailscale-auth.yaml similarity index 100% rename from systemProfiles/secrets/global/tailscale-auth.yaml rename to nix/systemProfiles/secrets/global/tailscale-auth.yaml diff --git a/systemProfiles/secrets/hopper/authelia.yaml b/nix/systemProfiles/secrets/hopper/authelia.yaml similarity index 100% rename from systemProfiles/secrets/hopper/authelia.yaml rename to nix/systemProfiles/secrets/hopper/authelia.yaml diff --git a/systemProfiles/secrets/hopper/betanin b/nix/systemProfiles/secrets/hopper/betanin similarity index 100% rename from systemProfiles/secrets/hopper/betanin rename to nix/systemProfiles/secrets/hopper/betanin diff --git a/systemProfiles/secrets/hopper/brawlstars b/nix/systemProfiles/secrets/hopper/brawlstars similarity index 100% rename from systemProfiles/secrets/hopper/brawlstars rename to nix/systemProfiles/secrets/hopper/brawlstars diff --git a/systemProfiles/secrets/hopper/cloudflare b/nix/systemProfiles/secrets/hopper/cloudflare similarity index 100% rename from systemProfiles/secrets/hopper/cloudflare rename to nix/systemProfiles/secrets/hopper/cloudflare diff --git a/systemProfiles/secrets/hopper/code-server b/nix/systemProfiles/secrets/hopper/code-server similarity index 100% rename from systemProfiles/secrets/hopper/code-server rename to nix/systemProfiles/secrets/hopper/code-server diff --git a/systemProfiles/secrets/hopper/default.nix b/nix/systemProfiles/secrets/hopper/default.nix similarity index 100% rename from systemProfiles/secrets/hopper/default.nix rename to nix/systemProfiles/secrets/hopper/default.nix diff --git a/systemProfiles/secrets/hopper/grafana-pass b/nix/systemProfiles/secrets/hopper/grafana-pass similarity index 100% rename from systemProfiles/secrets/hopper/grafana-pass rename to nix/systemProfiles/secrets/hopper/grafana-pass diff --git a/systemProfiles/secrets/hopper/jackett b/nix/systemProfiles/secrets/hopper/jackett similarity index 100% rename from systemProfiles/secrets/hopper/jackett rename to nix/systemProfiles/secrets/hopper/jackett diff --git a/systemProfiles/secrets/hopper/lldap.yaml b/nix/systemProfiles/secrets/hopper/lldap.yaml similarity index 100% rename from systemProfiles/secrets/hopper/lldap.yaml rename to nix/systemProfiles/secrets/hopper/lldap.yaml diff --git a/systemProfiles/secrets/hopper/serverenv b/nix/systemProfiles/secrets/hopper/serverenv similarity index 100% rename from systemProfiles/secrets/hopper/serverenv rename to nix/systemProfiles/secrets/hopper/serverenv diff --git a/systemProfiles/secrets/hopper/slskd b/nix/systemProfiles/secrets/hopper/slskd similarity index 100% rename from systemProfiles/secrets/hopper/slskd rename to nix/systemProfiles/secrets/hopper/slskd diff --git a/systemProfiles/secrets/hopper/transmission b/nix/systemProfiles/secrets/hopper/transmission similarity index 100% rename from systemProfiles/secrets/hopper/transmission rename to nix/systemProfiles/secrets/hopper/transmission diff --git a/systemProfiles/secrets/hopper/wakapi b/nix/systemProfiles/secrets/hopper/wakapi similarity index 100% rename from systemProfiles/secrets/hopper/wakapi rename to nix/systemProfiles/secrets/hopper/wakapi diff --git a/systemProfiles/secrets/hopper/wireguard b/nix/systemProfiles/secrets/hopper/wireguard similarity index 100% rename from systemProfiles/secrets/hopper/wireguard rename to nix/systemProfiles/secrets/hopper/wireguard diff --git a/systemProfiles/secrets/hopper/wireguard-config b/nix/systemProfiles/secrets/hopper/wireguard-config similarity index 100% rename from systemProfiles/secrets/hopper/wireguard-config rename to nix/systemProfiles/secrets/hopper/wireguard-config diff --git a/systemProfiles/secrets/hopper/wireguard.yaml b/nix/systemProfiles/secrets/hopper/wireguard.yaml similarity index 100% rename from systemProfiles/secrets/hopper/wireguard.yaml rename to nix/systemProfiles/secrets/hopper/wireguard.yaml diff --git a/systemProfiles/secrets/nixdesk/brawlstars b/nix/systemProfiles/secrets/nixdesk/brawlstars similarity index 100% rename from systemProfiles/secrets/nixdesk/brawlstars rename to nix/systemProfiles/secrets/nixdesk/brawlstars diff --git a/systemProfiles/secrets/nixdesk/cloudflare b/nix/systemProfiles/secrets/nixdesk/cloudflare similarity index 100% rename from systemProfiles/secrets/nixdesk/cloudflare rename to nix/systemProfiles/secrets/nixdesk/cloudflare diff --git a/systemProfiles/secrets/nixdesk/default.nix b/nix/systemProfiles/secrets/nixdesk/default.nix similarity index 100% rename from systemProfiles/secrets/nixdesk/default.nix rename to nix/systemProfiles/secrets/nixdesk/default.nix diff --git a/systemProfiles/secrets/nixdesk/samba b/nix/systemProfiles/secrets/nixdesk/samba similarity index 100% rename from systemProfiles/secrets/nixdesk/samba rename to nix/systemProfiles/secrets/nixdesk/samba diff --git a/systemProfiles/secrets/nixdesk/wireguard b/nix/systemProfiles/secrets/nixdesk/wireguard similarity index 100% rename from systemProfiles/secrets/nixdesk/wireguard rename to nix/systemProfiles/secrets/nixdesk/wireguard diff --git a/systemProfiles/secrets/nixdesk/wireguard.yaml b/nix/systemProfiles/secrets/nixdesk/wireguard.yaml similarity index 100% rename from systemProfiles/secrets/nixdesk/wireguard.yaml rename to nix/systemProfiles/secrets/nixdesk/wireguard.yaml diff --git a/systemProfiles/services/containers/experimental/beets.yaml b/nix/systemProfiles/services/containers/experimental/beets.yaml similarity index 100% rename from systemProfiles/services/containers/experimental/beets.yaml rename to nix/systemProfiles/services/containers/experimental/beets.yaml diff --git a/systemProfiles/services/containers/experimental/default.nix b/nix/systemProfiles/services/containers/experimental/default.nix similarity index 100% rename from systemProfiles/services/containers/experimental/default.nix rename to nix/systemProfiles/services/containers/experimental/default.nix diff --git a/systemProfiles/services/containers/experimental/smbshare.nix b/nix/systemProfiles/services/containers/experimental/smbshare.nix similarity index 100% rename from systemProfiles/services/containers/experimental/smbshare.nix rename to nix/systemProfiles/services/containers/experimental/smbshare.nix diff --git a/systemProfiles/services/containers/server/default.nix b/nix/systemProfiles/services/containers/server/default.nix similarity index 100% rename from systemProfiles/services/containers/server/default.nix rename to nix/systemProfiles/services/containers/server/default.nix diff --git a/systemProfiles/services/containers/server/statistics/default.nix b/nix/systemProfiles/services/containers/server/statistics/default.nix similarity index 100% rename from systemProfiles/services/containers/server/statistics/default.nix rename to nix/systemProfiles/services/containers/server/statistics/default.nix diff --git a/systemProfiles/services/containers/server/statistics/loki.yaml b/nix/systemProfiles/services/containers/server/statistics/loki.yaml similarity index 100% rename from systemProfiles/services/containers/server/statistics/loki.yaml rename to nix/systemProfiles/services/containers/server/statistics/loki.yaml diff --git a/systemProfiles/services/default.nix b/nix/systemProfiles/services/default.nix similarity index 100% rename from systemProfiles/services/default.nix rename to nix/systemProfiles/services/default.nix diff --git a/systemProfiles/services/flatpak.nix b/nix/systemProfiles/services/flatpak.nix similarity index 100% rename from systemProfiles/services/flatpak.nix rename to nix/systemProfiles/services/flatpak.nix diff --git a/systemProfiles/services/gnome-services.nix b/nix/systemProfiles/services/gnome-services.nix similarity index 100% rename from systemProfiles/services/gnome-services.nix rename to nix/systemProfiles/services/gnome-services.nix diff --git a/systemProfiles/services/ollama.nix b/nix/systemProfiles/services/ollama.nix similarity index 100% rename from systemProfiles/services/ollama.nix rename to nix/systemProfiles/services/ollama.nix diff --git a/systemProfiles/services/pipewire.nix b/nix/systemProfiles/services/pipewire.nix similarity index 100% rename from systemProfiles/services/pipewire.nix rename to nix/systemProfiles/services/pipewire.nix diff --git a/systemProfiles/services/syncthing.nix b/nix/systemProfiles/services/syncthing.nix similarity index 100% rename from systemProfiles/services/syncthing.nix rename to nix/systemProfiles/services/syncthing.nix diff --git a/systemProfiles/services/virt/distrobox.nix b/nix/systemProfiles/services/virt/distrobox.nix similarity index 100% rename from systemProfiles/services/virt/distrobox.nix rename to nix/systemProfiles/services/virt/distrobox.nix diff --git a/systemProfiles/services/virt/docker.nix b/nix/systemProfiles/services/virt/docker.nix similarity index 100% rename from systemProfiles/services/virt/docker.nix rename to nix/systemProfiles/services/virt/docker.nix diff --git a/systemProfiles/services/virt/podman.nix b/nix/systemProfiles/services/virt/podman.nix similarity index 100% rename from systemProfiles/services/virt/podman.nix rename to nix/systemProfiles/services/virt/podman.nix diff --git a/systemProfiles/services/virt/virt-manager.nix b/nix/systemProfiles/services/virt/virt-manager.nix similarity index 100% rename from systemProfiles/services/virt/virt-manager.nix rename to nix/systemProfiles/services/virt/virt-manager.nix diff --git a/systemProfiles/services/virt/waydroid.nix b/nix/systemProfiles/services/virt/waydroid.nix similarity index 100% rename from systemProfiles/services/virt/waydroid.nix rename to nix/systemProfiles/services/virt/waydroid.nix diff --git a/systemProfiles/services/xdg-portals.nix b/nix/systemProfiles/services/xdg-portals.nix similarity index 100% rename from systemProfiles/services/xdg-portals.nix rename to nix/systemProfiles/services/xdg-portals.nix diff --git a/systemProfiles/themes/dark.nix b/nix/systemProfiles/themes/dark.nix similarity index 100% rename from systemProfiles/themes/dark.nix rename to nix/systemProfiles/themes/dark.nix diff --git a/systemProfiles/core/default.nix b/systemProfiles/core/default.nix deleted file mode 100644 index e6101a5..0000000 --- a/systemProfiles/core/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - self, - super, - root, -}: { - imports = [ - super.security - super.users - super.ssh - super.locale - root.nix.default - root.programs.zsh - ]; -}