Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/dot-emacs.d/bin/sexpdata-1.0.2
Browse files Browse the repository at this point in the history
nanasess authored Feb 24, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents dc0c4e5 + ca23d5f commit 36b3eaf
Showing 17 changed files with 157 additions and 55 deletions.
5 changes: 4 additions & 1 deletion .emacs.d/.gitignore
Original file line number Diff line number Diff line change
@@ -43,4 +43,7 @@ server
/tree-sitter
!/tree-sitter/README.md
/lib
/lib64
/lib64
/bin/bundle/
/node_modules/
/yarn.lock
2 changes: 2 additions & 0 deletions .emacs.d/bin/.bundle/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
BUNDLE_PATH: "bundle"
2 changes: 2 additions & 0 deletions .emacs.d/bin/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
source 'http://rubygems.org'
gem 'solargraph', group: :development
71 changes: 71 additions & 0 deletions .emacs.d/bin/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
GEM
remote: http://rubygems.org/
specs:
ast (2.4.2)
backport (1.2.0)
benchmark (0.3.0)
diff-lcs (1.5.0)
e2mmap (0.1.0)
jaro_winkler (1.5.6)
json (2.7.1)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
language_server-protocol (3.17.0.3)
nokogiri (1.16.0-x86_64-linux)
racc (~> 1.4)
parallel (1.24.0)
parser (3.3.0.5)
ast (~> 2.4.1)
racc
racc (1.7.3)
rainbow (3.1.1)
rbs (2.8.4)
regexp_parser (2.9.0)
reverse_markdown (2.1.1)
nokogiri
rexml (3.2.6)
rubocop (1.60.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
ruby-progressbar (1.13.0)
solargraph (0.50.0)
backport (~> 1.2)
benchmark
bundler (~> 2.0)
diff-lcs (~> 1.4)
e2mmap
jaro_winkler (~> 1.5)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.1)
parser (~> 3.0)
rbs (~> 2.0)
reverse_markdown (~> 2.0)
rubocop (~> 1.38)
thor (~> 1.0)
tilt (~> 2.0)
yard (~> 0.9, >= 0.9.24)
thor (1.3.0)
tilt (2.3.0)
unicode-display_width (2.5.0)
yard (0.9.34)

PLATFORMS
x86_64-linux

DEPENDENCIES
solargraph

BUNDLED WITH
2.3.26
1 change: 1 addition & 0 deletions .emacs.d/bin/cabal
1 change: 1 addition & 0 deletions .emacs.d/bin/ghc
3 changes: 0 additions & 3 deletions .emacs.d/bin/haskell-language-server

This file was deleted.

3 changes: 0 additions & 3 deletions .emacs.d/bin/haskell-language-server-wrapper

This file was deleted.

1 change: 1 addition & 0 deletions .emacs.d/bin/haskell-language-server-wrapper
8 changes: 4 additions & 4 deletions .emacs.d/bin/package.json
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@
"main": "index.js",
"license": "MIT",
"dependencies": {
"@emacs-eask/cli": "^0.9.1",
"@emacs-eask/cli": "^0.9.5",
"@mermaid-js/mermaid-cli": "^10",
"bash-language-server": "^5.0.0",
"bash-language-server": "^5.1.2",
"copilot-node-server": "^1.13.0",
"dockerfile-language-server-nodejs": "^0.11.0",
"typescript": "^5.2.2",
"typescript-language-server": "^4.2.0",
"typescript": "^5.3.3",
"typescript-language-server": "^4.3.3",
"vscode-langservers-extracted": "^4.8.0",
"yaml-language-server": "^1.14.0"
}
4 changes: 2 additions & 2 deletions .emacs.d/bin/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
epc==0.0.5
orjson==3.9.7
paramiko==3.3.1
rapidfuzz==3.3.1
paramiko==3.4.0
rapidfuzz==3.6.1
sexpdata==1.0.2
six==1.16.0
2 changes: 1 addition & 1 deletion .emacs.d/bin/solargraph
1 change: 1 addition & 0 deletions .emacs.d/bin/stack
95 changes: 58 additions & 37 deletions .emacs.d/bin/yarn.lock
Original file line number Diff line number Diff line change
@@ -20,9 +20,10 @@
chalk "^2.0.0"
js-tokens "^4.0.0"

"@emacs-eask/cli@^0.9.1":
version "0.9.1"
resolved "https://registry.yarnpkg.com/@emacs-eask/cli/-/cli-0.9.1.tgz#f54fe551448bb736b42f9e86367ef85117f59d73"
"@emacs-eask/cli@^0.9.5":
version "0.9.5"
resolved "https://registry.yarnpkg.com/@emacs-eask/cli/-/cli-0.9.5.tgz#60742bd79c7850ef1d9edb8ac11dfed3b25ea967"
integrity sha512-QJEdZYUYx0yCrQ1U3gB0IfVF0Qm5hGnK+nxZYsV/HGvo4qE3hxomfau6E7Ilin0fB/m9sy4qY481XSB30Wt/1g==
dependencies:
which "^4.0.0"
yargs "^17.0.0"
@@ -116,18 +117,19 @@ base64-js@^1.3.1:
version "1.5.1"
resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"

