From 782b6d94437f9efaa9de6a5b1795bd787c0e1753 Mon Sep 17 00:00:00 2001
From: ottjk <joshott16@gmail.com>
Date: Mon, 1 Jan 2024 12:51:42 -0500
Subject: big terms

---
 config.fish             |  31 +++++++++++
 configs.toml            |  56 ++++++++++----------
 fish/config.fish        |  25 ---------
 fish/fish_variables     |  38 -------------
 starship.toml           | 124 -------------------------------------------
 starship/starship.toml  | 138 ++++++++++++++++++++++++++++++++++++++++++++++++
 starship/transient.toml |  13 +++++
 7 files changed, 210 insertions(+), 215 deletions(-)
 create mode 100644 config.fish
 delete mode 100644 fish/config.fish
 delete mode 100644 fish/fish_variables
 delete mode 100644 starship.toml
 create mode 100644 starship/starship.toml
 create mode 100644 starship/transient.toml

diff --git a/config.fish b/config.fish
new file mode 100644
index 0000000..f2c9832
--- /dev/null
+++ b/config.fish
@@ -0,0 +1,31 @@
+fish_add_path -p /usr/local/sbin /usr/local/bin /usr/bin
+
+set -e TERMCAP
+set -e MANPATH
+set -U fish_greeting
+set -Ux STARSHIP_CONFIG ~/.config/starship/starship.toml
+
+pyenv init - | source
+zoxide init fish | source
+starship init fish | source
+
+function starship_transient_prompt_func
+    set --local -x STARSHIP_CONFIG ~/.config/starship/transient.toml
+    starship module character
+end
+
+function xcd
+    set --local result (command xplr $argv)
+    [ -n "$result" ] && cd "$result"
+end
+
+if status is-interactive
+    alias ls='eza -w 80 --icons'
+    alias cd='z'
+    alias grep='grep --color=auto'
+    alias nv=nvim
+
+    fish_add_path -p ~/.cargo/bin ~/.local/bin
+    fish_vi_key_bindings
+    enable_transience
+end
diff --git a/configs.toml b/configs.toml
index d5aaea4..86fa235 100644
--- a/configs.toml
+++ b/configs.toml
@@ -1,55 +1,55 @@
-[starship]
-file = "starship.toml"
-parent = "/home/josh/.config"
-
 [dunst]
 file = "dunst"
 parent = "~/.config"
 
-[swaylock]
-file = "swaylock"
+[nvim]
+file = "nvim"
 parent = "~/.config"
 
-[vim]
-file = ".vimrc"
-parent = "~/"
+[starship]
+file = "starship"
+parent = "/home/josh/.config"
 
-[tofi]
-file = "tofi"
+[kanata]
+file = "keybs"
 parent = "~/.config"
 
-[tex]
-file = "texmf"
-parent = "~/"
-
-[fish]
-file = "fish"
+[xplr]
+file = "xplr"
 parent = "~/.config"
 
-[nvim]
-file = "nvim"
+[tofi]
+file = "tofi"
 parent = "~/.config"
 
-[kanata]
-file = "keybs"
-parent = "~/.config"
+[wezterm]
+file = ".wezterm.lua"
+parent = "~/"
 
 [zathura]
 file = "zathura"
 parent = "~/.config"
 
-[xplr]
-file = "xplr"
+[swaylock]
+file = "swaylock"
 parent = "~/.config"
 
+[fish]
+file = "/home/josh/.config/fish"
+parent = "config.fish"
+
+[vim]
+file = ".vimrc"
+parent = "~/"
+
 [sway]
 file = "sway"
 parent = "~/.config"
 
+[tex]
+file = "texmf"
+parent = "~/"
+
 [waybar]
 file = "waybar"
 parent = "~/.config"
