From 860ca7f5855d3a07fa1faa6dda88cc87bf9db01d Mon Sep 17 00:00:00 2001 From: Protesilaos Stavrou Date: Thu, 9 May 2019 09:09:12 +0300 Subject: [PATCH] Remove ALL Vim folds This removes the Vim modeline and all the markers that tell Vim to fold the wrapped lines at startup. Rationale: 1. Line folding is a user preference. 2. Files look cleaner overall, especially for non-Vim users. --- NO-STOW-neomutt/.config/neomutt/neomuttrc | 38 ++--- bin/bin/flatpakmenu | 2 - bin/bin/gev | 8 +- bin/bin/melonpanel | 38 ++--- bin/bin/nbm | 32 ++-- .../own_script_bspwm_external_rules_command | 8 +- bin/bin/own_script_bspwm_per_host_configs | 8 +- bin/bin/own_script_laptop_dual_monitor | 24 +-- bin/bin/own_script_local_build_tempus_themes | 6 +- bin/bin/own_script_mate_setup | 50 ++---- bin/bin/own_script_mate_terminal_setup | 20 +-- bin/bin/own_script_update_environment_theme | 150 ++++++------------ bin/bin/own_script_update_running_terminals | 8 +- bin/bin/poweroptionsmenu | 6 +- bin/bin/stm | 26 +-- bin/bin/tempusmenu | 26 +-- bspwm/.config/bspwm/bspwmrc | 26 +-- bspwm/.config/sxhkd/sxhkdrc | 34 ++-- compton/.config/compton.conf | 32 ++-- music/.config/ncmpcpp/config | 25 +-- shell/.bashrc | 56 +++---- tmux/.tmux.conf | 38 ++--- 22 files changed, 205 insertions(+), 456 deletions(-) diff --git a/NO-STOW-neomutt/.config/neomutt/neomuttrc b/NO-STOW-neomutt/.config/neomutt/neomuttrc index 455b0484..cf065bc5 100644 --- a/NO-STOW-neomutt/.config/neomutt/neomuttrc +++ b/NO-STOW-neomutt/.config/neomutt/neomuttrc @@ -1,5 +1,3 @@ -# vi:foldmethod=marker - # Configuration file for Neomutt. Tested on 2019-02-28. Debian Buster # running NeoMutt 20180716. # @@ -13,8 +11,8 @@ # This file and everything sourced herein is part of my dotfiles. See # https://gitlab.com/protesilaos/dotfiles. -# General settings {{{ -# ------------------- +# General settings +# ---------------- set arrow_cursor=no # yes == indicator "->" will note the position in the index, else the whole line is highlighted set sleep_time=0 @@ -47,10 +45,8 @@ unset markers # do not show markers for wrapped lines set pager_index_lines=10 set mime_forward=yes # send forwarded mails as attachments -# }}} - -# Composing {{{ -# ------------- +# Composing +# --------- set editor="vim +':set textwidth=72' +':set formatoptions=twan12'" set empty_subject='Your email' set askcc=no @@ -85,10 +81,8 @@ set abort_noattach_regex="\\" -# }}} - -# Index and status bars {{{ -# ------------------------- +# Index and status bars +# --------------------- # For the date_format, see `man strftime`. For the index_format see # `man neomuttrc`. Notice the number in %C (index_fromat). set date_format="%Y-%m-%d %R" @@ -110,10 +104,8 @@ Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l??]───' set pager_format='───%F: %s%*─(%P)' -# }}} - -# Mailboxes {{{ -# ------------- +# Mailboxes +# --------- # NOTE the passwords for each account are stored in an encrypted file. # Each password is defined as a custom variable by prepending the `my_` # directive. Such as `set my_variable = "password"`. @@ -133,20 +125,16 @@ folder-hook $folder 'source ~/.config/neomutt/mails/email-two' source "~/.config/neomutt/mails/email-three" folder-hook $folder 'source ~/.config/neomutt/mails/email-three' -# }}} - -# Sidebar settings (I don't really use this) {{{ -# ---------------------------------------------- +# Sidebar settings (I don't really use this) +# ------------------------------------------ set sidebar_visible=no set mail_check_stats set sidebar_format="%B%?F? [%F]?%* %?N?%N/?%S" set sidebar_short_path=yes set sidebar_delim_chars='/' -# }}} - -# Key bindings {{{ -# ---------------- +# Key bindings +# ------------ bind editor complete-query # Compose a new email (not a reply) to the sender @@ -197,5 +185,3 @@ bind index,pager sidebar-toggle-visible bind index,pager sidebar-prev bind index,pager sidebar-next bind index,pager sidebar-open - -# }} diff --git a/bin/bin/flatpakmenu b/bin/bin/flatpakmenu index b228e2bc..ec16d5e0 100755 --- a/bin/bin/flatpakmenu +++ b/bin/bin/flatpakmenu @@ -51,5 +51,3 @@ if [ "$my_flatpaks_choice" ]; then echo "flatpak run \"$my_flatpaks_choice\"" flatpak run "$my_flatpaks_choice" & fi - -# vi:foldmethod=marker diff --git a/bin/bin/gev b/bin/bin/gev index 16df9219..99d69572 100755 --- a/bin/bin/gev +++ b/bin/bin/gev @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Description {{{ -# --------------- +# Description +# ----------- # # GEV: Git's Eye View. A simple way to get an overview of the status of # all git repos inside a directory. A simple two column list is drawn, @@ -31,8 +31,6 @@ # apt install git # # Part of my dotfiles: https://gitlab.com/protesilaos/dotfiles -# -# }}} # Which directory contains our repos? parent_directory="$HOME" @@ -81,5 +79,3 @@ while IFS= read -r -d '' repo; do cd "$repo/.." > /dev/null || exit printf "%s %s\\n" "$(git_status)" "$PWD" done - -# vi:foldmethod=marker diff --git a/bin/bin/melonpanel b/bin/bin/melonpanel index d850c2c4..38e8ae00 100755 --- a/bin/bin/melonpanel +++ b/bin/bin/melonpanel @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Description {{{ -# --------------- +# Description +# ----------- # # Melonpanel: my `lemonbar` implementation, for use in my custom desktop # session (see my dotfiles https://gitlab.com/protesilaos/dotfiles). @@ -29,11 +29,9 @@ # apt install amixer mpd mpc # # Last full review 2019-04-04 -# -# }}} -# General settings {{{ -# -------------------- +# General settings +# ---------------- # Check if any lemonbar is running and kill it if pgrep -xo lemonbar > /dev/null; then @@ -55,10 +53,8 @@ else melonpanel_font='-misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1' fi -# }}} - -# Colours for modules and bspwm indicators {{{ -# -------------------------------------------- +# Colours for modules and bspwm indicators +# ---------------------------------------- # Add colours from current Tempus theme. That file is used in other # places as well to offer a convenient way of styling multiple tools in @@ -126,10 +122,8 @@ COLOR_MONOCLE_BG="$COLOR_DEFAULT_BG" COLOR_FLAGS_FG="$COLOR_DEFAULT_FG" COLOR_FLAGS_BG="$COLOR_DEFAULT_BG" -# }}} - -# Panel modules {{{ -# ----------------- +# Panel modules +# ------------- # # NOTE all functions that are meant to pipe their output to the panel # will echo a majuscule (letter A-Z). This is done to easily retrieve @@ -272,10 +266,8 @@ my_modules() { done } -# }}} - -# Piping and reading the output of the modules {{{ -# ------------------------------------------------ +# Piping and reading the output of the modules +# -------------------------------------------- # The design of this section has been heavily inspired/adapted from the # examples provided by upstream bspwm. @@ -460,10 +452,8 @@ melonpanel() { done } -# }}} - -# Launch the panel with the given parameters {{{ -# ---------------------------------------------- +# Launch the panel with the given parameters +# ------------------------------------------ melonpanel < "$melonpanel_fifo" | lemonbar -u 1 -p -g "x${melonpanel_height}" \ -F "$COLOR_DEFAULT_FG" -B "$COLOR_DEFAULT_BG" -f "$melonpanel_font" -n "Melonpanel" & @@ -480,7 +470,3 @@ until bar_id=$(xdo id -a 'Melonpanel'); do done xdo below -t $(xdo id -n root) $bar_id & - -# }}} - -# vi:foldmethod=marker diff --git a/bin/bin/nbm b/bin/bin/nbm index 9f5f1bd8..65a6aaad 100755 --- a/bin/bin/nbm +++ b/bin/bin/nbm @@ -14,8 +14,8 @@ # along with this program. If not, see . -# Description {{{ -# --------------- +# Description +# ----------- # # Nimble Backdrop Manager. Interface with `sxiv` to view your Pictures # folder and set a new wallpaper (by marking the thumbnail with "m" and @@ -39,11 +39,9 @@ # Assign this script to a key binding for your convenience. # # TODO is "Pictures" automatically localised? -# -# }}} -# Image viewer parameters {{{ -# --------------------------- +# Image viewer parameters +# ----------------------- # # Define the sxiv command with reading from stdin and delivering to # stdout. Start the program in thumbnail mode. The -N flag is for @@ -53,10 +51,8 @@ my_sxiv() { sxiv -iot -N 'my_float_window' } -# }}} - -# Query the Pictures folder and present images {{{ -# ------------------------------------------------ +# Query the Pictures folder and present images +# -------------------------------------------- # Get image files that end in .{jpg,jpeg,png} from ~/Pictures. find_pictures() { @@ -82,10 +78,8 @@ sxiv_interface() { find_pictures | my_sxiv } -# }}} - -# Apply the wallpaper {{{ -# ----------------------- +# Apply the wallpaper +# ------------------- # # This is the command that sets the wallpaper, which it reads as the # first argument. The commands for the desktop environment's listed @@ -126,10 +120,8 @@ apply_wallpaper() { esac } -# }}} - -# Conditions for running this script {{{ -# -------------------------------------- +# Conditions for running this script +# ---------------------------------- nbm_exec() { local quit_text='You hit the "q" key. Quiting program...' # Open the interface with all available files from ~/Pictures @@ -187,7 +179,3 @@ nbm_exec() { # Run the script nbm_exec - -# }}} - -# vi:foldmethod=marker diff --git a/bin/bin/own_script_bspwm_external_rules_command b/bin/bin/own_script_bspwm_external_rules_command index b6b587de..82968473 100755 --- a/bin/bin/own_script_bspwm_external_rules_command +++ b/bin/bin/own_script_bspwm_external_rules_command @@ -13,16 +13,14 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Description {{{ -# --------------- +# Description +# ----------- # # This script defines conditions that alter the way `bspwm` treats # certain window types. # # Note that this is a very simplistic approach that may need to be # optimised and expanded upon. For the time being, it "just works". -# -# }}} window_id="$1" window_class="$2" @@ -40,5 +38,3 @@ case "$window_class" in esac ;; esac - -# vim:ft=sh:foldmethod=marker diff --git a/bin/bin/own_script_bspwm_per_host_configs b/bin/bin/own_script_bspwm_per_host_configs index 54f63baa..96734a7c 100755 --- a/bin/bin/own_script_bspwm_per_host_configs +++ b/bin/bin/own_script_bspwm_per_host_configs @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Description {{{ -# --------------- +# Description +# ----------- # # Configure `bspwm` depending on the host computer. Part of my dotfiles. # See https://gitlab.com/protesilaos/dotfiles @@ -30,8 +30,6 @@ # setup in advance. I deploy my dotfiles on two separate machines. On # one I often run a dual monitor setup. As such, there are some bespoke # configs for each host. -# -# }}} # I define my host names as BASH variables in this file. The format is # `my_variable='my_value'`. Then I source it to retrieve the value I @@ -95,5 +93,3 @@ case "$(hostname)" in bspwm_generic_workspaces ;; esac - -# vi:foldmethod=marker diff --git a/bin/bin/own_script_laptop_dual_monitor b/bin/bin/own_script_laptop_dual_monitor index 6b4de585..f84f4528 100755 --- a/bin/bin/own_script_laptop_dual_monitor +++ b/bin/bin/own_script_laptop_dual_monitor @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Description {{{ -# --------------- +# Description +# ----------- # # This script has a dual purpose when executed from my laptop: # @@ -34,10 +34,8 @@ # dotfiles https://gitlab.com/protesilaos/dotfiles. # # Last full review on 2019-04-21 -# -# }}} -# Configure this for LightDM {{{ +# Configure this for LightDM # # To instruct `lightdm` to run this at startup on a machine running # Debian Buster/Sid, you must edit `/etc/lightdm/lightdm.conf` (requires @@ -60,11 +58,9 @@ # # This might also work with other greeters, such as `slick-greeter`. # Needs further testing. -# -# }}} -# XrandR functions {{{ -# -------------------- +# XrandR functions +# ---------------- # XXX NOTE XXX These will have no permanent effect if another program # adjusts the screen's colours and brightness, such as `redshift`. @@ -105,10 +101,8 @@ multihead_brightness() { xrandr --output VGA1 --brightness 1 --gamma 1:1:1 } -# }}} - -# Conditions for running this script {{{ -# -------------------------------------- +# Conditions for running this script +# ---------------------------------- # If the VGA1 port connects to a monitor, the output of the variable # will not be empty. In which case it is assumed that I am using my @@ -134,7 +128,3 @@ else laptop_coordinates laptop_brightness fi - -# }}} - -# vi:foldmethod=marker diff --git a/bin/bin/own_script_local_build_tempus_themes b/bin/bin/own_script_local_build_tempus_themes index bf6bdc80..44704260 100755 --- a/bin/bin/own_script_local_build_tempus_themes +++ b/bin/bin/own_script_local_build_tempus_themes @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# README for dependencies {{{ -# --------------------------- +# README for dependencies +# ----------------------- # Builds theme files for all items in the Tempus Themes collection and # places them in their corresponding location inside my dotfiles. For @@ -37,8 +37,6 @@ # CONTRIBUTING.md. # # Last full review on 2019-05-07 -# -# }}} # The generator path generator_dir="$HOME/tempus-themes-generator" diff --git a/bin/bin/own_script_mate_setup b/bin/bin/own_script_mate_setup index f5f905a2..1eee8d30 100755 --- a/bin/bin/own_script_mate_setup +++ b/bin/bin/own_script_mate_setup @@ -30,16 +30,14 @@ # manually and then using the `dconf-editor` to figure out what changed # in the backend. -# Keyboard settings {{{ -# --------------------- +# Keyboard settings +# ----------------- gsettings set org.mate.peripherals-keyboard numlock-state 'off' gsettings set org.mate.peripherals-keyboard-xkb.kbd layouts "['us','gr']" gsettings set org.mate.peripherals-keyboard-xkb.kbd options "['grp\tgrp:alt_caps_toggle', 'Compose key\tcompose:menu']" -# }}} - -# Key bindings {{{ -# ---------------- +# Key bindings +# ------------ gsettings set org.mate.Marco.window-keybindings tile-to-side-e 'l' gsettings set org.mate.Marco.window-keybindings tile-to-side-w 'h' gsettings set org.mate.Marco.window-keybindings toggle-fullscreen 'f' @@ -58,20 +56,16 @@ gsettings set org.mate.Marco.global-keybindings run-command-screenshot 'Pr gsettings set org.mate.SettingsDaemon.plugins.media-keys logout 'Delete' gsettings set org.mate.SettingsDaemon.plugins.media-keys power 'End' -# }}} - -# Font settings {{{ -# ----------------- +# Font settings +# ------------- gsettings set org.mate.caja.desktop font 'Sans 10' gsettings set org.mate.interface font-name 'Sans 10' gsettings set org.mate.Marco.general titlebar-font 'Sans 10' gsettings set org.mate.interface document-font-name 'Sans 10' gsettings set org.mate.interface monospace-font-name 'Monospace 10' -# }}} - -# Theme settings {{{ -# ------------------ +# Theme settings +# -------------- # Dependencies: # apt install materia-gtk-theme papirus-icon-theme @@ -93,34 +87,26 @@ gsettings set org.mate.peripherals-mouse cursor-size '24' # any effect. gsettings set org.mate.NotificationDaemon theme 'coco' -# }}} - -# Desktop settings {{{ -# -------------------- +# Desktop settings +# ---------------- gsettings set org.mate.background show-desktop-icons 'true' gsettings set org.mate.caja.desktop home-icon-visible 'false' gsettings set org.mate.Marco.general num-workspaces '4' -# }}} - -# Panel settings {{{ -# ------------------ +# Panel settings +# -------------- gsettings set org.mate.panel toplevel-id-list "['top']" gsettings set org.mate.panel.toplevel.background:/org/mate/panel/toplevels/top/background/ color 'rgba(0,0,0,0.6)' gsettings set org.mate.panel.toplevel.background:/org/mate/panel/toplevels/top/background/ type 'color' -# }}} - -# Window manager settings {{{ -# --------------------------- +# Window manager settings +# ----------------------- gsettings set org.mate.session.required-components windowmanager 'marco' gsettings set org.mate.Marco.general center-new-windows 'false' gsettings set org.mate.Marco.general compositing-manager 'true' -# }}} - -# App settings {{{ -# ---------------- +# App settings +# ------------ # Eye of MATE gsettings set org.mate.eom.ui image-collection 'false' @@ -154,7 +140,3 @@ gsettings set org.mate.screensaver mode 'single' # Settings daemon gsettings set org.mate.SettingsDaemon.plugins.media-keys enable-osd 'false' gsettings set org.mate.SettingsDaemon.plugins.media-keys screensaver 'disabled' - -# }}} - -# vi:foldmethod=marker diff --git a/bin/bin/own_script_mate_terminal_setup b/bin/bin/own_script_mate_terminal_setup index 7427b317..dd4465d6 100755 --- a/bin/bin/own_script_mate_terminal_setup +++ b/bin/bin/own_script_mate_terminal_setup @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Description {{{ -# --------------- +# Description +# ----------- # # Configures the MATE Terminal (default terminal emulator for MATE # Desktop Environment) to my liking. This script is part of my dotfiles @@ -26,14 +26,12 @@ # # Written on 2019-03-31 and tested on an up-to-date Debian Buster/Sid # machine. In need of review. -# -# }}} # TODO improve documentation, especially in the "conditional commands" # section. -# Theme settings {{{ -# ------------------ +# Theme settings +# -------------- # # You do not need to run this script manually, just for the sake of # updating the terminals' colours. If you are using my `tempusmenu` (or @@ -58,10 +56,8 @@ dconf write "$dconf_path/bold-color" "'$foreground'" dconf write "$dconf_path/background-color" "'$background'" dconf write "$dconf_path/palette" "'$color0:$color1:$color2:$color3:$color4:$color5:$color6:$color7:$color8:$color9:$color10:$color11:$color12:$color13:$color14:$color15'" -# }}} - -# Conditional commands {{{ -# ------------------------ +# Conditional commands +# -------------------- # # We define these in a conditional way because the idea is they will # remain constant over the long run. The idea is that this script will @@ -175,7 +171,3 @@ dconf_read_write_string_keys 'switch-to-tab-9' 'disabled' dconf_read_write_string_keys 'switch-to-tab-10' 'disabled' dconf_read_write_string_keys 'switch-to-tab-11' 'disabled' dconf_read_write_string_keys 'switch-to-tab-12' 'disabled' - -# }}} - -# vi:foldmethod=marker diff --git a/bin/bin/own_script_update_environment_theme b/bin/bin/own_script_update_environment_theme index cfd61c07..123e843d 100755 --- a/bin/bin/own_script_update_environment_theme +++ b/bin/bin/own_script_update_environment_theme @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Description {{{ -# =============== +# Description +# =========== # # A script that handles on-demand _Tempus themes_ changes for a variety # of tools. This is an integral part of my custom desktop session, @@ -33,11 +33,9 @@ # with 'de' as a second argument (read the script for the specifics). # # Last full review on 2019-04-12 -# -# }}} -# General variables {{{ -# ===================== +# General variables +# ================= # File system path to the Tempus themes (Bash variables implementation) tempus_files="$HOME/.local/share/my_colours/shell/" @@ -104,10 +102,8 @@ help_message() { exit 1 } -# }}} - -# Set wallpaper {{{ -# ------------------ +# Set wallpaper +# ------------- # dependency: # sudo apt install feh @@ -137,10 +133,8 @@ modify_wallpaper() { fi } -# }}} - -# Set GTK themes {{{ -# ------------------ +# Set GTK themes +# -------------- # Debian Buster optional dependencies: # sudo apt install materia-gtk-theme papirus-icon-theme @@ -189,10 +183,8 @@ modify_gtk() { echo "Updating GTK widget and icon themes" } -# }}} - -# Set GTKsourceview3 colours {{{ -# ------------------------------ +# Set GTKsourceview3 colours +# -------------------------- # TODO LOWPRIORITY find xfconf-query for mousepad (Xfce editor) @@ -222,10 +214,8 @@ modify_gtksourceview3() { fi } -# }}} - -# Set GTKsourceview4 colours {{{ -# ------------------------------ +# Set GTKsourceview4 colours +# -------------------------- modify_gtksourceview4() { if [ "$(command -v gnome-builder 2> /dev/null)" ]; then @@ -241,10 +231,8 @@ modify_gtksourceview4() { fi } -# }}} - -# Set vim syntax theme {{{ -# ------------------------ +# Set vim syntax theme +# -------------------- # Change the Vim `colorscheme` value. that because the Tempus themes # are _structurally_ identical (only the colour _values_ change), the @@ -264,10 +252,8 @@ modify_vim() { echo "Updating vim syntax theme" } -# }}} - -# Set theme for MATE Terminal {{{ -# ------------------------------- +# Set theme for MATE Terminal +# --------------------------- # # This is my default terminal emulator. This script leverages `dconf` # to make the necessary changes. @@ -278,10 +264,8 @@ modify_mate_terminal() { fi } -# }}} - -# Set tmux theme {{{ -# ------------------ +# Set tmux theme +# -------------- # dependency: # sudo apt install tmux @@ -301,10 +285,8 @@ modify_tmux() { fi } -# }}} - -# Set generic shell variables {{{ -# ------------------------------- +# Set generic shell variables +# --------------------------- # Change the shell variables theme, used by a number of tools, such as # `tmux`, my various `dmenu` implimentations, `bspwm`, `dunst`. Any @@ -336,10 +318,8 @@ modify_shell_theme() { fi } -# }}} - -# Set less manpager colours {{{ -# ----------------------------- +# Set less manpager colours +# ------------------------- # Change the man pages colour output based on whether the theme is light # or dark. This assumes the $PAGER or $MANPAGER is `less`. @@ -363,10 +343,8 @@ modify_less_manpages() { fi } -# }}} - -# Set newsboat theme {{{ -# ---------------------- +# Set newsboat theme +# ------------------ # dependency: # sudo apt install newsboat @@ -389,10 +367,8 @@ modify_newsboat() { fi } -# }}} - -# Set neomutt theme {{{ -# --------------------- +# Set neomutt theme +# ----------------- # dependency: # sudo apt install neomutt @@ -408,10 +384,8 @@ modify_neomutt() { fi } -# }}} - -# Set bspwm colours {{{ -# --------------------- +# Set bspwm colours +# ----------------- # dependency: # sudo apt install bspwm @@ -445,9 +419,7 @@ modify_bspwm() { fi } -# }}} - -# Reload melonpanel(lemonbar) {{{ +# Reload melonpanel(lemonbar) modify_melonpanel() { if pgrep -xo melonpanel > /dev/null; then pkill -xo melonpanel @@ -456,10 +428,8 @@ modify_melonpanel() { melonpanel && echo "Reloading the system panel (melonpanel)" } -# }}} - -# Set dunst colours {{{ -# --------------------- +# Set dunst colours +# ----------------- # dependency: # sudo apt install dunst @@ -486,10 +456,8 @@ modify_dunst() { fi } -# }}} - -# Set GNOME theme {{{ -# ------------------- +# Set GNOME theme +# --------------- # update GNOME settings # TODO how to change gnome terminal profile, assuming the presence of @@ -507,10 +475,8 @@ modify_gnome() { fi } -# }}} - -# Set MATE theme {{{ -# ------------------ +# Set MATE theme +# -------------- # Optional dependencies: # sudo apt install materia-gtk-theme papirus-icon-theme @@ -551,10 +517,8 @@ modify_mate() { fi } -# }}} - -# Set Xfce theme {{{ -# ------------------ +# Set Xfce theme +# -------------- # update Xfce settings modify_xfce() { @@ -577,10 +541,8 @@ modify_xfce() { fi } -# }}} - -# Set gsettings without DE {{{ -# ---------------------------- +# Set gsettings without DE +# ------------------------ # Optional dependencies: # sudo apt install materia-gtk-theme papirus-icon-theme @@ -613,10 +575,8 @@ modify_gsettings_without_de() { fi } -# }}} - -# Set xfsettingsd without Xfce {{{ -# -------------------------------- +# Set xfsettingsd without Xfce +# ---------------------------- # NOTE this function is not used inside an Xfce session. Its purpose is # two-fold: @@ -636,10 +596,8 @@ modify_xfconf_without_xfce() { fi } -# }}} - -# Live theme switch for Flatpak apps {{{ -# -------------------------------------- +# Live theme switch for Flatpak apps +# ----------------------------------- # IMPORTANT NOTE ABOUT `modify_running_gtk_and_flatpak` # ----------------------------------------------------- @@ -674,10 +632,8 @@ modify_running_gtk_and_flatpak() { fi } -# }}} - -# Catch-all function when running a standalone WM (bspwm) {{{ -# ----------------------------------------------------------- +# Catch-all function when running a standalone WM (bspwm) +# ------------------------------------------------------- update_environment_theme() { modify_wallpaper @@ -703,10 +659,8 @@ update_environment_theme() { modify_mate_terminal } -# }}} - -# Catch-all function when running a fully fledged DE {{{ -# ------------------------------------------------------ +# Catch-all function when running a fully fledged DE +# -------------------------------------------------- update_environment_theme_de() { case "$DESKTOP_SESSION" in @@ -743,10 +697,8 @@ update_environment_theme_de() { modify_mate_terminal } -# }}} - -# Conditions for running this script {{{ -# ====================================== +# Conditions for running this script +# ================================== # The project is controlled with git. Else throw an error and exit. if [ "$(command -v git 2> /dev/null)" ]; then @@ -817,7 +769,3 @@ case "$#" in echo "Aborting" exit 1 esac - -# }}} - -# vi:foldmethod=marker diff --git a/bin/bin/own_script_update_running_terminals b/bin/bin/own_script_update_running_terminals index 8e0d80aa..e621ce12 100755 --- a/bin/bin/own_script_update_running_terminals +++ b/bin/bin/own_script_update_running_terminals @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Description {{{ -# --------------- +# Description +# ----------- # # Use ANSI codes to apply theme change to all active terminals. This is # particularly useful for programs that source their colours at startup, @@ -27,8 +27,6 @@ # # The ANSI escape sequences are defined in this document # http://pod.tst.eu/http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.7.pod#XTerm_Operating_System_Commands -# -# }}} active_theme="$HOME/.local/share/my_colours/active-theme-content" @@ -73,5 +71,3 @@ ansi_sequences+="\\033]17;$(get_hex_value foreground)\\007" for term in /dev/pts/[0-9]*; do printf "%b" "$ansi_sequences" > "$term" & done - -# vi:foldmethod=marker diff --git a/bin/bin/poweroptionsmenu b/bin/bin/poweroptionsmenu index fb1723d7..b0f5835f 100755 --- a/bin/bin/poweroptionsmenu +++ b/bin/bin/poweroptionsmenu @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Description {{{ --------------- +# Description # # A dmenu script to provide an interface for selecting session actions: # lock, logout, switch users, reboot, poweroff. @@ -27,8 +27,6 @@ # apt install suckless-tools libnotify-bin # # Last full review on 2019-04-11 -# -# }}} # pass custom colours to dmenu command source "$HOME/.local/share/my_colours/active-tempus-theme.sh" @@ -84,5 +82,3 @@ case "$choice" in exit 1 ;; esac - -# vi:foldmethod=marker diff --git a/bin/bin/stm b/bin/bin/stm index ba6def98..aa2253bb 100755 --- a/bin/bin/stm +++ b/bin/bin/stm @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Description and overview {{{ -# ---------------------------- +# Description and overview +# ------------------------ # # Simplistic Task Manager: a shell script that uses standard UNIX tools # to control the presentation and contents of a plain text file that @@ -46,11 +46,9 @@ # For a dmenu interface to adding/removing tasks to the same to-do list, # see my stmmenu, which is also part of my dotfiles (inside the "bin" # directory). -# -# }}} -# Global variables {{{ -# -------------------- +# Global variables +# ---------------- # Define my task list file. # @@ -77,10 +75,8 @@ my_nocol='\033[0m' # the line length for folding stm's output stm_fold=80 -# }}} - -# Functions {{{ -# ------------- +# Functions +# --------- stm_help() { echo -e "${my_cyan}stm${my_nocol} ${my_magenta}[d|due] [e|edit] [l|list] [o|omit] [h|help|-h|--help]${my_nocol}" @@ -152,10 +148,8 @@ stm_omit() { fi } -# }}} - -# Conditions {{{ -# -------------- +# Conditions +# ---------- # A second argument is required by options that filter the output. stm_region="$2" @@ -197,7 +191,3 @@ else ;; esac fi - -# }}} - -# vi:foldmethod=marker diff --git a/bin/bin/tempusmenu b/bin/bin/tempusmenu index 5c6bcded..dfb4c777 100755 --- a/bin/bin/tempusmenu +++ b/bin/bin/tempusmenu @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Description {{{ -# --------------- +# Description +# ----------- # # This is a `dmenu` script to switch between Tempus themes on demand. # It parses the list of available options and presents them once @@ -38,11 +38,9 @@ # is required for this to work as intended. # # Last full review 2019-04-12 -# -# }}} -# General variables {{{ -# --------------------- +# General variables +# ----------------- # We use this logic to check and then pass to the rest of the script the # colour values and the custom font. If the files are not available, @@ -77,10 +75,8 @@ source_file "$my_font" 'UI font' # presents the output in alphabetical order. tempus_themes_array=$(find "$HOME/.local/share/my_colours/shell/" -type f -printf "%f\\n" | sed -e 's/tempus_\([a-z]*\).sh/\1/g' | sort) -# }}} - -# Functions and conditions {{{ -# ---------------------------- +# Functions and conditions +# ------------------------ # This is the `dmenu` wrapper with the list of available Tempus themes. # Instead of offering a direct input source that yields an immediate @@ -141,10 +137,8 @@ case "$#" in ;; esac -# }}} - -# ANNEX with further explanations {{{ -# ----------------------------------- +# ANNEX with further explanations +# ------------------------------- # I store my colors in "$HOME/.local/share/my_colours/". The Tempus # themes are at $HOME/.local/share/my_colours/shell/. @@ -178,7 +172,3 @@ esac # totus # warp # winter - -# }}} - -# vi:foldmethod=marker diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc index 121d8488..dc3747c5 100755 --- a/bspwm/.config/bspwm/bspwmrc +++ b/bspwm/.config/bspwm/bspwmrc @@ -1,16 +1,14 @@ #!/bin/bash -# Description {{{ -# =============== +# Description +# =========== # # Configuration file for the Binary Space Partitioning Window Manager. # This is part of my dotfiles, which are managed with GNU Stow. See # https://gitlab.com/protesilaos/dotfiles -# -# }}} -# Visual options {{{ -# ================== +# Visual options +# ============== # window management # ----------------- @@ -52,10 +50,8 @@ bspc config active_border_color "#b58d88" # focused window, unfocused monitor bspc config focused_border_color "#6da280" # focused window, focused monitor bspc config presel_feedback_color "#312e30" # feedback for manual node split -# }}} - -# autostart {{{ -# ============= +# autostart +# ========= # The hotkey daemon that handles all custom key bindings, including the # ones that control BSPWM @@ -139,10 +135,8 @@ if [ "$(command -v mpDris2 2> /dev/null)" ]; then mpDris2 & fi -# }}} - -# Per host configurations {{{ -# =========================== +# Per host configurations +# ======================= # I deploy my dotfiles on two separate machines. On one I often run a # dual monitor setup. As such, there are some bespoke configs for each @@ -151,7 +145,3 @@ fi if [ "$(command -v own_script_bspwm_per_host_configs)" ]; then own_script_bspwm_per_host_configs fi - -# }}} - -# vim:foldmethod=marker diff --git a/bspwm/.config/sxhkd/sxhkdrc b/bspwm/.config/sxhkd/sxhkdrc index 365d61fe..73feda96 100644 --- a/bspwm/.config/sxhkd/sxhkdrc +++ b/bspwm/.config/sxhkd/sxhkdrc @@ -2,8 +2,8 @@ # ~/.config/sxhkd/sxhkdrc # -# Description {{{ -# =============== +# Description +# =========== # # Configuration file for the Simple X Hotkey Daemon. Meant to work with # `bspwm`. This is part of my dotfiles, which are managed with GNU @@ -14,11 +14,9 @@ # # Last full review on 2018-11-07 # Last major edit on 2019-04-01 -# -# }}} -# Index with key chord chain mnemonics {{{ -# ======================================== +# Index with key chord chain mnemonics +# ==================================== # # Key chord chains are used for less common or ancillary commands, or # for when assigning direct keybindings would become unwieldy. The idea @@ -35,10 +33,8 @@ # workaround is to use this syntax instead `super + n; X ; ...`, where X # is a variable. -# }}} - -# General key chords that do not invoke BSPC {{{ -# ============================================== +# General key chords that do not invoke BSPC +# ========================================== # Keyboard layout # --------------- @@ -174,7 +170,7 @@ super + shift + d # Tools and utilities # ------------------- -# PLACEHOLDER for future release of dunst {{{ +# PLACEHOLDER for future release of dunst # # TODO add all `dunst` related keys here. Currently, it only supports # # setting key bindings inside `dunstrc`, but there is ongoing work to @@ -187,8 +183,6 @@ super + shift + d # # super + {_, shift + } c # # CLOSE {all} notification{s} -# }}} - # Screenshots (requires `scrot`). First one is for the focused window. # The other is of the entire X session (including all active monitors). # Note that `scrot` only has an interactive mode that I do not use. @@ -234,10 +228,8 @@ XF86AudioMicMute super + XF86Audio{Mute,LowerVolume,RaiseVolume} amixer set Capture {toggle,5%-,5%+} -# }}} - -# BSPWM operations for window management {{{ -# ========================================== +# BSPWM operations for window management +# ====================================== # Close or kill currently focused node super + {_,shift + }q @@ -312,7 +304,7 @@ super + ctrl + {h,j,k,l} super + shift + {Left,Down,Up,Right} bspc node -v {-20 0,0 20,0 -20,20 0} -# FIXME TODO on focus history (see following three commands) {{{ +# FIXME TODO on focus history (see following three commands) # # 1. Can Alt+Tab work like the standard Alt+Tab implementation where # releasing the key on the first occurrence rewrites the focus @@ -320,8 +312,6 @@ super + shift + {Left,Down,Up,Right} # 2. Research how to consolidate these in fewer keystrokes on something # that makes more sense. Too many options that provide overlapping # functions. -# -# }}} # Focus the last node/desktop. This only cycles through the active and # the last active node. Compare it to the behaviour of the following @@ -373,7 +363,3 @@ super + shift + {y,u,i,o} # Dynamic gaps. super + shift + bracket{left,right} bspc config -d focused window_gap $((`bspc config -d focused window_gap` {-,+} 5 )) - -# }}} - -# vim:ft=sh:foldmethod=marker diff --git a/compton/.config/compton.conf b/compton/.config/compton.conf index 678811ab..76f071db 100644 --- a/compton/.config/compton.conf +++ b/compton/.config/compton.conf @@ -2,8 +2,8 @@ # ~/.config/compton.conf # -# Description {{{ -# =============== +# Description +# =========== # # This is the `compton` configuration file. Compton is the display # compositor used in my custom working environment, centred around @@ -20,11 +20,9 @@ # Buster/Sid. # # Last reviewed on: 2018-11-12 -# -# }}} -# Backend {{{ -# =========== +# Backend +# ======= # This is hardware dependent. On my Lenovo ThinkPad X220, all options # work. However, the "xr_glx_hybrid" value seems to be the most @@ -45,10 +43,8 @@ glx-no-rebind-pixmap=true; # recommended as "true" if it works with the video dr glx-swap-method="undefined"; # slowest, but safest # glx-use-gpushader4=false; -# }}} - -# Shadows {{{ -# =========== +# Shadows +# ======= shadow=true; shadow-radius=3; # default 12 @@ -83,10 +79,8 @@ shadow-exclude = [ "_GTK_FRAME_EXTENTS@:c" ]; -# }}} - -# Opacity, blur, fading {{{ -# ========================= +# Opacity, blur, fading +# ===================== active-opacity=1.0; frame-opacity=1.0; @@ -115,10 +109,8 @@ fade-delta=6; # default 10 (this is miliseconds) fade-in-step = 0.055; # default 0.028 fade-out-step = 0.06; # default 0.03 -# }}} - -# Other options {{{ -# ================= +# Other options +# ============= # NOTE the comments in this section are either adapted from the manpage # or copied from the example config shipped with the source. @@ -184,7 +176,3 @@ wintypes: focus=false; }; }; - -# }}} - -# vi: ft=conf:foldmethod=marker diff --git a/music/.config/ncmpcpp/config b/music/.config/ncmpcpp/config index 645954a4..c397dd21 100644 --- a/music/.config/ncmpcpp/config +++ b/music/.config/ncmpcpp/config @@ -3,8 +3,8 @@ # # See `man ncmpcpp` for the meaning of each option. -# Essentials {{{ -# -------------- +# Essentials +# ---------- # Remove comment lines grep -ev '^#' ~/.config/ncmpcpp/config @@ -16,10 +16,8 @@ lyrics_directory=~/.config/ncmpcpp/lyrics # Define Music directory (needed for editing tags) mpd_music_dir=~/Music/ -# }}} - -# General settings {{{ -# -------------------- +# General settings +# ---------------- # Interface enable_window_title=yes @@ -63,10 +61,8 @@ default_find_mode=wrapped jump_to_now_playing_song_at_start=yes space_add_mode=add_remove -# }}} - -# Visualiser settings {{{ -# ----------------------- +# Visualiser settings +# ------------------- visualizer_fifo_path=/tmp/mpd.fifo visualizer_output_name=my_fifo visualizer_sync_interval=30 @@ -81,11 +77,8 @@ visualizer_look = "◆▎" ####visualizer_look = "◆▪" ####visualizer_look = "◆•" - -# }}} - -# Colours and formatting {{{ -# -------------------------- +# Colours and formatting +# ---------------------- colors_enabled=yes # NOTE colours numbers are terminal number + 1 @@ -122,5 +115,3 @@ statusbar_time_color=5 player_state_color=13 progressbar_color=6 progressbar_elapsed_color=14 - -# vi:foldmethod=marker diff --git a/shell/.bashrc b/shell/.bashrc index 0b9af1b6..59a5c559 100644 --- a/shell/.bashrc +++ b/shell/.bashrc @@ -2,8 +2,8 @@ # ~/.bashrc # -# Description {{{ -# =============== +# Description +# =========== # # BASH configuration file. Any modules such as the `dircolors` config # are stored in ~/.local/share/my_bash/. This setup is part of my @@ -14,10 +14,8 @@ # # Last reviewed on 2019-03-23 -# }}} - -# General settings {{{ -# ==================== +# General settings +# ================ # Include my scripts in the PATH. To avoid conflicts, I always prepend # `own_script_` to my files. There are some exceptions though, where I @@ -100,17 +98,15 @@ shopt -s checkwinsize #### similar/same name to a directory. #### shopt -s autocd -# }}} - -# Aliases {{{ -# =========== +# Aliases +# ======= # A note on how I define aliases. I try to abstract the command into # its initials or something that resembles the original. This helps me # remember the original command when necessary. There are some # exceptions for commands I seldom execute. -# APT (package management on Debian) {{{ -# -------------------------------------- +# APT (package management on Debian) +# ---------------------------------- # If you are coming to Debian from Arch-based distros, check # compatibility with `pacman`: @@ -162,10 +158,8 @@ if [ "$(command -v aptitude 2> /dev/null)" ]; then alias apc="sudo aptitude purge ~c" fi -# }}} - -# Common tasks and utilities {{{ -# ------------------------------ +# Common tasks and utilities +# -------------------------- # Check these because some of them modify the behaviour of standard # commands, such as `cp`, `mv`, `rm`, so that they provide verbose @@ -236,10 +230,8 @@ alias lsla='ls -lhpvA --color=auto --group-directories-first' # Shortcuts to common configs. alias urls="$EDITOR $HOME/.config/newsboat/urls" -# }}} - -# Extra tasks and infrequently used tools {{{ -# ------------------------------------------- +# Extra tasks and infrequently used tools +# --------------------------------------- # These options are very opinionated, disabling images, javascript, # etc. See `man surf`. @@ -276,10 +268,8 @@ if [ "$(command -v xclip 2> /dev/null)" ]; then alias xclipc='xclip -selection clipboard' # followed by path to file fi -# }}} - -# Flatpak commands {{{ -# -------------------- +# Flatpak commands +# ---------------- if [ "$(command -v flatpak 2> /dev/null)" ]; then alias fli="flatpak install" # must be followed by a source, e.g. fli flathub @@ -288,10 +278,8 @@ if [ "$(command -v flatpak 2> /dev/null)" ]; then alias flu="flatpak update" fi -# }}} - -# Git commands {{{ -# ---------------- +# Git commands +# ------------ if [ "$(command -v git 2> /dev/null)" ]; then # add, commit @@ -333,12 +321,8 @@ if [ "$(command -v git 2> /dev/null)" ]; then alias gph='git push -u origin HEAD' fi -# }}} - -# }}} - -# Functions {{{ -# ============= +# Functions +# ========= # Colourise man pages man() { @@ -372,7 +356,3 @@ cd() { backupthis() { cp -riv $1 ${1}-$(date +%Y%m%d%H%M).backup; } - -# }}} - -# vi:foldmethod=marker diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 3c3d4fe6..829992e2 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -2,8 +2,8 @@ # ~/.tmux.conf # -# Description {{{ -# =============== +# Description +# =========== # # This is my Tmux config file. It is part of my dotfiles, which # establish a custom desktop session based on `bspwm`. See @@ -21,11 +21,9 @@ # Current `tmux` version is 2.8. # # Last reviewed: 2019-04-01 -# -# }}} -# Base colours --- DO NOT EDIT {{{ -# ================================ +# Base colours --- DO NOT EDIT +# ============================ # Do not edit these variables manually because they are modified by my # `own_script_update_environment` script, which is part of my dotfiles, @@ -58,10 +56,8 @@ tempus_bg_dim="#2a2829" # black, red, green, yellow, blue, magenta, cyan, white # brblack, brred, bryellow, brblue, brmagenta, brcyan, brwhite -# }}} - -# Base configuration {{{ -# ---------------------- +# Base configuration +# ------------------ # Default shell. Note that `bash` is the only shell I use. As such, # everything in my dotfiles is built arround that constant. @@ -100,10 +96,8 @@ set -sg escape-time 0 # with the `-r` flag. set -g repeat-time 300 -# end Base configuration }}} - -# User Interface {{{ -# ------------------ +# User Interface +# -------------- # Title and window settings set -g set-titles off # only works with WM that add titlebars? @@ -153,10 +147,8 @@ set -g message-style "bg=default,fg=default,bold" set -g clock-mode-style 24 # time format set -g clock-mode-colour "$tempus_fg_alt" -# end User Interface }}} - -# Key bindings {{{ -# ---------------- +# Key bindings +# ------------ # NOTE the `bind -r` directive uses the `repeat-time` option to bypass # the need for repeated use of the in commands that are @@ -244,10 +236,8 @@ bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe "xclip -selection # For emacs copy mode bindings bind -T copy-mode MouseDragEnd1Pane send-keys -X copy-pipe "xclip -selection clipboard -i" -# end Key bindings }}} - -# Status bar {{{ -# -------------- +# Status bar +# ---------- # TODO document the styles in use @@ -283,7 +273,3 @@ set -g window-status-last-style "" # Status left and right set -g status-left "#[reverse]#{?pane_synchronized,#[fg=colour5]#[bold] sync on ,}#{?pane_in_mode,#[fg=colour4]#[bold] #{pane_mode}#{?selection_present, selecting,} ,}" set -g status-right "#[bg=default,fg=default]#{?client_prefix,#[fg=colour3]#[bg=default]#[reverse] ,}#S #{session_id} #{?client_prefix,,}" - -# end Status line }}} - -# vi: ft=tmux:foldmethod=marker