hosts/desktop/default.nix

@@ -41,7 +41,6 @@
       aseprite
       cloc
       viu
-      qbittorrent
     ];
 
     chuj = {
@@ -117,7 +116,6 @@
           enable = true;
           keys = {
             "git@github.com".file = "github";
-            "git@codeberg.org".file = "codeberg";
             "forgejo@git.jacekpoz.pl".file = "jacekgit";
             "krizej@192.168.1.12".file = "rpi";
             "discord@zasadzka.pl" = {
@@ -136,13 +134,10 @@
         gaming = {
           enable = true;
           quake = true;
+          homm3 = true;
           dosbox = true;
           ror2 = true;
           steam = true;
-          scripts = [
-            { name = "homm3"; exe = "HD_Launcher.exe"; }
-            { name = "gtasa"; exe = "gta_sa.exe"; }
-          ];
         };
       };
     };

modules/stuff/gaming.nix

@@ -1,22 +1,15 @@
 { lib, pkgs, config, ...}: let
-  inherit (lib) mkIf mkEnableOption mkOption types optionals forEach;
+  inherit (lib) mkIf mkEnableOption mkOption types optionals;
   cfg = config.chuj.stuff.gaming;
   user = config.chuj.system.user;
 in {
   options.chuj.stuff.gaming = {
     enable = mkEnableOption "gaming";
     quake = mkEnableOption "quake";
+    homm3 = mkEnableOption "homm3";
     dosbox = mkEnableOption "dosbox";
     ror2 = mkEnableOption "ror2";
     steam = mkEnableOption "steam";
-    scripts = mkOption {
-      type = types.listOf (types.submodule {
-        options = {
-          name = mkOption { type = types.str; };
-          exe = mkOption { type = types.str; };
-        };
-      }); 
-    };
   };
   
   config = mkIf cfg.enable {
@@ -25,16 +18,17 @@ in {
     home-manager.users.${user}.home.packages = with pkgs; ([
       wineWowPackages.stable
       winetricks
-      protontricks
-    ] ++ forEach cfg.scripts (s:
-      (pkgs.writeShellScriptBin s.name ''
-        cd ~/games/${s.name}
-        wine ${s.exe}
-      '')
-    )
+    ]
     ++ optionals cfg.dosbox [ dosbox-staging ]
     ++ optionals cfg.ror2 [ r2modman ]
-    ++ optionals cfg.quake [ vkquake ericw-tools-latest trenchbroom fteqcc gmqcc ]);
+    ++ optionals cfg.quake [ vkquake ericw-tools-latest trenchbroom fteqcc gmqcc ]
+    ++ optionals cfg.homm3 [
+      # todo download it from rpi maybe or something
+      (pkgs.writeShellScriptBin "homm3" ''
+        cd ~/games/homm3
+        wine HD_Launcher.exe
+      '')
+    ]);
 
     # Trenchbroom
     nixpkgs.config.permittedInsecurePackages = optionals cfg.quake [

modules/stuff/i3.nix

@@ -86,8 +86,8 @@ in {
           ++ optionals config.chuj.stuff.dunst.enable [{ command = "dunst &"; notification = false; }]
           ++ optionals config.chuj.stuff.flameshot.enable [{ command = "flameshot &"; notification = false; }]
           ++ optionals cfg.communicators.autostart [
-#            { command = "i3-msg \"workspace ${cfg.communicators.workspace}; append_layout ${../../files/i3_communicators_layout.json}\""; notification = false; }
-#            { command = "discord &"; notification = false; }
+            { command = "i3-msg \"workspace ${cfg.communicators.workspace}; append_layout ${../../files/i3_communicators_layout.json}\""; notification = false; }
+            { command = "discord &"; notification = false; }
             { command = "element-desktop &"; notification = false; }
           ]
           ++ optionals config.chuj.stuff.mpd.enable [

pkgs/default.nix

@@ -19,12 +19,5 @@
         make -j6 DO_USERDIRS=1 prefix=$out bindir=$out/bin 
       '';
     });
-    protontricks = prevPkgs.protontricks.overrideAttrs (prev: {
-      src = pkgs.fetchFromGitHub {
-        inherit (prev.src) owner repo;
-        rev = "f7b1fa33b0438dbd72f7222703f8442e40edc510";
-        sha256 = "sha256-t794WEMJx/JNX3gTMHfgquFWB7yXkleW07+QURm1NPM=";
-      };
-    });
   })
 ]