-
-[wezterm]
-file = ".wezterm.lua"
-parent = "~/"
diff --git a/fish/config.fish b/fish/config.fish
deleted file mode 100644
index fa56cd5..0000000
--- a/fish/config.fish
+++ /dev/null
@@ -1,25 +0,0 @@
-fish_add_path -p /usr/local/sbin /usr/local/bin /usr/bin
-
-set -e TERMCAP
-set -e MANPATH
-
-pyenv init - | source
-zoxide init fish | source
-starship init fish | source
-
-function xcd
-    set --local result (command xplr $argv)
-    [ -n "$result" ] && cd "$result"
-end
-
-if status is-interactive
-    alias ls='eza'
-    alias cd='z'
-    alias grep='grep --color=auto'
-    alias nv=nvim
-
-    fish_add_path -p ~/.cargo/bin ~/.local/bin
-    fish_vi_key_bindings
-    enable_transience
-    pfetch
-end
diff --git a/fish/fish_variables b/fish/fish_variables
deleted file mode 100644
index f4539c1..0000000
--- a/fish/fish_variables
+++ /dev/null
@@ -1,38 +0,0 @@
-# This file contains fish universal variable definitions.
-# VERSION: 3.0
-SETUVAR --export EDITOR:nvim
-SETUVAR --export PF_INFO:ascii\x20title\x20os\x20uptime\x20pkgs\x20memory
-SETUVAR --export PYENV_ROOT:/home/josh/\x2epyenv
-SETUVAR --export VISUAL:nvim
-SETUVAR --export XDG_SCREENSHOTS_DIR:/home/josh/Pictures/screenshots
-SETUVAR __fish_initialized:3400
-SETUVAR _fisher_upgraded_to_4_4:\x1d
-SETUVAR fish_color_autosuggestion:555\x1ebrblack
-SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:blue
-SETUVAR fish_color_comment:red
-SETUVAR fish_color_cwd:green
-SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:green
-SETUVAR fish_color_error:brred
-SETUVAR fish_color_escape:brcyan
-SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:brcyan
-SETUVAR fish_color_param:cyan
-SETUVAR fish_color_quote:yellow
-SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
-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_status:red
-SETUVAR fish_color_user:brgreen
-SETUVAR fish_color_valid_path:\x2d\x2dunderline
-SETUVAR fish_key_bindings:fish_default_key_bindings
-SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:B3A06D\x1eyellow\x1e\x2di
-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_selected_background:\x2dr
-SETUVAR fish_user_paths:/home/josh/\x2ecargo/bin\x1e/home/josh/\x2elocal/bin\x1e/home/josh/git\x1e/usr/local/sbin\x1e/usr/local/bin\x1e/usr/bin
diff --git a/starship.toml b/starship.toml
deleted file mode 100644
index 37d9f42..0000000
--- a/starship.toml
+++ /dev/null
@@ -1,124 +0,0 @@
-format = """
-[╭](id_color)\
-[](id_color)\
-$os\
-$username\
-[](fg:id_color bg:dir_color)\
-$directory\
-[](fg:dir_color bg:git_color)\
-$git_branch\
-$git_status\
-[](fg:git_color bg:lang_color)\
-$c\
-$rust\
-$golang\
-$nodejs\
-$php\
-$java\
-$kotlin\
-$haskell\
-$python\
-$julia\
-[](fg:lang_color)\
-$line_break\
-[╰](id_color)$character
-"""
-
-palette = "catppuccin"
-
-[palettes.catppuccin]
-id_color = "#f0c6c6" # flamingo
-dir_color = "#ed8796" # red
-git_color = "#c6a0f6" # mauve
-lang_color = "#b7bdf8" # lavender
-yellow = "#eed49f"
-mauve = "#c6a0f6"
-
-[os]
-disabled = false
-style = "bg:id_color fg:black bold"
-
-[os.symbols]
-Linux = "󰌽"
-Gentoo = "󰣨"
-Fedora = "󰣛"
-Arch = "󰣇"
-
-[username]
-show_always = true
-format = '[ $user ](bg:id_color fg:black bold)'
-disabled = false
-
-[directory]
-style = "bg:dir_color"
-format = "[ $path ]($style fg:black bold)"
-truncation_length = 3
-truncation_symbol = "…/"
-
-[git_branch]
-symbol = ""
-style = "bg:git_color fg:black bold"
-format = '[ $symbol $branch ]($style)'
-
-[git_status]
-style = "bg:git_color fg:black bold"
-format = '[$all_status$ahead_behind ]($style)'
-
-# [character]
-# disabled = false
-# success_symbol = '[](bold fg:green)'
-# error_symbol = '[](bold fg:red)'
-# vimcmd_symbol = '[](bold fg:green)'
-# vimcmd_replace_one_symbol = '[](bold fg:mauve)'
-# vimcmd_replace_symbol = '[](bold fg:mauve)'
-# vimcmd_visual_symbol = '[](bold fg:yellow)'
-
-[nodejs]
-symbol = ""
-style = "bg:lang_color fg:black bold"
-format = '[ $symbol( $version) ]($style)'
-
-[c]
-symbol = ""
-style = "bg:lang_color fg:black bold"
-format = '[ $symbol( $version) ]($style)'
-
-[rust]
-symbol = ""
-style = "bg:lang_color fg:black bold"
-format = '[ $symbol( $version) ]($style)'
-
-[golang]
-symbol = ""
-style = "bg:lang_color fg:black bold"
-format = '[ $symbol( $version) ]($style)'
-
-[php]
-symbol = ""
-style = "bg:lang_color fg:black bold"
-format = '[ $symbol( $version) ]($style)'
-
-[java]
-symbol = ""
-style = "bg:lang_color fg:black bold"
-format = '[ $symbol( $version) ]($style)'
-
-[kotlin]
-symbol = ""
-style = "bg:lang_color fg:black bold"
-format = '[ $symbol( $version) ]($style)'
-
-[haskell]
-symbol = ""
-style = "bg:lang_color fg:black bold"
-format = '[ $symbol( $version) ]($style)'
-
-[python]
-symbol = ""
-style = "bg:lang_color fg:black bold"
-format = '[ $symbol( $version) ]($style)'
-
-[julia]
-symbol = ""
-style = "bg:lang_color fg:black bold"
-format = '[ $symbol( $version) ]($style)'
diff --git a/starship/starship.toml b/starship/starship.toml
new file mode 100644
index 0000000..f6a90c2
--- /dev/null
+++ b/starship/starship.toml
@@ -0,0 +1,138 @@
+format = """
+[╭](id_color)\
+[](id_color)\
+$os\
+$username\
+$sudo\
+[](fg:id_color bg:dir_color)\
+$directory\
+[](fg:dir_color bg:git_color)\
+$git_branch\
+$git_status\
+[](fg:git_color bg:lang_color)\
+$c\
+$rust\
+$golang\
+$nodejs\
+$php\
+$java\
+$kotlin\
+$haskell\
+$python\
+$julia\
+$lua\
+[](fg:lang_color)\
+$line_break\
+[╰](id_color)$character
+"""
+
+palette = "catppuccin"
+
+[palettes.catppuccin]
+id_color = "#f0c6c6" # flamingo
+dir_color = "#ed8796" # red
+git_color = "#c6a0f6" # mauve
+lang_color = "#b7bdf8" # lavender
+yellow = "#eed49f"
+mauve = "#c6a0f6"
+
+[os]
+disabled = false
+style = "bg:id_color fg:black bold"
+
+[os.symbols]
+Linux = "󰌽"
+Gentoo = "󰣨"
+Fedora = "󰣛"
+Arch = "󰣇"
+
+[username]
+show_always = true
+format = '[ $user ](bg:id_color fg:black bold)'
+disabled = false
+
+[directory]
+style = "bg:dir_color"
+read_only = ""
+format = '[ $path( $read_only) ]($style fg:black bold)'
+truncation_length = 3
+truncation_symbol = "…/"
+
+[git_branch]
+symbol = ""
+style = "bg:git_color fg:black bold"
+format = '[ $symbol $branch ]($style)'
+
+[git_status]
+style = "bg:git_color fg:black bold"
+format = '[$all_status$ahead_behind ]($style)'
+
+[character]
+disabled = false
+success_symbol = '[─󰁔](fg:id_color)'
+error_symbol = '[┤](fg:id_color)[󰁔](fg:red)'
+vimcmd_symbol = '[┤](fg:id_color)[](fg:green)'
+vimcmd_replace_one_symbol = '[┤](fg:id_color)[](fg:mauve)'
+vimcmd_replace_symbol = '[┤](fg:id_color)[](fg:mauve)'
+vimcmd_visual_symbol = '[┤](fg:id_color)[](fg:yellow)'
+
+[sudo]
+disabled = false
+symbol = " "
+style = "bg:id_color fg:black"
+format = '[$symbol]($style)'
+
+[nodejs]
+symbol = ""
+style = "bg:lang_color fg:black bold"
+format = '[ $symbol( $version) ]($style)'
+
+[c]
+symbol = ""
+style = "bg:lang_color fg:black bold"
+format = '[ $symbol( $version) ]($style)'
+
+[rust]
+symbol = ""
+style = "bg:lang_color fg:black bold"
+format = '[ $symbol( $version) ]($style)'
+
+[golang]
+symbol = ""
+style = "bg:lang_color fg:black bold"
+format = '[ $symbol( $version) ]($style)'
+
+[php]
+symbol = ""
+style = "bg:lang_color fg:black bold"
+format = '[ $symbol( $version) ]($style)'
+
+[java]
+symbol = ""
+style = "bg:lang_color fg:black bold"
+format = '[ $symbol( $version) ]($style)'
+
+[kotlin]
+symbol = ""
+style = "bg:lang_color fg:black bold"
+format = '[ $symbol( $version) ]($style)'
+
+[haskell]
+symbol = ""
+style = "bg:lang_color fg:black bold"
+format = '[ $symbol( $version) ]($style)'
+
+[python]
+symbol = ""
+style = "bg:lang_color fg:black bold"
+format = '[ $symbol( $version) ]($style)'
+
+[julia]
+symbol = ""
+style = "bg:lang_color fg:black bold"
+format = '[ $symbol( $version) ]($style)'
+
+[lua]
+symbol = ""
+style = "bg:lang_color fg:black bold"
+format = '[ $symbol( $version) ]($style)'
diff --git a/starship/transient.toml b/starship/transient.toml
new file mode 100644
index 0000000..089db4d
--- /dev/null
+++ b/starship/transient.toml
@@ -0,0 +1,13 @@
+palette = "catppuccin"
+
+[palettes.catppuccin]
+id_color = "#f0c6c6" # flamingo
+
+[character]
+disabled = false
+success_symbol = '[󰑂─󰁔](fg:id_color)'
+error_symbol = '[󰑂┤](fg:id_color)[󰁔](fg:red)'
+vimcmd_symbol = '[󰑂┤](fg:id_color)[](fg:green)'
+vimcmd_replace_one_symbol = '[󰑂┤](fg:id_color)[](fg:mauve)'
+vimcmd_replace_symbol = '[󰑂┤](fg:id_color)[](fg:mauve)'
+vimcmd_visual_symbol = '[󰑂┤](fg:id_color)[](fg:yellow)'
-- 
cgit v1.3