From 737202d0f6e60a15052c29fa88e6c417adf2a713 Mon Sep 17 00:00:00 2001
From: Sashanoraa <sasha@noraa.gay>
Date: Sun, 19 Feb 2023 03:00:48 -0500
Subject: [PATCH] More shell config

---
 .config/fish/config.fish         |  1 +
 .config/fish/fish_variables      | 54 ++++++++++++++++++--------------
 .config/kitty/current-theme.conf | 15 ++++++---
 .config/lvim/config.lua          |  6 ++++
 .config/starship.toml            | 31 ++++++++++--------
 5 files changed, 66 insertions(+), 41 deletions(-)

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index e619b28..712d869 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -76,6 +76,7 @@ if status is-interactive
     end
     if [ "$DISTRO" = "manjaro" ]
         source /usr/share/fzf/key-bindings.fish
+	source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish
     end
     fzf_key_bindings
 
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index b4c5cbb..b39e0da 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -1,42 +1,50 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
 SETUVAR __fish_initialized:3400
-SETUVAR fish_color_autosuggestion:969896
-SETUVAR fish_color_cancel:\x2d\x2dreverse
-SETUVAR fish_color_command:b294bb
-SETUVAR fish_color_comment:f0c674
-SETUVAR fish_color_cwd:green
+SETUVAR _fisher_franciscolourenco_2F_done_files:\x7e/\x2econfig/fish/conf\x2ed/done\x2efish
+SETUVAR _fisher_jorgebucaran_2F_autopair_2E_fish_files:\x7e/\x2econfig/fish/functions/_autopair_backspace\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_insert_left\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_insert_right\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_insert_same\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_tab\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/autopair\x2efish
+SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish
+SETUVAR _fisher_kidonng_2F_nix_2D_completions_2E_fish_files:\x7e/\x2econfig/fish/functions/_nix_complete_common_options\x2efish\x1e\x7e/\x2econfig/fish/completions/nix\x2dchannel\x2efish\x1e\x7e/\x2econfig/fish/completions/nix\x2dcollect\x2dgarbage\x2efish\x1e\x7e/\x2econfig/fish/completions/nix\x2dcopy\x2dclosure\x2efish\x1e\x7e/\x2econfig/fish/completions/nix\x2denv\x2efish\x1e\x7e/\x2econfig/fish/completions/nix\x2dhash\x2efish\x1e\x7e/\x2econfig/fish/completions/nix\x2dinstantiate\x2efish\x1e\x7e/\x2econfig/fish/completions/nix\x2dprefetch\x2durl\x2efish\x1e\x7e/\x2econfig/fish/completions/nix\x2efish
+SETUVAR _fisher_nickeb96_2F_puffer_2D_fish_files:\x7e/\x2econfig/fish/functions/_puffer_fish_expand_bang\x2efish\x1e\x7e/\x2econfig/fish/functions/_puffer_fish_expand_dots\x2efish\x1e\x7e/\x2econfig/fish/functions/_puffer_fish_expand_lastarg\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/puffer_fish_key_bindings\x2efish
+SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ekidonng/nix\x2dcompletions\x2efish\x1efranciscolourenco/done\x1enickeb96/puffer\x2dfish\x1ejorgebucaran/autopair\x2efish\x1evitallium/tokyonight\x2dfish
+SETUVAR _fisher_upgraded_to_4_4:\x1d
+SETUVAR _fisher_vitallium_2F_tokyonight_2D_fish_files:\x7e/\x2econfig/fish/themes/TokyoNight\x20Day\x2etheme\x1e\x7e/\x2econfig/fish/themes/TokyoNight\x20Moon\x2etheme\x1e\x7e/\x2econfig/fish/themes/TokyoNight\x20Night\x2etheme\x1e\x7e/\x2econfig/fish/themes/TokyoNight\x20Storm\x2etheme
+SETUVAR fish_color_autosuggestion:565f89
+SETUVAR fish_color_cancel:\x1d
+SETUVAR fish_color_command:7dcfff
+SETUVAR fish_color_comment:565f89
+SETUVAR fish_color_cwd:\x1d
 SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:b294bb
-SETUVAR fish_color_error:cc6666
-SETUVAR fish_color_escape:00a6b2
+SETUVAR fish_color_end:ff9e64
+SETUVAR fish_color_error:f7768e
+SETUVAR fish_color_escape:bb9af7
 SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:normal
+SETUVAR fish_color_host:\x1d
 SETUVAR fish_color_host_remote:\x1d
-SETUVAR fish_color_keyword:\x1d
+SETUVAR fish_color_keyword:bb9af7
 SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:00a6b2
+SETUVAR fish_color_normal:c0caf5
+SETUVAR fish_color_operator:9ece6a
 SETUVAR fish_color_option:\x1d
-SETUVAR fish_color_param:81a2be
-SETUVAR fish_color_quote:b5bd68
-SETUVAR fish_color_redirection:8abeb7
-SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_param:9d7cd8
+SETUVAR fish_color_quote:e0af68
+SETUVAR fish_color_redirection:c0caf5
+SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d33467c
+SETUVAR fish_color_selection:\x2d\x2dbackground\x3d33467c
 SETUVAR fish_color_status:red
-SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_user:\x1d
 SETUVAR fish_color_valid_path:\x2d\x2dunderline
 SETUVAR fish_key_bindings:fish_default_key_bindings
 SETUVAR fish_pager_color_background:\x1d
-SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:B3A06D
-SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_completion:c0caf5
+SETUVAR fish_pager_color_description:565f89
+SETUVAR fish_pager_color_prefix:7dcfff
+SETUVAR fish_pager_color_progress:565f89
 SETUVAR fish_pager_color_secondary_background:\x1d
 SETUVAR fish_pager_color_secondary_completion:\x1d
 SETUVAR fish_pager_color_secondary_description:\x1d
 SETUVAR fish_pager_color_secondary_prefix:\x1d
-SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3d33467c
 SETUVAR fish_pager_color_selected_completion:\x1d
 SETUVAR fish_pager_color_selected_description:\x1d
 SETUVAR fish_pager_color_selected_prefix:\x1d
diff --git a/.config/kitty/current-theme.conf b/.config/kitty/current-theme.conf
index 7ff8ff1..d7dce44 100644
--- a/.config/kitty/current-theme.conf
+++ b/.config/kitty/current-theme.conf
@@ -3,25 +3,30 @@
 ## name: Tokyo Night
 ## license: MIT
 ## author: Folke Lemaitre
-## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty_tokyonight_night.conf
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_night.conf
 
 
 background #1a1b26
 foreground #c0caf5
-selection_background #33467C
+selection_background #33467c
 selection_foreground #c0caf5
 url_color #73daca
 cursor #c0caf5
+cursor_text_color #1a1b26
 
 # Tabs
 active_tab_background #7aa2f7
-active_tab_foreground #1f2335
+active_tab_foreground #16161e
 inactive_tab_background #292e42
 inactive_tab_foreground #545c7e
-#tab_bar_background #15161E
+#tab_bar_background #15161e
+
+# Windows
+active_border_color #7aa2f7
+inactive_border_color #292e42
 
 # normal
-color0 #15161E
+color0 #15161e
 color1 #f7768e
 color2 #9ece6a
 color3 #e0af68
diff --git a/.config/lvim/config.lua b/.config/lvim/config.lua
index 7ddf5ff..85608fd 100644
--- a/.config/lvim/config.lua
+++ b/.config/lvim/config.lua
@@ -75,6 +75,12 @@ lvim.plugins = {
     { "kana/vim-textobj-user" },
     { "npxbr/glow.nvim" },
     { "folke/tokyonight.nvim" },
+    { 
+        "norcalli/nvim-colorizer.lua",
+        setup = function ()
+            require("colorizer").setup()
+        end
+    },
     {
         "gpanders/vim-scdoc",
         ft = "scdoc"
diff --git a/.config/starship.toml b/.config/starship.toml
index ca9ac87..3d081f0 100644
--- a/.config/starship.toml
+++ b/.config/starship.toml
@@ -79,68 +79,73 @@ symbol = " "
 style = "bg:#06969A"
 format = '[ $symbol $context ]($style) $path'
 
+[nix_shell]
+symbol = ""
+style = "bg:#06969A"
+format = '[ $symbol $context ]($style) $path'
+
 [elixir]
 symbol = " "
-style = "bg:#86BBD8"
+style = "bg:#86BBD8 fg#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [elm]
 symbol = " "
-style = "bg:#86BBD8"
+style = "bg:#86BBD8 fg#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [git_branch]
 symbol = ""
-style = "bg:#FCA17D"
+style = "bg:#FCA17D fg:#1A1B26"
 format = '[ $symbol $branch ]($style)'
 
 [hg_branch]
 symbol = ""
-style = "bg:#FCA17D"
+style = "bg:#FCA17D fg:#1A1B26"
 format = '[ $symbol $branch ]($style)'
 
 [git_status]
-style = "bg:#FCA17D"
+style = "bg:#FCA17D fg:#1A1B26"
 format = '[$all_status$ahead_behind ]($style)'
 
 [golang]
 symbol = " "
-style = "bg:#86BBD8"
+style = "bg:#86BBD8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [haskell]
 symbol = " "
-style = "bg:#86BBD8"
+style = "bg:#86BBD8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [java]
 symbol = " "
-style = "bg:#86BBD8"
+style = "bg:#86BBD8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [julia]
 symbol = " "
-style = "bg:#86BBD8"
+style = "bg:#86BBD8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [nodejs]
 symbol = ""
-style = "bg:#86BBD8"
+style = "bg:#86BBD8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [nim]
 symbol = " "
-style = "bg:#86BBD8"
+style = "bg:#86BBD8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [rust]
 symbol = ""
-style = "bg:#86BBD8"
+style = "bg:#86BBD8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [scala]
 symbol = " "
-style = "bg:#86BBD8"
+style = "bg:#86BBD8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [time]
-- 
2.45.2