refactor(koumakyou): clean up jovian config
This commit is contained in:
parent
4d77320203
commit
ab7e7606f0
|
@ -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
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
{ pkgs, lib, config, jovian, ... }: {
|
||||
imports = [
|
||||
jovian.nixosModules.jovian
|
||||
];
|
||||
{ pkgs, lib, config, ... }: with lib; {
|
||||
options.global.jovian = mkEnableOption "set up Jovian NixOS" // { default = true; };
|
||||
|
||||
config = mkIf config.global.jovian {
|
||||
jovian = {
|
||||
hardware.has.amd.gpu = true;
|
||||
steamos.useSteamOSConfig = true;
|
||||
steamos.enableDefaultCmdlineConfig = false;
|
||||
#steamos.enableDefaultCmdlineConfig = false;
|
||||
|
||||
steam = {
|
||||
enable = true;
|
||||
|
@ -49,42 +48,19 @@
|
|||
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
|
||||
];
|
||||
|
||||
# This package doesn't have upstream tests.
|
||||
doCheck = false;
|
||||
};
|
||||
in {
|
||||
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 # adjustor
|
||||
curl unzip util-linux gnugrep procps pciutils kmod ryzenadj
|
||||
];
|
||||
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" ];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue