DEV Community: Codingones

Improve your experience using git cli

Codingones — Sat, 12 Dec 2020 17:53:56 +0000

Improve your experience using git cli

❓ Abstract

Not So Basic: Devenv is a series of tutorials in which we aim to have a nice, productive and portable development environment that takes the best of both worlds between Linux and windows.

In this third tutorial "Improve your experience using git cli" we focus on git:

Installation and basic configuration
P4merge as visual diff and merge tools
Some handy aliases
SSH authentication for GitHub and GitLab and SSH agent

⚠️ This tutorial assumes that you have followed the previous ones, especially Linux on Windows, and are following this tutorial in WSL.

📝 Overview

To complete this tutorial, you need to:

Install and configure git
Visual diff and merge
Add command aliases
Check your configuration
Authenticate through SSH

Install and configure git

git is a version control system that allows you to track every modification on your codebase. With a distributed paradigm you can use git locally, and sync changes with other repositories whenever you need.

Install

If git is not installed on your machine, you can run:

sudo apt install git-all

Follow the instructions described in this article when you are getting started with git CLI, then you can use a lot of variables to improve your configuration.

You can specify one of the three git configuration storage options: --system, --global or --local:

Global configuration, for all the repositories of the current user. After you run your first git config global command, git creates a .gitconfig file for you in your home folder.
System configuration, for all the repositories of all users and stored in /etc/gitconfig file.
Local, the default scope, stores the configuration for the current repository, in .git/config file. this configuration is not tracked.

Configure User

Git associates all commit with a user, useful when you are working in a team to see the author of a change. You have to configure your username and your email:

git config --global user.name "John Doe"
git config --global user.email johndoe@example.com

Configure editor

Some git commands require an editor, you can set your preferred choice with:

git config --global core.editor vim

Configure line endings

Files use special characters to represent the end of a line so that the text editors can display the next characters in a new line. The problem is that theses special characters differ depending on the operating systems. This can lead to file execution errors. You can use git autocrlf option to fix line endings.

git documentation recommends setting autocrlf to true for Windows users so that it converts line endings to CRLF when you check out code.
I would suggest to use LF line endings even on Windows to avoid some annoying problems.
For instance, you may encounter hard to resolve bugs when running a Docker container you build locally because of files containing CRLF line endings copied into the Docker image.

You can probably configure your IDE to use LF line endings as well, so you can run the following command to make git automatically convert CRLF to LF on commit:

git config --global core.autocrlf input

Visual diff and merge

Consider using git with CLI if you do not have a long experience with git, because it invites you to understand how it works under the hood.

That said, GUI tools can help, especially in case of conflict resolution. Many IDEs can handle that well, but it is also nice to have a tool dedicated for that purpose.

P4Merge

P4Merge allows you to visualize the differences between files, you can even use it to compare images. It also offers an integration with git to show differences between two versions and to resolve conflicts.

Download and install the version that match your OS. For Windows users using git through WSL, download and install the Windows version.

Diff tool

difftool is a git command that can display all the differences between HEAD and a given commit or between two commits. When you use it without arguments, it displays the current unstaged changes. It is common to run it before staging files to check that all the changes are coherent for a single commit.

Define p4merge as git diff tool, then specify the command to execute.

Here is an example for a WSL setup that uses p4merge.exe, use p4merge for other systems:

git config --global diff.tool p4merge
git config --global difftool.p4merge.cmd 'p4merge.exe "$(wslpath -aw $LOCAL)" "$(wslpath -aw $REMOTE)"'

Then disable difftool prompt; otherwise your cli will asks you to confirm between each file display:

git config --global --add difftool.prompt false

Now you can go to any git repository, add a modification and run:

git difftool

p4merge will show you unstaged differences.

Merge tool

mergetool shares some similarities with difftool but it offers the ability to resolve conflict. It displays two conflicted files and help to merge them in a result preview.

Configuration :

git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd 'p4merge.exe "$(wslpath -aw $BASE)" "$(wslpath -aw $LOCAL)" "$(wslpath -aw $REMOTE)" "$(wslpath -aw $MERGED)"'
git config --global --add mergetool.prompt false

Set mergetool.keepBackup to false to avoid preserving .orig files after performing a merge:

git config --global --add mergetool.keepBackup false

Set mergetool.trustexitcode to true so that exit code returned by p4merge indicates merge success:

git config --global --add mergetool.trustexitcode true

(Alternative) Use your Intellij IDE

Open your IDE GUI and go to "Tools > Create Command-line Launcher"
be sure to set a path for the script were you have the file permissions rights.
eg : '~/tools/wstorm.sh'

git config --global diff.tool webstorm
git config --global difftool.webstorm.cmd '~/tools/wstorm.sh diff $LOCAL $REMOTE'
git config --global merge.tool webstorm
git config --global mergetool.webstorm.cmd '~/tools/wstorm.sh merge $LOCAL $REMOTE $BASE $MERGED'
git config --global --add mergetool.prompt false
git config --global --add difftool.prompt false

Add command aliases

When using git via CLI, you can save time by setting shortcut aliases for common git commands.

ci instead of commit:

git config --global --add alias.ci commit

co instead of checkout:

git config --global --add alias.co checkout

br instead of branch:

git config --global --add alias.br branch

cl instead of clone:

git config --global --add alias.cl clone

cp instead of cherry-pick:

git config --global --add alias.cp cherry-pick

st instead of status, with additional options. s to have an output in the short-format, andb to show the branch and tracking information:

git config --global --add alias.st 'status -sb'

ds instead of difftool, with additional staged option that runs p4merge to show differences between head and staged files:

git config --global --add alias.ds 'difftool --staged'

last to show the latest commit:

git config --global --add alias.last 'log -1 --stat'

unstage to cancel git add actions and reset all staged files:

git config --global --add alias.unstage 'reset HEAD --'

clear to remove all the current modifications.

Warning! You cannot revert this action:

git config --global --add alias.clear 'checkout .'

Finally, lg to display git history within a nice graph:

git config --global --add alias.lg 'log --graph --abbrev-commit --date=relative --all --pretty=format:"%C(green)%h%C(reset) -%C(red)%d%C(reset) %s %C(yellow)(%cr) %C(blue)<%an>%C(reset)"'

Here are some details about options used in this alias:

graph: adds a graph to represent branches on the left of logged commits
abbrev-commit: displays a short commit hash instead of a full hash
date=relative: displays elapsed time instead of commit date
all: shows all commits in the history of branches and tags
pretty=format: displays one line commits:
- %h: commit hash in green followed by a dash
- %d: branch name in red
- %s: commit message
- %cr: elapsed time in yellow between parentheses
- %an: author name in blue between chevrons

Check your configuration

You can display the current configuration file with:

cat ~/.gitconfig

The output should look like this:

[user]
        name = John Doe
        email = johndoe@example.com
[core]
        editor = vim
        autocrlf = input
[diff]
        tool = p4merge
[difftool "p4merge"]
        cmd = p4merge.exe $LOCAL $REMOTE
[difftool]
        prompt = false
[merge]
        tool = p4merge
[mergetool "p4merge"]
        cmd = p4merge.exe $BASE $LOCAL $REMOTE $MERGED
[mergetool]
        prompt = false
        keepBackup = false
        trustexitcode = true
[alias]
        ci = commit
        co = checkout
        br = branch
        cl = clone
        cp = cherry-pick
        st = status -sb
        ds = difftool --staged
        last = log -1 --stat
        unstage = reset HEAD --
        clear = checkout .
        lg = log --graph --pretty=format:\"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %Cblue<%an>%Creset\" --abbrev-commit --date=relative --all

You can also use git config to list the current configurations:

git config -l

Authenticate through SSH

You can use SSH to generate a key pair composed of a public and a private part.

You can add your public key on your git repository host, so that it accepts SSH connections, then you can avoid writing your email each time you need to perform an action on your remote repository.

Generate a key

Run the following command to generate your SSH key pair, then:

Indicates the file in which to save the key, hit enter to leave the default value
Type your passphrase twice

ssh-keygen -t rsa -b 4096 -C johndoe@example.com

The key generator set your key pair id_rsa and id_rsa.pub in ~/.ssh.
Never share id_rsa file, it should stay safe on your computer.

Display the content of public id_rsa.pub key and copy the output:

cat ~/.ssh/id_rsa.pub

Register it in your git repository host

Once you copied your SSH public key, you will register it in your git repository host.

GitHub

Log in to your GitHub account, then click on the arrow next to your profile picture on the top right of the page and select Settings in the drop-down.

Click on SSH and GPG keys on the left of the page.

Click on New SSH key and set the title that describes your machine such as Home or Work and paste the public key copied in the previous section, then click on Add SSH key.

GitLab

Log in to your GitLab account, then click on the arrow next to your profile picture on the top right of the page and select Settings in the drop-down.

Click on SSH Keys on the left of the page.

Paste the public key copied in the previous section, then set a title that describes your machine such as Home or Work, finally click on Add Key.

Try to clone a repository

You can now clone one of your repositories using the SSH link:

git cl git@host.com:johndoe/my-repository.git

The first time you clone from your repository host, git asks you to confirm that you want to continue connecting, type yes, then you will be asked for the passphrase you entered when generating the SSH key pair.

Try to remove the repository you just cloned, then clone it again, you can see that you will only be asked for your password.

Type your password once

As you may have noticed, when using SSH link, you do not need to type your email anymore, but you still spend time typing your password.

Run SSH agent

You can enter your password once for all with the following workflow, first run:

ssh-agent

Then copy and paste the output in your terminal. Once the three commands executed, run:

ssh-add

This makes your SSH identity available for the current session. If you try to clone the repository again, git do not asks to type your password.

