From c6f1eb60cc040c8894caf2f119f520c2579c47cd Mon Sep 17 00:00:00 2001 From: encode42 Date: Fri, 26 Dec 2025 01:12:47 -0500 Subject: [PATCH] Refactor prospect user config --- hosts/prospect/homes/config/games.nix | 39 ++++----------------- hosts/prospect/homes/encode42.nix | 1 + hosts/prospect/homes/guest.nix | 10 ++++++ hosts/prospect/{ => users}/config/games.nix | 0 hosts/prospect/users/encode42.nix | 3 +- hosts/prospect/users/guest.nix | 19 ++-------- 6 files changed, 21 insertions(+), 51 deletions(-) rename hosts/prospect/{ => users}/config/games.nix (100%) diff --git a/hosts/prospect/homes/config/games.nix b/hosts/prospect/homes/config/games.nix index 53f184b..14ffd35 100644 --- a/hosts/prospect/homes/config/games.nix +++ b/hosts/prospect/homes/config/games.nix @@ -1,37 +1,10 @@ -{ pkgs, pkgs-unstable, ... }: +{ pkgs, ... }: -let - stable-emulators = with pkgs; [ - punes-qt6 # Nintendo Entertainment System - blastem # Sega Genesis - bsnes-hd # Nintendo Super Entertainment System - yabause # Sega Saturn - duckstation # Sony Playstation 1 - rmg-wayland # Nintendo 64 - flycast # Sega Dreamcast - mgba # Nintendo Game Boy - pcsx2 # Sony Playstation 2 - xemu # Microsoft Xbox - melonDS # Nintendo DS - ppsspp-qt # Sony Playstation Portable - xenia-canary # Microsoft Xbox 360 - rpcs3 # Sony Playstation 3 - azahar # Nintendo 3DS - cemu # Nintendo Wii U - ]; +{ + # TODO: package Vita3k and Gearsystem - unstable-emulators = with pkgs-unstable; [ + home.packages = with pkgs; [ + r2modman + olympus ]; - - # TODO: Vita3k and Gearsystem -in -{ - home.packages = - with pkgs; - [ - r2modman - olympus - ] - ++ stable-emulators - ++ unstable-emulators; } diff --git a/hosts/prospect/homes/encode42.nix b/hosts/prospect/homes/encode42.nix index 01f74d1..b8f70cc 100644 --- a/hosts/prospect/homes/encode42.nix +++ b/hosts/prospect/homes/encode42.nix @@ -15,6 +15,7 @@ (flakeRoot + /homes/shared/desktop/prismlauncher.nix) + ./config/games.nix ./config/pegasus.nix ]; } diff --git a/hosts/prospect/homes/guest.nix b/hosts/prospect/homes/guest.nix index 9042b46..9f6d9eb 100644 --- a/hosts/prospect/homes/guest.nix +++ b/hosts/prospect/homes/guest.nix @@ -12,5 +12,15 @@ (flakeRoot + /homes/shared/desktop/firefox.nix) (flakeRoot + /homes/shared/desktop/prismlauncher.nix) + + ./config/games.nix + ./config/pegasus.nix ]; + + dconf.settings = { + "org/gnome/desktop/screensaver" = { + lock-enabled = false; + lock-on-suspend = false; + }; + }; } diff --git a/hosts/prospect/config/games.nix b/hosts/prospect/users/config/games.nix similarity index 100% rename from hosts/prospect/config/games.nix rename to hosts/prospect/users/config/games.nix diff --git a/hosts/prospect/users/encode42.nix b/hosts/prospect/users/encode42.nix index de6575c..a7289dc 100644 --- a/hosts/prospect/users/encode42.nix +++ b/hosts/prospect/users/encode42.nix @@ -5,7 +5,7 @@ { imports = [ - ../config/games.nix + ./config/games.nix (flakeRoot + /users/encode42/common) (flakeRoot + /users/encode42/desktop/environments/gnome.nix) @@ -15,7 +15,6 @@ home-manager.users.encode42 = { imports = [ - ../homes/config/games.nix ../homes/encode42.nix ]; diff --git a/hosts/prospect/users/guest.nix b/hosts/prospect/users/guest.nix index 06025ea..2c8e5a1 100644 --- a/hosts/prospect/users/guest.nix +++ b/hosts/prospect/users/guest.nix @@ -17,11 +17,10 @@ let ".local/share/Steam/steamapps/*.acf" ".local/share/Steam/steamapps/common" - ".local/share/PrismLauncher/prismlauncher.cfg" # TODO: Create + ".local/share/PrismLauncher/prismlauncher.cfg" ".local/share/PrismLauncher/instances" - ".config/mgba/config.ini" # TODO: Create - ".mgba" # TODO: Move to .config/mgba + ".blastem-saves" ]; rsyncExcludes = builtins.concatStringsSep " \\\n" ( @@ -30,7 +29,7 @@ let in { imports = [ - ../config/games.nix + ./config/games.nix ]; services.displayManager.autoLogin.enable = true; @@ -44,24 +43,12 @@ in home-manager.users.guest = { imports = [ - ../homes/config/games.nix ../homes/guest.nix ]; - dconf.settings = { - "org/gnome/desktop/screensaver" = { - lock-enabled = false; - lock-on-suspend = false; - }; - }; - home.stateVersion = "25.05"; }; - environment.systemPackages = with pkgs; [ - rsync - ]; - systemd.services.clean-guest-home = { description = "Perform guest account cleanup"; wantedBy = [ "multi-user.target" ]; # TODO: Only start when the guest account is logged in -- 2.54.0