From c4811368b22ec051f7104b260d66813265505a5b Mon Sep 17 00:00:00 2001 From: EvilMuffinHa Date: Fri, 13 May 2022 18:15:19 -0400 Subject: [PATCH] javascript --- install.conf.yaml | 2 +- npmrc | 4 ++++ nvim/lua/lsp.lua | 39 ++++++++++++++++++++++++++++++++++++++- nvim/lua/plugins.lua | 4 ++++ picom/picom.conf | 2 +- zsh/zshrc | 2 +- zshenv | 2 ++ 7 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 npmrc diff --git a/install.conf.yaml b/install.conf.yaml index 4b364c4..e37b41f 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -27,7 +27,6 @@ ~/.config/bspwm: bspwm ~/.config/sxhkd: sxhkd ~/.config/bin: scripts - ~/.config/wal: wal ~/.config/picom.conf: picom/picom.conf ~/.config/alacritty/alacritty.yml: alacritty/alacritty.yml ~/.config/latexmk/latexmkrc: latexmk/latexmkrc @@ -36,6 +35,7 @@ ~/.config/rofi: rofi ~/.xinitrc: xinitrc ~/.zshenv: zshenv + ~/.npmrc: npmrc ~/.config/wallpapers: wallpapers ~/.config/radare2/radare2rc: r2rizin/radare2rc ~/.config/rizin/rizinrc: r2rizin/rizinrc diff --git a/npmrc b/npmrc new file mode 100644 index 0000000..fc84b78 --- /dev/null +++ b/npmrc @@ -0,0 +1,4 @@ +prefix=${XDG_DATA_HOME}/npm +cache=${XDG_CACHE_HOME}/npm +tmp=${XDG_RUNTIME_DIR}/npm +init-module=${XDG_CONFIG_HOME}/npm/config/npm-init.js diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua index 8125b6d..b725cbf 100644 --- a/nvim/lua/lsp.lua +++ b/nvim/lua/lsp.lua @@ -7,6 +7,21 @@ local coq = require('coq') local lspstatus = require('lsp-status') lspstatus.register_progress() +local function find_repo_root(names) + local util = require("lspconfig.util") + local config = names.configfiles + for _, i in ipairs(config) do + local gitroot = util.root_pattern('.git')(i) + if gitroot then + for _, file in ipairs(config) do + if util.path.is_file(util.path.join(gitroot, file)) then + return gitroot + end + end + end + end +end + local lsp_confs = { sumneko_lua = { settings = { @@ -39,7 +54,29 @@ local lsp_confs = { ccls = {}, pyright = {}, gopls = {}, - dartls = {} + dartls = {}, + tsserver = { + root_dir = find_repo_root({ + configfiles = { "tsconfig.json", "jsconfig.json", "package.json" } + }), + }, + eslint = { + root_dir = find_repo_root({ + configfiles = { ".eslintrc", ".eslintrc.js", "package.json" } + }), + on_new_config = function (config, new_root_dir) + local default_config = require('lspconfig.server_configurations.eslint').default_config + default_config.on_new_config(config, new_root_dir) + + local util = require('lspconfig.util') + local pnp_cjs = util.path.join(new_root_dir, '.pnp.cjs') + local pnp_js = util.path.join(new_root_dir, '.pnp.js') + if util.path.exists(pnp_cjs) or util.path.exists(pnp_js) then + config.cmd = { 'yarn', 'exec', unpack(default_config.cmd) } + end + end + }, + svelte = {} } diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index eb611b8..f7d7d9c 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -18,6 +18,10 @@ return require('packer').startup({function(use) 'mustache/vim-mustache-handlebars' } + use { + 'evanleck/vim-svelte' + } + use { 'tpope/vim-fugitive', config = function() diff --git a/picom/picom.conf b/picom/picom.conf index 4796473..cbbf1b7 100644 --- a/picom/picom.conf +++ b/picom/picom.conf @@ -221,7 +221,7 @@ backend = "xrender"; # Enable/disable VSync. # vsync = false -# vsync = true +vsync = true # Enable remote control via D-Bus. See the *D-BUS API* section below for more details. # dbus = false diff --git a/zsh/zshrc b/zsh/zshrc index 7552960..44ae3b9 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -9,7 +9,7 @@ setopt vi alias gef='gdb --eval-command="source /usr/share/gef/gef.py"' alias pwndbg='gdb --eval-command="source /usr/share/pwndbg/gdbinit.py"' -alias wget='wget --hsts-file="$XDG_CACHE_HOME/wget-hsts"' +alias wget='wget --hsts-file="$XDG_DATA_HOME/wget-hsts"' alias neofetch='neofetch --kitty $XDG_CONFIG_HOME/neofetch/$(hostname).png --size 400px' alias la='exa -lah --icons' alias ll='exa -lah --icons' diff --git a/zshenv b/zshenv index 518671f..4a345ed 100644 --- a/zshenv +++ b/zshenv @@ -7,6 +7,8 @@ export XDG_DATA_HOME="$HOME"/.local/share export XDG_CACHE_HOME="$HOME"/.cache export CHROME_EXECUTABLE=$(which chromium) +export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle +export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java export ZDOTDIR=~/.config/zsh export RUSTUP_HOME="$XDG_DATA_HOME"/rustup export CARGO_HOME="$XDG_DATA_HOME"/cargo