If you close your terminal, reopen it and try to clone the repository, git asks for your password since your session has been cleared.

SSH agent zsh plugin

You can further simplify the workflow by activating ssh-agent plugin in your zsh configuration:

vim ~/.zshrc

Find the line that contains plugins=, it is probably not commented with git plugin configured. Remove the comment character, the line should look like this:

plugins=(git)

Now add ssh-agent plugin next to git separated with a whitespace, the line should finally look like this:

plugins=(git ssh-agent)

Save and quit the editor and close your terminal. When you open your terminal again, ssh-agent asks you to type your SSH passphrase. You can now use git without requiring typing your password. When you close and open your terminal again, you will retrieve your session. But you will have to type your passphrase when you restart your computer.

In the next article, we will focus on node.js.

Contributors

References used

A better shell with oh-my-zsh

Codingones — Sat, 31 Oct 2020 18:35:16 +0000

A better shell with oh-my-zsh

❓ Abstract

Not So Basic: Devenv is a series of tutorials where we aim to have a nice, productive and portable environment that take the best of both worlds between Linux and windows.

In this second tutorial "A better shell with oh-my-zsh" we do the groundwork using:

Zsh: a Linux shell with extended capabilities (command-line completion, command history, theming and much more...).
Oh My Zsh: a framework for managing Zsh configurations and theming.
Powerlevel10k: A quick, flexible and powerful theme for Zsh.

📝 Overview

To complete this tutorial, you need to:

Install Zsh and Oh My Zsh
Install and configure Powerlevel10k

Zsh and Oh My Zsh

Zsh

First you need to run the following commands to install zsh:



sudo apt update
sudo apt install zsh

Oh My Zsh

Now you need to install Oh My Zsh.

Run the following command to install Oh My Zsh:



sh -c "$(curl -fsSLk https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended

Change the default shell

The default shell is the shell used when you start your terminal, to use zsh with the configuration we just set up, run:



chsh -s $(which zsh)

Now run exit, it will close your current terminal, then open it again, you should be using zsh with your current theme.

A look on the default configuration.

You can find the default configuration file is in your home folder: ~/.zshrc

If you open it, you can see that most of it is commented.

A short version can be summarized as:



# Path to your oh-my-zsh installation.
export ZSH="$HOME/.oh-my-zsh"

# Set name of the theme
ZSH_THEME="robbyrussel"

# Plugins
plugins=(git)

#import parent settings
source $ZSH/oh-my-zsh.sh

Themes can add new features and nice display improvements.

Powerlevel10k

Install

Powerlevel10k is a full-featured theme for Zsh.

This theme offers the possibility to customize the style of your shell using many elements based on a font that includes icons.

Nerd fonts contains all the icons you need to have a good experience with the tool. You can check the features offered on the official nerd fonts website, select the font you prefer from the download page, or use the cheat sheet to search for an icon.

We will use FiraCode Nerd Font Mono in this tutorial because it is a monospaced programming font including typographic ligatures and well rendered by most of the terminals.

Install the recommended font on Windows

Download FiraCode Nerd Font, then follow the manual font installation instructions for your terminal.

Install the recommended font on Linux

Create a fonts directory in ~/.local/share



mkdir -p ~/.local/share/fonts

Then you can download FiraCode Nerd Font:



wget https://github.com/ryanoasis/nerd-fonts/raw/refs/heads/master/patched-fonts/FiraCode/Bold/FiraCodeNerdFontMono-Bold.ttf -P ~/.local/share/fonts
wget https://github.com/ryanoasis/nerd-fonts/raw/refs/heads/master/patched-fonts/FiraCode/Light/FiraCodeNerdFontMono-Light.ttf -P ~/.local/share/fonts
wget https://github.com/ryanoasis/nerd-fonts/raw/refs/heads/master/patched-fonts/FiraCode/Medium/FiraCodeNerdFontMono-Medium.ttf -P ~/.local/share/fonts
wget https://github.com/ryanoasis/nerd-fonts/raw/refs/heads/master/patched-fonts/FiraCode/Regular/FiraCodeNerdFontMono-Regular.ttf -P ~/.local/share/fonts
wget https://github.com/ryanoasis/nerd-fonts/raw/refs/heads/master/patched-fonts/FiraCode/Retina/FiraCodeNerdFontMono-Retina.ttf -P ~/.local/share/fonts
wget https://github.com/ryanoasis/nerd-fonts/raw/refs/heads/master/patched-fonts/FiraCode/SemiBold/FiraCodeNerdFontMono-SemiBold.ttf -P ~/.local/share/fonts

Finally, you can follow the manual font installation instructions for your terminal.

Install powerlevel10k as a Oh-my-zsh theme

Verify that git is present on your distribution:



git --version

If git is not installed on your distribution, follow these instructions to install it, then run:



git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k

Set ZSH_THEME="powerlevel10k/powerlevel10k" in ~/.zshrc



sed -i 's/ZSH_THEME="[^"]*/ZSH_THEME="powerlevel10k\/powerlevel10k/g' .zshrc

