[flake] update

Need to find some better way of doing this so that it works across
home-manager-only installations as well as nixos home manager module
installations.

.goosehints

@@ -0,0 +1,22 @@
+NixOS Configurations Repository
+================================
+
+Overview:
+---------
+This repository hosts modular and reproducible NixOS configurations managed via Nix flakes. It is structured to separate concerns across machine-specific setups, common roles, and custom packages.
+
+Directory Structure:
+----------------------
+• secrets/       - Confidential data (passwords, keys, etc.) required for system configuration.
+• packages/      - Custom Nix packages leveraged across various configurations.
+• roles/         - Role-based configurations (e.g., kodi, bluetooth) each with its own module (default.nix) for inclusion in machine setups.
+• machines/      - Machine-specific configurations (e.g., nix-book, z790prors, boxy, wixos) including configuration.nix and hardware-configuration.nix tailored for each hardware.
+• home/          - Home-manager configurations for personal environments and application settings (e.g., home-nix-book.nix, home-z790prors.nix).
+
+Design Principles:
+------------------
+• Modularity: Clear separation between roles, machines, and packages allows for flexible and reusable configurations.
+• Declarative & Reproducible: Using Nix flakes guarantees a fully declarative setup that can be effortlessly reproduced across systems.
+• Scalability: The structure is designed to accommodate adding new roles or machines with minimal disruption to existing configurations.
+
+This file serves as a concise guide for navigating and understanding the repository from an advanced Nix perspective. Further documentation can be found within the respective directories or individual README files where applicable.

flake.lock

@@ -3,11 +3,11 @@
     "doomemacs": {
       "flake": false,
       "locked": {
-        "lastModified": 1736881038,
-        "narHash": "sha256-i0GVHWoIqDcFB9JmEdd9T+qxrEx3ckBlPfTD/yLoNyg=",
+        "lastModified": 1742013576,
+        "narHash": "sha256-wgzv3IFBxJkAYfLG0vCp1jbajHKrrpFzKZ2BssWVSlo=",
         "owner": "doomemacs",
         "repo": "doomemacs",
-        "rev": "2bc052425ca45a41532be0648ebd976d1bd2e6c1",
+        "rev": "466490c252d06f42a9c165f361de74a6e6abad8d",
         "type": "github"
       },
       "original": {
@@ -26,11 +26,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738916398,
-        "narHash": "sha256-JBnztNWoVJIVO0j9lU0//or2FdynJ5GMrdqpT3xCmqs=",
+        "lastModified": 1742113225,
+        "narHash": "sha256-tUor57FbLwwy+duUbjq8Ff0TyayK1i50rUbXBfdgfuM=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "62e6f266d6fc1443d83457c65ef4b860d2f3835a",
+        "rev": "7e13aa507d714371e6ff70a91d76dcb339311773",
         "type": "github"
       },
       "original": {
@@ -55,6 +55,26 @@
         "type": "github"
       }
     },
