5 files changed, 60 insertions(+), 104 deletions(-)

D .config/fish/functions/gl.fish
D .config/fish/functions/gpn.fish
M .config/fish/git.fish
M .config/kitty/kitty.conf
M .config/starship.toml

@@ 1,3 0,0 @@
-function gl --wraps='git log' --description 'alias gl=git log'
-  git log $argv; 
-end

@@ 1,3 0,0 @@
-function gpn --wraps='git push -u origin $(git_current_branch)' --description 'alias gpn=git push -u origin $(git_current_branch)'
-  git push -u origin $(git_current_branch) $argv; 
-end

@@ 2,80 2,44 @@
 
 # Aliases
 alias g='git'
-#compdef g=git
-alias gst='git status'
-#compdef _git gst=git-status
 alias gd='git diff'
-#compdef _git gd=git-diff
 alias gdc='git diff --cached'
-#compdef _git gdc=git-diff
-alias gl='git pull'
-#compdef _git gl=git-pull
+alias gl='git log'
 alias gup='git pull --rebase'
-#compdef _git gup=git-fetch
 alias gp='git push'
-#compdef _git gp=git-push
 alias gd='git diff'
 
 function gdv
   git diff -w $argv | view -
 end
 
-#compdef _git gdv=git-diff
 alias gc='git commit -v'
-#compdef _git gc=git-commit
 alias gc!='git commit -v --amend'
-#compdef _git gc!=git-commit
-alias gca='git commit -v -a'
-#compdef _git gc=git-commit
-alias gca!='git commit -v -a --amend'
-#compdef _git gca!=git-commit
+alias gca='git commit -v --amend'
 alias gcmsg='git commit -m'
-#compdef _git gcmsg=git-commit
 alias gco='git checkout'
-#compdef _git gco=git-checkout
 alias gcm='git checkout master'
 alias gr='git remote'
-#compdef _git gr=git-remote
 alias grv='git remote -v'
-#compdef _git grv=git-remote
 alias grmv='git remote rename'
-#compdef _git grmv=git-remote
 alias grrm='git remote remove'
-#compdef _git grrm=git-remote
 alias grset='git remote set-url'
-#compdef _git grset=git-remote
 alias grup='git remote update'
-#compdef _git grset=git-remote
 alias grbi='git rebase -i'
-#compdef _git grbi=git-rebase
 alias grbc='git rebase --continue'
-#compdef _git grbc=git-rebase
 alias grba='git rebase --abort'
-#compdef _git grba=git-rebase
 alias gb='git branch'
-#compdef _git gb=git-branch
 alias gba='git branch -a'
-#compdef _git gba=git-branch
 alias gcount='git shortlog -sn'
-#compdef gcount=git
 alias gcl='git config --list'
 alias gcp='git cherry-pick'
-#compdef _git gcp=git-cherry-pick
 alias glg='git log --stat --max-count=10'
-#compdef _git glg=git-log
 alias glgg='git log --graph --max-count=10'
-#compdef _git glgg=git-log
 alias glgga='git log --graph --decorate --all'
-#compdef _git glgga=git-log
 alias glo='git log --oneline'
-#compdef _git glo=git-log
 alias gss='git status -s'
-#compdef _git gss=git-status
 alias ga='git add'
-#compdef _git ga=git-add
 alias gm='git merge'
-#compdef _git gm=git-merge
 alias grh='git reset HEAD'
 alias grhh='git reset HEAD --hard'
 alias gclean='git reset --hard; and git clean -dfx'


@@ 86,7 50,6 @@ alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
 
 alias gpoat='git push origin --all; and git push origin --tags'
 alias gmt='git mergetool --no-prompt'
-#compdef _git gm=git-mergetool
 
 alias gg='git gui citool'
 alias gga='git gui citool --amend'