Configure

Using the configuration wizard

When you exit and go back to your shell, you will be prompted by Powerlevel10k configuration wizard, follows the instructions to set up the configuration of your choice.

If you want to start again the configuration wizard, run:



p10k configure

Manual advanced configuration

The configuration wizard is a nice starting point to quickly get a good-looking shell, but there is much more parameters you can fine-tune.

Here is an example of the result you can get at the end by following the Customization examples, which are taken from our p10k configuration file:

We will be glad to see the result of your own configuration, feel free to post a screenshot in the comments section!

You can use vim to explore and edit p10k configuration file, run the following command to install vim:



sudo apt install vim

Here are some basic vim commands:

i to enter insert mode
escape to exit insert mode
/ to enter a search term
enter to perform search
n to find the next occurrence or N to find the previous occurrence
escape to exit insert mode, then :wq and enter to save the file and quit vim
escape to exit insert mode, then :q! and enter to quit vim without saving
Read Getting started with Vim to learn the basics of this powerful cli file editor

Open p10k configuration file with vim:



vim ~/.p10k.zsh

Customization examples

Switch a prompt segment from a side to another

For this example we will add the context user@hostname on the left prompt side and the vcs (git) segment to the right side.

Left prompt segments

Add context, not active by default on a local session, but we will change that later
Remove vcs to display it with right prompt segments ```bash=

typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(
...
context # user@hostname
...
)

###### Right prompt segments


Remove context since it is now displayed with left prompt segments
Add vcs 
Add contextual information about tools. Only displayed when installed and referenced by content of the current directory: Node.js, dotnet, PHP, Laravel, package

Add information about hardware on the next line 
```bash=


