From 2cf21cea4d95421493163d9c056911d3e563987d Mon Sep 17 00:00:00 2001
From: Valerie <sleeplessval@gmail.com>
Date: Wed, 15 Jun 2022 15:32:37 -0400
Subject: [PATCH] updated bashrc, helix, starship, tmux, and vim configurations

---
 bashrc                        |  1 +
 helix/config.toml             |  9 ++++++---
 helix/languages.toml          | 11 ++++++++---
 helix/themes/val-onedark.toml |  4 ++--
 starship.toml                 |  7 +++++--
 tmux.conf                     | 16 +++++++++-------
 vim => vimrc                  |  4 ++--
 7 files changed, 33 insertions(+), 19 deletions(-)
 rename vim => vimrc (94%)

diff --git a/bashrc b/bashrc
index 54097fb..1f246b8 100644
--- a/bashrc
+++ b/bashrc
@@ -10,6 +10,7 @@
 
 alias hx='helix'
 alias ls='ls --color=auto'
+alias lsd="lsd -l"
 alias imgcat="wezterm imgcat --height 50%"
 alias motd="rust-motd"
 
diff --git a/helix/config.toml b/helix/config.toml
index 94b154c..57dd27e 100644
--- a/helix/config.toml
+++ b/helix/config.toml
@@ -1,11 +1,14 @@
 theme = "val-onedark"
 
 [editor]
+auto-completion = false
+auto-format = false
 auto-pairs = false
-
-[editor.file-picker]
-hidden = false
+idle-timeout = 2000
 
 [editor.lsp]
 display-messages = true
 
+[keys.insert]
+C-space = "completion"
+
diff --git a/helix/languages.toml b/helix/languages.toml
index 9de8486..4897bdf 100644
--- a/helix/languages.toml
+++ b/helix/languages.toml
@@ -3,9 +3,6 @@
 name = "rust"
 indent = { tab-width = 4, unit = "\t" }
 
-[language.auto-pairs]
-# no auto pairs >:(
-
 [[language]]
 name = "bash"
 indent = { tab-width = 4, unit = "\t" }
@@ -15,6 +12,10 @@ shebangs = ["sh", "bash", "/usr/bin/bash", "/usr/bin/sh"]
 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" }
@@ -36,6 +37,10 @@ indent = { tab-width = 4, unit = "\t" }
 name = "json"
 indent = { tab-width = 4, unit = "\t" }
 
+[[language]]
+name = "lua"
+indent = { tab-width = 4, unit = "\t" }
+
 [[language]]
 name = "markdown"
 indent = { tab-width = 4, unit = "\t" }
diff --git a/helix/themes/val-onedark.toml b/helix/themes/val-onedark.toml
index 38ae500..581d9b1 100644
--- a/helix/themes/val-onedark.toml
+++ b/helix/themes/val-onedark.toml
@@ -54,7 +54,7 @@ diagnostic = { modifiers = ["underlined"] }
 "ui.cursor.match" = { fg = "blue", modifiers = ["underlined"]}
 
 "ui.selection" = { bg = "light-gray" }
-"ui.selection.primary" = { bg = "gray" }
+"ui.selection.primary" = {} #{ bg = "gray" }
 
 "ui.linenr" = { fg = "linenr" }
 "ui.linenr.selected" = { fg = "white" }
@@ -63,7 +63,7 @@ diagnostic = { modifiers = ["underlined"] }
 "ui.statusline.inactive" = { fg = "light-gray", bg = "light-black" }
 
 "ui.text" = { fg = "white" }
-"ui.text.focus" = { fg = "white", bg = "light-black", modifiers = ["bold"] }
+"ui.text.focus" = { fg = "white", modifiers = ["bold"] }
 
 "ui.help" = { bg = "gray" }
 "ui.popup" = { bg = "gray" }
diff --git a/starship.toml b/starship.toml
index c7c9908..4628acd 100644
--- a/starship.toml
+++ b/starship.toml
@@ -37,8 +37,8 @@ format = "[$symbol]($style) "
 #                   /____/            /____/             
 
 [cmake]
-#symbol = "C "
-symbol = " "
+symbol = "C "
+#symbol = " "
 
 [dotnet]
 format = "[$symbol($version )]($style)"
@@ -66,6 +66,9 @@ symbol = "Lua "
 [perl]
 symbol = "Perl "
 
+[php]
+symbol = "PHP "
+
 [python]
 symbol = "Py "
 #symbol = " "
diff --git a/tmux.conf b/tmux.conf
index 70e339b..d746f00 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -46,7 +46,7 @@ bind e next-window
 setw -g clock-mode-colour colour7
 setw -g clock-mode-style 12
 
-setw -g mode-style 'fg=colour15 bold bg=colour240'
+setw -g mode-style 'fg=colour15 bold bg=colour235'
 
 # Panes
 set -g pane-border-style 'fg=colour251'
@@ -57,15 +57,17 @@ set -g status-position bottom
 set -g status-justify left
 set -g status-style 'fg=colour15'
 set -g status-left ''
-set -g status-right '#[fg=colour233]#[fg=colour15,bg=colour233] #H #[fg=colour233,bg=colour240] %m/%d #[fg=colour233,bg=colour247] %I:%M '
+set -g status-right ' #[fg=colour233]#[fg=colour15,bg=colour233] #(whoami)@#H #[fg=colour236,bg=colour233]#[fg=colour15,bg=colour236] %m/%d #[fg=colour239,bg=colour236]#[fg=colour15,bg=colour239] %I:%M '
+# set -g status-right ' #[fg=colour233]#[fg=colour15,bg=colour233] #H #[fg=colour236,bg=colour233]#[fg=colour15,bg=colour236] %m/%d #[fg=colour239,bg=colour236]#[fg=colour15,bg=colour239] %I:%M '
 
-setw -g window-status-current-style 'fg=colour15 bold bg=colour241' #67bg
-setw -g window-status-current-format ' #I: #W '
+setw -g window-status-current-style 'fg=colour15 bold bg=colour242'
+setw -g window-status-current-format ' #W '
 
-setw -g window-status-style 'fg=colour15 bg=colour237'
-setw -g window-status-format ' #I: #W '
+setw -g window-status-style 'fg=colour15 bg=colour233' # 'fg=colour15 bg=colour237'
+setw -g window-status-format ' #W '
 
 setw -g window-status-bell-style 'fg=colour7 bg=colour202'
 
-set -g message-style 'fg=colour15 bg=colour235'
+set -g message-style 'fg=colour15' 
+# bg=colour235
 
diff --git a/vim b/vimrc
similarity index 94%
rename from vim
rename to vimrc
index bfd3693..7345ecb 100644
--- a/vim
+++ b/vimrc
@@ -7,8 +7,8 @@
 syntax on
 filetype plugin on
 let g:onedark_termcolors = 256
-" colorscheme onedark
-colorscheme pablo
+colorscheme onedark
+" colorscheme pablo
 
 set autoindent
 set noexpandtab