+    "google-cookie-retrieval": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739823862,
+        "narHash": "sha256-h08hlS0ImlONZfeemVMzo29PUC3/abdSb9muYO9E048=",
+        "ref": "refs/heads/main",
+        "rev": "675f98b0145f908897c4d899836bcb3dad9da79a",
+        "revCount": 9,
+        "type": "git",
+        "url": "https://git.johnogle.info/johno/google-cookie-retrieval.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.johnogle.info/johno/google-cookie-retrieval.git"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -62,11 +82,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738878603,
-        "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=",
+        "lastModified": 1741955947,
+        "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd",
+        "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4",
         "type": "github"
       },
       "original": {
@@ -85,11 +105,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1738917332,
-        "narHash": "sha256-9YUFZurcctem45ASrnH05nGUORlpWvxL9pPqM7XD92E=",
+        "lastModified": 1742122199,
+        "narHash": "sha256-vEdsZd9MmjRYXutcSVnOoR15ikI9yU8Oc9f1UCNvUwI=",
         "owner": "marienz",
         "repo": "nix-doom-emacs-unstraightened",
-        "rev": "20c76d5a3549d195bf164bb147b11c9f8b21f500",
+        "rev": "366d3b516d4878e1f93158708015be3dac09a72f",
         "type": "github"
       },
       "original": {
@@ -104,11 +124,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1736095716,
-        "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=",
+        "lastModified": 1741870048,
+        "narHash": "sha256-odXRdNZGdXg1LmwlAeWL85kgy/FVHsgKlDwrvbR2BsU=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0",
+        "rev": "5d76001e33ee19644a598ad80e7318ab0957b122",
         "type": "github"
       },
       "original": {
@@ -120,27 +140,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733384649,
-        "narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=",
+        "lastModified": 1740865531,
+        "narHash": "sha256-h00vGIh/jxcGl8aWdfnVRD74KuLpyY3mZgMFMy7iKIc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13",
+        "rev": "5ef6c425980847c78a80d759abc476e941a9bf42",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1738680400,
-        "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
+        "lastModified": 1742069588,
+        "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "799ba5bffed04ced7067a91798353d360788b30d",
+        "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
         "type": "github"
       },
       "original": {
@@ -160,11 +180,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736549395,
-        "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=",
+        "lastModified": 1740569341,
+        "narHash": "sha256-WV8nY2IOfWdzBF5syVgCcgOchg/qQtpYh6LECYS9XkY=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b",
+        "rev": "5eeb0172fb74392053b66a8149e61b5e191b2845",
         "type": "github"
       },
       "original": {
@@ -175,6 +195,7 @@
     },
     "root": {
       "inputs": {
+        "google-cookie-retrieval": "google-cookie-retrieval",
         "home-manager": "home-manager",
         "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
         "nixos-wsl": "nixos-wsl",
@@ -190,11 +211,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738291974,
-        "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=",
+        "lastModified": 1741861888,
+        "narHash": "sha256-ynOgXAyToeE1UdLNfrUn/hL7MN0OpIS2BtNdLjpjPf0=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7",
+        "rev": "d016ce0365b87d848a57c12ffcfdc71da7a2b55f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -25,6 +25,11 @@
       url = "github:marienz/nix-doom-emacs-unstraightened";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    google-cookie-retrieval = {
+      url = "git+https://git.johnogle.info/johno/google-cookie-retrieval.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { self, nixpkgs, nixos-wsl, ... } @ inputs: let
@@ -39,26 +44,19 @@
           inputs.plasma-manager.homeManagerModules.plasma-manager
           inputs.nix-doom-emacs-unstraightened.hmModule
         ];
+        home-manager.extraSpecialArgs = {
+          globalInputs = inputs;
+        };
       }
     ];
   in {
-    nixosConfigurations.z790prors-nix = nixpkgs.lib.nixosSystem rec {
-      system = "x86_64-linux";
-      specialArgs = { inherit inputs; };
-      modules = baseModules ++ [
-        ./machines/z790prors/configuration.nix
-        {
-          home-manager.users.johno = import ./home/home-z790prors.nix;
-        }
-      ];
-    };
-
     nixosConfigurations.nix-book = nixpkgs.lib.nixosSystem rec {
       system = "x86_64-linux";
       modules = baseModules ++ [
         ./machines/nix-book/configuration.nix
         {
           home-manager.users.johno = import ./home/home-nix-book.nix;
+          home-manager.extraSpecialArgs = { inherit system; };
         }
       ];
     };
@@ -69,7 +67,8 @@
         ./machines/boxy/configuration.nix
         inputs.home-manager.nixosModules.home-manager
         {
-          home-manager.users.johno = import ./home/home-default.nix;
+          home-manager.users.johno = import ./home/home.nix;
+          home-manager.extraSpecialArgs = { inherit system; };
         }
       ];
     };
@@ -81,9 +80,23 @@
         ./machines/wixos/configuration.nix
         inputs.home-manager.nixosModules.home-manager
         {
-          home-manager.users.johno = import ./home/home-default.nix;
+          home-manager.users.johno = import ./home/home.nix;
+          home-manager.extraSpecialArgs = { inherit system; };
         }
       ];
     };
+
+    homeConfigurations."johno" = inputs.home-manager.lib.homeManagerConfiguration {
+      pkgs = inputs.nixpkgs.legacyPackages."x86_64-linux";
+      modules = [
+        inputs.plasma-manager.homeManagerModules.plasma-manager
+        inputs.nix-doom-emacs-unstraightened.hmModule
+        ./home/home.nix
+      ];
+      extraSpecialArgs = {
+        system = "x86_64-linux";
+        globalInputs = inputs;
+      };
+    };
   };
 }

home/home-nix-book.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./home-default.nix
+    ./home.nix
   ];
 
   home.i3_sway.extraSwayConfig = {

home/home-z790prors.nix

@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [
-    ./home-default.nix
-  ];
-}