bash-language-server@^5.0.0:
version "5.0.0"
resolved "https://registry.npmjs.org/bash-language-server/-/bash-language-server-5.0.0.tgz"
bash-language-server@^5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/bash-language-server/-/bash-language-server-5.1.2.tgz#f1831511ce27366d138f5ed9676c27b1881abcdc"
integrity sha512-hXgN71VWVV2nQVE1ej7scAHVGvRAxoYhs2KwzvJq+lSqp4VQ60M0Cff1QzJKJM/cTyLWNjabb98bDGZgDMMh2g==
dependencies:
fast-glob "3.3.0"
fast-glob "3.3.2"
fuzzy-search "3.2.1"
node-fetch "2.6.12"
node-fetch "2.7.0"
turndown "7.1.2"
vscode-languageserver "8.0.2"
vscode-languageserver-textdocument "1.0.8"
vscode-languageserver-textdocument "1.0.11"
web-tree-sitter "0.20.8"
zod "3.21.4"
zod "3.22.4"

bl@^4.0.3:
version "4.1.0"
@@ -343,6 +345,15 @@ emoji-regex@^8.0.0:
version "8.0.0"
resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"

domutils@^3.0.1:
version "3.1.0"
resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e"
integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==
dependencies:
dom-serializer "^2.0.0"
domelementtype "^2.3.0"
domhandler "^5.0.3"

end-of-stream@^1.1.0, end-of-stream@^1.4.1:
version "1.4.4"
resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"
@@ -382,9 +393,10 @@ fast-deep-equal@^3.1.1:
version "3.1.3"
resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"

[email protected]:
version "3.3.0"
resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz"
[email protected]:
version "3.3.2"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
dependencies:
"@nodelib/fs.stat" "^2.0.2"
"@nodelib/fs.walk" "^1.2.3"
@@ -456,6 +468,11 @@ [email protected]:
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==

[email protected]:
version "1.2.0"
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==

[email protected]:
version "5.0.1"
resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"
@@ -571,18 +588,19 @@ [email protected]:
version "2.1.2"
resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"

[email protected]:
version "2.6.12"
resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz"
dependencies:
whatwg-url "^5.0.0"

[email protected]:
version "2.6.7"
resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"
dependencies:
whatwg-url "^5.0.0"

[email protected]:
version "2.7.0"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
dependencies:
whatwg-url "^5.0.0"

node-html-parser@^6.1.5:
version "6.1.12"
resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-6.1.12.tgz#6138f805d0ad7a6b5ef415bcd91bca07374bf575"
@@ -716,6 +734,11 @@ require-directory@^2.1.1:
version "2.1.1"
resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"

request-light@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.7.0.tgz#885628bb2f8040c26401ebf258ec51c4ae98ac2a"
integrity sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q==

require-from-string@^2.0.2:
version "2.0.2"
resolved "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"
@@ -809,17 +832,18 @@ [email protected]:
dependencies:
domino "^2.1.6"

typescript-language-server@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/typescript-language-server/-/typescript-language-server-4.2.0.tgz#b61b755c4b45a4868dfebf4ac57b8b6af9e7f2ca"
typescript-language-server@^4.3.3:
version "4.3.3"
resolved "https://registry.yarnpkg.com/typescript-language-server/-/typescript-language-server-4.3.3.tgz#b52836fa0ec7a9c05007af44d5a49605f5fe72e0"
integrity sha512-3QLj57Ru9S6zv10sa4z1pA3TIR1Rdkd04Ke0EszbO4fx5PLdlYhlC/PMxwlyxls9wrZs7wPCME1Ru0s1Gabz4Q==

typescript@^4.0.5:
version "4.8.4"
resolved "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz"

typescript@^5.2.2:
version "5.2.2"
resolved "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz"
typescript@^5.3.3:
version "5.3.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"

[email protected]:
version "1.4.3"
@@ -935,14 +959,14 @@ [email protected]:
vscode-jsonrpc "8.2.0"
vscode-languageserver-types "3.17.5"

[email protected], vscode-languageserver-textdocument@^1.0.1, vscode-languageserver-textdocument@^1.0.11, vscode-languageserver-textdocument@^1.0.8, vscode-languageserver-textdocument@~1.0.8:
version "1.0.11"
resolved "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz"

[email protected]:
version "1.0.8"
resolved "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz"

