From 0b146ca6251d05090e5210d3ca34ee5129524635 Mon Sep 17 00:00:00 2001 From: trivernis Date: Tue, 14 Nov 2023 13:36:19 +0100 Subject: [PATCH] Add fnm and biome to hx --- private_dot_config/helix/languages.toml | 27 ++++++++++++------------- private_dot_config/nushell/config.nu | 6 ++++++ private_dot_config/nushell/fnm.nu | 10 +++++++++ private_dot_config/nushell/path.nu | 1 + 4 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 private_dot_config/nushell/fnm.nu diff --git a/private_dot_config/helix/languages.toml b/private_dot_config/helix/languages.toml index 098d1ae..4293cc8 100644 --- a/private_dot_config/helix/languages.toml +++ b/private_dot_config/helix/languages.toml @@ -1,18 +1,17 @@ -[[language]] -name = "xml" -scope = "text.xml.basic" -injection-regex = "xml" -file-types = ["xml"] -roots = [] -language-server = { command = "lemminx", args = [] } -auto-format = false -config = { "provideFormatter" = true } -indent = { tab-width = 2, unit = " " } +[language-server.biome] +command = "biome" +args = ["lsp-proxy"] -[[grammar]] -name = "xml" -source = { git = "https://github.com/trivernis/tree-sitter-xml", rev = "3ef1d1a92ba91445c5b4bf50a300bb61e9c9ae8a" } +[[language]] +name = "typescript" +language-servers = ["typescript-language-server", "biome"] +formatter = { command = "biome" , args = ["format", "--stdin-file-path=file.ts"] } [[language]] -name = "rust" +name = "javascript" +language-servers = ["typescript-language-server", "biome"] +formatter = { command = "biome" , args = ["format", "--stdin-file-path=file.js"] } +[[language]] +name = "javascript" +formatter = { command = "biome" , args = ["format", "--stdin-file-path=file.json"] } diff --git a/private_dot_config/nushell/config.nu b/private_dot_config/nushell/config.nu index b1226c0..90a03d7 100644 --- a/private_dot_config/nushell/config.nu +++ b/private_dot_config/nushell/config.nu @@ -425,3 +425,9 @@ source ~/.config/nushell/aliases.nu # motd source ~/.config/nushell/motd.nu + +# fnm +source ~/.config/nushell/fnm.nu + +# broot +source ~/.config/broot/launcher/nushell/br diff --git a/private_dot_config/nushell/fnm.nu b/private_dot_config/nushell/fnm.nu new file mode 100644 index 0000000..fcab64c --- /dev/null +++ b/private_dot_config/nushell/fnm.nu @@ -0,0 +1,10 @@ +load-env (fnm env --shell bash + | lines + | str replace 'export ' '' + | str replace -a '"' '' + | split column = + | rename name value + | where name != "FNM_ARCH" and name != "PATH" + | reduce -f {} {|it, acc| $acc | upsert $it.name $it.value } +) +$env.PATH = ($env.PATH | prepend $"($env.FNM_MULTISHELL_PATH)/bin") diff --git a/private_dot_config/nushell/path.nu b/private_dot_config/nushell/path.nu index a51aa51..709cb82 100644 --- a/private_dot_config/nushell/path.nu +++ b/private_dot_config/nushell/path.nu @@ -2,4 +2,5 @@ $env.PATH = ( $env.PATH | prepend $'($env.HOME)/.local/bin' | prepend $'($env.HOME)/.cargo/bin' | prepend $'($env.HOME)/.local/share/nenv/bin' + | prepend $'($env.HOME)/.fnm' )