feat(katwine): more work

nixos/common/nix.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+_: {
   nix = {
     gc = {
       automatic = true;
@@ -10,7 +10,7 @@
         "deploy"
       ];
     };
-    package = pkgs.lix;
+    #package = pkgs.lixPackageSets.stable.lix;
   };
   system = {
     rebuild.enableNg = true;

nixos/profiles/dev/packages.nix

@@ -1,17 +1,6 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
-    (callPackage ida-pro {
-      runfile = pkgs.requireFile {
-        name = "ida-pro_92_x64linux.run";
-        message = "Don't copy that floppy~!";
-        hash = "sha256-qt0PiulyuE+U8ql0g0q/FhnzvZM7O02CdfnFAAjQWuE=";
-      };
-      normalScript = pkgs.requireFile {
-        name = "ida-normalScript.py";
-        message = "Floppy; copied.";
-        hash = "sha256-8UWf1RKsRNWJ8CC6ceDeIOv4eY3ybxZ9tv5MCHx80NY=";
-      };
-    })
+    ida-pro-kat
     android-studio
   ];
 }

nixos/profiles/gaming/steam.nix

@@ -1,6 +1,11 @@
-_: {
+{pkgs, ...}: {
   programs.steam = {
     enable = true;
+    package = pkgs.steam.override {
+      extraProfile = ''
+        unset TZ
+      '';
+    };
     remotePlay.openFirewall = true;
     platformOptimizations.enable = true;
     extraCompatPackages = [

nixos/profiles/gaming/wine.nix

@@ -1,16 +1,88 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  systemd.user.services.gw = {
+    description = "Guild Wars";
+    serviceConfig = {
+      ExecStart = "${pkgs.katwine}/bin/katwine gw";
+      Type = "simple";
+    };
+    environment = {
+      PROTON_CACHYOS = "${inputs.chaotic.packages.${pkgs.system}.proton-cachyos_x86_64_v3.out}/bin";
+      PROTON_GE = "${inputs.chaotic.packages.${pkgs.system}.proton-ge-custom.out}/bin";
+    };
+  };
+  systemd.user.services.gw2 = {
+    description = "Guild Wars 2";
+    serviceConfig = {
+      ExecStart = "${pkgs.katwine}/bin/katwine gw2";
+      Type = "simple";
+    };
+    environment = {
+      PROTON_CACHYOS = "${inputs.chaotic.packages.${pkgs.system}.proton-cachyos_x86_64_v3.out}/bin";
+      PROTON_GE = "${inputs.chaotic.packages.${pkgs.system}.proton-ge-custom.out}/bin";
+    };
+  };
+  systemd.user.services.battlenet = {
+    description = "Battle.net";
+    serviceConfig = {
+      ExecStart = "${pkgs.katwine}/bin/katwine bnet";
+      Type = "simple";
+    };
+    environment = {
+      PROTON_CACHYOS = "${inputs.chaotic.packages.${pkgs.system}.proton-cachyos_x86_64_v3.out}/bin";
+      PROTON_GE = "${inputs.chaotic.packages.${pkgs.system}.proton-ge-custom.out}/bin";
+    };
+  };
+  systemd.user.services.sc = {
+    description = "Starcraft";
+    serviceConfig = {
+      ExecStart = "${pkgs.katwine}/bin/katwine sc";
+      Type = "simple";
+    };
+    environment = {
+      PROTON_CACHYOS = "${inputs.chaotic.packages.${pkgs.system}.proton-cachyos_x86_64_v3.out}/bin";
+      PROTON_GE = "${inputs.chaotic.packages.${pkgs.system}.proton-ge-custom.out}/bin";
+    };
+  };
+  systemd.user.services.sc2 = {
+    description = "Starcraft 2";
+    serviceConfig = {
+      ExecStart = "${pkgs.katwine}/bin/katwine sc2";
+      Type = "simple";
+    };
+    environment = {
+      PROTON_CACHYOS = "${inputs.chaotic.packages.${pkgs.system}.proton-cachyos_x86_64_v3.out}/bin";
+      PROTON_GE = "${inputs.chaotic.packages.${pkgs.system}.proton-ge-custom.out}/bin";
+    };
+  };
+  systemd.user.services.wc3 = {
+    description = "Warcraft 3";
+    serviceConfig = {
+      ExecStart = "${pkgs.katwine}/bin/katwine wc3 wc3";
+      Type = "simple";
+    };
+    environment = {
+      PROTON_CACHYOS = "${inputs.chaotic.packages.${pkgs.system}.proton-cachyos_x86_64_v3.out}/bin";
+      PROTON_GE = "${inputs.chaotic.packages.${pkgs.system}.proton-ge-custom.out}/bin";
+      #PROTON_WC3 = "/home/kat/.local/share/Steam/compatibilitytools.d/GE-Proton10-3";
+      PROTON_WC3 = "/home/kat/.local/share/Steam/steamapps/common/Proton - Experimental";
+    };
+  };
   systemd.user.services.kanon = {
     description = "Kanon";
     serviceConfig = {
       ExecStart = "${pkgs.katwine}/bin/katwine kanon";
-      Type = "forking";
+      Type = "simple";
     };
   };
   systemd.user.services.hanahira = {
     description = "Hanahira";
     serviceConfig = {
       ExecStart = "${pkgs.katwine}/bin/katwine hanahira";
-      Type = "forking";
+      Type = "simple";
     };
   };
 }

nixos/profiles/graphical/mullvad/default.nix

@@ -1,6 +1,4 @@
-{lib, ...}: let
-  inherit (lib.generators) toJSON;
-
+_: let
   mullvadSettings = builtins.toJSON {
     allow_lan = true;
     auto_connect = true;

nixos/servers/weechat/buflist.nix

@@ -1,4 +1,4 @@
-{config, ...}: {
+_: {
   home-manager.users.kat.programs.weechat.config.buflist = {
     format = {
       indent = " "; # default "  "

nixos/servers/weechat/python.nix

@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   inputs,
   ...

nixos/servers/weechat/weechat.nix

@@ -1,4 +1,4 @@
-{config, ...}: {
+_: {
   home-manager.users.kat = {
     services.weechat.enable = true;
     programs.weechat = {