add rstudio; add lib function: addFlags

home/lib/addFlags.nix

@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+  config.lib.misc.addFlags =
+    flags: name: pkg:
+    pkgs.symlinkJoin {
+      name = "${name}-wrapped";
+      paths = [ "${pkg}" ];
+      buildInputs = [ pkgs.makeWrapper ];
+      postBuild = ''
+        wrapProgram $out/bin/${name} --add-flags "${flags}"
+      '';
+    };
+}

home/lib/default.nix

@@ -4,6 +4,6 @@
     ./wallpaper
     ./monitors.nix
     ./swhkd.nix
-    ./fixChromeIME.nix
+    ./addFlags.nix
   ];
 }

home/lib/fixChromeIME.nix

@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-{
-  config.lib.misc.fixChromeIME =
-    package:
-    pkgs.symlinkJoin {
-      name = "${package}-wrapped";
-      paths = [ pkgs.${package} ];
-      buildInputs = [ pkgs.makeWrapper ];
-      postBuild = ''
-        wrapProgram $out/bin/${package} --add-flags "--wayland-text-input-version=3"
-      '';
-    };
-}

home/programs/coding/R.nix

@@ -4,7 +4,10 @@ let
 in
 {
   home.packages = [
-    (import ../../../pkgs/rstudio.nix pkgs)
+    (
+      import ../../../pkgs/rstudio.nix pkgs
+      |> config.lib.misc.addFlags "--enable-features=UseOzonePlatform --ozone-platform=wayland --use-gl=angle --wayland-text-input-version=3" "rstudio"
+    )
   ];
   xdg.configFile."rstudio/themes/stylix.rstheme".text = with colors; ''
     /* rsthemes 0.5.0 */

home/programs/utils/default.nix

@@ -41,7 +41,7 @@
     nurl
     wl-color-picker
     matugen
-    (config.lib.misc.fixChromeIME "cherry-studio")
+    (config.lib.misc.addFlags "--wayland-text-input-version=3" "cherry-studio" cherry-studio)
   ];
   imports = [
     ./eye-candy.nix

pkgs/rstudio.nix

@@ -1,25 +1,14 @@
 pkgs:
-let
-  myRstudio = pkgs.rstudioWrapper.override {
-    packages = with pkgs.rPackages; [
-      ggplot2
-      dplyr
-      tidyverse
-      bruceR
-      afex
-      ggpubr
-      reshape2
-      rmdformats
-      see
-    ];
-  };
-in
-pkgs.symlinkJoin {
-  name = "rstudio-wrapped";
-  paths = [ myRstudio ];
-  buildInputs = [ pkgs.makeWrapper ];
-  postBuild = ''
-    wrapProgram $out/bin/rstudio --add-flags \
-      "--enable-features=UseOzonePlatform --ozone-platform=wayland --use-gl=angle"
-  '';
+pkgs.rstudioWrapper.override {
+  packages = with pkgs.rPackages; [
+    ggplot2
+    dplyr
+    tidyverse
+    bruceR
+    afex
+    ggpubr
+    reshape2
+    rmdformats
+    see
+  ];
 }