home/home.nix

@@ -1,4 +1,4 @@
-{ pkgs, customPkgs, ... }:
+{ pkgs, customPkgs, globalInputs, system, ... }:
 
 let
   customPkgs = pkgs.callPackage ../packages {};
@@ -43,6 +43,7 @@ in
     pkgs.element-desktop
     pkgs.fd
     #pkgs.fluffychat # security vulnerability in current version
+    pkgs.goose-cli
     pkgs.gzip
     pkgs.htop
     pkgs.jellyfin-media-player
@@ -54,7 +55,7 @@ in
     pkgs.ncdu
     pkgs.nextcloud-talk-desktop
     pkgs.pandoc
-    pkgs.pinentry-qt
+    #pkgs.pinentry-qt
     #pkgs.pytest
     pkgs.shellcheck
     pkgs.solaar # Logitech management software
@@ -62,6 +63,8 @@ in
     pkgs.waybar
     pkgs.wofi
     pkgs.vlc
+
+    globalInputs.google-cookie-retrieval.packages.${system}.default
   ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
@@ -77,9 +80,10 @@ in
     #   org.gradle.console=verbose
     #   org.gradle.daemon.idletimeout=3600000
     # '';
-
   };
 
+  targets.genericLinux.enable = true;
+
   # Home Manager can also manage your environment variables through
   # 'home.sessionVariables'. These will be explicitly sourced when using a
   # shell provided by Home Manager. If you don't want to manage your shell
@@ -97,30 +101,20 @@ in
   #  /etc/profiles/per-user/johno/etc/profile.d/hm-session-vars.sh
   #
   home.sessionVariables = {
-    ENABLE_GAMESCOPE_WSI = "1";
   };
 
   home.sessionPath = [
   ];
 
-  nixpkgs.config.allowUnfree = true;
-
   imports = [
     ./modules/emacs
     ./modules/i3+sway
-    ./modules/lutris
     ./modules/plasma-manager
     ./modules/tmux
   ];
 
   programs.bash.enable = true;
 
-  nix = {
-    gc = {
-      automatic = true;
-    };
-  };
-
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 
@@ -139,15 +133,6 @@ in
     };
   };
 
-  programs.gpg.enable = true;
-
-  services.gpg-agent = {
-    enable = true;
-    enableSshSupport = true;
-    defaultCacheTtl = 1800;
-    pinentryPackage = pkgs.pinentry-qt;
-  };
-
   programs.jq.enable = true;
 
   programs.k9s.enable = true;
@@ -180,17 +165,16 @@ in
     };
   };
 
-  services.home-manager.autoUpgrade = {
-    enable = true;
-    frequency = "weekly";
-  };
-
   services.kdeconnect = {
     enable = true;
     indicator = true;
     package = pkgs.kdePackages.kdeconnect-kde;
   };
 
+  services.gnome-keyring = {
+    enable = true;
+  };
+
   services.syncthing = {
     enable = true;
     tray = {

home/modules/emacs/default.nix

@@ -20,7 +20,7 @@ with lib;
     ];
 
     programs.doom-emacs = {
-      #enable = true;
+      enable = true;
       doomDir = ./doom;
     };
 

home/modules/lutris/default.nix

@@ -1,9 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  home.packages = [
-    pkgs.gamescope
-    pkgs.lutris
-    pkgs.mangohud
-  ];
-}

machines/boxy/configuration.nix

@@ -2,7 +2,7 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ lib, ... }:
+{ lib, pkgs, ... }:
 
 with lib;
 
