feat: myGaming module, remove jdks, remove unstable packages

Signed-off-by: saygo-png <saygo.mail@proton.me>

Author: saygo-png

configuration.nix

@@ -10,7 +10,6 @@
   options,
   conUsername,
   conFlakePath,
-  pkgs-unstable,
   ...
 }: {
   imports =
@@ -63,6 +62,7 @@
       "myTmux.nix"
       "myAichat.nix"
       "myThunar.nix"
+      "myGaming.nix"
       "myPackages.nix"
       "myStupid.nix"
       "myTemplates.nix"
@@ -539,7 +539,7 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    extraSpecialArgs = {inherit inputs pkgs-unstable;};
+    extraSpecialArgs = {inherit inputs;};
     backupFileExtension = "backup"; # home-manager breaks without it.
     users.${conUsername} = {
       lib,
@@ -779,8 +779,8 @@
 
           # Unstable
           # nixpkgs-unstable-working-krita.krita # Painting
-          pkgs-unstable.krita # Painting
-          pkgs-unstable.inkscape # Vector graphics
+          krita # Painting
+          inkscape # Vector graphics
           deno
         ];
 

hosts/desktop/desktop.nix

@@ -54,20 +54,6 @@
   powerManagement.cpuFreqGovernor = "performance";
   boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
 
-  # Taken from https://github.com/fufexan/nix-gaming
-  boot.kernel.sysctl = {
-    # 20-shed.conf
-    "kernel.sched_cfs_bandwidth_slice_us" = 3000;
-    # 20-net-timeout.conf
-    # This is required due to some games being unable to reuse their TCP ports
-    # if they're killed and restarted quickly - the default timeout is too large.
-    "net.ipv4.tcp_fin_timeout" = 5;
-    # 30-vm.conf
-    # USE MAX_INT - MAPCOUNT_ELF_CORE_MARGIN.
-    # see comment in include/linux/mm.h in the kernel tree.
-    "vm.max_map_count" = 2147483642;
-  };
-
   services.xserver.videoDrivers = ["modesetting"];
 
   hardware = {
@@ -100,11 +86,6 @@
     # services.easyeffects.enable = true;
     # services.easyeffects.preset = "Audio-Technica ATH-M30x";
 
-    programs.mangohud = {
-      enable = true;
-      enableSessionWide = false;
-    };
-
     xdg.configFile."zed/settings.json".text = builtins.toJSON {
       tab_size = 2;
       ensure_final_newline_on_save = false;
@@ -199,15 +180,6 @@
     };
   };
 
-  # Allowed unfree packages
-  nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (lib.getName pkg) [
-      "steam"
-      "steam-run"
-      "steam-original"
-      "steam-unwrapped"
-    ];
-
   # There is a module for this but i find nix -> yaml weird
   services.borgmatic.enable = true;
   environment.etc = {
@@ -246,54 +218,5 @@
     piper # For ratbagd
     borgbackup
     pkgs-unstable.zed-editor.fhs # Another text editor
-
-    # Game launcher
-    lutris
-    winetricks
-    wineWowPackages.waylandFull
-    blender-hip
-
-    (
-      writeShellScriptBin
-      "sgamescope" # [s]team [gamescope]
-      
-      ''
-        gamescope \
-          -w ${builtins.toString config.const.screenWidth} \
-          -W ${builtins.toString config.const.screenWidth} \
-          -h ${builtins.toString config.const.screenHeight} \
-          -H ${builtins.toString config.const.screenHeight} \
-          -r ${builtins.toString config.const.refreshRate} -f steam
-      ''
-    )
   ];
-
-  # # This is the command for running all 3 programs at once that u put into steam
-  # # gamemoderun gamescope -w 1920 -h 1080 -f -- mangohud %command%
-  programs.steam = {
-    enable = true;
-    gamescopeSession.enable = true;
-    # Load the extest library into Steam, to translate X11 input events to uinput events (for using Steam Input on Wayland).
-    # extest.enable = true;
-    extraCompatPackages = [pkgs-unstable.proton-ge-bin];
-    extraPackages = [
-      pkgs.gamescope
-      pkgs.gamemode
-      # pkgs.libpng
-      # pkgs.libkrb5
-      # pkgs.keyutils
-      # pkgs.libvorbis
-      # pkgs.xorg.libXi
-      # pkgs.libpulseaudio
-      # pkgs.xorg.libXcursor
-      # pkgs.stdenv.cc.cc.lib
-      # pkgs.xorg.libXinerama
-      # pkgs.xorg.libXScrnSaver
-    ];
-  };
-  programs.gamemode.enable = true;
-  programs.gamescope = {
-    enable = true;
-    capSysNice = true; # Breaks it inside of hyprland
-  };
 }

