[kodi] Add wayland option

machines/boxy/configuration.nix

@@ -8,7 +8,10 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ../../roles/common/default.nix
       ../../roles/nix/default.nix
+      (import ../../roles/kodi/default.nix { autologin = true; wayland = true; inherit lib; inherit pkgs; })
+      (import ../../roles/users/default.nix { extraGroups = []; })
     ];
 
   # Use the systemd-boot EFI boot loader.
@@ -16,93 +19,8 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   networking.hostName = "boxy"; # Define your hostname.
-  # Pick only one of the below networking options.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
 
-  # Set your time zone.
-  # time.timeZone = "Europe/Amsterdam";
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Select internationalisation properties.
-  # i18n.defaultLocale = "en_US.UTF-8";
-  # console = {
-  #   font = "Lat2-Terminus16";
-  #   keyMap = "us";
-  #   useXkbConfig = true; # use xkb.options in tty.
-  # };
-
-  # Enable the X11 windowing system.
-  # services.xserver.enable = true;
-
-
-  
-
-  # Configure keymap in X11
-  # services.xserver.xkb.layout = "us";
-  # services.xserver.xkb.options = "eurosign:e,caps:escape";
-
-  # Enable CUPS to print documents.
-  # services.printing.enable = true;
-
-  # Enable sound.
-  # hardware.pulseaudio.enable = true;
-  # OR
-  # services.pipewire = {
-  #   enable = true;
-  #   pulse.enable = true;
-  # };
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  # users.users.alice = {
-  #   isNormalUser = true;
-  #   extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-  #   packages = with pkgs; [
-  #     firefox
-  #     tree
-  #   ];
-  # };
-  users.users.johno = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" ];
-  };
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  # environment.systemPackages = with pkgs; [
-  #   vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-  #   wget
-  # ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # Copy the NixOS configuration file and link it from the resulting system
-  # (/run/current-system/configuration.nix). This is useful in case you
-  # accidentally delete configuration.nix.
-  # system.copySystemConfiguration = true;
+  hardware.graphics.enable = true;
 
   # 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.

machines/z790prors/configuration.nix

@@ -11,7 +11,7 @@
       ../../roles/common/default.nix
       (import ../../roles/desktop/default.nix { x11Only = true; inherit inputs; inherit pkgs; })
       ../../roles/kids/default.nix
-      (import ../../roles/kodi/default.nix { autologin = false; inherit lib; inherit pkgs; })
+      (import ../../roles/kodi/default.nix { autologin = false; wayland = false; inherit lib; inherit pkgs; })
       ../../roles/nfs-mounts/default.nix
       ../../roles/nix/default.nix
       ../../roles/printing/default.nix

roles/common/default.nix

@@ -17,6 +17,11 @@
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
 
+  services.pipewire = {
+    enable = true;
+    pulse.enable = true;
+  };
+
   environment.systemPackages = with pkgs; [
     vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     git

roles/kodi/default.nix

@@ -1,12 +1,17 @@
-{ autologin ? false, pkgs, ... }:
+{ autologin ? false, wayland ? false, lib, pkgs, ... }:
 
+with lib;
+
+let
+  kodiBasePkg = if wayland then pkgs.kodi-wayland else pkgs.kodi;
+  kodiPkg = kodiBasePkg.withPackages (pkgs: with pkgs; [
+    jellyfin
+    steam-launcher
+    steam-library
+    youtube
+  ]);
+in
 {
-  services.xserver.desktopManager.kodi = {
-    enable = true;
-    package = pkgs.kodi.withPackages (pkgs: with pkgs; [
-      jellyfin
-    ]);
-  };
   users.extraUsers.kodi.isNormalUser = true;
 
   networking.firewall = {
@@ -14,13 +19,29 @@
     allowedUDPPorts = [ 8080 ];
   };
 
-  services.displayManager = if autologin then {
-    autoLogin.enable = true;
-    autoLogin.user = "kodi";
-    defaultSession = "kodi";
-  } else {};
-  services.xserver.displayManager = if autologin then {
-    lightdm.enable = true;
-    lightdm.greeter.enable = false;
-  } else {};
+  services = mkIf autologin {
+    cage = mkIf wayland {
+      user = "kodi";
+      program = "${kodiPkg}/bin/kodi-standalone";
+      enable = true;
+    };
+
+    xserver = mkIf (!wayland) {
+      enable = true;
+      desktopManager.kodi = {
+        enable = true;
+        package = kodiPkg;
+      };
+      displayManager.lightdm = {
+        enable = true;
+        greeter.enable = false;
+      };
+    };
+    displayManager = mkIf (!wayland) {
+      autoLogin.enable = true;
+      autoLogin.user = "kodi";
+      defaultSession = "kodi";
+      sessionData.autologinSession = "kodi";
+    };
+  };
 }