@@ -14,9 +14,17 @@ with lib;
 
   roles = {
     audio.enable = true;
+    bluetooth.enable = true;
+    desktop = {
+      enable = true;
+      gaming = true;
+      kde = true;
+      sddm = true;
+      wayland = true;
+    };
     kodi = {
       enable = true;
-      autologin = true;
+      autologin = false;
       wayland = true;
     };
     users.enable = true;
@@ -28,9 +36,15 @@ with lib;
 
   networking.hostName = "boxy"; # Define your hostname.
 
+  services.xserver.videoDrivers = [ "amdgpu" ];
   hardware.graphics.enable = true;
-
-  services.displayManager.enable = mkForce false;
+  hardware.graphics.enable32Bit = true;
+  hardware.graphics.extraPackages = with pkgs; [
+    amdvlk
+  ];
+  hardware.graphics.extraPackages32 = with pkgs; [
+    driversi686Linux.amdvlk
+  ];
 
   # 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/boxy/hardware-configuration.nix

@@ -9,7 +9,7 @@
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "thunderbolt" "usb_storage" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
+  boot.initrd.kernelModules = [ "amdgpu" ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 

machines/nix-book/configuration.nix

@@ -14,7 +14,10 @@
     bluetooth.enable = true;
     desktop = {
       enable = true;
-      waylandOnly = true;
+      wayland = true;
+      gaming = true;
+      kde = true;
+      sddm = true;
     };
     nfs-mounts.enable = true;
     printing.enable = true;

machines/wixos/configuration.nix

@@ -12,7 +12,11 @@
   ];
 
   roles = {
-    desktop.enable = true;
+    audio.enable = true;
+    desktop = {
+      enable = true;
+      wayland = true;
+    };
   };
 
   networking.hostName = "wixos";
@@ -24,6 +28,29 @@
   wsl.wslConf.network.hostname = "wixos";
   wsl.wslConf.user.default = "johno";
 
+  services.xserver.videoDrivers = [ "nvidia" ];
+  hardware.graphics = { 
+    enable = true;
+
+    extraPackages = with pkgs; [
+      mesa.drivers
+      libvdpau-va-gl
+      vaapiVdpau
+    ];
+  };
+  environment.sessionVariables = {
+    LD_LIBRARY_PATH = [
+      "/usr/lib/wsl/lib"
+      "/run/opengl-driver/lib"
+    ];
+  };
+  hardware.nvidia = {
+    modesetting.enable = true;
+    nvidiaSettings = true;
+    open = true;
+    package = config.boot.kernelPackages.nvidiaPackages.latest;
+  };
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It's perfectly fine and recommended to leave

machines/z790prors/configuration.nix

@@ -1,70 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
-
-  roles = {
-    audio.enable = true;
-    desktop = {
-      enable = true;
-      x11Only = true;
-    };
-    kodi.enable = true;
-    nfs-mounts.enable = true;
-    printing.enable = true;
-    spotifyd.enable = true;
-    users = {
-      enable = true;
-      extraGroups = [ "input" "libvirtd" ];
-    };
-    virtualisation.enable = true;
-  };
-
-  # Use the systemd-boot EFI boot loader.
-  #boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.efi.efiSysMountPoint = "/boot";
-  boot.loader.grub = {
-    enable = true;
-    useOSProber = true;
-    devices = [ "nodev" ];
-  };
-
-  networking = {
-    hostName = "z790prors-nix"; # Define your hostname.
-    domain = "oglehome";
-    defaultGateway = "10.0.0.1";
-    nameservers = [ "10.0.0.1" ];
-
-    # The global useDHCP flag is deprecated, therefore explicitly set to false here.
-    # Per-interface useDHCP will be mandatory in the future, so this generated config
-    # replicates the default behaviour.
-    useDHCP = false;
-    
-    interfaces.enp3s0.ipv4.addresses = [{
-      address = "10.0.0.37";
-      prefixLength = 24;
-    }];
-  };
-
-  time.timeZone = "America/Los_Angeles";
-  time.hardwareClockInLocalTime = true;
-
-  # TODO: Figure out something with this
-  nix.settings.secret-key-files = /root/cache-priv-key.pem;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "21.11"; # Did you read the comment?
-}

machines/z790prors/hardware-configuration.nix

