refactor

nixos/fuchsia/configuration.nix

@@ -2,15 +2,23 @@
   imports = [
     # Global configuartion for all our systems
     ../common/global
+
     # Our user configuration and optional user units
     ../common/users/sajenim
     ../common/users/sajenim/samba
     ../common/users/sajenim/steam
+
     # Optional components
-    ../common/optional/key.nix
-    # Programs and services
-    ./programs
-    ./services
+    ../common/optional/yubikey.nix
+
+    # Services
+    ./services/amdgpu-clocks
+    ./services/flatpak
+    ./services/libinput
+    ./services/printers
+    ./services/udev
+    ./services/xserver
+
     # Setup our hardware
     ./hardware-configuration.nix
   ];
@@ -21,7 +29,22 @@
     networkmanager.enable = true;
   };
 
-  # Use docker instead of podman for our containers.
+  # Configure programs
+  programs = {
+    zsh.enable = true;
+    # Load and unload environment variables.
+    direnv.enable = true;
+    # Android debug bridge: communicate with devices.
+    adb.enable = true;
+  };
+
+  # Configure services
+  services = {
+    # Access smart cards using SCard API
+    pcscd.enable = true;
+  };
+
+  # Manage linux containers
   virtualisation.docker = {
     enable = true;
     liveRestore = false;

nixos/fuchsia/programs/default.nix

@@ -1,9 +0,0 @@
-{...}: {
-  programs = {
-    zsh.enable = true;
-    # Load and unload environment variables.
-    direnv.enable = true;
-    # Android debug bridge: communicate with devices.
-    adb.enable = true;
-  };
-}

nixos/fuchsia/services/default.nix

@@ -1,15 +0,0 @@
-{...}: {
-  imports = [
-    ./printer
-    ./amdgpu-clocks.nix
-    ./flatpak.nix
-    ./libinput.nix
-    ./udev.nix
-    ./xserver.nix
-  ];
-
-  # Enable a few extra services.
-  services = {
-    pcscd.enable = true;
-  };
-}