From ab7e7606f0206e57a293a20e3068d822fe1ef0bd Mon Sep 17 00:00:00 2001
From: 514fpv <koishi@514fpv.one>
Date: Tue, 11 Jun 2024 11:53:49 +0800
Subject: [PATCH] refactor(koumakyou): clean up jovian config

---
 spec/koumakyou/default.nix |  14 ++--
 spec/koumakyou/jovian.nix  | 136 +++++++++++++++----------------------
 2 files changed, 63 insertions(+), 87 deletions(-)

diff --git a/spec/koumakyou/default.nix b/spec/koumakyou/default.nix
index 152489a5..b1c239d3 100644
--- a/spec/koumakyou/default.nix
+++ b/spec/koumakyou/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }: {
+{ pkgs, lib, config, jovian, ... }: {
   global = {
     id = "0a920a834b5f480bab258040096d4c6e";
     fs.esp.uuid = "ACB3-4AFF";
@@ -41,11 +41,8 @@
   console.earlySetup = true;
 
   specialisation.desktop.configuration = {
-    programs.regreet.enable = lib.mkForce true;
-    jovian.steam.autoStart = lib.mkForce false;
-    jovian.steam.desktopSession = lib.mkForce "sway";
-    jovian.decky-loader.enable = lib.mkForce false;
-    home.plasma.enable = lib.mkForce false;
+    global.jovian = false;
+    jovian.steamos.useSteamOSConfig = false;
     services.greetd.settings.default_session.command = let
       cfg = config.programs.regreet;
     in "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${pkgs.writeShellScript "cageResolution" ''
@@ -67,5 +64,8 @@
   boot.extraModulePackages = [ ];
   hardware.cpu.intel.updateMicrocode = true;
 
-  imports = [ ./jovian.nix ];
+  imports = [
+    jovian.nixosModules.jovian
+    ./jovian.nix
+  ];
 }
diff --git a/spec/koumakyou/jovian.nix b/spec/koumakyou/jovian.nix
index 23c95207..d08aa145 100644
--- a/spec/koumakyou/jovian.nix
+++ b/spec/koumakyou/jovian.nix
@@ -1,90 +1,66 @@
-{ pkgs, lib, config, jovian, ... }: {
-  imports = [
-    jovian.nixosModules.jovian
-  ];
+{ pkgs, lib, config, ... }: with lib; {
+  options.global.jovian = mkEnableOption "set up Jovian NixOS" // { default = true; };
 
-  jovian = {
-    hardware.has.amd.gpu = true;
-    steamos.useSteamOSConfig = true;
-    steamos.enableDefaultCmdlineConfig = false;
+  config = mkIf config.global.jovian {
+    jovian = {
+      hardware.has.amd.gpu = true;
+      steamos.useSteamOSConfig = true;
+      #steamos.enableDefaultCmdlineConfig = false;
 
-    steam = {
+      steam = {
+        enable = true;
+        autoStart = true;
+        desktopSession = "plasma";
+        user = "app";
+      };
+    };
+
+    users.home.persistApp.directories = [
+      ".steam" ".local/share/Steam"
+      ".config/gamescope" ".config/hhd"
+      ".kodi"
+    ];
+
+    users.users.app.extraGroups = [ "networkmanager" "gamemode" ];
+    programs.gamemode.enable = true;
+    programs.regreet.enable = false;
+    home.plasma.enable = true;
+    home.plasma.extraConfig = {
+      configFile = {
+        kwinrc.Xwayland.Scale = 1.75;
+        kscreenlockerrc.Daemon.Autolock = false;
+      };
+    };
+
+    home-manager.users.app.home.packages = with pkgs; [
+      (pkgs.kodi-wayland.passthru.withPackages (kodiPkgs: with kodiPkgs; [
+        joystick # keymap steam-controller
+        #controller-topology-project
+        libretro libretro-2048
+        libretro-fuse libretro-genplus libretro-mgba
+        libretro-nestopia libretro-snes9x
+        jellycon
+      ]))
+    ];
+
+    services.handheld-daemon = {
       enable = true;
-      autoStart = true;
-      desktopSession = "plasma";
       user = "app";
     };
-  };
 
-  users.home.persistApp.directories = [
-    ".steam" ".local/share/Steam"
-    ".config/gamescope" ".config/hhd"
-    ".kodi"
-  ];
-
-  users.users.app.extraGroups = [ "networkmanager" "gamemode" ];
-  programs.gamemode.enable = true;
-  programs.regreet.enable = false;
-  home.plasma.enable = true;
-  home.plasma.extraConfig = {
-    configFile = {
-      kwinrc.Xwayland.Scale = 1.75;
-      kscreenlockerrc.Daemon.Autolock = false;
-    };
-  };
-
-  home-manager.users.app.home.packages = with pkgs; [
-    (pkgs.kodi-wayland.passthru.withPackages (kodiPkgs: with kodiPkgs; [
-      joystick # keymap steam-controller
-      #controller-topology-project
-      libretro libretro-2048
-      libretro-fuse libretro-genplus libretro-mgba
-      libretro-nestopia libretro-snes9x
-      jellycon
-    ]))
-  ];
-
-  services.handheld-daemon = {
-    enable = true;
-    user = "app";
-  };
-
-  jovian.decky-loader = let
-    adjustor = pkgs.python3.pkgs.buildPythonApplication rec {
-      pname = "adjustor";
-      version = "2.1.5";
-      pyproject = true;
-
-      src = pkgs.fetchFromGitHub {
-        owner = "hhd-dev";
-        repo = pname;
-        rev = "v${version}";
-        hash = "sha256-KgeK2lC3b9VbjYmy7rD/ImODWDDx3pWIzWgNnSLJeDs=";
-      };
-
-      propagatedBuildInputs = with pkgs.python3.pkgs; [
-        setuptools
-        pyroute2
-        rich
+    jovian.decky-loader = {
+      # ~/.steam/steam/.cef-enable-remote-debugging
+      enable = true;
+      user = "app";
+      extraPackages = with pkgs; [
+        curl unzip util-linux gnugrep procps pciutils kmod ryzenadj
       ];
-
-      # This package doesn't have upstream tests.
-      doCheck = false;
+      extraPythonPackages = pythonPackages: with pythonPackages; [
+        hid pyyaml
+      ];
+      stateDir = "/nix/persist/decky";
     };
-  in {
-    # ~/.steam/steam/.cef-enable-remote-debugging
-    enable = true;
-    user = "app";
-    extraPackages = with pkgs; [
-      curl unzip util-linux gnugrep procps pciutils kmod
-      ryzenadj # adjustor
-    ];
-    extraPythonPackages = pythonPackages: with pythonPackages; [
-      hid pyyaml
-      # adjustor
-    ];
-    stateDir = "/nix/persist/decky";
-  };
 
-  boot.kernelParams = lib.mkIf config.jovian.decky-loader.enable [ "iomem=relaxed" "amd_pstate=passive" ];
+    boot.kernelParams = [ "iomem=relaxed" "amd_pstate=passive" ];
+  };
 }