bmoelans.github.io/index.html at master · bmoelans/bmoelans.github.io · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
<!doctype html>

<html lang="en">
<head>
  <meta charset="utf-8">

  <title>About Bart Moelans</title>
  <meta name="description" content="Simple page to test GitHub pages">
  <meta name="author" content="Bart Moelans">
</head>

<body>
	<h1>My setup</h1>
	<p>
        I like to setup my computer to my needs, but I also like to change hardware and software gears regularly.
        Certainly when I switch hardware, I tend to loose some of my software tweaks, so this section is an attempt to document my setup.
        Mainly for my own sake, but why not share it with the world.
    </p>
    <h2>Quick links</h2>
    <ul>
        <li><a href="#terminal">Terminal</a>
    </ul>

<section>
    <h2>OS</h2>
    <p>
        I use MacBook Pro (13-inch, 2017) and thus macOC Mojave, so software mentioned here is only tested on this platform
    </p>
</section>

<a name="terminal"></a>
<section>
<h2>Terminal</h2>
<p>
    I love working in terminal so I also finetuned this to my needs.
</p>
<dl>
        <dt><a href="https://ohmyz.sh/">oh my zsh</a></dt>
        <dd>
            Your terminal never felt this good before.
            I use following extra plugins on ohmyzsh
            <ul>
                <li><a href="https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins#docker">docker</a></li>
                <li><a href="https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins#git">git</a></li>
                <li><a href="https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins#osx">osx</a></li>
                <li><a href="https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins#vscode">vscode</a></li>
                <li><a href="https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins#z">z</a></li>
            </ul>
        </dd>

    <dt><a href="https://github.com/sharkdp/bat">bat</a></dt>
    <dd>
        cat with highlighting.
    </dd>

    <dt><a href="https://the.exa.website/">exa</a></dt>
    <dd>
        A modern replacement for ls.
    </dd>


    <dt><a href="https://github.com/sharkdp/fd">fd</a></dt>
    <dd>
        For easier and faster finding files & directories
    </dd>

    <dt><a href="https://github.com/sharkdp/fd">rg (RipGrep)</a></dt>
    <dd>
        For easier finding strings in files
    </dd>
</dl>
</section>

<section>
<h2>Git</h2>
<p>My finetuning for Git</p>
<dl>
    <dt><a href="http://meldmerge.org/">Meld</a></dt>
    <dd>Tool I use to solve Merge conflict with Git, my config
        <pre>
        [diff]
            tool = meld
        [difftool]
            prompt = false
        [difftool "meld"]
            cmd = meld "$LOCAL" "$REMOTE"
        [merge]
            tool = meld
        [mergetool]
            # don't ask if we want to skip merge
            prompt = false
            # don't create backup *.orig files
            keepBackup = false
        </pre>
    </dd>

    <dt>Sublime</dt>
    <dd>
        <pre>
        [core]
            editor = 'sublime' --wait
        </pre>
    </dd>

    <dt><a href-"https://github.com/so-fancy/diff-so-fancy">diff-so-fancy</a></dt>
    <dd>Better looking git diff in CMD</dd>

</dl>

<h3>Aliases</h3>
<dl>
    <dt><tt>root = rev-parse --show-toplevel</tt></dt>
    <dd>So with <tt>git root</tt> I can see root of git tree and with <tt>cd $(git root)</tt></dd>

    <dt>l = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all<dt>
    <dd></dd>

    <dt>ll = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(  reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all</dt>
    <dd></dd>

    <dt>reset-commit = reset --soft HEAD~1</dt><dd></dd>
    <dt>reset-commit-hard = reset --hard HEAD~1      </dt><dd></dd>
    <dt>reset-commit-clean = !git reset --hard HEAD~1 && git clean -fd</dt><dd></dd>
    <dt>reset-to-origin = !git reset --hard $(git upstream-name)</dt><dd></dd>

    <dt>upstream-name = !git for-each-ref --format='%(upstream:short)' $(git symbolic-ref -q HEAD)</dt>
    <dd>Get name of the upstream branch</dd>
</section>
</body>
</html>