Skip to content
This repository has been archived by the owner on Apr 1, 2022. It is now read-only.

Commit

Permalink
(#154) 0.6.1:
Browse files Browse the repository at this point in the history
* (#153) Apply fixes for current issues.
  • Loading branch information
Pavel Sobolev authored Jun 17, 2021
2 parents fc9749a + ad7b619 commit 6f520fe
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM docker.io/bitnami/git:2

# Meta information
LABEL maintainer="Pavel Sobolev (https://github.com/Paveloom)"
LABEL version="0.6.0"
LABEL version="0.6.1"
LABEL description="This is an image containing paveloom's personal development environment."
LABEL github-repository="https://github.com/paveloom-d/dev"
LABEL image-repository="https://github.com/orgs/paveloom-d/packages/container/package/dev"
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ See all details under the spoiler:
<li>Additional essential packages:</li>
<ul>
<li><code>apt-utils</code></li>
<li><code>iproute2</code></li>
<li><code>exa</code></li>
<li><code>ncurses-bin</code></li>
<li><code>htop</code></li>
Expand Down
3 changes: 3 additions & 0 deletions build-scripts/root/install-essential-packages.bash
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ ln -s /opt/bitnami/git/bin/git /usr/bin/git
echo -e '\e[1;36m> Installing `apt-utils`...\e[0m'
install_packages apt-utils >/dev/null 2>&1

echo -e '\e[1;36m> Installing `iproute2`...\e[0m'
install_packages iproute2 >/dev/null

echo -e '\e[1;36m> Installing `exa`...\e[0m'
install_packages exa >/dev/null

Expand Down
8 changes: 7 additions & 1 deletion configs/.config/fish/config.fish
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,15 @@ set -gx LESS -FXR
## Set up the display (for WSL)
set -gx DISPLAY (cat /etc/resolv.conf | grep nameserver | awk '{print $2}'):0

## Set the quotes' color to green
set -gx fish_color_quote green

## Let the GPG program use the terminal connected to standard input
set -x GPG_TTY (tty)

# Aliases
alias ls=exa
alias cfg="nano ~/.config/fish/config.fish"

# Keychain
# eval keychain -q --noask --eval id_rsa >/dev/null
# eval (keychain -q --eval id_rsa) >/dev/null
16 changes: 10 additions & 6 deletions configs/.config/fish/functions/fish_prompt.fish
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function fish_prompt --description 'Write out the prompt'
set -l last_pipestatus $pipestatus
set -l pipestatus_ $pipestatus

set -g __fish_git_prompt_show_informative_status 1
set -g __fish_git_prompt_hide_untrackedfiles 1
Expand All @@ -21,13 +21,17 @@ function fish_prompt --description 'Write out the prompt'
set -g __fish_git_prompt_color_untrackedfiles $fish_color_normal
set -g __fish_git_prompt_color_cleanstate green --bold

set -l prefix_color
if test $pipestatus = 0
set prefix_color green
else
set prefix_color red
set -l prefix_color_ green
for i in $pipestatus
if test $i = 1
set prefix_color_ red
break
end
end

set -l prefix_color
set -l prefix_color $prefix_color_

# PWD
echo -n (set_color $prefix_color)"~> "(set_color -o cyan)(basename (prompt_pwd))(set_color normal)
set_color normal
Expand Down
3 changes: 2 additions & 1 deletion user-scripts/GPG.bash
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ while true; do
done

# User's e-mail
EMAIL=paveloomm@gmail.com
EMAIL=paveloom@tuta.io
EMAIL_Default=$EMAIL

# Check if the current e-mail is what the user needs
Expand Down Expand Up @@ -79,6 +79,7 @@ git config --global push.default matching
git config --global pull.rebase false
git config --global commit.gpgsign true
git config --global gpg.program gpg
git config --global core.editor nano

echo -e "\n${cyan}This script have also updated the ${mage}git${cyan} configuration. You can check it using ${mage}git config --list${cyan}.${reset}"

Expand Down
2 changes: 1 addition & 1 deletion user-scripts/SSH.bash
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ while true; do
done

# User's e-mail
EMAIL=paveloomm@gmail.com
EMAIL=paveloom@tuta.io
EMAIL_Default=$EMAIL

# Check if the current e-mail is what the user needs
Expand Down

0 comments on commit 6f520fe

Please sign in to comment.