From 515827b2870268a76d526abd83988bb3aa766f62 Mon Sep 17 00:00:00 2001 From: SqrtMinusOne Date: Mon, 21 Aug 2023 11:22:19 +0300 Subject: [PATCH] fix(console): formatting --- .config/alacritty/alacritty.yml | 4 +-- Console.org | 58 ++++++++++++++++----------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index f24660f..2a94929 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -1,4 +1,4 @@ -# [[file:../../Console.org::*Alacritty][Alacritty:4]] +# [[file:../../Console.org::*Alacritty][Alacritty:1]] decorations: none font: @@ -66,4 +66,4 @@ key_bindings: - { key: NumpadAdd, mods: Control, action: IncreaseFontSize } - { key: Minus, mods: Control, action: DecreaseFontSize } - { key: NumpadSubtract, mods: Control, action: DecreaseFontSize } -# Alacritty:4 ends here +# Alacritty:1 ends here diff --git a/Console.org b/Console.org index 09831d6..8bea645 100644 --- a/Console.org +++ b/Console.org @@ -849,31 +849,31 @@ key_bindings: - { key: NumpadSubtract, mods: Control, action: DecreaseFontSize } #+end_src * Various console applications -| Guix dependency | Description | -|-----------------+---------------------------------------------| -| ncurses | Provides stuff like ~clear~ | -| exa | ~ls~ replacement, written in Rust | -| bat | ~cat~ clone with syntax highlighting | -| htop | Interactive process viewer | -| nethogs | A tool to group processed by used bandwidth | -| osync | rsync wrapper | -| neofetch | Fetch system info | -| fzf | fuzzy finder | -| p7zip | archiver | -| password-store | CLI password manager | -| zip | | -| unzip | | -| jmtpfs | A tool to mount MTP devices (e.g. Android) | -| tokei | Count lines of code | -| sshfs | Mount stuff over SSH | -| git-lfs | | -| glibc-locales | | -| direnv | | -| jless-bin | JSON viewer | -| megacmd | mega.nz client | -| ncdu | disk usage analyzer | -| openssl | | -| bottom-bin | resource monitor | +| Guix dependency | Description | +|-----------------------+---------------------------------------------| +| ncurses | Provides stuff like ~clear~ | +| exa | ~ls~ replacement, written in Rust | +| bat | ~cat~ clone with syntax highlighting | +| htop | Interactive process viewer | +| nethogs | A tool to group processed by used bandwidth | +| osync | rsync wrapper | +| neofetch | Fetch system info | +| fzf | fuzzy finder | +| p7zip | archiver | +| password-store | CLI password manager | +| zip | | +| unzip | | +| jmtpfs | A tool to mount MTP devices (e.g. Android) | +| tokei | Count lines of code | +| sshfs | Mount stuff over SSH | +| git-lfs | | +| glibc-locales | | +| direnv | | +| jless-bin | JSON viewer | +| megacmd | mega.nz client | +| ncdu | disk usage analyzer | +| openssl | | +| bottom-bin | resource monitor | ** ripgrep config Occasionally I can't exclude certain files from ripgrep via the VCS settings, so here is a simple config to ignore certain files globally. @@ -908,7 +908,7 @@ else fi #+end_src ** =autocommit= -A script to autocommit files in a repository. I use it to sync my org directory and password store. I guess it's not how git is intended to be used, but it works for me. +A script to perform automatic commits in a repository. I use it to sync my org directory and password store. I guess it's not how git is intended to be used, but it works for me. Usage: #+begin_example @@ -920,11 +920,11 @@ Environment: |---------------+-----------------+---------------| | =TIMEOUT_MIN= | Default timeout | 60 | -Here's more or less what the script is doing: +Here's roughly what the script is doing: - If there is a merge conflict, notify -- If there are changed files in the last =TIMEOUT_MIN= minutes, commit +- If there were changed files in the last =TIMEOUT_MIN= minutes, commit - Fetch -- If there were changes in the last =TTMEOUT_MIN=, merge (usually the merge has to be fast-forwarded) +- If there were changes in the last =TTMEOUT_MIN=, merge (usually the merge is just fast-forward) - If the fetch was successful & the merge was either successful or delayed because of changes in the last =TIMEOUT_MIN=, push - Send a notification about the events above - Send a separate notification if there is a merge conflict