chore: pnpm-package.json

yqrashawn · Oct 30, 2024 · 21625ca · 21625ca
1 parent 383b9db
commit 21625ca
Show file tree

Hide file tree

Showing 10 changed files with 8,417 additions and 31 deletions.
diff --git a/.doom.d/js.el b/.doom.d/js.el
@@ -128,3 +128,20 @@
            solidity-mode)
   :when (locate-dominating-file default-directory "package.json")
   :add-hooks '(+javascript-add-npm-path-h npm-mode))
+
+(use-package! lsp-tailwindcss
+  :init
+  (setq lsp-tailwindcss-add-on-mode t)
+  :config
+  (dolist (tw-major-mode
+           '(css-mode
+             css-ts-mode
+             typescript-mode
+             typescript-ts-mode
+             tsx-ts-mode
+             rjsx-mode
+             js2-mode
+             js-ts-mode
+             clojure-mode
+             clojurescript-mode))
+    (add-to-list 'lsp-tailwindcss-major-modes tw-major-mode)))
diff --git a/.doom.d/packages.el b/.doom.d/packages.el
@@ -360,6 +360,7 @@
 (package! imake)
 (package! parseedn)
 (package! cloel :recipe (:host github :repo "manateelazycat/cloel"))
+(package! lsp-tailwindcss)
 ;; (package! casual)
 ;; (package! jinx) ;; installed via nix
 

diff --git a/modules/yqrashawn/common.nix b/modules/yqrashawn/common.nix
@@ -249,6 +249,7 @@ in {
         redis
         # langs
         tree-sitter
+        rustywind
         nodePackages.js-beautify
         nodePackages.stylelint
         # nodePackages.expo-cli

diff --git a/modules/yqrashawn/darwin/preferences.nix b/modules/yqrashawn/darwin/preferences.nix
@@ -222,12 +222,16 @@ in {
         rm -rf ~/.doom.d || true
         ln -s ~/.nixpkgs/.doom.d ~/.doom.d
 
-        rm -rf ~/.config/yarn/global/package.json || true
-        rm -rf ~/.local/share/yarn/global/package.json || true
-        mkdir -p ~/.config/yarn/global
-        mkdir -p ~/.local/share/yarn/global
-        ln -s ~/.nixpkgs/modules/yqrashawn/home-manager/dotfiles/package.json ~/.config/yarn/global/package.json
-        ln -s ~/.nixpkgs/modules/yqrashawn/home-manager/dotfiles/package.json ~/.local/share/yarn/global/package.json
+        if [ ! -e ~/.local/share/yarn/global/package.json ]; then
+            mkdir -p ~/.local/share/yarn/global
+            ln -s ~/.nixpkgs/modules/yqrashawn/home-manager/dotfiles/yarn-package.json ~/.local/share/yarn/global/package.json
+        fi
+
+        if [ ! -e ~/.local/share/pnpm/global/5/package.json ]; then
+            mkdir -p ~/.local/share/pnpm/global/5
+            ln -s ~/.nixpkgs/modules/yqrashawn/home-manager/dotfiles/pnpm-package.json ~/.local/share/pnpm/global/5/package.json
+            ln -s ~/.nixpkgs/modules/yqrashawn/home-manager/dotfiles/pnpm-lock.yaml ~/.local/share/pnpm/global/5/pnpm-lock.yaml
+        fi
 
         rm -rf ~/.config/karabiner.edn || true
         ln -s ~/.nixpkgs/modules/yqrashawn/home-manager/dotfiles/karabiner.edn ~/.config/karabiner.edn
@@ -295,7 +299,10 @@ in {
             mkdir -p ~/.config
             ln -s ~/.nixpkgs/modules/yqrashawn/home-manager/dotfiles/clj-kondo ~/.config/clj-kondo
         fi
-
+        if [ ! -e ~/.tool-versions ]; then
+            echo 'link ~/.tool-versions'
+            ln -s ~/.nixpkgs/modules/yqrashawn/home-manager/dotfiles/.tool-versions ~/.tool-versions
+        fi
       '';
     };
   };

diff --git a/modules/yqrashawn/home-manager/cli/zsh.nix b/modules/yqrashawn/home-manager/cli/zsh.nix
@@ -53,11 +53,15 @@ let
     lsa = "eza -abghl --git --color=automatic";
     lsd = "eza -l --color=automatic | grep --color=never '^d'";
     lst = "eza --sort=created --time=created --long --all -r | sed 15q";
+    p = "pnpm";
+    pi = "pnpm i";
+    pga = "pnpm i -g";
+    px = "pnpx";
     y = "yarn";
     yi = "yarn init";
     ya = "yarn add";
     yad = "yarn add --dev";
-    ysrc = "yarn start --reset-cache";
+    ystnc = "yarn start --reset-cache";
     yga = "yarn global add";
     yu = "yarn upgrade";
     yui = "yarn upgrade-interactive";

diff --git a/modules/yqrashawn/home-manager/dotfiles/.tool-versions b/modules/yqrashawn/home-manager/dotfiles/.tool-versions
@@ -0,0 +1,15 @@
+# clojure latest
+clojure 1.11.1.1429
+java oracle-graalvm-22
+# java adoptopenjdk-21.0.1+12.0.LTS
+nodejs 21.6.2
+python 3.12.2
+ruby 3.2.2
+nim 1.6.18
+ruby 3.2.2
+golang 1.20.12
+bun 1.0.20
+deno 1.39.1
+lua 5.4.4
+babashka 1.12.194
+zig 0.11.0
diff --git a/modules/yqrashawn/home-manager/dotfiles/package.json b/modules/yqrashawn/home-manager/dotfiles/package.json
@@ -1,25 +1,27 @@
 {
-  "dependencies": {
-    "bash-language-server": ">=0",
-    "create-cloudflare": ">=0",
-    "create-next-app": ">=0",
-    "create-react-app": ">=0",
-    "create-turbo": ">=0",
-    "create-vite": ">=0",
-    "dockerfile-language-server-nodejs": ">=0",
-    "graphql": ">=0",
-    "graphql-language-service-cli": ">=0",
-    "marked": ">=0",
-    "nbb": ">=0",
-    "shadow-cljs": ">=0",
-    "surge": ">=0",
-    "textlint": ">=0",
-    "textlint-rule-write-good": ">=0",
-    "tree-sitter-cli": ">=0",
-    "typescript-language-server": ">=0",
-    "vercel": ">=0",
-    "vscode-langservers-extracted": ">=0",
-    "wrangler": ">=0",
-    "yaml-language-server": ">=0"
-  }
+	"dependencies": {
+		"bash-language-server": "^5.3.4",
+		"copilot-node-server": "^1.33.0",
+		"create-cloudflare": "^2.21.4",
+		"create-next-app": "^14.2.3",
+		"create-react-app": "^5.0.1",
+		"create-turbo": "^1.13.4",
+		"create-vite": "^5.2.3",
+		"dockerfile-language-server-nodejs": "^0.11.0",
+		"graphql-language-service-cli": "^3.4.2",
+		"marked": "^12.0.2",
+		"nbb": "^1.2.188",
+		"shadow-cljs": "^2.28.8",
+		"smee-client": "^2.0.2",
+		"surge": "^0.23.1",
+		"textlint": "^14.0.4",
+		"textlint-rule-write-good": "^2.0.0",
+		"tree-sitter-cli": "0.21.0-pre-release-1",
+		"turbo": "^1.13.4",
+		"typescript-language-server": "^4.3.3",
+		"vercel": "^37.13.0",
+		"vscode-langservers-extracted": "^4.10.0",
+		"wrangler": "^3.62.0",
+		"yaml-language-server": "^1.14.0"
+	}
 }