Merge branch 'main' of ssh://git.trivernis.net:22321/Trivernis/dotfiles-silo

3 months ago · 38cc5d0f35
parent 1ef80a61bb 74bc42e5f0
commit 38cc5d0f35
8 changed files with 311 additions and 136 deletions
--- a/content/config/firejail/discord.local
+++ b/content/config/firejail/discord.local
@ -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
--- a/content/config/helix/config.toml
+++ b/content/config/helix/config.toml
@ -23,6 +23,7 @@ theme = "dracula-purple"
      "selections",
      "position",
      "position-percentage",
+      "primary-selection-length",
      "separator",
      "file-encoding",
      "file-line-ending",
--- a/content/config/helix/languages.toml
+++ b/content/config/helix/languages.toml
@ -1,211 +1,305 @@
 [language-server.biome]
-command = "biome"
-args = ["lsp-proxy"]
+  command = "biome"
+  args = ["lsp-proxy"]

 [language-server.efm]
-command = "efm-langserver"
+  command = "efm-langserver"

 [language-server.roc_lang_server]
-command = "roc_lang_server"
-args = []
+  command = "roc_lang_server"
+  args = []


 [language-server.graphql-language-service]
-command = "graphql-lsp"
-args = ["server", "-m", "stream"]
+  command = "graphql-lsp"
+  args = ["server", "-m", "stream"]

 [language-server.typescript-language-server.config.preferences]
-disableSuggestions = true
+  disableSuggestions = true

 [language-server.nu-lsp]
-command = "nu"
-args = ["-I", "~/.config/nushell/scripts", "--lsp"]
+  command = "nu"
+  args = ["-I", "~/.config/nushell/scripts", "--lsp"]


 [language-server.pug-lsp]
-command = "pug-lsp"
-args = []
+  command = "pug-lsp"
+  args = []


 [language-server.astro-ls]
-command = "astro-ls"
-args = ["--stdio"]
+  command = "astro-ls"
+  args = ["--stdio"]

-[language-server.astro-ls.config]
-typescript = {}
+  [language-server.astro-ls.config]
+    typescript = {}

 [language-server.vls]