@@ 103,7 66,6 @@ alias grt='cd (git rev-parse --show-toplevel; or echo ".")'
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit; and git push github master:svntrunk'
-#compdef git-svn-dcommit-push=git
 
 alias gsr='git svn rebase'
 alias gsd='git svn dcommit'


@@ 114,7 76,7 @@ alias gsd='git svn dcommit'
 function current_branch
   set ref (git symbolic-ref HEAD 2> /dev/null); or \
   set ref (git rev-parse --short HEAD 2> /dev/null); or return
-  echo ref | sed s-refs/heads--
+  echo $ref | sed s-refs/heads/--
 end
 
 function current_repository


@@ 125,13 87,9 @@ end
 
 # these aliases take advantage of the previous function
 alias ggpull='git pull origin (current_branch)'
-#compdef ggpull=git
 alias ggpur='git pull --rebase origin (current_branch)'
-#compdef ggpur=git
 alias ggpush='git push origin (current_branch)'
-#compdef ggpush=git
 alias ggpnp='git pull origin (current_branch); and git push origin (current_branch)'
-#compdef ggpnp=git
 
 # Pretty log messages
 function _git_log_prettily


@@ 141,7 99,6 @@ function _git_log_prettily
 end
 
 alias glp="_git_log_prettily"
-#compdef _git glp=git-log
 
 # Work In Progress (wip)
 # These features allow to pause a branch development and switch to another one (wip)


@@ 157,3 114,6 @@ end
 # these alias commit and uncomit wip branches
 alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "wip"'
 alias gunwip='git log -n 1 | grep -q -c wip; and git reset HEAD~1'
+
+
+alias gpn='git push -u origin (current_branch)'

@@ 14,6 14,7 @@ font_family      Fira Code
 
 # Nerd Fonts BS
 symbol_map U+23FB-U+23FE,U+2665,U+26A1,U+2B58,U+E000-U+E00A,U+E0A0-U+E0A3,U+E0B0-U+E0C8,U+E0CA,U+E0CC-U+E0D2,U+E0D4,U+E200-U+E2A9,U+E300-U+E3E3,U+E5FA-U+E634,U+E700-U+E7C5,U+EA60-U+EBEB,U+F000-U+F2E0,U+F300-U+F32F,U+F400-U+F4A9,U+F500-U+F8FF Symbols Nerd Font Mono
+symbol_map U+10FF00-U+10FFF0 CircleDrawing
 
 #: You can specify different fonts for the bold/italic/bold-italic
 #: variants. To get a full list of supported fonts use the `kitty

@@ 1,15 1,15 @@
 format = """
-[](#9A348E)\
+╭[](#22152a)\
 $os\
 $username\
 $container\
-[](bg:#DA627D fg:#9A348E)\
+[](bg:#291933 fg:#22152a)\
 $directory\
-[](fg:#DA627D bg:#FCA17D)\
+[](fg:#291933 bg:#4a1f62)\
 $git_branch\
 $git_status\
 $hg_branch\
-[](fg:#FCA17D bg:#86BBD8)\
+[](fg:#4a1f62 bg:#cc96e8)\
 $c\
 $elixir\
 $elm\


@@ 21,12 21,13 @@ $nodejs\
 $nim\
 $rust\
 $scala\
-[](fg:#86BBD8 bg:#06969A)\
+[](fg:#cc96e8 bg:#ff68a1)\
 $docker_context\
-[](fg:#06969A bg:#33658A)\
+[](fg:#ff68a1 bg:#e34d87)\
 $jobs\
 $time\
-[ ](fg:#33658A)\
+[ ](fg:#e34d87)\
+\n│\n╰ 
 """
 
 right_format = "$battery $status $cmd_duration"


@@ 38,19 39,23 @@ right_format = "$battery $status $cmd_duration"
 # and use the os module below
 [username]
 show_always = true