hosts/thinkpad/thinkpad.nix

@@ -167,11 +167,6 @@
   environment.systemPackages = with pkgs; [
     acpi # Cli battery interface.
     powertop # Power drain check
-
-    # Games.
-    lutris-free
-    winetricks
-    wineWowPackages.waylandFull
   ];
 
   services.libinput.mouse.accelSpeed = lib.strings.floatToString config.const.accelSpeed;

modules/myGaming.nix

@@ -0,0 +1,88 @@
+{
+  pkgs,
+  lib,
+  config,
+  conUsername,
+  ...
+}: {
+  # Allowed unfree packages
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [
+      "steam"
+      "steam-run"
+      "steam-original"
+      "steam-unwrapped"
+    ];
+
+  home-manager.users.${conUsername} = _: {
+    programs.mangohud = {
+      enable = true;
+      enableSessionWide = false;
+    };
+  };
+
+  # # This is the command for running all 3 programs at once that u put into steam
+  # # gamemoderun gamescope -w 1920 -h 1080 -f -- mangohud %command%
+  programs.steam = {
+    enable = true;
+    gamescopeSession.enable = true;
+    # Load the extest library into Steam, to translate X11 input events to uinput events (for using Steam Input on Wayland).
+    # extest.enable = true;
+    extraCompatPackages = [pkgs.proton-ge-bin];
+    extraPackages = [
+      pkgs.gamescope
+      pkgs.gamemode
+      # pkgs.libpng
+      # pkgs.libkrb5
+      # pkgs.keyutils
+      # pkgs.libvorbis
+      # pkgs.xorg.libXi
+      # pkgs.libpulseaudio
+      # pkgs.xorg.libXcursor
+      # pkgs.stdenv.cc.cc.lib
+      # pkgs.xorg.libXinerama
+      # pkgs.xorg.libXScrnSaver
+    ];
+  };
+
+  programs.gamemode.enable = true;
+  programs.gamescope = {
+    enable = true;
+    capSysNice = true; # Breaks it inside of hyprland
+  };
+
+  # Taken from https://github.com/fufexan/nix-gaming
+  boot.kernel.sysctl = {
+    # 20-shed.conf
+    "kernel.sched_cfs_bandwidth_slice_us" = 3000;
+    # 20-net-timeout.conf
+    # This is required due to some games being unable to reuse their TCP ports
+    # if they're killed and restarted quickly - the default timeout is too large.
+    "net.ipv4.tcp_fin_timeout" = 5;
+    # 30-vm.conf
+    # USE MAX_INT - MAPCOUNT_ELF_CORE_MARGIN.
+    # see comment in include/linux/mm.h in the kernel tree.
+    "vm.max_map_count" = 2147483642;
+  };
+  environment.systemPackages = [
+    # Game launcher
+    pkgs.lutris
+    pkgs.winetricks
+    pkgs.wineWowPackages.waylandFull
+    pkgs.blender-hip
+
+    (
+      pkgs.writeShellScriptBin
+      "sgamescope" # [s]team [gamescope]
+
+      ''
+        gamescope \
+          -w ${builtins.toString config.const.screenWidth} \
+          -W ${builtins.toString config.const.screenWidth} \
+          -h ${builtins.toString config.const.screenHeight} \
+          -H ${builtins.toString config.const.screenHeight} \
+          -r ${builtins.toString config.const.refreshRate} -f steam
+      ''
+    )
+  ];
+}

modules/myPrismlauncher.nix

@@ -4,7 +4,7 @@
   ...
 }: {
   home-manager.users.${conUsername} = {
-    home.packages = with pkgs; [
+    home.packages = [
       (let
         prismlauncher-unwrapped-patched = pkgs.prismlauncher-unwrapped.overrideAttrs {
           patches = [
@@ -33,11 +33,6 @@
       in
         pkgs.prismlauncher.override {
           prismlauncher-unwrapped = prismlauncher-unwrapped-patched;
-          jdks = [
-            temurin-bin-8
-            temurin-bin-17
-            temurin-bin-21
-          ];
         })
     ];
   };