From a23cd449ae9e41d3c7681924ad740b5a7c8398a0 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 21 Oct 2021 15:49:19 -0400 Subject: switch back to starship prompt --- alacritty/.config/alacritty/nord-alacritty | 2 +- bin/.local/bin/gamemount | 4 -- bin/.local/bin/prm | 3 ++ shells/.local/share/zsh/powerlevel10k | 2 +- shells/.zshrc | 12 +---- starship/.config/starship.toml | 17 +++--- tilix/.config/tilix/schemes/Dracula.json | 1 - tilix/.config/tilix/schemes/dracula-tilix | 1 - tilix/.config/tilix/schemes/nord-tilix | 1 - tilix/.config/tilix/schemes/nord.json | 1 - tmux/.tmux.conf | 83 ------------------------------ tmux/.tmux/plugins/tpm | 1 - 12 files changed, 16 insertions(+), 112 deletions(-) delete mode 100755 bin/.local/bin/gamemount create mode 100755 bin/.local/bin/prm delete mode 120000 tilix/.config/tilix/schemes/Dracula.json delete mode 160000 tilix/.config/tilix/schemes/dracula-tilix delete mode 160000 tilix/.config/tilix/schemes/nord-tilix delete mode 120000 tilix/.config/tilix/schemes/nord.json delete mode 100644 tmux/.tmux.conf delete mode 160000 tmux/.tmux/plugins/tpm diff --git a/alacritty/.config/alacritty/nord-alacritty b/alacritty/.config/alacritty/nord-alacritty index d4b6d20..940c88a 160000 --- a/alacritty/.config/alacritty/nord-alacritty +++ b/alacritty/.config/alacritty/nord-alacritty @@ -1 +1 @@ -Subproject commit d4b6d2049157a23958dd0e7ecc4d18f64eaa36f3 +Subproject commit 940c88a6e424ca3c7b62c8e7acc6b389f70a1b64 diff --git a/bin/.local/bin/gamemount b/bin/.local/bin/gamemount deleted file mode 100755 index d00c5a8..0000000 --- a/bin/.local/bin/gamemount +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -sudo mount /dev/sdc2 /media/gamedisk1 -o 'uid=1000,gid=1000,rw,user,exec,umask=000 0 0' -sudo mount /dev/sda2 /media/gamedisk2 -o 'uid=1000,gid=1000,rw,user,exec,umask=000 0 0' diff --git a/bin/.local/bin/prm b/bin/.local/bin/prm new file mode 100755 index 0000000..5fb23d7 --- /dev/null +++ b/bin/.local/bin/prm @@ -0,0 +1,3 @@ +#!/bin/sh + +sudo pacman -Rns $(pacman -Qtdq) diff --git a/shells/.local/share/zsh/powerlevel10k b/shells/.local/share/zsh/powerlevel10k index 7a72acf..ed0bd29 160000 --- a/shells/.local/share/zsh/powerlevel10k +++ b/shells/.local/share/zsh/powerlevel10k @@ -1 +1 @@ -Subproject commit 7a72acf5635cfc09aa544bfb70e13ad46faa432b +Subproject commit ed0bd29416af583b22e6e7b03f9f6d449c4522ca diff --git a/shells/.zshrc b/shells/.zshrc index c1bc735..6d93adf 100644 --- a/shells/.zshrc +++ b/shells/.zshrc @@ -1,10 +1,3 @@ -# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. -# Initialization code that may require console input (password prompts, [y/n] -# confirmations, etc.) must go above this block; everything else may go below. -if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then - source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" -fi - # # g3tchoo's zshrc # @@ -39,7 +32,4 @@ alias la='ls -a' alias g='git' source $HOME/.local/share/zsh/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh -source $HOME/.local/share/zsh/powerlevel10k/powerlevel10k.zsh-theme - -# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. -[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh +eval "$(starship init zsh)" diff --git a/starship/.config/starship.toml b/starship/.config/starship.toml index f522ffe..744befb 100644 --- a/starship/.config/starship.toml +++ b/starship/.config/starship.toml @@ -1,13 +1,16 @@ add_newline = false -[directory] -format = "in [$path]($style)[$read_only]($read_only_style) " - -[hostname] -ssh_only = false -format = "@[$hostname](bold purple) " +[line_break] +disabled = true [username] +disabled = false show_always = true -format = "[$user]($style)" +[hostname] +ssh_only = false + +[cmd_duration] +min_time = 10000 +show_milliseconds = false +disabled = false diff --git a/tilix/.config/tilix/schemes/Dracula.json b/tilix/.config/tilix/schemes/Dracula.json deleted file mode 120000 index 526b0fc..0000000 --- a/tilix/.config/tilix/schemes/Dracula.json +++ /dev/null @@ -1 +0,0 @@ -dracula-tilix/Dracula.json \ No newline at end of file diff --git a/tilix/.config/tilix/schemes/dracula-tilix b/tilix/.config/tilix/schemes/dracula-tilix deleted file mode 160000 index 9d8b825..0000000 --- a/tilix/.config/tilix/schemes/dracula-tilix +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9d8b8258c0be0c4e6a9c95055dda023d94574da5 diff --git a/tilix/.config/tilix/schemes/nord-tilix b/tilix/.config/tilix/schemes/nord-tilix deleted file mode 160000 index 91f27af..0000000 --- a/tilix/.config/tilix/schemes/nord-tilix +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 91f27af8113e58e6bc941e7862e228783c659a6f diff --git a/tilix/.config/tilix/schemes/nord.json b/tilix/.config/tilix/schemes/nord.json deleted file mode 120000 index ad39018..0000000 --- a/tilix/.config/tilix/schemes/nord.json +++ /dev/null @@ -1 +0,0 @@ -nord-tilix/src/json/nord.json \ No newline at end of file diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf deleted file mode 100644 index 550b9d1..0000000 --- a/tmux/.tmux.conf +++ /dev/null @@ -1,83 +0,0 @@ -set -g @plugin 'tmux-plugins/tpm' -set -g @plugin 'tmux-plugins/tmux-sensible' - -############################# -########## Settings -############################# - -# Refresh status line every 5 seconds - Good for when music is playing / update time etc -set -g status-interval 5 - -# Start window and pane indices at 1. -set -g base-index 1 -set -g pane-base-index 0 - -# Length of tmux status line -set -g status-left-length 30 -set -g status-right-length 150 - -set-option -g status "on" - -# Default statusbar color -set-option -g status-style bg=colour237,fg=colour223 # bg=bg1, fg=fg1 - -# Default window title colors -set-window-option -g window-status-style bg=colour214,fg=colour237 # bg=yellow, fg=bg1 - -# Default window with an activity alert -set-window-option -g window-status-activity-style bg=colour237,fg=colour248 # bg=bg1, fg=fg3 - -# Active window title colors -set-window-option -g window-status-current-style bg=red,fg=colour237 # fg=bg1 - -# Set active pane border color -set-option -g pane-active-border-style fg=colour214 - -# Set inactive pane border color -set-option -g pane-border-style fg=colour239 - -# Message info -set-option -g message-style bg=colour239,fg=colour223 # bg=bg2, fg=fg1 - -# Writing commands inactive -set-option -g message-command-style bg=colour239,fg=colour223 # bg=fg3, fg=bg1 - -# Pane number display -set-option -g display-panes-active-colour colour1 #fg2 -set-option -g display-panes-colour colour237 #bg1 - -# Clock -set-window-option -g clock-mode-colour colour109 #blue - -# Bell -set-window-option -g window-status-bell-style bg=colour167,fg=colour235 # bg=red, fg=bg - -set-option -g status-left "\ -#[fg=colour7, bg=colour241]#{?client_prefix,#[bg=colour167],} ❐ #S \ -#[fg=colour241, bg=colour237]#{?client_prefix,#[fg=colour167],}#{?window_zoomed_flag, 🔍,}" - -set-option -g status-right "\ -#[fg=colour214, bg=colour237] \ -#[fg=colour237, bg=colour214] #(~/dotfiles/tmux_scripts/music.sh) \ -#[fg=colour223, bg=colour237] #(~/dotfiles/tmux_scripts/uptime.sh) \ -#[fg=colour246, bg=colour237]  %b %d '%y\ -#[fg=colour109]  %H:%M \ -#[fg=colour248, bg=colour239]" - -set-window-option -g window-status-current-format "\ -#[fg=colour237, bg=colour214]\ -#[fg=colour239, bg=colour214] #I* \ -#[fg=colour239, bg=colour214, bold] #W \ -#[fg=colour214, bg=colour237]" - -set-window-option -g window-status-format "\ -#[fg=colour237,bg=colour239,noitalics]\ -#[fg=colour223,bg=colour239] #I \ -#[fg=colour223, bg=colour239] #W \ -#[fg=colour239, bg=colour237]" - -# Set the history limit so we get lots of scrollback. -setw -g history-limit 50000000 - - -run '~/.tmux/plugins/tpm/tpm' diff --git a/tmux/.tmux/plugins/tpm b/tmux/.tmux/plugins/tpm deleted file mode 160000 index 693e5a2..0000000 --- a/tmux/.tmux/plugins/tpm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 693e5a2a0f6acfd2666882655d5dfd32e8c6c50b -- cgit v1.2.3