Fix nushell

main
trivernis 3 months ago
parent 64e15f78f2
commit 64a8a660b7

@ -3,3 +3,13 @@ include ro-common.inc
# Enable notifications
dbus-user.talk org.freedesktop.Notifications
dbus-user.talk org.freedesktop.portal.Desktop
blacklist /mnt
blacklist /run/media
# allow access to config
noblacklist ${HOME}/.config/discord-screenaudio
mkdir ${HOME}/.config/discord-screenaudio
whitelist ${HOME}/.config/discord-screenaudio

@ -18,7 +18,7 @@ select = "underline"
[editor.statusline]
left = ["mode", "spinner", "spacer", "file-name"]
center = []
right = ["diagnostics", "selections", "position", "position-percentage", "separator", "file-encoding", "file-line-ending", "file-type", "separator", "spacer", "version-control", "spacer"]
right = ["diagnostics", "selections", "position", "position-percentage", "primary-selection-length", "separator", "file-encoding", "file-line-ending", "file-type", "separator", "spacer", "version-control", "spacer"]
separator = " │"
[editor.lsp]

@ -38,27 +38,76 @@ typescript = {}
command = "vls"
args = []
[language-server.pest-lsp]
command = "pest-language-server"
args = []
[language-server.svelteserver]
command = "svelteserver"
args = ["--stdio"]
[language-server.svelteserver.config.configuration.typescript]
inlayHints.parameterTypes.enabled = true
inlayHints.variableTypes.enabled = true
inlayHints.propertyDeclarationTypes.enabled = true
inlayHints.functionLikeReturnTypes.enabled = true
inlayHints.enumMemberValues.enabled = true
inlayHints.parameterNames.enabled = "all"
[language-server.svelteserver.config.configuration.javascript]
inlayHints.parameterTypes.enabled = true
inlayHints.variableTypes.enabled = true
inlayHints.propertyDeclarationTypes.enabled = true
inlayHints.functionLikeReturnTypes.enabled = true
inlayHints.enumMemberValues.enabled = true
inlayHints.parameterNames.enabled = "all"
# languages
[[language]]
name = "typescript"
language-servers = ["typescript-language-server", "biome", "graphql-language-service", { name = "efm", only-features = ["diagnostics", "format"]}]
language-servers = [
"typescript-language-server",
"biome",
"graphql-language-service",
{ name = "efm", only-features = [
"diagnostics",
"format",
] },
]
auto-format = true
formatter = { command = "biome" , args = ["format", "--stdin-file-path=file.ts"] }
formatter = { command = "biome", args = [
"format",
"--stdin-file-path=file.ts",
] }
indent = { tab-width = 4, unit = " " }
[[language]]
name = "javascript"
language-servers = ["typescript-language-server", "biome", { name = "efm", only-features = ["diagnostics", "format"]}]
language-servers = [
"typescript-language-server",
"biome",
{ name = "efm", only-features = [
"diagnostics",
"format",
] },
]
auto-format = true
formatter = { command = "biome" , args = ["format", "--stdin-file-path=file.js"] }
formatter = { command = "biome", args = [
"format",
"--stdin-file-path=file.js",
] }
indent = { tab-width = 4, unit = " " }
[[language]]
name = "json"
formatter = { command = "biome" , args = ["format", "--stdin-file-path=file.json"] }
formatter = { command = "biome", args = [
"format",
"--stdin-file-path=file.json",
] }
[[language]]
@ -84,7 +133,7 @@ indent = { tab-width = 4, unit = " " }
file-types = ["roc"]
shebangs = ["roc"]
scope = "source.roc"
comment-token = "#"
comment-tokens = ["#"]
roots = []
formatter = { command = "roc", args = ['format', '--stdin', '--stdout'] }
grammar = "roc"
@ -112,7 +161,6 @@ scope = "source.nu"
injection-regex = "nu"
file-types = ["nu", "nuon"]
shebangs = ["nu"]
comment-token = "#"
indent = { tab-width = 2, unit = " " }
language-servers = ["nu-lsp"]
@ -139,7 +187,7 @@ auto-format = true
indent = { tab-width = 4, unit = " " }
file-types = ["pug"]
scope = "source.pug"
comment-token = "//"
comment-tokens = ["//"]
roots = []
grammar = "pug"
@ -155,6 +203,11 @@ name = "pug"
source = { git = "https://github.com/zealot128/tree-sitter-pug", rev = "a7ff31a38908df9b9f34828d21d6ca5e12413e18" }
[[language]]
name = "svelte"
auto-format = true
language-servers = [ "svelteserver", "biome" ]
[[language]]
name = "astro"
language-servers = ["astro-ls"]
@ -167,7 +220,7 @@ auto-format = true
indent = { tab-width = 4, unit = " " }
file-types = ["jora"]
scope = "source.jora"
comment-token = "//"
comment-tokens = ["//"]
roots = []
grammar = "jora"
@ -180,9 +233,42 @@ grammar = "jora"
[[language]]
name = "vue"
auto-format = true
formatter = { command = "biome" , args = ["format", "--stdin-file-path=file.vue"] }
formatter = { command = "biome", args = [
"format",
"--stdin-file-path=file.vue",
] }
language-servers = ["vls"]
[[language]]
name = "env"
file-types = [{ glob = ".env" }, { glob = ".env.*" }, { glob = ".envrc" }, { glob = ".envrc.*" }, { glob = "*.env" }]
file-types = [
{ glob = ".env" },
{ glob = ".env.*" },
{ glob = ".envrc" },
{ glob = ".envrc.*" },
{ glob = "*.env" },
]
[[language]]
name = "pest"
language-servers = ["pest-lsp"]
auto-format = true
indent = { tab-width = 2, unit = " " }
file-types = ["pest"]
shebangs = ["pest"]
scope = "source.pest"
comment-tokens = ["//"]
grammar = "pest"
[language.auto-pairs]
'(' = ')'
'{' = '}'
'[' = ']'
'"' = '"'
[[grammar]]
name = "pest"
source = { git = "https://github.com/pest-parser/tree-sitter-pest", rev = "a8a98a824452b1ec4da7f508386a187a2f234b85" }

