Tux: Rename submodules to more closely adhere to the dendritic pattern

modules/hosts/keith/configuration.nix

@@ -7,6 +7,7 @@
         (grub-boot "/dev/nvme0n1")
         development-tools
         i18n-de
+        mount-duke-smb
 
         #TODO: moar aspects
       ];

modules/hosts/tux/devtools.nix

@@ -1,5 +1,5 @@
 { inputs, ... }: {
-  flake.modules.nixos.tux = {
+  flake.modules.nixos.tux-devtools = {
     imports = with inputs.self.modules.nixos;
       with inputs.self.factory; [
         development-tools
@@ -9,7 +9,7 @@
         udev-pio
         udev-lauterbach
 
-        docker
+        (docker [ "weckyy702" ])
       ];
   };
 }

modules/hosts/tux/filesystems.nix

@@ -1,20 +1,18 @@
 {
-	flake.modules.nixos.tux = {
+  flake.modules.nixos.tux-filesystems = {
-  fileSystems."/" =
+    fileSystems."/" = {
-    { device = "/dev/mapper/luks-9d836ef1-a7f9-430f-8fb8-f202f6336e5a";
+      device = "/dev/mapper/luks-9d836ef1-a7f9-430f-8fb8-f202f6336e5a";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" =
+    fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/15FA-55CF";
+      device = "/dev/disk/by-uuid/15FA-55CF";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
-  swapDevices =
+    swapDevices = [
-    [ { device = "/dev/mapper/luks-46e78828-ab23-48b8-8e2a-de7a21adbe24"; }
+      { device = "/dev/mapper/luks-46e78828-ab23-48b8-8e2a-de7a21adbe24"; }
     ];
-
-
   };
 }

modules/hosts/tux/hardware.nix

@@ -1,5 +1,5 @@
 { inputs, ... }: {
-  flake.modules.nixos.tux = {
+  flake.modules.nixos.tux-hardware = {
     imports = with inputs.self.modules.nixos; [
       intel-gpu
     ];

modules/hosts/tux/networking.nix

@@ -1,5 +1,5 @@
-{inputs, ...}: {
+{ inputs, ... }: {
-	flake.modules.nixos.tux = {
+  flake.modules.nixos.tux-networking = {
     imports = with inputs.self.modules.nixos; [
       networkmanager
     ];

modules/hosts/tux/tux.nix

@@ -6,14 +6,19 @@
         systemd-boot
         bluetooth
         i18n-de
-        powermanagement
-
-        (autologin "weckyy702")
-
         home-vpn
         opentablet
-
         appimage
+        powermanagement
+        mount-duke-smb
+        tux-hardware
+        tux-filesystems
+        tux-networking
+        tux-devtools
+
+        tux-weckyy702
+
+        (autologin "weckyy702")
       ];
   };
 }

modules/hosts/tux/users/weckyy702/docker.nix

@@ -1,5 +0,0 @@
-{
-  flake.modules.nixos.tux = {
-    users.users.weckyy702.extraGroups = [ "docker" ];
-  };
-}

modules/hosts/tux/users/weckyy702/mount-nas.nix

@@ -1,16 +0,0 @@
-{ inputs, ... }: {
-  flake.modules.nixos.tux = { config, ... }: {
-    age.secrets."nas-creds".file = "${inputs.secrets}/nas-creds.age";
-
-    imports = with inputs.self.factory; [
-      (mount-cifs {
-        host = "duke.veltnet";
-        resource = "smb-share";
-        destination = "/mnt/nas";
-        credentials_path = "${config.age.secrets.nas-creds.path}";
-        UID = "weckyy702";
-        GID = "users";
-      })
-    ];
-  };
-}

modules/hosts/tux/users/weckyy702/weckyy702.nix

@@ -1,5 +1,5 @@
 { inputs, ... }: {
-  flake.modules.nixos.tux = {
+  flake.modules.nixos.tux-weckyy702 = {
     imports = with inputs.self.modules.nixos; [
       weckyy702
       upower

modules/programs/docker.nix

@@ -1,8 +1,14 @@
 {
-  flake.modules.nixos.docker = {
+  config.flake.factory.docker = users: { lib, ... }: {
     virtualisation.docker = {
       enable = true;
       autoPrune.enable = true;
     };
+    users.users =
+      lib.genAttrs
+        users
+        (_: {
+          extraGroups = [ "docker" ];
+        });
   };
 }

modules/services/mount-duke-smb.nix

@@ -1,5 +1,5 @@
 { inputs, ... }: {
-  flake.modules.nixos.keith = { config, ... }: {
+  flake.modules.nixos.mount-duke-smb = { config, ... }: {
     age.secrets."nas-creds".file = "${inputs.secrets}/nas-creds.age";
 
     imports = with inputs.self.factory; [