@@ -1,85 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, modulesPath, pkgs, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [
-    "nvidia"
-    "nvidia_modeset"
-    "nvidia_uvm"
-    "nvidia_drm"
-  ];
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.kernelParams = [
-    "nvidia_drm.fbdev=1"
-    "nvidia_drm.modeset=1"
-  ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  hardware.graphics.enable = true;
-  services.xserver.videoDrivers = ["nvidia"];
-  services.xserver.screenSection = ''Option "metamodes" "3440x1440_165 +0+0"'';
-  services.xserver.enableTearFree = true;
-  hardware.nvidia = {
-    modesetting.enable = true;
-    powerManagement.enable = false;
-    powerManagement.finegrained = false;
-    open = false;
-    nvidiaSettings = true;
-    package = config.boot.kernelPackages.nvidiaPackages.latest;
-    #package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
-      #version = "555.58";
-
-      #sha256_64bit = "sha256-bXvcXkg2kQZuCNKRZM5QoTaTjF4l2TtrsKUvyicj5ew=";
-      #sha256_aarch64 = lib.fakeSha256;
-      #openSha256 = lib.fakeSha256;
-      #settingsSha256 = "sha256-vWnrXlBCb3K5uVkDFmJDVq51wrCoqgPF03lSjZOuU8M=";
-      #persistencedSha256 = lib.fakeSha256;
-    #};
-  };
-  environment.sessionVariables = {
-    KWIN_DRM_ALLOW_NVIDIA_COLORSPACE = "1";
-  };
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/8d996d13-6d55-4524-83a2-6f6fb47a09ea";
-      fsType = "btrfs";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/7445-C336";
-      fsType = "vfat";
-    };
-
-  fileSystems."/steam" =
-    { device = "/dev/disk/by-uuid/E494DA9A94DA6E94";
-      fsType = "ntfs";
-      options = [
-        "nofail"
-        "rw"
-        "user"
-        "exec" # This needs to go after "user". See https://askubuntu.com/questions/30243/why-does-ubuntu-refuse-to-execute-files-from-an-ntfs-partition
-        "umask=000"
-      ];
-    };
-
-  swapDevices = [ ];
-
-  services.beesd.filesystems = {
-    root = {
-      spec = "LABEL=nixos";
-      hashTableSizeMB = 4096;
-      verbosity = "crit";
-    };
-  };
-
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

roles/audio/default.nix

@@ -22,6 +22,7 @@ in
         enable = true;
         pulse.enable = true;
       };
+
       services.pulseaudio = {
         package = pkgs.pulseaudioFull;
         extraConfig = ''
@@ -29,6 +30,11 @@ in
           load-module module-switch-on-connect
         '';
       };
+
+      services.squeezelite = {
+        #enable = true;
+        pulseAudio = true;
+      };
     };
 
 }

roles/default.nix

@@ -31,6 +31,12 @@ with lib;
     };
     time.timeZone = "America/Los_Angeles";
 
+    services.xserver.xkb = {
+      layout = "us";
+      variant = "";
+      options = "caps:escape";
+    };
+
     # Don't go to emergency mode if we aren't able to mount filesystems.
     # This is silly if you have multiple hard drives or partitions
     # configured on a machine and then one goes away intentionally or

roles/desktop/default.nix

@@ -2,90 +2,23 @@
 
 with lib;
 
-let
-  cfg = config.roles.desktop;
-
-  customPackages = pkgs.callPackage ../../packages {};
-
-  basePackages = with pkgs; [
-    #bambu-studio
-    brightnessctl
-    emacs-nox
-  ];
-
-  x11BasePackages = with pkgs; [
-  ];
-
-  x11OnlyPackages = with pkgs; [
-  ];
-
-  waylandBasePackages = with pkgs; [
-    grim
-    slurp
-    wl-clipboard
-    mako
-  ];
-
-  waylandOnlyPackages = with pkgs; [
-  ];
-in
 {
   options.roles.desktop = {
-    enable = mkEnableOption "Enable the desktop role";
-    x11Only = mkOption {
-      type = types.bool;
-      default = false;
-    };
-    waylandOnly = mkOption {
-      type = types.bool;
-      default = false;
-    };
+    enable = mkEnableOption "Enable the desktop role.";
+
+    x11 = mkOption { type = types.bool; default = false; description = "Enable X11 support."; };
+    wayland = mkOption { type = types.bool; default = false; description = "Enable Wayland support."; };
+    kde = mkOption { type = types.bool; default = false; description = "Enable KDE."; };
+    gaming = mkOption { type = types.bool; default = false; description = "Enable gaming support."; };
+    sddm = mkOption { type = types.bool; default = false; description = "Enable SDDM greeter."; };
   };
 
-  config = mkIf cfg.enable
-    {
-      services.xserver.xkb = {
-        layout = "us";
-        variant = "";
-        options = "caps:escape";
-      };
-      services.xserver.enable = true;
-
-      services.displayManager.sddm = {
-        enable = true;
-        wayland.enable = !cfg.x11Only;
-      };
-      services.desktopManager.plasma6.enable = true;
-
-      services.xserver.windowManager.i3 = {
-        enable = true;
-        extraPackages = with pkgs; [
-          dmenu
-          i3status
-          i3lock
-        ];
-      };
-      programs.dconf.enable = true;
-      services.gnome.gnome-keyring.enable = true;
-
-      programs.sway = mkIf (!cfg.x11Only) {
-        enable = true;
-        wrapperFeatures.gtk = true;
-      };
-      programs.light.enable = mkIf (!cfg.x11Only) true;
-
-      programs.kdeconnect.enable = true;
-
-      virtualisation.docker.enable = true;
-      users.extraGroups.docker.members = [ "johno" ];
-
-      environment.systemPackages = with pkgs; mkMerge [
-        basePackages
-        (mkIf (!cfg.waylandOnly) x11BasePackages)
-        (mkIf cfg.x11Only x11OnlyPackages)
-        (mkIf (!cfg.x11Only) waylandBasePackages)
-        (mkIf (cfg.waylandOnly) waylandOnlyPackages)
-      ];
-    };
-
+  imports = [
+    ./x11.nix
+    ./wayland.nix
+    ./gaming.nix
+    ./kde.nix
+    ./programs.nix
+    ./sddm.nix
+  ];
 }

