fix(emacs): coerce makeWrapper args

hosts/sydpc/configuration.nix

@@ -21,6 +21,7 @@
     stylix.enable = true;
     qemu.enable = true;
     flatpak.enable = true;
+    gtav-battleye-hack.enable = true;
     # gdm.enable = true;
     openssh.enable = true;
     sydpkgs.overlay.enable = true;

modules/home/emacs.nix

@@ -56,7 +56,12 @@ in {
         Extra arguments to pass to the final wrapProgram call.
       '';
       default = [];
-      type = lib.types.listOf lib.types.str;
+      type = with lib.types;
+        listOf
+          (coercedTo
+            (oneOf [str package])
+            builtins.toString
+            str);
       apply = lib.escapeShellArgs;
     };
   };

modules/home/prism-launcher.nix

@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.sydnix.prism-launcher;
+in {
+  options.sydnix.prism-launcher = {
+    enable = lib.mkEnableOption "Prism Launcher";
+  };
+
+  config = lib.mkIf cfg.enable {
+    home.packages = [
+      pkgs.prismlauncher
+    ];
+
+    sydnix.impermanence.directories = [
+      ".local/share/PrismLauncher"
+    ];
+  };
+}

modules/home/users/msyds/emacs.nix

@@ -51,6 +51,10 @@ in {
         pkgs.nerd-fonts.victor-mono
         pkgs.ibm-plex
       ];
+      extraWrapProgramArgs = [
+        "--set" "ESHELL_ALIASES_FILE"
+        config.home.sessionVariables.ESHELL_ALIASES_FILE
+      ];
     };
   };
 }

modules/home/users/msyds/emacs/lisp/syd/auctex.el

@@ -2,7 +2,10 @@
 
 (require 'syd/base)
 
-(use-package auctex
+(use-package auctex)
+
+(use-package tex
+  :straight nil ; Part of auctex.
   :config
   (add-to-list 'TeX-view-program-selection '(output-pdf "Sioyek")))
 

modules/home/users/msyds/emacs/lisp/syd/fcitx.el

@@ -3,8 +3,8 @@
 (require 'syd/base)
 
 (use-package fcitx
-  :custom ((fcitx-remote-command "fcitx5-remote"))
   :config
+  (setq fcitx-remote-command "fcitx5-remote")
   (fcitx-aggressive-setup))
 
 (provide 'syd/fcitx)

modules/home/users/msyds/emacs/lisp/syd/ligature.el

@@ -22,11 +22,16 @@
 			    "/*" "/=" "/>" "//" "__" "~~" "(*" "*)"
 			    "\\\\" "://"))
   ;; Sitelen pona glyphs.
-  (rx-let ((ideograph (any (#xF1900 . #xF198C))))
+  (rx-let ((ideograph (any (#xF1900 . #xF198C)))
+           (tok-punct (any "󱦜" "󱦝"))
+           (arrow (any "←-↙"))
+           (zwj "‍"))
     (ligature-set-ligatures
      'fundamental-mode
-     `(("󱦐" ,(rx (* ideograph)))
-       ("󱥍" ,(rx "󱦗" (* ideograph))))))
+     `(("󱦐" ,(rx (* (or ideograph tok-punct))))
+       ("󱥍" ,(rx "󱦗" (* (or ideograph tok-punct)) "󱦘"))
+       ("󱥁" ,(rx zwj arrow))
+       ("󱤑" ,(rx zwj ideograph)))))
   (global-ligature-mode 1))
 
 (provide 'syd/ligature)

modules/home/users/msyds/emacs/lisp/syd/project.el

@@ -1,6 +1,7 @@
 ;;; -*- lexical-binding: t; -*-
 
 (require 'syd/base)
+(require 'syd/keymaps)
 (require 'syd/completion) ; For `consult'.
 (require 'consult)
 

modules/nixos/gtav-battleye-hack.nix

@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.sydnix.gtav-battleye-hack;
+in {
+  options.sydnix.gtav-battleye-hack = {
+    enable = lib.mkEnableOption
+      "Grand Theft Auto V Online BattlEye workaround";
+  };
+
+  config = lib.mkIf cfg.enable {
+    networking.hosts."0.0.0.0" = [
+      "paradise-s1.battleye.com"
+      "test-s1.battleye.com"
+      "paradiseenhanced-s1.battleye.com"
+    ];
+  };
+}

users/msyds/default.nix

@@ -46,6 +46,8 @@
         kdeconnect.enable = true;
         qalculate.enable = true;
         toki-pona.enable = true;
+        prism-launcher.enable = on "sydpc";
+        flatpak.enable = on "sydpc";
         sops = {
           enable = true;
           keyFile = "/persist/private-keys/age/crumb";