Add more editor config

4 months ago · 41b4850b11
parent 64e15f78f2
commit 41b4850b11
10 changed files with 90 additions and 39 deletions
--- a/content/config/helix/actions/typescript.json
+++ b/content/config/helix/actions/typescript.json
@ -0,0 +1 @@
+{}
--- a/content/config/helix/config.toml
+++ b/content/config/helix/config.toml
@ -55,3 +55,5 @@ D = [":sh use ide.nu; ide write-here \"9y%d\"9p"]
 [keys.normal."A-/"]
 j = ["goto_line_start", ":insert-output use ide.nu; ide doc-comment java-style", ":format", "normal_mode", "move_visual_line_up", "insert_at_line_end"]
 r = ["goto_line_start", ":insert-output use ide.nu; ide doc-comment rust-style", ":format", "normal_mode", "insert_at_line_end"]
+
+
--- a/content/config/helix/languages.toml
+++ b/content/config/helix/languages.toml
@ -38,11 +38,16 @@ typescript = {}
 command = "vls"
 args = []

+
+[language-server.hx-lsp]
+command = "hx-lsp"
+args = []
+
 # 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"]}, "hx-lsp"]
 auto-format = true
 formatter = { command = "biome" , args = ["format", "--stdin-file-path=file.ts"] }
 indent = { tab-width = 4, unit = "    " }
@ -50,7 +55,7 @@ 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"]}, "hx-lsp"]
 auto-format = true
 formatter = { command = "biome" , args = ["format", "--stdin-file-path=file.js"] }
 indent = { tab-width = 4, unit = "    " }