roles/desktop/gaming.nix

@@ -0,0 +1,18 @@
+{ lib, config, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.roles.desktop;
+in
+{
+  config = mkIf (cfg.enable && cfg.gaming) {
+    environment.systemPackages = with pkgs; [
+      steam
+      lutris
+      moonlight
+    ];
+
+    # Possibly other gaming specific services or settings
+  };
+}

roles/desktop/kde.nix

@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.roles.desktop;
+in
+{
+  config = mkIf (cfg.enable && cfg.kde) {
+    services.desktopManager.plasma6.enable = true;
+  };
+}

roles/desktop/programs.nix

@@ -0,0 +1,20 @@
+{ lib, config, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.roles.desktop;
+in
+{
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      brightnessctl
+      emacs-nox
+      moonlight-qt
+    ];
+
+    programs.dconf.enable = true;
+    services.gnome.gnome-keyring.enable = true;
+    programs.kdeconnect.enable = true;
+  };
+}

roles/desktop/sddm.nix

@@ -0,0 +1,15 @@
+{ lib, config, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.roles.desktop;
+in
+{
+  config = mkIf (cfg.enable && cfg.sddm) {
+    services.displayManager.sddm = {
+      enable = true;
+      wayland.enable = (!cfg.x11 && cfg.wayland);
+    };
+  };
+}

roles/desktop/wayland.nix

@@ -0,0 +1,23 @@
+{ lib, config, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.roles.desktop;
+in
+{
+  config = mkIf (cfg.enable && cfg.wayland) {
+    programs.sway = {
+      enable = true;
+      wrapperFeatures.gtk = true;
+    };
+    programs.light.enable = true;
+
+    environment.systemPackages = with pkgs; [
+      grim
+      slurp
+      wl-clipboard
+      mako
+    ];
+  };
+}

roles/desktop/x11.nix

@@ -0,0 +1,19 @@
+{ lib, config, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.roles.desktop;
+in
+{
+  config = mkIf (cfg.enable && cfg.x11) {
+    services.xserver = {
+      enable = true;
+
+      windowManager.i3 = {
+        enable = true;
+        extraPackages = with pkgs; [ dmenu i3status i3lock ];
+      };
+    };
+  };
+}

roles/kodi/default.nix

@@ -27,45 +27,28 @@ in
     ]);
   in mkIf cfg.enable
     {
-      users.extraUsers.kodi.isNormalUser = true;
+      users.extraUsers.kodi = {
+        isNormalUser = true;
+	extraGroups = [ "wheel" "networkmanager" "audio" "video" ];
+      };
 
       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;
-          };
-        })
+      environment.systemPackages = with pkgs; [
+	kodiPkg
+        wget
+      ];
 
-        (mkIf (!cfg.wayland) {
-          xserver = {
-            enable = true;
-            desktopManager.kodi = {
-              enable = true;
-              package = kodiPkg;
-            };
-            displayManager.lightdm = {
-              enable = true;
-              greeter.enable = false;
-            };
-          };
+      services = if cfg.autologin then {
           displayManager = {
             autoLogin.enable = true;
             autoLogin.user = "kodi";
             defaultSession = "kodi";
-            sessionData.autologinSession = "kodi";
+            sessionData.autologinSession = "plasma";
           };
-        })
-      ] else {};
+      } else {};
     };
 }

roles/virtualisation/default.nix

@@ -14,5 +14,7 @@ in
     {
       virtualisation.libvirtd.enable = true;
       programs.virt-manager.enable = true;
+      virtualisation.docker.enable = true;
+      users.extraGroups.docker.members = [ "johno" ];
     };
 }