typeset -g POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(

  
  
  =========================[ Line #1 ]=========================


vcs                     # git status

...

node_version            # node.js version

dotnet_version          # .NET version (https://dotnet.microsoft.com)

...

php_version             # php version (https://www.php.net/)

laravel_version         # laravel php framework version (https://laravel.com/)

...

package                 # name@version from package.json (https://docs.npmjs.com/files/package.json)

...

  
  
  =========================[ Line #2 ]=========================


...

load                    # CPU load

ram                     # free RAM

disk_usage              # disk usage

swap                    # used swap

battery                 # internal battery

wifi                    # wifi speed

...

)

Change common colors

If your terminal support hexColors, you can override with the format var='hexCode'

In this example we:

Update some prompt segment background color
Update the color of prompt char displayed on the left following the previous command execution result
Update current directory colors
Update exit code of the last command
Update direnv status ```bash=

...
typeset -g POWERLEVEL9K_BACKGROUND='#232323'
...
typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS,VIOWR}FOREGROUND='#7ca661'
...
typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND='#d55555'
...
typeset -g POWERLEVEL9K_DIR_FOREGROUND='#92b7d4'
...
typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND='#44637a'
...
typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND='#6fa0c6'
...
typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_COLOR='#6fa0c6'
...
typeset -g POWERLEVEL9K_VCS_LOADING_VISUAL_IDENTIFIER_COLOR='#6fa0c6'
...
typeset -g POWERLEVEL9K_STATUS_OK_FOREGROUND='#7ca661'
...
typeset -g POWERLEVEL9K_STATUS_OK_PIPE_FOREGROUND='#7ca661'
...
typeset -g POWERLEVEL9K_STATUS_ERROR_FOREGROUND='#d55555'
...
typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL_FOREGROUND='#d55555'
...
typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_FOREGROUND='#d55555'
...
typeset -g POWERLEVEL9K_DIRENV_FOREGROUND='#6fa0c6'
...



  
  
  Define VCS icons


You can override icons with the format var='charCode'

We create our own icons variables for the stashed/conflicted/staged/unstaged states.

In this example we: 


Update untracked icon to replace default ? with a ghost from available font icons

Add a stash icon to replace default * with an archive from available font icons

Add a conflicted icon to replace default ~ with a skull from available font icons

Add a staged icon to replace default + with a filled star from available font icons

Add an unstaged icon to replace default ! with an empty star from available font icons
```bash=


...

  
  
  Change the value of this parameter to show a different untracked file icon.


typeset -g POWERLEVEL9K_VCS_UNTRACKED_ICON='\uf79f '

  
  
  Change the value of this parameter to show a different stashed file icon.


typeset -g POWERLEVEL9K_VCS_STASHES_ICON='\uf187 '

  
  
  Change the value of this parameter to show a different conflicted file icon.


typeset -g POWERLEVEL9K_VCS_CONFLICTED_ICON='\ufb8a '

  
  
  Change the value of this parameter to show a different staged file icon.


typeset -g POWERLEVEL9K_VCS_STAGED_ICON='\uf005 '

  
  
  Change the value of this parameter to show a different unstaged file icon.


typeset -g POWERLEVEL9K_VCS_UNSTAGED_ICON='\uf006 '

...

Change VCS colors and icons

We will edit the my_git_formatter() original function

Update git status color ```bash=

...
function my_git_formatter() {
...
if (( $1 )); then
...
local clean='%F{#6fa0c6}' # blue foreground
local modified='%F{#e8c273}' # yellow foreground
local untracked='%F{#e1874d}' # orange foreground
local conflicted='%F{#d55555}' # red foreground
...
}




Update git status constants to use the previously defined icons variables (later in function)
```bash=


...

function my_git_formatter() {

...

    (( VCS_STATUS_STASHES        )) && res+=" ${clean}${(g::)POWERLEVEL9K_VCS_STATUS_STASHES_ICON}${VCS_STATUS_STASHES}"

...

    (( VCS_STATUS_NUM_CONFLICTED )) && res+=" ${conflicted}${(g::)POWERLEVEL9K_VCS_CONFLICTED_ICON}${VCS_STATUS_NUM_CONFLICTED}"

...

    (( VCS_STATUS_NUM_STAGED     )) && res+=" ${modified}${(g::)POWERLEVEL9K_VCS_STAGED_ICON}${VCS_STATUS_NUM_STAGED}"

...

    (( VCS_STATUS_NUM_UNSTAGED   )) && res+=" ${modified}${(g::)POWERLEVEL9K_VCS_UNSTAGED_ICON}${VCS_STATUS_NUM_UNSTAGED}"

...

}

Package version format

Update current node package version format package-name:package-version



...

typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${P9K_PACKAGE_NAME//\%/%%}:${P9K_PACKAGE_VERSION//\%/%%}'

...

Hardware colors and configuration

Update disk usage colors
Update disk usage levels thresholds
Update disk usage display on warning
Update free ram color
Update used swap color
Update CPU load colors
Update battery colors
Update wifi colors
Update time colors ```bash=

...
typeset -g POWERLEVEL9K_DISK_USAGE_NORMAL_FOREGROUND='#97b882'
typeset -g POWERLEVEL9K_DISK_USAGE_WARNING_FOREGROUND='#e1874d'
typeset -g POWERLEVEL9K_DISK_USAGE_CRITICAL_FOREGROUND='#d55555'
...
typeset -g POWERLEVEL9K_DISK_USAGE_WARNING_LEVEL=80
typeset -g POWERLEVEL9K_DISK_USAGE_CRITICAL_LEVEL=90
...
typeset -g POWERLEVEL9K_DISK_USAGE_ONLY_WARNING=true
...
typeset -g POWERLEVEL9K_RAM_FOREGROUND='#af7ca4'
...
typeset -g POWERLEVEL9K_SWAP_FOREGROUND='#e1874d'
...
typeset -g POWERLEVEL9K_LOAD_NORMAL_FOREGROUND='#9090c0'
...
typeset -g POWERLEVEL9K_LOAD_WARNING_FOREGROUND='#e1874d'
...
typeset -g POWERLEVEL9K_LOAD_CRITICAL_FOREGROUND='#d55555'
...
typeset -g POWERLEVEL9K_BATTERY_LOW_FOREGROUND='#d55555'
...
typeset -g POWERLEVEL9K_BATTERY_{CHARGING,CHARGED}_FOREGROUND='#7ca661'
...
typeset -g POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND='#d55555'
...
typeset -g POWERLEVEL9K_WIFI_FOREGROUND='#9fbfb4'
...
typeset -g POWERLEVEL9K_TIME_FOREGROUND='#76a394'
...



  
  
  Context colors



Update context colors
Update context display to be always shown by commenting the relevant line
```bash=


...

typeset -g POWERLEVEL9K_CONTEXT_ROOT_FOREGROUND='#db6e51'

...

typeset -g POWERLEVEL9K_CONTEXT_{REMOTE,REMOTE_SUDO}_FOREGROUND='#d55555'

...

typeset -g POWERLEVEL9K_CONTEXT_FOREGROUND='#e8c273'

...

  
  
  typeset -g POWERLEVEL9K_CONTEXT_{DEFAULT,SUDO}_{CONTENT,VISUAL_IDENTIFIER}_EXPANSION=


...

Development tools colors

Update tools colors Node.js, nvm, package, Rust, dotnet, Java, Scala, PHP, Laravel, PostgreSQL ```bash=

...
typeset -g POWERLEVEL9K_ASDF_NODEJS_FOREGROUND='#97b882'
...
typeset -g POWERLEVEL9K_ASDF_RUST_FOREGROUND='#e4917a'
...
typeset -g POWERLEVEL9K_ASDF_DOTNET_CORE_FOREGROUND='#b0b0d2'
...
typeset -g POWERLEVEL9K_ASDF_JAVA_FOREGROUND='#e8a478'
...
typeset -g POWERLEVEL9K_ASDF_POSTGRES_FOREGROUND='#c29cba'
...
typeset -g POWERLEVEL9K_ASDF_PHP_FOREGROUND='#92b7d4'
...
typeset -g POWERLEVEL9K_NODENV_FOREGROUND='#7ca661'
...
typeset -g POWERLEVEL9K_NVM_FOREGROUND='#7ca661'
...
typeset -g POWERLEVEL9K_NODEENV_FOREGROUND='#7ca661'
...
typeset -g POWERLEVEL9K_NODE_VERSION_FOREGROUND='#7ca661'
...
typeset -g POWERLEVEL9K_DOTNET_VERSION_FOREGROUND='#9090c0'
...
typeset -g POWERLEVEL9K_PHP_VERSION_FOREGROUND='#af7ca4'
...
typeset -g POWERLEVEL9K_LARAVEL_VERSION_FOREGROUND='#db6e51'
...
typeset -g POWERLEVEL9K_JAVA_VERSION_FOREGROUND='#e1874d'
...
typeset -g POWERLEVEL9K_PACKAGE_FOREGROUND='#97b882'
...
typeset -g POWERLEVEL9K_JENV_FOREGROUND='#e1874d'
...
typeset -g POWERLEVEL9K_PHPENV_FOREGROUND='#af7ca4'
...
typeset -g POWERLEVEL9K_SCALAENV_FOREGROUND='#e8a478'



  
  
  Change cloud tools colors



Update Terraform, Kubernetes, aws and Azure colors
```bash=


...

typeset -g POWERLEVEL9K_TERRAFORM_OTHER_FOREGROUND='#727299'

...

typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_FOREGROUND='#5a82a1'

...

typeset -g POWERLEVEL9K_AWS_DEFAULT_FOREGROUND='#ba7040'

...

typeset -g POWERLEVEL9K_AWS_EB_ENV_FOREGROUND='#ba7040'

...

typeset -g POWERLEVEL9K_AZURE_FOREGROUND='#92b7d4'

In the next article Improve your experience using git cli we will focus on customizing git.

Contributors

Romain Cambonie
Marc Gavanier

References used

Linux on Windows

Codingones — Sun, 27 Sep 2020 12:40:56 +0000

Linux On Windows

❓ Abstract

Not So Basic: Devenv is a series of tutorials in which we aim to have a nice, productive and portable development environment that takes the best of both worlds between Linux and Windows.

In this first tutorial "Linux On Windows" we do the groundwork to install:

WSL 2: an efficient system to install Linux distributions on your PC. Thus giving access to a Unix shell.
Docker Desktop: for local development environment, to avoid system-dependent configuration.
Windows Terminal: a productive, configurable and efficient terminal that plays well with WSL, multiple profiles and shells.

📝 Overview

To complete this tutorial, you need to:

Upgrade to Windows version 2004
Enable WSL 2
Install a Linux distribution
Install Docker Desktop
Install Windows Terminal

Upgrade to Windows version 2004

⚠️ This step can take a long time (2h+) depending on your machine and connection. Do not attempt this if you have limited time.

Run winver to check Windows version.

If your Windows version is lower than 2004, go to Settings > Update & Security to update your system¹. Repeat this step until your PC restarts with the right version².

Enable WSL 2

Following Microsoft documentation, you need to enable the Windows Subsystem for Linux (Step 1) to do that, open PowerShell as administrator and run:

dism.exe /online /enable-feature /featurename:Microsoft-Windows-Subsystem-Linux /all /norestart

Then, you need to enable Virtual Machine feature (Step 3), run:

dism.exe /online /enable-feature /featurename:VirtualMachinePlatform /all /norestart

Restart your machine to complete the WSL install and update to WSL 2.

Download the WSL2 Linux kernel update package for x64 machines. Run it as administrator (Step 4)³.

To set WSL 2 as your default version (Step 5), run the following command:

wsl --set-default-version 2

Install a Linux distribution

WSL is ready to run Linux on your machine, now you can install your favorite distribution (Step 6)

Open the Microsoft Store, then search and install your desired Linux distribution.

When the installation⁴ ends⁵, you will be prompted to create your user and set your password.

Now you should be connected to your distribution with the user previously set⁶.

You can see the installed distributions and their name with:

wsl -l -v

The default distribution is marked with a star, you can set a distribution as default with:

wsl --set-default <distro>

To launch the default distro you can execute the wsl command.

To launch a specific distro:

wsl -d <distro>

If you have a previously installed distribution using WSL 1 (VERSION is 1), you can upgrade it with:

wsl --set-version <distro> 2

This operation may take a long time.

Install Docker Desktop

Following Docker documentation, download and install Docker Desktop

You need to activate Docker Desktop to your Linux distribution, to do that, open Docker Desktop dashboard from the Windows task bar hidden icons.

Go to Settings > Resources > WSL integration, activate WSL integration for your distribution, then click on Apply & Restart.

Install Windows Terminal

You may need a better terminal in order to have the full comfort of your Linux distribution, Windows terminal fits our requirements. You can Install the app from the Microsoft Store.

Once installed you can customize the settings, use this JSON schema to see all the available options. To open the setting file, click the downside arrow in the top bar then click on Settings (Ctrl,+).

To change the default shell profile, set the guid value of the profile you want as default in defaultProfile. Profiles guids can be found in the profiles section.

"defaultProfile": "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx}",

To set your distribution home directory as the starting path instead of the Windows mount location, add ~ to the commandline entry on your distribution profile.

"profiles": [
     #...
    "list": [
        #...
        {
            #...
            "name": "<distribution-name>",
            "source": "Windows.Terminal.Wsl",
            "commandline": "wsl.exe ~ -d <distribution-name>",
            #...
        }
        #...
    ]
    #...
]

Terminal settings and shell override.

⚠️ Windows terminal is a medium to interact with a shell. Some of the settings defined here might be overridden by the shell configuration.

Configuration samples

Color scheme

Override the default color scheme and set a name.

"schemes": [
    #...
    {
        "name": "Gerbier",
        "background": "#111111",
        "foreground": "#C8C8C8",
        "black": "#C8C8C8",
        "blue": "#44637A",
        "brightBlack": "#7A7A7A",
        "brightBlue": "#6FA0C6",
        "brightCyan": "#76A394",
        "brightGreen": "#7CA661",
        "brightPurple": "#9090C0",
        "brightRed": "#B04646",
        "brightWhite": "#505050",
        "brightYellow": "#E8C273",
        "cyan": "#32464A",
        "green": "#425934",
        "purple": "#555573",
        "red": "#8A3737",
        "white": "#3C3C3C",
        "yellow": "#9C824D"
    }
    #...    
],

Reference your color scheme by associating the name to the colorScheme property.

"profiles": [
     #...
    "list": [
        #...
        {
            #...
            "colorScheme": "Gerbier",
            #...
        }
        #...
    ]
    #...
]

Custom keybindings example

 "actions":
    [
        // Application-level Keys
        { "command": "closeWindow", "keys": "alt+f4" },
        { "command": "toggleFullscreen", "keys": "alt+enter" },
        { "command": "toggleFullscreen", "keys": "f11" },
        { "command": "toggleFocusMode" },
        { "command": "toggleAlwaysOnTop" },
        { "command": "openNewTabDropdown", "keys": "ctrl+shift+space" },
        { "command": "openSettings", "keys": "ctrl+," },
        { "command": { "action": "openSettings", "target": "defaultsFile" }, "keys": "ctrl+alt+," },
        { "command": "find", "keys": "ctrl+f" },
        { "command": "toggleRetroEffect" },
        { "command": "openTabColorPicker" },
        { "command": "commandPalette", "keys":"ctrl+shift+p" },

        // Tab Management
        // "command": "closeTab" is unbound by default.
        //   The closeTab command closes a tab without confirmation, even if it has multiple panes.
        { "command": "closeOtherTabs" },
        { "command": "closeTabsAfter" },
        { "command": "newTab", "keys": "ctrl+t" },
        { "command": "duplicateTab", "keys": "ctrl+d" },
        { "command": "nextTab", "keys": "ctrl+tab" },
        { "command": "prevTab", "keys": "ctrl+shift+tab" },

        // Pane Management
        { "command": "closePane", "keys": "ctrl+w" },
        { "command": { "action": "splitPane", "split": "horizontal" }, "keys": "alt+shift+-" },
        { "command": { "action": "splitPane", "split": "vertical" }, "keys": "alt+shift+plus" },
        { "command": { "action": "resizePane", "direction": "down" }, "keys": "alt+shift+down" },
        { "command": { "action": "resizePane", "direction": "left" }, "keys": "alt+shift+left" },
        { "command": { "action": "resizePane", "direction": "right" }, "keys": "alt+shift+right" },
        { "command": { "action": "resizePane", "direction": "up" }, "keys": "alt+shift+up" },
        { "command": { "action": "moveFocus", "direction": "down" }, "keys": "alt+down" },
        { "command": { "action": "moveFocus", "direction": "left" }, "keys": "alt+left" },
        { "command": { "action": "moveFocus", "direction": "right" }, "keys": "alt+right" },
        { "command": { "action": "moveFocus", "direction": "up" }, "keys": "alt+up" },

        // Clipboard Integration
        { "command": { "action": "copy", "singleLine": false }, "keys": "ctrl+c" },
        { "command": { "action": "copy", "singleLine": false }, "keys": "ctrl+insert" },
        { "command": "paste", "keys": "ctrl+v" },
        { "command": "paste", "keys": "shift+insert" },

        // Scrollback
        { "command": "scrollDown", "keys": "ctrl+down" },
        { "command": "scrollDownPage", "keys": "ctrl+pgdn" },
        { "command": "scrollUp", "keys": "ctrl+up" },
        { "command": "scrollUpPage", "keys": "ctrl+pgup" },

        // Visual Adjustments
        { "command": { "action": "adjustFontSize", "delta": 1 }, "keys": "ctrl+=" },
        { "command": { "action": "adjustFontSize", "delta": -1 }, "keys": "ctrl+-" },
        { "command": "resetFontSize", "keys": "ctrl+0" },

        // Other commands
        {
            // Select color scheme...
            "name": { "key": "SetColorSchemeParentCommandName" },
            "commands": [
                {
                    "iterateOn": "schemes",
                    "name": "${scheme.name}",
                    "command": { "action": "setColorScheme", "colorScheme": "${scheme.name}" }
                }
            ]
        },
        {
            // New tab...
            "name": { "key": "NewTabParentCommandName" },
            "commands": [
                {
                    "iterateOn": "profiles",
                    "icon": "${profile.icon}",
                    "name": "${profile.name}",
                    "command": { "action": "newTab", "profile": "${profile.name}" }
                }
            ]
        },
        {
            // Split pane...
            "name": { "key": "SplitPaneParentCommandName" },
            "commands": [
                {
                    "iterateOn": "profiles",
                    "icon": "${profile.icon}",
                    "name": "${profile.name}...",
                    "commands": [
                        {
                            "command": { "action": "splitPane", "profile": "${profile.name}", "split": "auto" }
                        },
                        {
                            "command": { "action": "splitPane", "profile": "${profile.name}", "split": "vertical" }
                        },
                        {
                            "command": { "action": "splitPane", "profile": "${profile.name}", "split": "horizontal" }
                        }
                    ]
                }
            ]
        }
    ]

In the next article A better shell with oh-my-zsh we will focus on customizing the shell.

Contributors

Romain Cambonie
Marc Gavanier

References used

To see the Windows version 2004 update you may have to click on Check online for updates from Microsoft Updates, just under the button Check for updates ↩
If you already have docker desktop installed on your machine, you will be prompted with a message that invites you to use WSL 2 instead of HyperV. This will be addressed later in this tutorial. ↩
If you cannot run wsl_update_x64.msi as administrator, the installation may end with the following error:
This update only applies to machines with the Windows Subsystem for Linux
To get around this problem, open PowerShell as administrator and run the installation via CLI. ↩
You may need to press enter if you feel that the installation takes too long. Installs should typically take under a minute. ↩
You may encounter the following error:
Error: 0xc03a001a The requested operation could not be completed due to a virtual disk system limitation. Virtual hard disk files must be decompressed and unencrypted and must not be sparse. ↩

To fix this error, go to $USER\AppData\Local\Packages, and find the package of the distribution (eg: CanonicalGroupLimited.Ubuntu20.04... ), open the folder properties General > Advanced, then uncheck Compress and Encrypt attributes.
If you are connected as 'root' on your distribution, the installation failed somewhere, the easier option is to uninstall and reinstall. Run wsl --unregister <distro> Launch your distribution again from the Windows Store to restart the installation. ↩

DEV Community: Codingones

Improve your experience using git cli

Improve your experience using git cli

❓ Abstract

📝 Overview

Install and configure git

Install

Configure User

Configure editor

Configure line endings

Visual diff and merge

P4Merge

Diff tool

Merge tool

(Alternative) Use your Intellij IDE

Add command aliases

Check your configuration

Authenticate through SSH

Generate a key

Register it in your git repository host

GitHub

GitLab

Try to clone a repository

Type your password once

Run SSH agent

SSH agent zsh plugin

Next article

Contributors

References used

A better shell with oh-my-zsh

A better shell with oh-my-zsh

❓ Abstract

📝 Overview

Zsh and Oh My Zsh

Zsh

Oh My Zsh

Change the default shell

A look on the default configuration.

Powerlevel10k

Install

Install the recommended font on Windows

Install the recommended font on Linux

Install powerlevel10k as a Oh-my-zsh theme

Configure

Using the configuration wizard

Manual advanced configuration

Customization examples

Switch a prompt segment from a side to another

Left prompt segments

=========================[ Line #1 ]=========================

=========================[ Line #2 ]=========================

Change common colors

Define VCS icons

Change the value of this parameter to show a different untracked file icon.

Change the value of this parameter to show a different stashed file icon.

Change the value of this parameter to show a different conflicted file icon.

Change the value of this parameter to show a different staged file icon.

Change the value of this parameter to show a different unstaged file icon.

Change VCS colors and icons

Package version format

Hardware colors and configuration

Context colors

typeset -g POWERLEVEL9K_CONTEXT_{DEFAULT,SUDO}_{CONTENT,VISUAL_IDENTIFIER}_EXPANSION=

Development tools colors

Change cloud tools colors

Next article

Contributors

References used

Linux on Windows

Linux On Windows

❓ Abstract

📝 Overview

Upgrade to Windows version 2004

Enable WSL 2

Install a Linux distribution

Install Docker Desktop

Install Windows Terminal

Terminal settings and shell override.

Configuration samples

Color scheme