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

main
trivernis 3 months ago
commit 74bc42e5f0

@ -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"]

@ -63,6 +63,11 @@ inlayHints.functionLikeReturnTypes.enabled = true
inlayHints.enumMemberValues.enabled = true
inlayHints.parameterNames.enabled = "all"
[language-server.hx-lsp]
command = "hx-lsp"
args = []
# languages
[[language]]
@ -75,6 +80,7 @@ language-servers = [
"diagnostics",
"format",
] },
"hx-lsp"
]
auto-format = true
formatter = { command = "biome", args = [
@ -86,14 +92,8 @@ 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",
@ -104,11 +104,7 @@ 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]]
name = "handlebars"
@ -210,7 +206,7 @@ language-servers = [ "svelteserver", "biome" ]
[[language]]
name = "astro"
language-servers = ["astro-ls"]
language-servers = [ "astro-ls", "hx-lsp" ]
[[language]]
@ -222,6 +218,7 @@ file-types = ["jora"]
scope = "source.jora"
comment-tokens = ["//"]
roots = []
language-servers = [ "hx-lsp" ]
grammar = "jora"

@ -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}))"
}
}

@ -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" }

@ -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

@ -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}}

@ -1,41 +1,34 @@
scroll_buffer_size 10000
copy_command "wl-copy"
auto_layout false
layout {
default_tab_template {
children
pane size=1 borderless=true {
plugin location="https://github.com/dj95/zjstatus/releases/latest/download/zjstatus.wasm" {
format_left "{command_lpl}{tabs}"
format_right "{command_rpl}"
format_left "{command_lpl}{tabs}"
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}"
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_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_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 "#[fg=#181825,bg=#b1bbfa] {format} "
datetime_format "%A, %d %b %Y %H:%M"
datetime_timezone "Europe/Berlin"
}
@ -49,11 +42,15 @@ layout {
command "nu"
args "-c" "broot --conf {{dirs.config}}/broot/ide.toml --sort-by-type-dirs-first"
}
pane borderless=true{
pane borderless=true {
name "Editor"
command "nu"
size "55%"
{{#if (eq ctx.environment "unitb")}}
args "-c hx"
{{else}}
args "-c helix"
{{/if}}
}
pane {
name "Terminal"
@ -64,21 +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 p"
unbind "Alt k"
}
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"
}
}
}

@ -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

@ -23,8 +23,6 @@ source ~/.local/share/zsh/aliases.zsh
# antigen
source ~/.local/share/zsh/antigen.zsh
antigen use oh-my-zsh
@ -38,7 +36,6 @@ antigen bundle zsh-users/zsh-syntax-highlighting
antigen bundle zsh-users/zsh-autosuggestions
antigen bundle lukechilds/zsh-nvm
antigen apply
# antigen end
@ -67,7 +64,3 @@ eval "$(zoxide init zsh --cmd cd)"
# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
export PATH="$PATH:$HOME/.rvm/bin"
# Load Angular CLI autocompletion.
#source <(ng completion script)

@ -81,7 +81,6 @@ config.modules = {
'joypixels',
},
extras = mod {
'librewolf',
'spotify',
'libsForQt5.plasma-browser-integration',
'vale',
@ -89,8 +88,7 @@ config.modules = {
'helix',
'zellij',
'broot',
'wezterm',
'starship',
'nodePackages.conventional-changelog-cli',
},
docker = mod {
'docker',

Loading…
Cancel
Save