-style_user = "bg:#9A348E"
-style_root = "bg:#9A348E"
+style_user = "bg:#22152a"
+style_root = "bg:#22152a"
 format = '[$user ]($style)'
 disabled = false
 
 # An alternative to the username module which displays a symbol that
 # represents the current operating system
 [os]
-style = "bg:#9A348E"
+style = "bg:#22152a"
 disabled = true # Disabled by default
 
+[container]
+style = "bg:#22152a"
+format = '[$symbol ]($style)'
+
 [directory]
-style = "bg:#DA627D"
+style = "bg:#291933"
 format = "[ $path ]($style)"
 truncation_length = 3
 truncation_symbol = "…/"


@@ 69,99 74,95 @@ truncation_symbol = "…/"
 # So either put "Important Documents" before "Documents" or use the substituted version:
 # "Important  " = "  "
 
+[git_branch]
+symbol = ""
+style = "bg:#4a1f62"
+format = '[ $symbol $branch ]($style)'
+
+[hg_branch]
+symbol = ""
+style = "bg:#4a1f62"
+format = '[ $symbol $branch ]($style)'
+
+[git_status]
+style = "bg:#4a1f62"
+format = '[$all_status$ahead_behind ]($style)'
+
 [c]
 symbol = " "
-style = "bg:#86BBD8"
+style = "bg:#cc96e8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
-[docker_context]
-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 fg#1A1B26"
+style = "bg:#cc96e8 fg#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [elm]
 symbol = " "
-style = "bg:#86BBD8 fg#1A1B26"
+style = "bg:#cc96e8 fg#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
-[git_branch]
-symbol = ""
-style = "bg:#FCA17D fg:#1A1B26"
-format = '[ $symbol $branch ]($style)'
-
-[hg_branch]
-symbol = ""
-style = "bg:#FCA17D fg:#1A1B26"
-format = '[ $symbol $branch ]($style)'
-
-[git_status]
-style = "bg:#FCA17D fg:#1A1B26"
-format = '[$all_status$ahead_behind ]($style)'
-
 [golang]
 symbol = " "
-style = "bg:#86BBD8 fg:#1A1B26"
+style = "bg:#cc96e8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [haskell]
 symbol = " "
-style = "bg:#86BBD8 fg:#1A1B26"
+style = "bg:#cc96e8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [java]
 symbol = " "
-style = "bg:#86BBD8 fg:#1A1B26"
+style = "bg:#cc96e8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [julia]
 symbol = " "
-style = "bg:#86BBD8 fg:#1A1B26"
+style = "bg:#cc96e8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [nodejs]
 symbol = ""
-style = "bg:#86BBD8 fg:#1A1B26"
+style = "bg:#cc96e8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [nim]
 symbol = " "
-style = "bg:#86BBD8 fg:#1A1B26"
+style = "bg:#cc96e8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [rust]
 symbol = ""
-style = "bg:#86BBD8 fg:#1A1B26"
+style = "bg:#cc96e8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
 [scala]
 symbol = " "
-style = "bg:#86BBD8 fg:#1A1B26"
+style = "bg:#cc96e8 fg:#1A1B26"
 format = '[ $symbol ($version) ]($style)'
 
+[docker_context]
+symbol = " "
+style = "bg:#ff68a1"
+format = '[ $symbol $context ]($style) $path'
+
+[nix_shell]
+symbol = ""
+style = "bg:#ff68a1"
+format = '[ $symbol $context ]($style) $path'
+
 [time]
 disabled = false
 time_format = "%R" # Hour:Minute Format
-style = "bg:#33658A"
+style = "bg:#e34d87"
 format = '[ ♥ $time ]($style)'
 
 [jobs]
-style = "bg:#33658A"
+style = "bg:#e34d87"
 format = '[$symbol$number]($style)'
 
-[container]
-style = "bg:#9A348E"
-format = '[$symbol ]($style)'
-
 [status]
 style = "bold red"
 format = '[\[$common_meaning$signal_name$maybe_int\]]($style)'