From cb35b1afd9d86ad6f33dfa54d708398f739dd7d9 Mon Sep 17 00:00:00 2001 From: Jan-Bulthuis Date: Sun, 26 Jan 2025 15:11:52 +0100 Subject: [PATCH] Back to ES-DE --- flake.lock | 42 +++++++++++------------ flake.nix | 5 +++ user-modules/feishin/default.nix | 3 -- user-modules/gaming/default.nix | 2 +- user-modules/gaming/launchers/es-de.nix | 26 ++++++++++++++ user-modules/gaming/launchers/pegasus.nix | 23 ------------- users/jan.nix | 2 +- 7 files changed, 54 insertions(+), 49 deletions(-) create mode 100644 user-modules/gaming/launchers/es-de.nix delete mode 100644 user-modules/gaming/launchers/pegasus.nix diff --git a/flake.lock b/flake.lock index b517a77..ed8d5eb 100644 --- a/flake.lock +++ b/flake.lock @@ -366,11 +366,11 @@ ] }, "locked": { - "lastModified": 1737669579, - "narHash": "sha256-v9WQ3c4ctwPMfdBZMZxpdM9xXev4uChce4BxOpvsu0E=", + "lastModified": 1737762889, + "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b9ece1bf3c8780cde9b975b28c2d9ccd7e9cdb9", + "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "type": "github" }, "original": { @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1737630279, - "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=", + "lastModified": 1737762889, + "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "owner": "nix-community", "repo": "home-manager", - "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c", + "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "type": "github" }, "original": { @@ -493,11 +493,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "lastModified": 1737746512, + "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "825479c345a7f806485b7f00dbe3abb50641b083", "type": "github" }, "original": { @@ -509,11 +509,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1737525964, - "narHash": "sha256-3wFonKmNRWKq1himW9N3TllbeGIHFACI5vmLpk6moF8=", + "lastModified": 1737717945, + "narHash": "sha256-ET91TMkab3PmOZnqiJQYOtSGvSTvGeHoegAv4zcTefM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5757bbb8bd7c0630a0cc4bb19c47e588db30b97c", + "rev": "ecd26a469ac56357fd333946a99086e992452b6a", "type": "github" }, "original": { @@ -552,11 +552,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737667561, - "narHash": "sha256-BKUapQPTji3V2uxymGq62/UWF1XMjfHvKd565jj1HlA=", + "lastModified": 1737832569, + "narHash": "sha256-VkK73VRVgvSQOPw9qx9HzvbulvUM9Ae4nNd3xNP+pkI=", "owner": "nix-community", "repo": "nixvim", - "rev": "aab2b81792567237c104b90c3936e073d28a9ac6", + "rev": "d7df58321110d3b0e12a829bbd110db31ccd34b1", "type": "github" }, "original": { @@ -574,11 +574,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1737676011, - "narHash": "sha256-NqRCQ98D1LY1txY8juG8ufvdSCfvvnoYjV6U6KLRHQ8=", + "lastModified": 1737897819, + "narHash": "sha256-oVr0st3IHSgIPLDCoDtbI/TiLcMqs85KGBfLqFV3xQU=", "owner": "nix-community", "repo": "NUR", - "rev": "470a60434e82a09ea60adb564919923e1017feb7", + "rev": "ee6e560d3cbfdbb2d92d1d95c83aaa434ed42dc5", "type": "github" }, "original": { @@ -640,11 +640,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1737657729, - "narHash": "sha256-TIDR1zKoP2uaqRot/LnarugfAC9U7geycjbJqA1naVM=", + "lastModified": 1737861120, + "narHash": "sha256-V/GWU1BQwbxyZif9RBvwn10S1KX+86uPkkI41KQEcQQ=", "owner": "danth", "repo": "stylix", - "rev": "e594886eb0951a0a0c28ffa333a9df6fb13857a1", + "rev": "d6951d0b2ffe74e4779a180e9b6a0e17627756e1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4a97997..c510125 100644 --- a/flake.nix +++ b/flake.nix @@ -44,6 +44,11 @@ nixvim.homeManagerModules.nixvim nur.modules.homeManager.default { + # TODO: Remove insecure package exception + nixpkgs.config.permittedInsecurePackages = [ + "freeimage-unstable-2021-11-01" # For emulation station + "electron-31.7.7" # For feishin + ]; nixpkgs.overlays = [ nix-matlab.overlay ]; diff --git a/user-modules/feishin/default.nix b/user-modules/feishin/default.nix index cbec769..c3134f0 100644 --- a/user-modules/feishin/default.nix +++ b/user-modules/feishin/default.nix @@ -13,9 +13,6 @@ in options.modules.feishin.enable = mkEnableOption "feishin"; config = mkIf cfg.enable { - # TODO: Remove insecure package exception - nixpkgs.config.permittedInsecurePackages = [ "electron-31.7.7" ]; - # TODO: Move to audioling home.packages = with pkgs; [ feishin ]; }; diff --git a/user-modules/gaming/default.nix b/user-modules/gaming/default.nix index 06affc9..4f5ae53 100644 --- a/user-modules/gaming/default.nix +++ b/user-modules/gaming/default.nix @@ -3,8 +3,8 @@ { imports = [ ./emulators/ryujinx.nix + ./launchers/es-de.nix ./launchers/modrinth.nix - ./launchers/pegasus.nix ./launchers/steam.nix ]; } diff --git a/user-modules/gaming/launchers/es-de.nix b/user-modules/gaming/launchers/es-de.nix new file mode 100644 index 0000000..ffe91c2 --- /dev/null +++ b/user-modules/gaming/launchers/es-de.nix @@ -0,0 +1,26 @@ +{ + lib, + config, + pkgs, + ... +}: + +with lib; +let + cfg = config.modules.es-de; +in +{ + options.modules.es-de = { + enable = mkEnableOption "Emulation Station Desktop Edition"; + }; + + config = mkIf cfg.enable { + home.packages = with pkgs; [ + emulationstation-de + ]; + + home.sessionVariables = { + ESDE_APPDATA_DIR = "$HOME/.config/ES-DE"; + }; + }; +} diff --git a/user-modules/gaming/launchers/pegasus.nix b/user-modules/gaming/launchers/pegasus.nix deleted file mode 100644 index 3221e60..0000000 --- a/user-modules/gaming/launchers/pegasus.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: - -with lib; -let - cfg = config.modules.pegasus; -in -{ - options.modules.pegasus = { - enable = mkEnableOption "Pegasus Frontend"; - }; - - config = mkIf cfg.enable { - - home.packages = with pkgs; [ - pegasus-frontend - ]; - }; -} diff --git a/users/jan.nix b/users/jan.nix index b6a3a6d..7958e6e 100644 --- a/users/jan.nix +++ b/users/jan.nix @@ -65,7 +65,7 @@ # Gaming steam.enable = true; modrinth.enable = true; - pegasus.enable = true; + es-de.enable = true; ryujinx.enable = true; # Media