Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
carlsmedstad committed Feb 11, 2024
1 parent ab1fb50 commit 7b64ca2
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .config/alacritty/alacritty.toml
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,6 @@ y = 3
[font]
size = 11.0
offset = { x = 0, y = 3 }

[shell]
program = "/bin/fish"
5 changes: 5 additions & 0 deletions .config/fish/config.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if status is-interactive
set -U fish_color_cwd f9e2af
set -g fish_sheme "Catppuccin Mocha"
set -g fish_greeting ""
end
2 changes: 2 additions & 0 deletions .config/fish/fish_plugins
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
catppuccin/fish
patrickf1/fzf.fish
33 changes: 33 additions & 0 deletions .config/fish/functions/fish_prompt.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
function fish_prompt --description 'Write out the prompt'
set -l last_pipestatus $pipestatus
set -lx __fish_last_status $status # Export for __fish_print_pipestatus.
set -l normal (set_color normal)
set -q fish_color_status
or set -g fish_color_status red

# Color the prompt differently when we're root
set -l color_cwd $fish_color_cwd
set -l suffix '$'
if functions -q fish_is_root_user; and fish_is_root_user
if set -q fish_color_cwd_root
set color_cwd $fish_color_cwd_root
end
set suffix '#'
end

# Write pipestatus
# If the status was carried over (if no command is issued or if `set` leaves the status untouched), don't bold it.
set -l bold_flag --bold
set -q __fish_prompt_status_generation; or set -g __fish_prompt_status_generation $status_generation
if test $__fish_prompt_status_generation = $status_generation
set bold_flag
end
set __fish_prompt_status_generation $status_generation
set -l status_color (set_color $fish_color_status)
set -l statusb_color (set_color $bold_flag $fish_color_status)
set -l prompt_status (__fish_print_pipestatus "[" "]" "|" "$status_color" "$statusb_color" $last_pipestatus)
set -l current_time (date "+%H:%M:%S")

echo -n -s (set_color "#fab387") $current_time " " (set_color $color_cwd) (prompt_pwd) $normal \
(fish_vcs_prompt) $normal " "$prompt_status " " $suffix " "
end
1 change: 1 addition & 0 deletions .config/nvim/lua/plugins/ale.lua
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ return {
cmake = { "cmakeformat" },
cpp = { "clang-format" },
css = { "prettier" },
fish = { "fish_indent" },
go = { "gofmt" },
html = { "prettier" },
javascript = { "prettier" },
Expand Down
14 changes: 8 additions & 6 deletions .local/bin/update-everything
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@ command -v sudo >> /dev/null && sudo cat /dev/null
command -v rustup >> /dev/null && rustup update
command -v flatpak >> /dev/null && flatpak update --assumeyes

[ -f /etc/os-release ] && grep --quiet 'ID=arch' /etc/os-release && {
aur sync --upgrades --sign --remove
sudo pacman -Syu --noconfirm
}
[ -f /etc/os-release ] && grep --quiet 'ID=arch' /etc/os-release \
&& aur sync --upgrades --sign --remove \
&& sudo pacman -Syu --noconfirm

[ "$(uname)" = Darwin ] && command -v brew >> /dev/null \
&& brew update \
&& brew upgrade

command -v nvim >> /dev/null && nvim --headless "+Lazy! sync" +qa
command -v nvim >> /dev/null && nvim --headless "TSUpdate" +qa
command -v fish >> /dev/null && fish -c "fisher update"

command -v nvim >> /dev/null \
&& nvim --headless "+Lazy! sync" +qa \
&& nvim --headless "TSUpdate" +qa

dotfiles_repo="$HOME/repos/github.com/carlsmedstad/dotfiles"
[ -d "$dotfiles_repo" ] \
Expand Down
3 changes: 3 additions & 0 deletions dotbot/common.conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
~/.config/bat/config: .config/bat/config
~/.config/bat/themes/Catppuccin-mocha.tmTheme: .config/bat/themes/Catppuccin-mocha.tmTheme
~/.config/black: .config/black
~/.config/fish/config.fish: .config/fish/config.fish
~/.config/fish/fish_plugins: .config/fish/fish_plugins
~/.config/fish/functions/fish_prompt.fish: .config/fish/functions/fish_prompt.fish
~/.config/gdb/gdbinit: .config/gdb/gdbinit
~/.config/git/config: .config/git/config
~/.config/git/ignore: .config/git/ignore
Expand Down

0 comments on commit 7b64ca2

Please sign in to comment.