diff --git a/home/liquidprompt.nix b/home/liquidprompt.nix index f10f572..c2e13af 100644 --- a/home/liquidprompt.nix +++ b/home/liquidprompt.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { - home.packages = with pkgs; [ khard ]; + home.packages = with pkgs; [ liquidprompt ]; xdg.configFile."liquidpromptrc".text = '' - source ~/.liquidprompt/myliquid.theme + source ~/.config/liquidprompt.theme LP_BATTERY_THRESHOLD=100 LP_LOAD_THRESHOLD=60 LP_TEMP_THRESHOLD=60 @@ -36,4 +36,88 @@ LP_ENABLE_SSH_COLORS=0 LP_DISABLED_VCS_PATH="" ''; + xdg.configFile."liquidprompt.theme".text = '' + if [[ "$(locale -k LC_CTYPE | sed -n 's/^charmap="\(.*\)"/\1/p')" == *"UTF-8"* ]]; then + LP_MARK_BATTERY="⌁" # in front of the battery charge + LP_MARK_ADAPTER="⏚" # displayed when plugged + LP_MARK_LOAD="⌂" # in front of the load + LP_MARK_TEMP="θ" # in front of the temp + LP_MARK_PROXY="↥" # indicate a proxy in use + LP_MARK_HG="☿" # prompt mark in hg repositories + LP_MARK_SVN="‡" # prompt mark in svn repositories + LP_MARK_GIT="±" # prompt mark in git repositories + LP_MARK_FOSSIL="⌘" # prompt mark in fossil repositories + LP_MARK_DISABLED="⌀" # prompt mark in directory with disabled VCS info + LP_MARK_UNTRACKED="*" # if git has untracked files + LP_MARK_STASH="+" # if git has stashs + LP_MARK_SHORTEN_PATH=" … " # prompt mark in shortened paths + LP_MARK_PERM=":" # separator between host and path + else + LP_MARK_BATTERY="b" + LP_MARK_ADAPTER="p" + LP_MARK_LOAD="c" + LP_MARK_TEMP="T" + LP_MARK_PROXY="^" + LP_MARK_HG="m" + LP_MARK_SVN="=" + LP_MARK_GIT="+" + LP_MARK_FOSSIL="f" + LP_MARK_DISABLED="!" + LP_MARK_UNTRACKED="*" + LP_MARK_STASH="+" + LP_MARK_SHORTEN_PATH=" ... " + LP_MARK_PERM=":" + fi + LP_MARK_BRACKET_OPEN="[" # open bracket + LP_MARK_BRACKET_CLOSE="]" # close bracket + LP_MARK_PREFIX=" " # prompt mark prefix + LP_PS1_PREFIX="" + LP_PS1_POSTFIX="" + LP_COLOR_PATH="$BOLD" # as normal user + LP_COLOR_PATH_ROOT="$BOLD_YELLOW" # as root + LP_COLOR_PROXY="$BOLD_BLUE" + LP_COLOR_JOB_D="$YELLOW" # Detached (aka screen sessions) + LP_COLOR_JOB_R="$BOLD_YELLOW" # Running (xterm &) + LP_COLOR_JOB_Z="$BOLD_YELLOW" # Sleeping (Ctrl-Z) + LP_COLOR_ERR="$PURPLE" + LP_COLOR_MARK="$BOLD" # as user + LP_COLOR_MARK_ROOT="$BOLD_RED" # as root + LP_COLOR_MARK_SUDO="$BOLD_RED" # when sudo credentials are cached + LP_COLOR_USER_LOGGED="" # user who logged in + LP_COLOR_USER_ALT="$BOLD" # user but not the one who logged in + LP_COLOR_USER_ROOT="$BOLD_YELLOW" # root + LP_COLOR_HOST="" # local host + LP_COLOR_SSH="$BLUE" # connected via SSH + LP_COLOR_SU="$BOLD_YELLOW" # connected remotely but in new environment through su/sudo + LP_COLOR_TELNET="$WARN_RED" # connected via telnet + LP_COLOR_X11_ON="$GREEN" # connected with X11 support + LP_COLOR_X11_OFF="$YELLOW" # connected without X11 support + LP_COLOR_WRITE="$GREEN" # have write permission + LP_COLOR_NOWRITE="$RED" # do not have write permission + LP_COLOR_UP="$GREEN" # repository is up to date / a push have been made + LP_COLOR_COMMITS="$YELLOW" # some commits have not been pushed + LP_COLOR_COMMITS_BEHIND="$BOLD_RED" # some commits have not been pushed + LP_COLOR_CHANGES="$RED" # there is some changes to commit + LP_COLOR_DIFF="$PURPLE" # number of lines impacted by current changes + LP_COLOR_CHARGING_ABOVE="$GREEN" # charging and above threshold + LP_COLOR_CHARGING_UNDER="$YELLOW" # charging but under threshold + LP_COLOR_DISCHARGING_ABOVE="$YELLOW" # discharging but above threshold + LP_COLOR_DISCHARGING_UNDER="$RED" # discharging and under threshold + LP_COLOR_TIME="$BOLD_WHITE" + LP_COLOR_IN_MULTIPLEXER="$BOLD_BLUE" + LP_COLOR_VIRTUALENV="$CYAN" + LP_COLOR_RUNTIME="$YELLOW" + LP_COLORMAP=( + "" + "$GREEN" + "$BOLD_GREEN" + "$YELLOW" + "$BOLD_YELLOW" + "$RED" + "$BOLD_RED" + "$WARN_RED" + "$CRIT_RED" + "$DANGER_RED" + ) + ''; } diff --git a/home/packages-gui.nix b/home/packages-gui.nix index aa337e3..7b22940 100644 --- a/home/packages-gui.nix +++ b/home/packages-gui.nix @@ -9,10 +9,14 @@ ./kde.nix ]; home.packages = with pkgs; [ + #cantarell-fonts + #noto-fonts + #terminus-nerdfont + #ubuntu_font_family + anonymousPro at-spi2-core authy blueberry - #cantarell-fonts citrix_workspace clipman cura @@ -25,8 +29,10 @@ gnome.simple-scan gnumeric headset-charge-indicator + ibm-plex imv jellyfin-media-player + jetbrains-mono kanshi lapce libappindicator @@ -36,14 +42,14 @@ neovim-qt nerdfonts nextcloud-client - #noto-fonts nvd obsidian + overpass pasystray pavucontrol - pwvucontrol poweralertd powerline-fonts + pwvucontrol qpwgraph quickemu quickgui @@ -55,10 +61,9 @@ sublime-music syncthingtray tdesktop - #terminus-nerdfont texlive.combined.scheme-medium thunderbird - #ubuntu_font_family + victor-mono widevine-cdm zoom-us ];