diff options
| -rw-r--r-- | alacritty/alacritty.toml | 6 | ||||
| -rw-r--r-- | fish/config.fish | 3 | ||||
| -rw-r--r-- | fish/fish_variables | 4 | ||||
| -rw-r--r-- | fish/functions/fish_prompt.fish | 90 | ||||
| -rw-r--r-- | sway/config | 3 | ||||
| -rw-r--r-- | wall.jpg | bin | 1388165 -> 1046452 bytes |
6 files changed, 101 insertions, 5 deletions
diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml index 1901715..39e2764 100644 --- a/alacritty/alacritty.toml +++ b/alacritty/alacritty.toml @@ -1,9 +1,9 @@ [font] -normal.family = "Hack Nerd Font Mono" -size = 10 +normal.family = "Mononoki Nerd Font Mono" +size = 11.5 [window] -opacity = 0.98 +opacity = 0.90 [colors.primary] background = '#212121' diff --git a/fish/config.fish b/fish/config.fish new file mode 100644 index 0000000..833df75 --- /dev/null +++ b/fish/config.fish @@ -0,0 +1,3 @@ +if status is-interactive + set -g fish_greeting +end diff --git a/fish/fish_variables b/fish/fish_variables new file mode 100644 index 0000000..1919996 --- /dev/null +++ b/fish/fish_variables @@ -0,0 +1,4 @@ +# This file contains fish universal variable definitions. +# VERSION: 3.0 +SETUVAR WLR_RENDERER:vulkan +SETUVAR fish_user_paths:/home/mw/usr/local/arm\x2dgnu\x2dtoolchain\x2d15\x2e3\x2erel1\x2dx86_64\x2darm\x2dnone\x2deabi/bin diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish new file mode 100644 index 0000000..144e77a --- /dev/null +++ b/fish/functions/fish_prompt.fish @@ -0,0 +1,90 @@ +function fish_prompt + set -l __last_command_exit_status $status + + if not set -q -g __fish_arrow_functions_defined + set -g __fish_arrow_functions_defined + function _git_branch_name + set -l branch (git symbolic-ref --quiet HEAD 2>/dev/null) + if set -q branch[1] + echo (string replace -r '^refs/heads/' '' $branch) + else + echo (git rev-parse --short HEAD 2>/dev/null) + end + end + + function _is_git_dirty + not command git diff-index --cached --quiet HEAD -- &>/dev/null + or not command git diff --no-ext-diff --quiet --exit-code &>/dev/null + end + + function _is_git_repo + type -q git + or return 1 + git rev-parse --git-dir >/dev/null 2>&1 + end + + function _hg_branch_name + echo (hg branch 2>/dev/null) + end + + function _is_hg_dirty + set -l stat (hg status -mard 2>/dev/null) + test -n "$stat" + end + + function _is_hg_repo + fish_print_hg_root >/dev/null + end + + function _repo_branch_name + _$argv[1]_branch_name + end + + function _is_repo_dirty + _is_$argv[1]_dirty + end + + function _repo_type + if _is_hg_repo + echo hg + return 0 + else if _is_git_repo + echo git + return 0 + end + return 1 + end + end + + set -l cyan (set_color -o cyan) + set -l yellow (set_color -o yellow) + set -l red (set_color -o red) + set -l green (set_color -o green) + set -l blue (set_color -o blue) + set -l normal (set_color --reset) + + set -l arrow_color "$green" + if test $__last_command_exit_status != 0 + set arrow_color "$red" + end + + set -l arrow "$arrow_color➜ " + if fish_is_root_user + set arrow "$arrow_color# " + end + + set -l cwd $cyan(prompt_pwd | path basename) + + set -l repo_info + if set -l repo_type (_repo_type) + set -l repo_branch $red(_repo_branch_name $repo_type) + set repo_info "$blue $repo_type:($repo_branch$blue)" + + if _is_repo_dirty $repo_type + set -l dirty "$yellow ✗" + set repo_info "$repo_info$dirty" + end + end + + echo -n -s $arrow ' '$cwd $repo_info $normal ' ' +end diff --git a/sway/config b/sway/config index ecde0c0..c6e017a 100644 --- a/sway/config +++ b/sway/config @@ -18,15 +18,14 @@ set $term alacritty # Your preferred application launcher set $menu fuzzel -exec pipewire exec waybar ### Output configuration # # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) output * bg ~/etc/wall.jpg fill -output * scale 2 output eDP-1 color_profile icc ~/etc/BOE0CB4.icm +seat * xcursor_theme Adwaita 24 # # Example configuration: # Binary files differ |
