From bfeebbb7fc2e1a2d06187ce8a387d5225e87068a Mon Sep 17 00:00:00 2001
From: EdenQwQ <lsahlm1eden@gmail.com>
Date: Sun, 9 Mar 2025 21:36:10 +0800
Subject: [PATCH] add R

---
 home/programs/coding/R.nix | 10 ++++++----
 pkgs/R.nix                 | 22 ++++++++++++++++++++++
 pkgs/rstudio.nix           | 14 --------------
 3 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/R.nix
 delete mode 100644 pkgs/rstudio.nix

diff --git a/home/programs/coding/R.nix b/home/programs/coding/R.nix
index 7b9f457..cc71bc0 100644
--- a/home/programs/coding/R.nix
+++ b/home/programs/coding/R.nix
@@ -3,11 +3,13 @@ let
   colors = config.lib.stylix.colors.withHashtag;
 in
 {
-  home.packages = [
-    (
-      import ../../../pkgs/rstudio.nix pkgs
-      |> config.lib.misc.addFlags "--enable-features=UseOzonePlatform --ozone-platform=wayland --use-gl=angle --wayland-text-input-version=3" "rstudio"
+  home.packages = with (import ../../../pkgs/R.nix pkgs); [
+    (config.lib.misc.addFlags
+      "--enable-features=UseOzonePlatform --ozone-platform=wayland --use-gl=angle --wayland-text-input-version=3"
+      "rstudio"
+      myRstudio
     )
+    myR
   ];
   xdg.configFile."rstudio/themes/stylix.rstheme".text = with colors; ''
     /* rsthemes 0.5.0 */
diff --git a/pkgs/R.nix b/pkgs/R.nix
new file mode 100644
index 0000000..2cccae1
--- /dev/null
+++ b/pkgs/R.nix
@@ -0,0 +1,22 @@
+pkgs:
+let
+  rPkgs = with pkgs.rPackages; [
+    ggplot2
+    dplyr
+    tidyverse
+    bruceR
+    afex
+    ggpubr
+    reshape2
+    rmdformats
+    see
+  ];
+in
+{
+  myR = pkgs.rWrapper.override {
+    packages = rPkgs;
+  };
+  myRstudio = pkgs.rstudioWrapper.override {
+    packages = rPkgs;
+  };
+}
diff --git a/pkgs/rstudio.nix b/pkgs/rstudio.nix
deleted file mode 100644
index 9dce8df..0000000
--- a/pkgs/rstudio.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-pkgs:
-pkgs.rstudioWrapper.override {
-  packages = with pkgs.rPackages; [
-    ggplot2
-    dplyr
-    tidyverse
-    bruceR
-    afex
-    ggpubr
-    reshape2
-    rmdformats
-    see
-  ];
-}