wip

flake.nix

@@ -55,13 +55,12 @@
       system = "x86_64-linux";
       modules = baseModules ++ [
         ./machines/boxy/configuration.nix
-        # inputs.home-manager.nixosModules.home-manager
-        # {
-        #   home-manager.users.johno = import ./home/home-default.nix;
-        #   home-manager.extraSpecialArgs.customPkgs =
-        #     nixpkgs.legacyPackages."${system}".callPackage ./packages {};
-        #     customPkgs = nixpkgs.legacyPackages."${system}".callPackage ./packages {};
-        # }
+        inputs.home-manager.nixosModules.home-manager
+        {
+          home-manager.users.johno = import ./home/home-default.nix;
+          home-manager.extraSpecialArgs.customPkgs =
+            nixpkgs.legacyPackages."${system}".callPackage ./packages {};
+        }
       ];
     };
   };

machines/boxy/configuration.nix

@@ -17,8 +17,9 @@ with lib;
     kodi = {
       enable = true;
       autologin = true;
-      wayland = false;
+      wayland = true;
     };
+    users.enable = true;
   };
 
   # Use the systemd-boot EFI boot loader.
@@ -29,7 +30,7 @@ with lib;
 
   hardware.graphics.enable = true;
 
-  #services.displayManager.enable = mkForce false;
+  services.displayManager.enable = mkForce false;
 
   # This option defines the first version of NixOS you have installed on this particular machine,
   # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.

roles/audio/default.nix

@@ -10,7 +10,7 @@ in
     enable = mkEnableOption "Enable the audio role";
   };
 
-  config =
+  config = mkIf cfg.enable
     {
       environment.systemPackages = with pkgs; [
         paprefs

roles/bluetooth/default.nix

@@ -10,7 +10,7 @@ in
     enable = mkEnableOption "Enable the bluetooth role";
   };
 
-  config =
+  config = mkIf cfg.enable
     {
       hardware.bluetooth.enable = true;
       hardware.bluetooth.powerOnBoot = true;

roles/kodi/default.nix

@@ -25,39 +25,47 @@ in
       steam-library
       youtube
     ]);
-  in {
-    users.extraUsers.kodi.isNormalUser = true;
+  in mkIf cfg.enable
+    {
+      users.extraUsers.kodi.isNormalUser = true;
 
-    networking.firewall = {
-      allowedTCPPorts = [ 8080 ];
-      allowedUDPPorts = [ 8080 ];
+      networking.firewall = {
+        allowedTCPPorts = [ 8080 ];
+        allowedUDPPorts = [ 8080 ];
+      };
+
+      services = if cfg.autologin then mkMerge [
+        mkIf cfg.wayland {
+          cage = mkIf cfg.wayland {
+            user = "kodi";
+            program = "${kodiPkg}/bin/kodi-standalone";
+            enable = true;
+          };
+          xserver = {
+            enable = false;
+            autorun = false;
+          };
+        }
+
+        mkIf (!cfg.wayland) {
+          xserver = {
+            enable = true;
+            desktopManager.kodi = {
+              enable = true;
+              package = kodiPkg;
+            };
+            displayManager.lightdm = {
+              enable = true;
+              greeter.enable = false;
+            };
+          };
+          displayManager = {
+            autoLogin.enable = true;
+            autoLogin.user = "kodi";
+            defaultSession = "kodi";
+            sessionData.autologinSession = "kodi";
+          };
+        }
+      ] else {};
     };
-
-    services = mkIf cfg.autologin {
-      cage = mkIf cfg.wayland {
-        user = "kodi";
-        program = "${kodiPkg}/bin/kodi-standalone";
-        enable = true;
-      };
-
-      xserver = mkIf (!cfg.wayland) {
-        enable = true;
-        desktopManager.kodi = {
-          enable = true;
-          package = kodiPkg;
-        };
-        displayManager.lightdm = {
-          enable = true;
-          greeter.enable = false;
-        };
-	displayManager.sddm.enable = mkForce false;
-      };
-      displayManager = mkIf (!cfg.wayland) {
-        autoLogin.enable = true;
-        autoLogin.user = "kodi";
-        defaultSession = "kodi";
-        sessionData.autologinSession = "kodi";
-      };
-    };
-  };
 }

roles/nfs-mounts/default.nix

@@ -16,15 +16,16 @@ in
     };
   };
 
-  config = {
-    fileSystems."/media" = {
-      device = "10.0.0.43:/media";
-      fsType = "nfs";
-      options = [
-        "defaults"
-        "nofail"
-        "softreval"
-      ];
+  config = mkIf cfg.enable
+    {
+      fileSystems."/media" = {
+        device = "10.0.0.43:/media";
+        fsType = "nfs";
+        options = [
+          "defaults"
+          "nofail"
+          "softreval"
+        ];
+      };
     };
-  };
 }

roles/printing/default.nix

@@ -2,18 +2,22 @@
 
 with lib;
 
+let
+  cfg = config.roles.printing;
+in
 {
   options.roles.printing = {
     enable = mkEnableOption "Enable default printing setup";
   };
 
-  config = {
-    services.printing.enable = true;
+  config = mkIf cfg.enable
+    {
+      services.printing.enable = true;
 
-    services.avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true;
+      services.avahi = {
+        enable = true;
+        nssmdns4 = true;
+        openFirewall = true;
+      };
     };
-  };
 }

roles/spotifyd/default.nix

@@ -10,30 +10,31 @@ in
     enable = mkEnableOption "Enable the spotifyd role";
   };
 
-  config = {
-    roles.audio.enable = true;
+  config = mkIf cfg.enable
+    {
+      roles.audio.enable = true;
 
-    services.spotifyd = {
-      enable = true;
-      settings = {
-        global = {
-          use_mpris = false;
-          backend = "alsa";
-          device = "sysdefault";
-          bitrate = 320;
-          cache_path = "";
-          zeroconf_port = 1234;
-          autoplay = false;
+      services.spotifyd = {
+        enable = true;
+        settings = {
+          global = {
+            use_mpris = false;
+            backend = "alsa";
+            device = "sysdefault";
+            bitrate = 320;
+            cache_path = "";
+            zeroconf_port = 1234;
+            autoplay = false;
+          };
         };
       };
-    };
 
-    networking.firewall.allowedTCPPorts = [
-      1234
-      57621
-    ];
-    networking.firewall.allowedUDPPorts = [
-      5353
-    ];
-  };
+      networking.firewall.allowedTCPPorts = [
+        1234
+        57621
+      ];
+      networking.firewall.allowedUDPPorts = [
+        5353
+      ];
+    };
 }

roles/users/default.nix

@@ -21,7 +21,7 @@ in
     kidsPackages = with pkgs; [
       firefox
     ];
-  in {
+  in mkIf cfg.enable {
     users.users.johno = {
       isNormalUser = true;
       description = "John Ogle";

roles/virtualisation/default.nix

@@ -2,13 +2,17 @@
 
 with lib;
 
+let
+  cfg = config.roles.virtualisation;
+in
 {
   options.roles.virtualisation = {
     enable = mkEnableOption "Enable virtualisation";
   };
 
-  config = {
-    virtualisation.libvirtd.enable = true;
-    programs.virt-manager.enable = true;
-  };
+  config = mkIf cfg.enable
+    {
+      virtualisation.libvirtd.enable = true;
+      programs.virt-manager.enable = true;
+    };
 }