koishi/nixos
1
0
Fork 0
Code Issues Pull requests Projects Activity

refactor(koumakyou): clean up jovian config

Browse source
This commit is contained in:
514fpv 2024-06-11 11:53:49 +08:00
parent 4d77320203
commit ab7e7606f0
Signed by: koishi
SSH key fingerprint: SHA256:axz0uIzzY+5W19i7QOUuiw5LSqhKfCBKPf3L4xFRxLw
2 changed files with 63 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
spec/koumakyou/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, jovian, ... }: {
global = { global = {
id = "0a920a834b5f480bab258040096d4c6e"; id = "0a920a834b5f480bab258040096d4c6e";
fs.esp.uuid = "ACB3-4AFF"; fs.esp.uuid = "ACB3-4AFF";
@ -41,11 +41,8 @@
console.earlySetup = true; console.earlySetup = true;
specialisation.desktop.configuration = { specialisation.desktop.configuration = {
programs.regreet.enable = lib.mkForce true; global.jovian = false;
jovian.steam.autoStart = lib.mkForce false; jovian.steamos.useSteamOSConfig = false;
jovian.steam.desktopSession = lib.mkForce "sway";
jovian.decky-loader.enable = lib.mkForce false;
home.plasma.enable = lib.mkForce false;
services.greetd.settings.default_session.command = let services.greetd.settings.default_session.command = let
cfg = config.programs.regreet; cfg = config.programs.regreet;
in "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${pkgs.writeShellScript "cageResolution" '' in "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${pkgs.writeShellScript "cageResolution" ''
@ -67,5 +64,8 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
hardware.cpu.intel.updateMicrocode = true; hardware.cpu.intel.updateMicrocode = true;
imports = [ ./jovian.nix ]; imports = [
jovian.nixosModules.jovian
./jovian.nix
];
} }

40
spec/koumakyou/jovian.nix
View file

@ -1,12 +1,11 @@
{ pkgs, lib, config, jovian, ... }: { { pkgs, lib, config, ... }: with lib; {
imports = [ options.global.jovian = mkEnableOption "set up Jovian NixOS" // { default = true; };
jovian.nixosModules.jovian
];
config = mkIf config.global.jovian {
jovian = { jovian = {
hardware.has.amd.gpu = true; hardware.has.amd.gpu = true;
steamos.useSteamOSConfig = true; steamos.useSteamOSConfig = true;
steamos.enableDefaultCmdlineConfig = false; #steamos.enableDefaultCmdlineConfig = false;
steam = { steam = {
enable = true; enable = true;
@ -49,42 +48,19 @@
user = "app"; user = "app";
}; };
jovian.decky-loader = let jovian.decky-loader = {
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 {
# ~/.steam/steam/.cef-enable-remote-debugging # ~/.steam/steam/.cef-enable-remote-debugging
enable = true; enable = true;
user = "app"; user = "app";
extraPackages = with pkgs; [ extraPackages = with pkgs; [
curl unzip util-linux gnugrep procps pciutils kmod curl unzip util-linux gnugrep procps pciutils kmod ryzenadj
ryzenadj # adjustor
]; ];
extraPythonPackages = pythonPackages: with pythonPackages; [ extraPythonPackages = pythonPackages: with pythonPackages; [
hid pyyaml hid pyyaml
# adjustor
]; ];
stateDir = "/nix/persist/decky"; 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" ];
};
} }