dentritic refactor

modules/nixos/services/appimage/default.nix

@@ -1,8 +0,0 @@
-{ ... }:
-
-{
-  programs.appimage = {
-    enable = true;
-    binfmt = true;
-  };
-}

modules/nixos/services/default.nix

@@ -1,15 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./appimage
-    ./flatpak
-    ./fwupd
-    ./kde_connect
-    ./ollama
-    ./performance
-    ./printing
-    ./security
-    ./ssh
-  ];
-}

modules/nixos/services/flatpak/default.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  services.flatpak.enable = true;
-}

modules/nixos/services/fwupd/default.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  services.fwupd.enable = true;
-}

modules/nixos/services/kde_connect/default.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  programs.kdeconnect.enable = true;
-}

modules/nixos/services/ollama/default.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  services.ollama.enable = true;
-}

modules/nixos/services/performance/default.nix

@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-  services.irqbalance.enable = true;
-  services.power-profiles-daemon.enable = true;
-  services.upower.enable = true;
-}

modules/nixos/services/printing/default.nix

@@ -1,28 +0,0 @@
-{ pkgs, ... }:
-
-{
-  services.printing = {
-    enable = true;
-    drivers = [
-      pkgs.cnijfilter2
-      pkgs.gutenprint
-      pkgs.gutenprintBin
-    ];
-  };
-
-  services.avahi = {
-    enable = true;
-    nssmdns4 = true;
-    openFirewall = true;
-    publish = {
-      enable = true;
-      addresses = true;
-      userServices = true;
-    };
-  };
-
-  hardware.sane = {
-    enable = true;
-    extraBackends = [ pkgs.sane-airscan ];
-  };
-}

modules/nixos/services/security/default.nix

@@ -1,19 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = false;
-  };
-
-  security.wrappers = {
-    gsr-kms-server = {
-      source = "${pkgs.gpu-screen-recorder}/bin/gsr-kms-server";
-      owner = "root";
-      group = "root";
-      permissions = "u+rx,g+rx,o+rx";
-    };
-  };
-
-  services.gnome.gnome-keyring.enable = true;
-}

modules/nixos/services/service-appimage.ulu.nix

@@ -0,0 +1,11 @@
+{ ... }:
+{
+  flake.nixosModules.service-appimage =
+    { ... }:
+    {
+      programs.appimage = {
+        enable = true;
+        binfmt = true;
+      };
+    };
+}

modules/nixos/services/service-docker.ulu.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  flake.nixosModules.service-docker =
+    { ... }:
+    {
+      virtualisation.docker.enable = true;
+    };
+}

modules/nixos/services/service-flatpak.ulu.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  flake.nixosModules.service-flatpak =
+    { ... }:
+    {
+      services.flatpak.enable = true;
+    };
+}

modules/nixos/services/service-fwupd.ulu.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  flake.nixosModules.service-fwupd =
+    { ... }:
+    {
+      services.fwupd.enable = true;
+    };
+}

modules/nixos/services/service-kde-connect.ulu.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  flake.nixosModules.service-kde-connect =
+    { ... }:
+    {
+      programs.kdeconnect.enable = true;
+    };
+}

modules/nixos/services/service-ollama.ulu.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  flake.nixosModules.service-ollama =
+    { ... }:
+    {
+      services.ollama.enable = true;
+    };
+}

modules/nixos/services/service-performance.ulu.nix

@@ -0,0 +1,10 @@
+{ ... }:
+{
+  flake.nixosModules.service-performance =
+    { ... }:
+    {
+      services.irqbalance.enable = true;
+      services.power-profiles-daemon.enable = true;
+      services.upower.enable = true;
+    };
+}

modules/nixos/services/service-printing.ulu.nix

@@ -0,0 +1,31 @@
+{ ... }:
+{
+  flake.nixosModules.service-printing =
+    { pkgs, ... }:
+    {
+      services.printing = {
+        enable = true;
+        drivers = [
+          pkgs.cnijfilter2
+          pkgs.gutenprint
+          pkgs.gutenprintBin
+        ];
+      };
+
+      services.avahi = {
+        enable = true;
+        nssmdns4 = true;
+        openFirewall = true;
+        publish = {
+          enable = true;
+          addresses = true;
+          userServices = true;
+        };
+      };
+
+      hardware.sane = {
+        enable = true;
+        extraBackends = [ pkgs.sane-airscan ];
+      };
+    };
+}

modules/nixos/services/service-security.ulu.nix

@@ -0,0 +1,22 @@
+{ ... }:
+{
+  flake.nixosModules.service-security =
+    { pkgs, ... }:
+    {
+      programs.gnupg.agent = {
+        enable = true;
+        enableSSHSupport = false;
+      };
+
+      security.wrappers = {
+        gsr-kms-server = {
+          source = "${pkgs.gpu-screen-recorder}/bin/gsr-kms-server";
+          owner = "root";
+          group = "root";
+          permissions = "u+rx,g+rx,o+rx";
+        };
+      };
+
+      services.gnome.gnome-keyring.enable = true;
+    };
+}

modules/nixos/services/service-ssh.ulu.nix

@@ -0,0 +1,9 @@
+{ ... }:
+{
+  flake.nixosModules.service-ssh =
+    { ... }:
+    {
+      services.openssh.enable = true;
+      services.tailscale.enable = true;
+    };
+}

modules/nixos/services/service-virt-manager.ulu.nix

@@ -0,0 +1,9 @@
+{ ... }:
+{
+  flake.nixosModules.service-virt-manager =
+    { ... }:
+    {
+      virtualisation.libvirtd.enable = true;
+      programs.virt-manager.enable = true;
+    };
+}

modules/nixos/services/ssh/default.nix

@@ -1,6 +0,0 @@
-{ ... }:
-
-{
-  services.openssh.enable = true;
-  services.tailscale.enable = true;
-}