vscode-languageserver-textdocument@^1.0.1, vscode-languageserver-textdocument@^1.0.11, vscode-languageserver-textdocument@^1.0.8, vscode-languageserver-textdocument@~1.0.8:
version "1.0.11"
resolved "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz"

[email protected]:
version "3.16.0"
resolved "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz"
@@ -994,11 +1018,7 @@ vscode-nls@^5.0.0, vscode-nls@^5.2.0:
version "5.2.0"
resolved "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.2.0.tgz"

vscode-uri@^3.0.2:
version "3.0.6"
resolved "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.6.tgz"

vscode-uri@^3.0.7, vscode-uri@^3.0.8:
vscode-uri@^3.0.2, vscode-uri@^3.0.7, vscode-uri@^3.0.8:
version "3.0.8"
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f"
integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==
@@ -1088,6 +1108,7 @@ yauzl@^2.10.0:
buffer-crc32 "~0.2.3"
fd-slicer "~1.1.0"

[email protected]:
version "3.21.4"
resolved "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz"
[email protected]:
version "3.22.4"
resolved "https://registry.yarnpkg.com/zod/-/zod-3.22.4.tgz#f31c3a9386f61b1f228af56faa9255e845cf3fff"
integrity sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==
6 changes: 3 additions & 3 deletions .emacs.d/el-get.lock
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
(setq el-get-lock-package-versions
'((tree-sitter-php-mode :checksum "2f791d9d83c35b11e9a14daf9a58dd7e23566041")
(php-ts-mode :checksum "bf0636751720b85ac1866e602e197ceb07fa9045")
(php-ts-mode :checksum "b398a871ce7dda880997196666083e850d153388")
(jq-mode :checksum "071c1c29bac30351ad338136f2b625e5601365cd")
(terraform-mode :checksum "25a22a66f81e35c75f2fdaaab89aad7f9940fe06")
(hcl-mode :checksum "ec27736c4c16fbf7f1ecab0210ec3c71ac2406fa")
(elisp-tree-sitter :checksum "fa5a072128da1235e237da827daf53f71a2cd562")
(fosi :checksum "f5f61d91545e18ebe879a53f1c679da6d3aa9c4e")
(wakatime-mode :checksum "ef923829912c3854d230834f81083814b7c9d992")
(compat :checksum "32e737b145fef05105e2bad4ca34ca41072e9569")
(lsp-bridge :checksum "1992ae27a196ff26e51646bd20053f818853142b")
(lsp-bridge :checksum "f582b8b2e32fe9bfb759fe1331791874e31e982b")
(copilot :checksum "421703f5dd5218ec2a3aa23ddf09d5f13e5014c2")
(eldoc-box :checksum "5c067f5c195198ffd16df2f455da95e46cc8ce02")
(eglot :checksum "e501275e06952889056268dabe08ccd0dbaf23e5")
@@ -58,7 +58,7 @@
(mew :checksum "97e21004fedf303b74f42aacd7f33a1820ea9ad7")
(dockerfile-mode :checksum "52c6c00da1d31c0b6c29c74335b3af63ed6bf06c")
(lsp-haskell :checksum "485c1148ce4d27030bb95b21c7289809294e7d31")
(haskell-mode :checksum "20d4e2300302a9af673e82d0185d3f489bfb0f59")
(haskell-mode :checksum "43b4036bf02b02de75643a1a2a31e28efac1c50b")
(csharp-mode :checksum "02c61c219b2c22491eff9b7315fed661fab423d4")
(csv-mode :checksum "db8a3e3aef31d35ce5bd1fd09127a3bbfdd0c340")
(groovy-mode :checksum "c612ac1e9f742856914ad6e8eb9e9dc169f489ab")
2 changes: 2 additions & 0 deletions .emacs.d/init.el
Original file line number Diff line number Diff line change
@@ -82,6 +82,8 @@
(dolist (dir (list "/sbin" "/usr/sbin" "/bin" "/usr/bin" "/usr/local/bin"
"/opt/local/sbin" "/opt/local/bin" "/usr/gnu/bin"
;; (expand-file-name "~/Applications/Emacs.app/Contents/Resources/bin")
(expand-file-name "~/.ghcup/bin")
(expand-file-name "~/.cabal/bin")
(expand-file-name "~/bin")
(expand-file-name "~/.emacs.d/bin")
(expand-file-name "~/.emacs.d/el-get/mew/bin")
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/.log
/.log
.php-cs-fixer.cache
2 changes: 2 additions & 0 deletions .zsh/.zshrc
Original file line number Diff line number Diff line change
@@ -69,3 +69,5 @@ fi
# if [[ ! -n $TMUX ]]; then
# tmux new-session
# fi

[ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env" # ghcup-env

0 comments on commit 36b3eaf

Please sign in to comment.