-command = "vls"
-args = ["--stdio"]
-config = { typescript = { tsdk = "node_modules/typescript/lib/" }}
+  command = "vls"
+  args = ["--stdio"]
+  config = { typescript = { tsdk = "node_modules/typescript/lib/" } }
+
+
+[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"


 [language-server.hx-lsp]
-command = "hx-lsp"
-args = []
+  command = "hx-lsp"
+  args = []

-# languages
+  # languages

 [[language]]
-name = "typescript"
-language-servers = ["typescript-language-server", "biome", "graphql-language-service", { name = "efm", only-features = ["diagnostics", "format"]}, "hx-lsp"]
-auto-format = true
-formatter = { command = "biome" , args = ["format", "--stdin-file-path=file.ts"] }
-indent = { tab-width = 4, unit = "    " }
+  name = "typescript"
+  language-servers = [
+    "typescript-language-server",
+    "biome",
+    "graphql-language-service",
+    { name = "efm", only-features = [
+      "diagnostics",
+      "format",
+    ] },
+    "hx-lsp",
+  ]
+  auto-format = true
+  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"]}, "hx-lsp"]
-auto-format = true
-formatter = { command = "biome" , args = ["format", "--stdin-file-path=file.js"] }
-indent = { tab-width = 4, unit = "    " }
+  name = "javascript"
+
+  language-servers = [
+    "typescript-language-server",
+    "biome",
+    { name = "efm", only-features = [
+      "diagnostics",
+      "format",
+    ] },
+    "hx-lsp",
+  ]
+  auto-format = true
+  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"]  }
-
+  name = "json"
+  formatter = { command = "biome", args = [
+    "format",
+    "--stdin-file-path=file.json",
+  ] }

 [[language]]
-name = "handlebars"
-injection-regex = "hbs"
-roots = ["package.json", "repo.toml", "dir.toml"]
-file-types = ["hbs", "tmpl"] 
-grammar = "glimmer"
-language-servers = ["ember"]
-formatter = { command = "prettier", args = ['--parser', 'glimmer'] }
-scope = "source.glimmer"
+  name = "handlebars"
+  injection-regex = "hbs"
+  roots = ["package.json", "repo.toml", "dir.toml"]
+  file-types = ["hbs", "tmpl"]
+  grammar = "glimmer"
+  language-servers = ["ember"]
+  formatter = { command = "prettier", args = ['--parser', 'glimmer'] }
+  scope = "source.glimmer"

 [[grammar]]
-name = "glimmer"
-source = { git = "https://github.com/alexlafroscia/tree-sitter-glimmer", rev = "f9746dc1d0707717fbba84cb5c22a71586af23e1" }
+  name = "glimmer"
+  source = { git = "https://github.com/alexlafroscia/tree-sitter-glimmer", rev = "f9746dc1d0707717fbba84cb5c22a71586af23e1" }


 [[language]]
-name = "roc"
-language-servers = ["roc_lang_server"]
-auto-format = true
-indent = { tab-width = 4, unit = "  " }
-file-types = ["roc"] 
-shebangs = ["roc"]
-scope = "source.roc"
-comment-token = "#"
-roots = []
-formatter = { command = "roc", args = ['format', '--stdin', '--stdout'] }
-grammar = "roc"
+  name = "roc"
+  language-servers = ["roc_lang_server"]
+  auto-format = true
+  indent = { tab-width = 4, unit = "  " }
+  file-types = ["roc"]
+  shebangs = ["roc"]
+  scope = "source.roc"
+  comment-tokens = ["#"]
+  roots = []
+  formatter = { command = "roc", args = ['format', '--stdin', '--stdout'] }
+  grammar = "roc"


 [[language]]
-name = "bash"
-auto-format = true
-formatter = { command = "shfmt", args = ["-s", "-sr", "-"]}
+  name = "bash"
+  auto-format = true
+  formatter = { command = "shfmt", args = ["-s", "-sr", "-"] }

-[language.auto-pairs]
-'(' = ')'
-'{' = '}'
-'[' = ']'
-'"' = '"'
+  [language.auto-pairs]
+    '(' = ')'
+    '{' = '}'
+    '[' = ']'
+    '"' = '"'

 [[grammar]]
-name = "roc"
-source = { git = "https://github.com/faldor20/tree-sitter-roc", rev = "381743cd40ee19a9508c6445aacb9085d4bc0cf8" }
+  name = "roc"
+  source = { git = "https://github.com/faldor20/tree-sitter-roc", rev = "381743cd40ee19a9508c6445aacb9085d4bc0cf8" }


 [[language]]
-name = "nu"
-scope = "source.nu"
-injection-regex = "nu"
-file-types = ["nu", "nuon"]
-shebangs = ["nu"]
-comment-token = "#"
-indent = { tab-width = 2, unit = "  " }
-language-servers = [ "nu-lsp" ]
+  name = "nu"
+  scope = "source.nu"
+  injection-regex = "nu"
+  file-types = ["nu", "nuon"]
+  shebangs = ["nu"]
+  indent = { tab-width = 2, unit = "  " }
+  language-servers = ["nu-lsp"]

 [[grammar]]
-name = "nu"
-source = { git = "https://github.com/nushell/tree-sitter-nu", rev = "358c4f509eb97f0148bbd25ad36acc729819b9c1" }
+  name = "nu"
+  source = { git = "https://github.com/nushell/tree-sitter-nu", rev = "358c4f509eb97f0148bbd25ad36acc729819b9c1" }

 [[language]]
-name = "markdown"
-# formatter = { command = "comrak", args = ["-t", "commonmark", "--gfm", "--unsafe", "-e", "table"] }
-formatter = { command = "prettier", args = ["--stdin-filepath=source.md"] }
+  name = "markdown"
+  # formatter = { command = "comrak", args = ["-t", "commonmark", "--gfm", "--unsafe", "-e", "table"] }
+  formatter = { command = "prettier", args = ["--stdin-filepath=source.md"] }


 [[language]]
-name = "kdl"
-auto-format = true
-formatter = { command = "kdlfmt" }
+  name = "kdl"
+  auto-format = true
+  formatter = { command = "kdlfmt" }


 [[language]]
-name = "toml"
-auto-format = true
-formatter = { command = "taplo", args = ["fmt", "--option", "indent_entries=true", "--option", "indent_tables=true", "-"] }
+  name = "toml"
+  auto-format = true
+  formatter = { command = "taplo", args = [
+    "fmt",
+    "--option",
+    "indent_entries=true",
+    "--option",
+    "indent_tables=true",
+    "-",
+  ] }


 [[language]]
-name = "pug"
-language-servers = ["pug-lsp"]
-auto-format = true
-indent = { tab-width = 4, unit = "  " }
-file-types = ["pug"] 
-scope = "source.pug"
-comment-token = "//"
-roots = []
-grammar = "pug"
-
-
-[language.auto-pairs]
-'(' = ')'
-'{' = '}'
-'[' = ']'
-'"' = '"'
+  name = "pug"
+  language-servers = ["pug-lsp"]
+  auto-format = true
+  indent = { tab-width = 4, unit = "  " }
+  file-types = ["pug"]
+  scope = "source.pug"
+  comment-tokens = ["//"]
+  roots = []
+  grammar = "pug"
+
+
+  [language.auto-pairs]
+    '(' = ')'
+    '{' = '}'
+    '[' = ']'
+    '"' = '"'

 [[grammar]]
-name = "pug"
-source = { git = "https://github.com/zealot128/tree-sitter-pug", rev = "a7ff31a38908df9b9f34828d21d6ca5e12413e18" }
+  name = "pug"
+  source = { git = "https://github.com/zealot128/tree-sitter-pug", rev = "a7ff31a38908df9b9f34828d21d6ca5e12413e18" }


 [[language]]
-name = "astro"
-language-servers = [ "astro-ls", "hx-lsp" ]
+  name = "svelte"
+  auto-format = true
+  language-servers = ["svelteserver", "biome"]
+
+[[language]]
+  name = "astro"
+  language-servers = ["astro-ls", "hx-lsp"]


 [[language]]
-name = "jora"
-injection-regex = "(jr|jora)"
-auto-format = true
-indent = { tab-width = 4, unit = "  " }
-file-types = ["jora"] 
-scope = "source.jora"
-comment-token = "//"
-roots = []
-language-servers = [ "hx-lsp" ]
-grammar = "jora"
+  name = "jora"
+  injection-regex = "(jr|jora)"
+  auto-format = true
+  indent = { tab-width = 4, unit = "  " }
+  file-types = ["jora"]
+  scope = "source.jora"
+  comment-tokens = ["//"]
+  roots = []
+  language-servers = ["hx-lsp"]
+  grammar = "jora"
+

+  # [[grammar]]
+  # name = "jora"
+  # source = { git = "git@gitlab.unitb.com:jri/tree-sitter-jora.git", rev = "3c65fd8a368818a2300ac4dee8f4801db9dd28e1" }

-# [[grammar]]
-# name = "jora"
-# source = { git = "git@gitlab.unitb.com:jri/tree-sitter-jora.git", rev = "3c65fd8a368818a2300ac4dee8f4801db9dd28e1" }

+[[language]]
+  name = "vue"
+  auto-format = true
+  language-servers = ["vls", "biome"]
+  formatter = { command = "biome", args = [
+    "format",
+    "--stdin-file-path=file.vue",
+  ] }

 [[language]]
-name = "vue"
-auto-format = true
-formatter = { command = "biome" , args = ["format", "--stdin-file-path=file.vue"] }
-language-servers = [ "vls", "biome" ]
+  name = "env"
+  file-types = [
+    { glob = ".env" },
+    { glob = ".env.*" },
+    { glob = ".envrc" },
+    { glob = ".envrc.*" },
+    { glob = "*.env" },
+  ]

 [[language]]
-name = "env"
-file-types = [{ glob = ".env" }, { glob = ".env.*" }, { glob = ".envrc" }, { glob = ".envrc.*" }, { glob = "*.env" }]
+  name = "scheme"
+  formatter = { command = "schemat" }


 [[language]]
-name = "scheme"
-formatter = { command = "schemat" }
+  name = "svelte"
+  auto-format = true


 [[language]]
-name = "svelte"
-auto-format = true
+  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" }
--- a/content/config/helix/runtime/queries/pest/highlights.scm
+++ b/content/config/helix/runtime/queries/pest/highlights.scm
@ -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
--- a/content/config/nushell/env.nu.tmpl
+++ b/content/config/nushell/env.nu.tmpl
@ -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}}
--- a/content/config/nushell/fnm.nu
+++ b/content/config/nushell/fnm.nu
@ -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 }
--- a/content/home/.gitconfig.tmpl
+++ b/content/home/.gitconfig.tmpl
@ -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"]
--- a/silo.config.lua
+++ b/silo.config.lua
@ -27,8 +27,6 @@ config.wezterm = { font_size = 12 }
 -- all software modules / package groups
 config.modules = {
  core = default_mod {
-    'starship',
-    'wezterm',
    'yazi',
    'bottom',
    'thefuck',