From 3d434d5ac6e806723214645596e352052fa23e30 Mon Sep 17 00:00:00 2001 From: Valerie Date: Mon, 26 Feb 2024 20:05:10 -0500 Subject: [PATCH] various updates --- bashrc | 7 +++++-- helix/config.toml | 3 +++ helix/languages.toml | 31 ++++++++++++++++++------------- tmux.conf | 5 +++++ 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/bashrc b/bashrc index 85b857e..e00888e 100644 --- a/bashrc +++ b/bashrc @@ -8,7 +8,11 @@ # If not running interactively, don't do anything [[ $- != *i* ]] && return -alias exa='exa --tree' +if [ -f "$HOME/.profile" ]; then + source "$HOME/.profile" +fi + +alias exa='exa --tree --git-ignore' alias flush='cd; clear; motd' alias fortune='fortune-rs' alias hx='helix' @@ -37,7 +41,6 @@ if [[ $TERM == 'linux' ]]; then return fi -#export PS1="$(starship prompt)" if [[ $SHLVL -le 3 ]]; then motd fi diff --git a/helix/config.toml b/helix/config.toml index 57dd27e..7c54f83 100644 --- a/helix/config.toml +++ b/helix/config.toml @@ -9,6 +9,9 @@ idle-timeout = 2000 [editor.lsp] display-messages = true +[editor.smart-tab] +enable = false + [keys.insert] C-space = "completion" diff --git a/helix/languages.toml b/helix/languages.toml index 4897bdf..3c9adb6 100644 --- a/helix/languages.toml +++ b/helix/languages.toml @@ -1,25 +1,15 @@ -[[language]] -name = "rust" -indent = { tab-width = 4, unit = "\t" } - [[language]] name = "bash" indent = { tab-width = 4, unit = "\t" } -shebangs = ["sh", "bash", "/usr/bin/bash", "/usr/bin/sh"] [[language]] name = "c" indent = { tab-width = 4, unit = "\t" } -[[language]] -name = "cpp" -indent = { tab-width = 4, unit = "\t" } - [[language]] name = "c-sharp" -indent = { tab-width = 4, unit = "\t" } -language-server = { commmand = "omnisharp", args = [ "--languageserver", "--stdio" ] } +language-servers = [ "omnisharp --languageserver --stdio" ] [[language]] name = "css" @@ -28,6 +18,11 @@ indent = { tab-width = 4, unit = "\t" } [[language]] name = "html" indent = { tab-width = 4, unit = "\t" } +file-types = [ "html", { suffix = "html.tera" } ] + +[[language]] +name = "java" +indent = { tab-width = 4, unit = "\t" } [[language]] name = "javascript" @@ -48,14 +43,24 @@ indent = { tab-width = 4, unit = "\t" } [[language]] name = "php" indent = { tab-width = 4, unit = "\t" } -shebangs = ['php', '/usr/bin/php'] [[language]] name = "python" indent = { tab-width = 4, unit = "\t" } -shebangs = ['python', '/usr/bin/python'] + +[[language]] +name = "rust" +indent = { tab-width = 4, unit = "\t" } + +[[language]] +name = "sql" +indent = { tab-width = 4, unit = "\t" } [[language]] name = "toml" indent = { tab-width = 4, unit = "\t" } +[[language]] +name = "xml" +indent = { tab-width = 4, unit = "\t" } + diff --git a/tmux.conf b/tmux.conf index b5ceb9e..1394870 100644 --- a/tmux.conf +++ b/tmux.conf @@ -6,6 +6,9 @@ # set -g mouse on +# no ESC delay +set -sg escape-time 10 + # __ __ __ _ __ # / //_/__ __ __/ /_ (_)___ ____/ /____ # / ,< / _ \/ / / / __ \/ / __ \/ __ / ___/ @@ -76,3 +79,5 @@ setw -g window-status-bell-style 'fg=colour7 bg=colour202' set -g message-style 'fg=colour15' # bg=colour235 +set fill-character ░ +