@ -0,0 +1,71 @@
(line_comment) @comment
(block_comment) @comment
[
"("
")"
"["
"]"
"{"
"}"
] @punctuation.bracket
((identifier) @variable)
((builtin) @type)
((const) @constant)
[
(string)
(character)
] @string
[
"~"
"|"
] @function
[
"="
"+"
"*"
"&"
"_"
"^"
"@"
"$"
"!"
"?"
".."
] @operator
[
(string)
(character)
] @string
[
"PUSH"
"PEEK"
"POP"
"SOI"
"EOI"
"ANY"
] @keyword
[
"~"
"|"
"="
"+"
"*"
"&"
"_"
"^"
"@"
"$"
"!"
"?"
".."
] @operator

@ -76,9 +76,9 @@ $env.GIT_PAGER = "most"
{{/if}}
{{# if flags.unix}}
$env.LC_ALL = en_GB.UTF-8
$env.LC_ALL = "en_GB.UTF-8"
{{/if}}
$env.HELIX_RUNTIME = {{dirs.config}}/helix/runtime
$env.HELIX_RUNTIME = "{{dirs.config}}/helix/runtime"
{{#if-installed nix}}
if $env.NIX_PATH? != null {
@ -94,3 +94,7 @@ zoxide init nushell | save -f ~/.zoxide.nu
{{#if-installed ltex-ls}}
$env.LTEX_GLOBAL_STORAGE_PATH = "{{dirs.data}}/ltex/"
{{/if-installed}}
{{#if-installed librewolf}}
$env.BROWSER = "librewolf"
{{/if-installed}}

@ -2,7 +2,7 @@ load-env (fnm env --shell bash
| lines
| str replace 'export ' ''
| str replace -a '"' ''
| split column =
| split column "="
| rename name value
| where name != "FNM_ARCH" and name != "PATH"
| reduce -f {} {|it, acc| $acc | upsert $it.name $it.value }

@ -68,7 +68,11 @@ layout {
keybinds {
normal {
bind "Ctrl f" { ToggleFocusFullscreen; }
bind "Alt p" { Run "nu" "-c" "use ide.nu; ide floating-prompt"; }
bind "Alt P" { Run "nu" "-c" "use ide.nu; ide floating-prompt"; }
unbind "Alt o"
unbind "Alt i"
unbind "Alt p"
unbind "Alt k"
}
shared_except "locked" {

@ -2,15 +2,12 @@
[user]
email = trivernis@protonmail.com
name = trivernis
signingkey = 6EBCBA37E8CFF6A9
[credential "https://git.trivernis.net"]
username = Trivernis
[credential "https://github.com"]
username = Trivernis
[credential]
helper = store
[commit]
gpgSign = true
[tag]
forceSignAnnotated = true
[filter "lfs"]

@ -27,8 +27,6 @@ config.wezterm = { font_size = 12 }
-- all software modules / package groups
config.modules = {
core = default_mod {
'starship',
'wezterm',
'yazi',
'bottom',
'thefuck',
@ -91,6 +89,8 @@ config.modules = {
'helix',
'zellij',
'broot',
'wezterm',
'starship',
},
docker = mod {
'docker',

Loading…
Cancel
Save