Restructure Computer/tools

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

6 files changed, 133 insertions, 150 deletions

diff --git a/Computer/tools.md b/Computer/tools.md
index 4e9a631..1aaa0fc 100644
--- a/Computer/tools.md
+++ b/Computer/tools.md
@@ -2,10 +2,19 @@
 title: Tools
 ---
 
+* [[git]] - goes without explanation
+* [[vim]] - of course!
+* [[nix]] - the package manager of the future
+* [[ranger]] is a nice [[cli]] filemanager ([[tui]], actually).
+* [[fzf]] is a fuzzy selection tool
+
 ## Collaboration
 
 * [etherpad](https://etherpad.org/)
 * [ethercalc](https://ethercalc.net/)
+* [excalidraw](https://excalidraw.com/)
+* [riseup pad](https://pad.riseup.net)
+* [Dudle](https://dudle.inf.tu-dresden.de/) - free "doodle" alternative
 
 
 ## Timetracking
@@ -31,3 +40,80 @@ title: Tools
 
 * [Binnen-I be gone](https://addons.mozilla.org/de/firefox/addon/binnen-i-be-gone/) - Filtert Binnen-Is auf deutschsprachigen Webseiten
 
+
+## List of neat CLI/TUI tools
+
+* [alacritty](https://github.com/alacritty/alacritty)
+* [atuin](https://github.com/ellie/atuin)
+* [bandwhich](https://github.com/imsnif/bandwhich)
+* [bat](https://github.com/sharkdp/bat)
+* [bb](https://github.com/epilys/bb)
+* [bfs](https://github.com/tavianator/bfs)
+* [bmon](https://github.com/tgraf/bmon)
+* [bottom](https://github.com/ClementTsang/bottom)
+* [broot](https://github.com/Canop/broot)
+* [choose](https://github.com/theryangeary/choose)
+* [coreutils](https://github.com/uutils/coreutils)
+* [delta](https://github.com/dandavison/delta)
+* [dijo](https://github.com/NerdyPepper/dijo)
+* [diskus](https://github.com/sharkdp/diskus)
+* [dive](https://github.com/wagoodman/dive)
+* [dua-cli](https://github.com/Byron/dua-cli)
+* [dutree](https://github.com/nachoparker/dutree)
+* [exa](https://github.com/ogham/exa)
+* [fd](https://github.com/sharkdp/fd)
+* [fselect](https://github.com/jhspetersson/fselect)
+* [fzf](https://github.com/junegunn/fzf)
+* [git-absorb](https://github.com/tummychow/git-absorb)
+* [git-interactive-rebase-tool](https://github.com/MitMaro/git-interactive-rebase-tool)
+* [git-journal](https://github.com/saschagrunert/git-journal)
+* [gitui](https://github.com/extrawurst/gitui)
+* [glances](https://github.com/nicolargo/glances)
+* [glow](https://github.com/charmbracelet/glow)
+* [gotop](https://github.com/xxxserxxx/gotop)
+* [gping](https://github.com/orf/gping)
+* [grpcurl](https://github.com/fullstorydev/grpcurl)
+* [hex](https://github.com/sitkevij/hex)
+* [hexyl](https://github.com/sharkdp/hexyl)
+* [httpie](https://httpie.io/)
+* [hugo](https://github.com/gohugoio/hugo)
+* [hunter](https://github.com/rabite0/hunter)
+* [joshuto](https://github.com/kamiyaa/joshuto)
+* [jp](https://github.com/sgreben/jp)
+* [jq](https://github.com/stedolan/jq)
+* [jrnl](https://github.com/jrnl-org/jrnl)
+* [lazygit](https://github.com/jesseduffield/lazygit)
+* [lsd](https://github.com/Peltoche/lsd)
+* [mdBook](https://github.com/rust-lang/mdBook)
+* [navi](https://github.com/denisidoro/navi)
+* [nemu](https://github.com/nemuTUI/nemu)
+* [netdata](https://github.com/netdata/netdata)
+* [ngxtop](https://github.com/lebinh/ngxtop)
+* [nvtop](https://github.com/Syllo/nvtop)
+* [pg_top](https://gitlab.com/pg_top/pg_top)
+* [pgcli](https://github.com/dbcli/pgcli)
+* [q](https://github.com/harelba/q)
+* [ranger](https://github.com/ranger/ranger)
+* [ripgrep](https://github.com/BurntSushi/ripgrep)
+* [rofi](https://github.com/davatorium/rofi)
+* [sad](https://github.com/ms-jpq/sad)
+* [sc-im](https://github.com/andmarti1424/sc-im)
+* [sd](https://github.com/chmln/sd)
+* [skim](https://github.com/lotabout/skim)
+* [slb](https://github.com/vlad17/slb)
+* [smenu](https://github.com/p-gen/smenu)
+* [so](https://github.com/samtay/so)
+* [sshuttle](https://github.com/sshuttle/sshuttle)
+* [starship](https://github.com/starship/starship)
+* [svgbob](https://github.com/ivanceras/svgbob)
+* [syncthing](https://github.com/syncthing/syncthing)
+* [tig](https.//github.com/jonas/tig)
+* [tmate](https://github.com/tmate-io/tmate)
+* [up](https://github.com/akavel/up)
+* [whatfiles](https://github.com/spieglt/whatfiles)
+* [xsv](https://github.com/BurntSushi/xsv)
+* [zellij](https://github.com/zellij-org/zellij)
+* [zenith](https://github.com/bvaisvil/zenith)
+* [zola](https://www.getzola.org/)
+
+
diff --git a/Computer/tools/cli.md b/Computer/tools/cli.md
deleted file mode 100644
index 5f81cc8..0000000
--- a/Computer/tools/cli.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-title: CLI
----
diff --git a/Computer/tools/cli/helpers.md b/Computer/tools/cli/helpers.md
deleted file mode 100644
index 209e3bf..0000000
--- a/Computer/tools/cli/helpers.md
+++ /dev/null
@@ -1,81 +0,0 @@
-
-+++
-title  = 'CLI Helper tools'
-weight = 1
-+++
-
-General list of helper tools that are nice, helpful and worth to have a look at
-
-* [alacritty](https://github.com/alacritty/alacritty)
-* [atuin](https://github.com/ellie/atuin)
-* [bandwhich](https://github.com/imsnif/bandwhich)
-* [bat](https://github.com/sharkdp/bat)
-* [bb](https://github.com/epilys/bb)
-* [bfs](https://github.com/tavianator/bfs)
-* [bmon](https://github.com/tgraf/bmon)
-* [bottom](https://github.com/ClementTsang/bottom)
-* [broot](https://github.com/Canop/broot)
-* [choose](https://github.com/theryangeary/choose)
-* [coreutils](https://github.com/uutils/coreutils)
-* [delta](https://github.com/dandavison/delta)
-* [dijo](https://github.com/NerdyPepper/dijo)
-* [diskus](https://github.com/sharkdp/diskus)
-* [dive](https://github.com/wagoodman/dive)
-* [dua-cli](https://github.com/Byron/dua-cli)
-* [dutree](https://github.com/nachoparker/dutree)
-* [exa](https://github.com/ogham/exa)
-* [fd](https://github.com/sharkdp/fd)
-* [fselect](https://github.com/jhspetersson/fselect)
-* [fzf](https://github.com/junegunn/fzf)
-* [git-absorb](https://github.com/tummychow/git-absorb)
-* [git-interactive-rebase-tool](https://github.com/MitMaro/git-interactive-rebase-tool)
-* [git-journal](https://github.com/saschagrunert/git-journal)
-* [gitui](https://github.com/extrawurst/gitui)
-* [glances](https://github.com/nicolargo/glances)
-* [glow](https://github.com/charmbracelet/glow)
-* [gotop](https://github.com/xxxserxxx/gotop)
-* [gping](https://github.com/orf/gping)
-* [grpcurl](https://github.com/fullstorydev/grpcurl)
-* [hex](https://github.com/sitkevij/hex)
-* [hexyl](https://github.com/sharkdp/hexyl)
-* [httpie](https://httpie.io/)
-* [hugo](https://github.com/gohugoio/hugo)
-* [hunter](https://github.com/rabite0/hunter)
-* [joshuto](https://github.com/kamiyaa/joshuto)
-* [jp](https://github.com/sgreben/jp)
-* [jq](https://github.com/stedolan/jq)
-* [jrnl](https://github.com/jrnl-org/jrnl)
-* [lazygit](https://github.com/jesseduffield/lazygit)
-* [lsd](https://github.com/Peltoche/lsd)
-* [mdBook](https://github.com/rust-lang/mdBook)
-* [navi](https://github.com/denisidoro/navi)
-* [nemu](https://github.com/nemuTUI/nemu)
-* [netdata](https://github.com/netdata/netdata)
-* [ngxtop](https://github.com/lebinh/ngxtop)
-* [nvtop](https://github.com/Syllo/nvtop)
-* [pg_top](https://gitlab.com/pg_top/pg_top)
-* [pgcli](https://github.com/dbcli/pgcli)
-* [q](https://github.com/harelba/q)
-* [ranger](https://github.com/ranger/ranger)
-* [ripgrep](https://github.com/BurntSushi/ripgrep)
-* [rofi](https://github.com/davatorium/rofi)
-* [sad](https://github.com/ms-jpq/sad)
-* [sc-im](https://github.com/andmarti1424/sc-im)
-* [sd](https://github.com/chmln/sd)
-* [skim](https://github.com/lotabout/skim)
-* [slb](https://github.com/vlad17/slb)
-* [smenu](https://github.com/p-gen/smenu)
-* [so](https://github.com/samtay/so)
-* [sshuttle](https://github.com/sshuttle/sshuttle)
-* [starship](https://github.com/starship/starship)
-* [svgbob](https://github.com/ivanceras/svgbob)
-* [syncthing](https://github.com/syncthing/syncthing)
-* [tig](https.//github.com/jonas/tig)
-* [tmate](https://github.com/tmate-io/tmate)
-* [up](https://github.com/akavel/up)
-* [whatfiles](https://github.com/spieglt/whatfiles)
-* [xsv](https://github.com/BurntSushi/xsv)
-* [zellij](https://github.com/zellij-org/zellij)
-* [zenith](https://github.com/bvaisvil/zenith)
-* [zola](https://www.getzola.org/)
-
diff --git a/Computer/tools/cli/scripts.md b/Computer/tools/fzf.md
index cb550ea..0088f2f 100644
--- a/Computer/tools/cli/scripts.md
+++ b/Computer/tools/fzf.md
@@ -1,16 +1,12 @@
-+++
-title = "CLI Helper scripts"
-weight = 1
-+++
+---
+title: FZF
+---
 
-## Commandline enhancements
-
-### [fzf](https://github.com/junegunn/fzf)
-
-`fzf` is a fuzzy selection tool written in [[go]]. An alternative in [[rust]] would be
+[fzf](https://github.com/junegunn/fzf)
+is a fuzzy selection tool written in [[go]]. An alternative in [[rust]] would be
 [skim](https://github.com/lotabout/skim).
 
-fzf can be used to automate a lot of things, for example it can replace the
+[[fzf]] can be used to automate a lot of things, for example it can replace the
 `CTRL-R` shortcut in bash:
 
 ```bash
@@ -70,7 +66,7 @@ fmux() {
 }
 ```
 
-### fzf in vim
+## fzf in vim
 
 It can also be integrated in `vim` for fuzzy selecting. Things like
 fuzzy-jump-to-line, for example:
@@ -87,44 +83,3 @@ nmap <Leader>zm :FZFMarks<CR>
 nmap <Leader>zw :FZFWindows<CR>
 ```
 
-
-## Ranger
-
-Ranger is a nice CLI filemanager (TUI).
-
-
-### (Not) Nesting ranger
-
-With the following script, one can
-ensure that only one ranger instance is running in the terminal (no nested
-sessions):
-
-```bash
-r() {
-    if [ $(jobs | grep ranger | wc -l) -gt 0 ]; then
-        fg $(jobs | grep ranger | sed 's,^\[,,; s,\].*,,')
-    else
-        if [ -z "$RANGER_LEVEL" ]; then
-            ranger
-        else
-            exit
-        fi
-    fi
-}
-```
-
-
-### tmux integration
-
-Using tmux from ranger is as simple as
-
-```
-map ef eval if 'TMUX' in os.environ.keys(): fm.run("tmux splitw -h 'rifle \"" + fm.thisfile.basename + "\"'")
-map ev eval if 'TMUX' in os.environ.keys(): fm.run("tmux splitw -v 'rifle \"" + fm.thisfile.basename + "\"'")
-map ew eval if 'TMUX' in os.environ.keys(): fm.run("tmux new-window 'rifle \"" + fm.thisfile.basename + "\"'")
-
-map sf eval if 'TMUX' in os.environ.keys(): fm.run("tmux splitw -h")
-map sv eval if 'TMUX' in os.environ.keys(): fm.run("tmux splitw -v")
-map sw eval if 'TMUX' in os.environ.keys(): fm.run("tmux new-window")
-```
-
diff --git a/Computer/tools/planning.md b/Computer/tools/planning.md
deleted file mode 100644
index c7a9961..0000000
--- a/Computer/tools/planning.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-title: Planning
----
-
-## Shared Text Boards
-
-* [excalidraw](https://excalidraw.com/)
-* [riseup pad](https://pad.riseup.net)
-
-
-## Appointment planning
-
-* [Dudle](https://dudle.inf.tu-dresden.de/) - free "doodle" alternative
-
diff --git a/Computer/tools/ranger.md b/Computer/tools/ranger.md
new file mode 100644
index 0000000..e26fee3
--- /dev/null
+++ b/Computer/tools/ranger.md
@@ -0,0 +1,40 @@
+---
+title: Ranger
+---
+
+
+
+## (Not) Nesting ranger
+
+With the following script, one can
+ensure that only one ranger instance is running in the terminal (no nested
+sessions):
+
+```bash
+r() {
+    if [ $(jobs | grep ranger | wc -l) -gt 0 ]; then
+        fg $(jobs | grep ranger | sed 's,^\[,,; s,\].*,,')
+    else
+        if [ -z "$RANGER_LEVEL" ]; then
+            ranger
+        else
+            exit
+        fi
+    fi
+}
+```
+
+## tmux integration
+
+Using tmux from ranger is as simple as
+
+```
+map ef eval if 'TMUX' in os.environ.keys(): fm.run("tmux splitw -h 'rifle \"" + fm.thisfile.basename + "\"'")
+map ev eval if 'TMUX' in os.environ.keys(): fm.run("tmux splitw -v 'rifle \"" + fm.thisfile.basename + "\"'")
+map ew eval if 'TMUX' in os.environ.keys(): fm.run("tmux new-window 'rifle \"" + fm.thisfile.basename + "\"'")
+
+map sf eval if 'TMUX' in os.environ.keys(): fm.run("tmux splitw -h")
+map sv eval if 'TMUX' in os.environ.keys(): fm.run("tmux splitw -v")
+map sw eval if 'TMUX' in os.environ.keys(): fm.run("tmux new-window")
+```
+