mhm

flake.nix

@@ -53,6 +53,5 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
   };
 }

hosts/desktop/default.nix

@@ -2,10 +2,12 @@
   networking.hostName = "desktop";
 
   openrgb.enable = true;
+  steam.enable = true;
+  suyu.enable = true;
+  norisk.enbale = true;
 
   imports = [
     ./hardware.nix
     ../../modules
-    ../../modules/games
   ];
 }

modules/apps/norm/misc/default.nix

@@ -1,10 +1,8 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
-    uget
     keepassxc
     vesktop
     signal-desktop
-    upscayl
     bottles
     boxbuddy
     waydroid

modules/default.nix

@@ -1,7 +1,8 @@
 {
   imports = [
-    ./apps
     ./wm
+    ./apps
+    ./games
     ./hardware
     ./services
     ./system

modules/games/default.nix

@@ -1,8 +1,7 @@
 {
   imports = [
     ./suyu
-    ./steam
     ./norisk
-    ./mics
+    ./steam
   ];
 }

modules/games/mics/default.nix

@@ -1,9 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    prismlauncher
-    zulu17
-    dolphin-emu
-    mangohud
-    lutris-free
-  ];
-}

modules/games/norisk/default.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  config,
   pkgs,
   ...
 }: let
@@ -16,26 +17,31 @@
         };
       };
     };
-  backgroundUrl = "https://raw.githubusercontent.com/NoRiskClient/noriskclient-launcher/refs/heads/main/src/images/norisk_logo.png";
-  backgroundSha256 = "sha256-VwWwShUrT055mcabS8QTqqb8INgRB/08U2qEEIVYHlg=";
+  logourl = "https://raw.githubusercontent.com/NoRiskClient/noriskclient-launcher/refs/heads/main/src/images/norisk_logo.png";
+  logsha256 = "sha256-VwWwShUrT055mcabS8QTqqb8INgRB/08U2qEEIVYHlg=";
 in {
-  environment.systemPackages = [
-    customPkgs.noriskclient
-  ];
+  options = {
+    norisk.enable = lib.mkEnableOption "";
+  };
+  config = lib.mkIf config.norisk.enable {
+    environment.systemPackages = [
+      customPkgs.noriskclient
+    ];
 
-  home-manager.users.joy.xdg = {
-    desktopEntries = {
-      NoRiskClient = {
-        name = "NoRisk Client";
-        exec = "noriskclient";
-        icon = pkgs.fetchurl {
-          url = backgroundUrl;
-          sha256 = backgroundSha256;
+    home-manager.users.joy.xdg = {
+      desktopEntries = {
+        NoRiskClient = {
+          name = "NoRisk Client";
+          exec = "noriskclient";
+          icon = pkgs.fetchurl {
+            url = logourl;
+            sha256 = logsha256;
+          };
+          terminal = false;
+          type = "Application";
+          categories = ["Game"];
+          mimeType = ["text/plain"];
         };
-        terminal = false;
-        type = "Application";
-        categories = ["Game"];
-        mimeType = ["text/plain"];
       };
     };
   };

modules/games/steam/default.nix

@@ -1,10 +1,23 @@
-{lib, ...}: {
-  nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (lib.getName pkg) [
-      "steam-original"
-      "steam"
-      "steam-run"
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: {
+  options = {
+    steam.enable = lib.mkEnableOption "";
+  };
+  config = lib.mkIf config.norisk.enable {
+    programs.steam.enable = true;
+    nixpkgs.config.allowUnfreePredicate = pkg:
+      builtins.elem (lib.getName pkg) [
+        "steam-original"
+        "steam"
+        "steam-run"
+      ];
+    environment.systemPackages = with pkgs; [
+      mangohud
+      lutris-free
     ];
-  programs.steam.enable = true;
-  services.joycond.enable = true;
+  };
 }

modules/games/suyu/default.nix

@@ -1,4 +1,9 @@
-{pkgs, ...}: let
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
   customPkgs =
     pkgs
     // {
@@ -13,20 +18,25 @@
       };
     };
 in {
-  environment.systemPackages = [
-    customPkgs.suyu
-  ];
+  options = {
+    suyu.enable = lib.mkEnableOption "";
+  };
+  config = lib.mkIf config.suyu.enable {
+    environment.systemPackages = [
+      customPkgs.suyu
+    ];
 
-  home-manager.users.joy.xdg = {
-    desktopEntries = {
-      suyu = {
-        name = "Suyu";
-        exec = "suyu";
-        icon = "suyu";
-        terminal = false;
-        type = "Application";
-        categories = ["Game" "Emulator"];
-        mimeType = ["text/plain"];
+    home-manager.users.joy.xdg = {
+      desktopEntries = {
+        suyu = {
+          name = "Suyu";
+          exec = "suyu";
+          icon = "suyu";
+          terminal = false;
+          type = "Application";
+          categories = ["Game" "Emulator"];
+          mimeType = ["text/plain"];
+        };
       };
     };
   };

modules/system/xdg/default.nix

@@ -19,10 +19,5 @@
         "video/*" = ["mpv.desktop"];
       };
     };
-    userDirs = {
-      enable = true;
-      desktop = "~/media/pic/screen";
-      download = "~/dl";
-    };
   };
 }

modules/wm/theme/stylix/default.nix

@@ -1,8 +1,12 @@
-{pkgs,inputs, ...}: let
+{
+  pkgs,
+  inputs,
+  ...
+}: let
   backgroundUrl = "https://wallpapers.joygnu.org/wallpapers/anime/ghibli-japanese-walled-garden.png";
   backgroundSha256 = "sha256-10Lv25V0RG0mnw/O90DeVchCNWJbdktUADtuI+enEwM=";
 in {
-  imports = [inputs.stylix.nixosModules.stylix ];
+  imports = [inputs.stylix.nixosModules.stylix];
 
   stylix = {
     enable = true;