@ -157,7 +162,7 @@ source = { git = "https://github.com/zealot128/tree-sitter-pug", rev = "a7ff31a3

 [[language]]
 name = "astro"
-language-servers = [ "astro-ls" ]
+language-servers = [ "astro-ls", "hx-lsp" ]


 [[language]]
@ -169,6 +174,7 @@ file-types = ["jora"]
 scope = "source.jora"
 comment-token = "//"
 roots = []
+language-servers = [ "hx-lsp" ]
 grammar = "jora"


--- a/content/config/helix/snippets/typescript.json
+++ b/content/config/helix/snippets/typescript.json
@ -0,0 +1,16 @@
+{
+	"function": {
+		"prefix": "fn",
+		"body": "function ${1:name}(${2:args}) {${3:body}}",
+		"description": "creates a function"
+	},
+	"async function": {
+		"prefix": "afn",
+		"body": "async function ${1:name}(${2:args}) {${3:body}}",
+		"description": "creates an async function"
+	},
+	"new test": {
+		"prefix": "describe",
+		"body": "describe(\"${1:unit}\", () => \nit(\"${2:test}\", () => {\n}))"
+	}
+}
--- a/content/config/helix/themes/dracula-purple.toml
+++ b/content/config/helix/themes/dracula-purple.toml
@ -31,7 +31,8 @@
 "label" = { fg = "red"}

 "diff.plus" = { fg = "green" }
-"diff.delta" = { fg = "orange" }
+"diff.delta" = { fg = "blue" }
+"diff.delta.conflict" = { fg = "orange" }
 "diff.minus" = { fg = "red" }

 "ui.background" = { fg = "foreground", bg = "background" }
--- a/content/config/nushell/aliases.nu.tmpl
+++ b/content/config/nushell/aliases.nu.tmpl
@ -1,5 +1,9 @@
 {{#if-installed helix}}
+{{#if (eq ctx.environment "unitb")}}
+alias helix = hx
+{{else}}
 alias hx = helix
+{{/if}}
 {{/if-installed}}
 {{#if-installed todo.sh}}
 alias t = todo.sh
--- a/content/config/nushell/path.nu.tmpl
+++ b/content/config/nushell/path.nu.tmpl
@ -12,6 +12,8 @@ $env.PATH = ( $env.PATH
  {{#if-installed nix}}
  | prepend $'{{dirs.home}}/.nix-profile/bin'
  {{/if-installed}}
+  | prepend $'/home/linuxbrew/.linuxbrew/sbin'
+  | prepend $'/home/linuxbrew/.linuxbrew/bin'
  {{#if-installed cargo}}
  | prepend $'{{dirs.home}}/.cargo/bin'
  {{/if-installed}}
--- a/content/config/zellij/development.kdl.tmpl
+++ b/content/config/zellij/development.kdl.tmpl
@ -1,7 +1,6 @@
 scroll_buffer_size 10000
 copy_command "wl-copy"
 auto_layout false
-
 layout {
    default_tab_template {
        children
@ -11,30 +10,24 @@ layout {
                format_right "{command_rpl}"
                format_center "{command_notify}"
                format_space ""
-
-
                tab_normal "#[fg=#181825,bg=#4C4C59] #[fg=#000000,bg=#4C4C59]{index}  {name} #[fg=#4C4C59,bg=#181825]"
                tab_normal_fullscreen "#[fg=#6C7086,bg=#181825] {index} {name} [] "
                tab_normal_sync "#[fg=#6C7086,bg=#181825] {index} {name} <> "
                tab_active "#[fg=#181825,bg=#ffffff,bold,italic] {index}  {name} #[fg=#ffffff,bg=#181825]"
                tab_active_fullscreen "#[fg=#9399B2,bg=#181825,bold,italic] {index} {name} [] "
                tab_active_sync "#[fg=#9399B2,bg=#181825,bold,italic] {index} {name} <> "
-
                command_notify_command "nu --no-newline -c \"use ide.nu; ide last-notification\""
                command_notify_format "{stdout}"
                command_notify_interval "1"
                command_notify_rendermode "raw"
-
                command_lpl_command "nu --no-newline -c \"use ide.nu; ide zjstatus powerline_left\""
                command_lpl_format "{stdout}"
                command_lpl_interval "1"
                command_lpl_rendermode "raw"
-
                command_rpl_command "nu --no-newline -c \"use ide.nu; ide zjstatus powerline_right\""
                command_rpl_format "{stdout}"
                command_rpl_interval "2"
                command_rpl_rendermode "raw"
-
                datetime "#[fg=#181825,bg=#b1bbfa] {format} "
                datetime_format "%A, %d %b %Y %H:%M"
                datetime_timezone "Europe/Berlin"
@ -53,7 +46,11 @@ layout {
                name "Editor"
                command "nu"
                size "55%"
+                {{#if (eq ctx.environment "unitb")}}
+                args "-c hx"
+                {{else}}
                args "-c helix"
+                {{/if}}
            }
            pane {
                name "Terminal"
@ -64,17 +61,35 @@ layout {
        }
    }
 }
-
 keybinds {
    normal {
-        bind "Ctrl f" { ToggleFocusFullscreen; }
-        bind "Alt p" { Run "nu" "-c" "use ide.nu; ide floating-prompt"; }
-    }
+        unbind "Alt n"
+        unbind "Alt o"
+        unbind "Alt i"
+        unbind "Alt U"
+        unbind "Alt u"
+        unbind "Alt I"
+        unbind "Alt a"

+        bind "Ctrl f" {
+            ToggleFocusFullscreen
+        }
+        bind "Alt P" {
+            Run "nu" "-c" "use ide.nu; ide floating-prompt"
+        }
+    }
    shared_except "locked" {
-        bind "Alt h" "Alt Left" { MoveFocus "Left"; }
-        bind "Alt l" "Alt Right" { MoveFocus "Right"; }
-        bind "Alt j" "Alt Down" { MoveFocus "Down"; }
-        bind "Alt k" "Alt Up" { MoveFocus "Up"; }
+        bind "Alt h" "Alt Left" {
+            MoveFocus "Left"
+        }
+        bind "Alt l" "Alt Right" {
+            MoveFocus "Right"
+        }
+        bind "Alt j" "Alt Down" {
+            MoveFocus "Down"
+        }
+        bind "Alt k" "Alt Up" {
+            MoveFocus "Up"
+        }
    }
 }
--- a/content/home/.profile
+++ b/content/home/.profile
@ -33,6 +33,10 @@ if [ -d "$HOME/.local/bin" ]; then
 	PATH="$HOME/.cargo/bin:$PATH"
 fi

+if [ -d "/home/linuxbrew/.linuxbrew" ]; then
+	eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+fi
+
 export XDG_DATA_DIRS=$HOME/.nix-profile/share:$HOME/.share:"${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}"
 # End Nix

--- a/silo.config.lua
+++ b/silo.config.lua
@ -83,7 +83,6 @@ config.modules = {
    'joypixels',
  },
  extras = mod {
-    'librewolf',
    'spotify',
    'libsForQt5.plasma-browser-integration',
    'vale',
@ -91,6 +90,7 @@ config.modules = {
    'helix',
    'zellij',
    'broot',
+    'nodePackages.conventional-changelog-cli',
  },
  docker = mod {
    'docker',