systemd: add & enable nm-applet service

Show patches and stats in appropriate places

.config/X11/xprofile

@@ -15,10 +15,4 @@ xrandr --dpi $(xrdb -query | grep -i xft.dpi | cut -d: -f2)
 
 setxkbmap -option caps:none
 xset r rate 200 18
-
+xmodmap "$XDG_CONFIG_HOME"/X11/xmodmap
-
-# Merge system clipboards
-if [ -n "$DISPLAY" ] && exists autocutsel && ! pidof autocutsel 1>/dev/null; then
-    autocutsel -fork
-    autocutsel -selection PRIMARY -fork
-fi

.config/alacritty/alacritty.yml

@@ -1,6 +1,5 @@
 # Configuration for Alacritty, the GPU enhanced terminal emulator.
 
-
 # Any items in the `env` entry below will be added as
 # environment variables. Some entries may override variables
 # set by alacritty itself.
@@ -9,9 +8,8 @@ env:
   #
   # This value is used to set the `$TERM` environment variable for
   # each instance of Alacritty. If it is not present, alacritty will
-  # check the local terminfo database and use 'alacritty' if it is
+  # check the local terminfo database and use `alacritty` if it is
-  # available, otherwise 'xterm-256color' is used.
+  # available, otherwise `xterm-256color` is used.
-  #
   TERM: xterm-256color
 
 window:
@@ -19,25 +17,67 @@ window:
   #
   # Specified in number of columns/lines, not pixels.
   # If both are `0`, this setting is ignored.
-  dimensions:
+  #dimensions:
-    columns: 80
+  #  columns: 0
-    lines: 24
+  #  lines: 0
+
+  # Window position (changes require restart)
+  #
+  # Specified in number of pixels.
+  # If the position is not set, the window manager will handle the placement.
+  #position:
+  #  x: 0
+  #  y: 0
 
   # Window padding (changes require restart)
   #
   # Blank space added around the window in pixels. This padding is scaled
   # by DPI and the specified value is always added at both opposing sides.
   padding:
-    x: 15
+    x: 22
-    y: 15
+    y: 22
+
+  # Spread additional padding evenly around the terminal content.
+  dynamic_padding: false
 
   # Window decorations
   #
   # Values for `decorations`:
   #     - full: Borders and title bar
   #     - none: Neither borders nor title bar
+  #
+  # Values for `decorations` (macOS only):
+  #     - transparent: Title bar, transparent background and title bar buttons
+  #     - buttonless: Title bar, transparent background, but no title bar buttons
   decorations: full
 
+  # Startup Mode (changes require restart)
+  #
+  # Values for `startup_mode`:
+  #   - Windowed
+  #   - Maximized
+  #   - Fullscreen
+  #
+  # Values for `startup_mode` (macOS only):
+  #   - SimpleFullscreen
+  startup_mode: Windowed
+
+  # Window title
+  #title: Alacritty
+
+  # Window class (Linux/BSD only):
+  #class:
+    # Application instance name
+    #instance: Alacritty
+    # General application class
+    #general: Alacritty
+
+  # GTK theme variant (Linux/BSD only)
+  #
+  # Override the variant of the GTK theme. Commonly supported values are `dark` and `light`.
+  # Set this to `None` to use the default theme variant.
+  #gtk_theme_variant: None
+
 scrolling:
   # Maximum number of lines in the scrollback buffer.
   # Specifying '0' will disable scrolling.
@@ -47,136 +87,174 @@ scrolling:
   # scrollback is enabled (history > 0).
   multiplier: 3
 
-  # Faux Scrolling
+# Font configuration
-  #
-  # The `faux_multiplier` setting controls the number of lines the terminal
-  # should scroll when the alternate screen buffer is active. This is used
-  # to allow mouse scrolling for applications like `man`.
-  #
-  # Specifying `0` will disable faux scrolling.
-  faux_multiplier: 3
-
-  # Scroll to the bottom when new text is written to the terminal.
-  auto_scroll: false
-
-# Spaces per Tab (changes require restart)
-#
-# This setting defines the width of a tab in cells.
-#
-# Some applications, like Emacs, rely on knowing about the width of a tab.
-# To prevent unexpected behavior in these applications, it's also required to
-# change the `it` value in terminfo when altering this setting.
-tabspaces: 8
-
-# Font configuration (changes require restart)
-#
-# Important font attributes like antialiasing, subpixel aa, and hinting can be
-# controlled through fontconfig. Specifically, the following attributes should
-# have an effect:
-#   - hintstyle
-#   - antialias
-#   - lcdfilter
-#   - rgba
-#
-# For instance, if you wish to disable subpixel antialiasing, you might set the
-# rgba property to `none`. If you wish to completely disable antialiasing, you
-# can set antialias to `false`.
-#
-# Please see these resources for more information on how to use fontconfig:
-#   - https://wiki.archlinux.org/index.php/font_configuration#Fontconfig_configuration
-#   - file:///usr/share/doc/fontconfig/fontconfig-user.html
 font:
   # Normal (roman) font face
-  normal:
+  #normal:
-    family: monospace
+    # Font family
+    #
+    # Default:
+    #   - (macOS) Menlo
+    #   - (Linux/BSD) monospace
+    #   - (Windows) Consolas
+    #family: monospace
+
     # The `style` can be specified to pick a specific face.
-    # style: Regular
+    #style: Regular
 
   # Bold font face
-  bold:
+  #bold:
-    family: monospace
+    # Font family
+    #
+    # If the bold family is not specified, it will fall back to the
+    # value specified for the normal font.
+    #family: monospace
+
     # The `style` can be specified to pick a specific face.
-    # style: Bold
+    #style: Bold
 
   # Italic font face
-  italic:
+  #italic:
-    family: monospace
+    # Font family
+    #
+    # If the italic family is not specified, it will fall back to the
+    # value specified for the normal font.
+    #family: monospace
+
     # The `style` can be specified to pick a specific face.
-    # style: Italic
+    #style: Italic
+
+  # Bold italic font face
+  #bold_italic:
+    # Font family
+    #
+    # If the bold italic family is not specified, it will fall back to the
+    # value specified for the normal font.
+    #family: monospace
+
+    # The `style` can be specified to pick a specific face.
+    #style: Bold Italic
 
   # Point size
   size: 9.0
 
   # Offset is the extra space around each character. `offset.y` can be thought of
   # as modifying the line spacing, and `offset.x` as modifying the letter spacing.
-  offset:
+  #offset:
-    x: 0
+  #  x: 0
-    y: 0
+  #  y: 0
 
   # Glyph offset determines the locations of the glyphs within their cells with
   # the default being at the bottom. Increasing `x` moves the glyph to the right,
   # increasing `y` moves the glyph upwards.
-  glyph_offset:
+  #glyph_offset:
-    x: 0
+  #  x: 0
-    y: 0
+  #  y: 0
 
-# Display the time it takes to redraw each frame.
+  # Thin stroke font rendering (macOS only)
-render_timer: false
+  #
+  # Thin strokes are suitable for retina displays, but for non-retina screens
+  # it is recommended to set `use_thin_strokes` to `false`
+  #
+  # macOS >= 10.14.x:
+  #
+  # If the font quality on non-retina display looks bad then set
+  # `use_thin_strokes` to `true` and enable font smoothing by running the
+  # following command:
+  #   `defaults write -g CGFontRenderingFontSmoothingDisabled -bool NO`
+  #
+  # This is a global setting and will require a log out or restart to take
+  # effect.
+  #use_thin_strokes: true
 
 # If `true`, bold text is drawn using the bright color variants.
 draw_bold_text_with_bright_colors: true
 
+# Colors (Tomorrow Night Bright)
 colors:
   # Default colors
   primary:
-    foreground: '0xeceff1'
+    foreground: '#eceff1'
-    background: '0x383c4a'
+    background: '#383c4a'
 
     # Bright and dim foreground colors
     #
     # The dimmed foreground color is calculated automatically if it is not present.
     # If the bright foreground color is not set, or `draw_bold_text_with_bright_colors`
     # is `false`, the normal foreground color will be used.
-    #
+    #dim_foreground: '#9a9a9a'
-    #dim_foreground: '0x9a9a9a'
+    #bright_foreground: '#ffffff'
-    #bright_foreground: '0xffffff'
 
   # Cursor colors
   #
-  # These will only be used when the `custom_cursor_colors` field is set to `true`.
+  # Colors which should be used to draw the terminal cursor. If these are
+  # unset, the cursor color will be the inverse of the cell color.
   cursor:
-    text:       '0xeceff1'
+    text:       '#eceff1'
-    cursor:     '0x5294e2'
+    cursor:     '#5294e2'
+
+  # Vi mode cursor colors
+  #
+  # Colors for the cursor when the vi mode is active. If these are unset, the
+  # cursor color will be the inverse of the cell color.
+  #vi_mode_cursor:
+  #  text: '#000000'
+  #  cursor: '#ffffff'
+
+  # Selection colors
+  #
+  # Colors which should be used to draw the selection area. If selection
+  # background is unset, selection color will be the inverse of the cell colors.
+  # If only text is unset the cell text color will remain the same.
+  selection:
+  #  text: '#eaeaea'
+    background: '#5294e2'
 
   # Normal colors
   normal:
-    black:      '0x333638'
+    black:      '#333638'
-    red:        '0xf41f1c'
+    red:        '#f41f1c'
-    green:      '0x8bc34a'
+    green:      '#8bc34a'
-    yellow:     '0xffc107'
+    yellow:     '#ffc107'
-    blue:       '0x0266f4'
+    blue:       '#0266f4'
-    magenta:    '0xcc17cc'
+    magenta:    '#cc17cc'
-    cyan:       '0x10aeba'
+    cyan:       '#10aeba'
-    white:      '0x8b9396'
+    white:      '#8b9396'
 
   # Bright colors
   bright:
-    black:      '0x475760'
+    black:      '#475760'
-    red:        '0xe53727'
+    red:        '#e53727'
-    green:      '0x9ccc65'
+    green:      '#9ccc65'
-    yellow:     '0xffa000'
+    yellow:     '#ffa000'
-    blue:       '0x81b3f9'
+    blue:       '#81b3f9'
-    magenta:    '0xa56ecc'
+    magenta:    '#a56ecc'
-    cyan:       '0x5ddae2'
+    cyan:       '#5ddae2'
-    white:      '0xeceff1'
+    white:      '#eceff1'
+
+  # Dim colors
+  #
+  # If the dim colors are not set, they will be calculated automatically based
+  # on the `normal` colors.
+  #dim:
+  #  black:   '#000000'
+  #  red:     '#8c3336'
+  #  green:   '#7a8530'
+  #  yellow:  '#97822e'
+  #  blue:    '#506d8f'
+  #  magenta: '#80638e'
+  #  cyan:    '#497e7a'
+  #  white:   '#9a9a9a'
 
   # Indexed Colors
   #
   # The indexed colors include all colors from 16 to 256.
   # When these are not set, they're filled with sensible defaults.
   #
-  #indexed_colors:
+  # Example:
-  #  - { index: 16, color: '0x000000' }
+  #   `- { index: 16, color: '#ff00ff' }`
+  #
+  #indexed_colors: []
 
 # Visual Bell
 #
@@ -199,78 +277,43 @@ colors:
 #   - Linear
 #
 # Specifying a `duration` of `0` will disable the visual bell.
-visual_bell:
+#visual_bell:
-  animation: EaseOutExpo
+#  animation: EaseOutExpo
-  duration: 0
+#  duration: 0
+#  color: '#ffffff'
 
 # Background opacity
 #
 # Window opacity as a floating point number from `0.0` to `1.0`.
 # The value `0.0` is completely transparent and `1.0` is opaque.
-background_opacity: 0.95
+background_opacity: 0.85
-
-# Mouse bindings
-#
-# Available fields:
-#   - mouse
-#   - action
-#   - mods (optional)
-#
-# Values for `mouse`:
-#   - Middle
-#   - Left
-#   - Right
-#   - Numeric identifier such as `5`
-#
-# All available `mods` and `action` values are documented in the key binding
-# section.
-mouse_bindings:
-  - { mouse: Middle, action: PasteSelection }
-
-mouse:
-  # Click settings
-  #
-  # The `double_click` and `triple_click` settings control the time
-  # alacritty should wait for accepting multiple clicks as one double
-  # or triple click.
-  double_click: { threshold: 300 }
-  triple_click: { threshold: 300 }
-
-  # If this is `true`, the cursor is temporarily hidden when typing.
-  hide_when_typing: false
-
-  url:
-    # URL launcher
-    #
-    # This program is executed when clicking on a text which is recognized as a URL.
-    # The URL is always added to the command as the last parameter.
-    launcher: xdg-open
-
-    # URL modifiers
-    #
-    # These are the modifiers that need to be held down for opening URLs when clicking
-    # on them. The available modifiers are documented in the key binding section.
-    #modifiers: Control|Shift
 
 selection:
-  semantic_escape_chars: ",│`|:\"' ()[]{}<>"
+  #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"
 
-  # When set to `true`, selected text will be copied to both the primary and
+  # When set to `true`, selected text will be copied to the primary clipboard.
-  # the selection clipboard. Otherwise, it will only be copied to the selection
-  # clipboard.
   save_to_clipboard: false
 
+# Allow terminal applications to change Alacritty's window title.
 dynamic_title: true
 
 cursor:
   # Cursor style
   #
-  # Values for 'style':
+  # Values for `style`:
   #   - ▇ Block
   #   - _ Underline
   #   - | Beam
   style: Block
 
+  # Vi mode cursor style
+  #
+  # If the vi mode cursor style is `None` or not specified, it will fall back to
+  # the style of the active value of the normal cursor.
+  #
+  # See `cursor.style` for available options.
+  #vi_mode_style: None
+
   # If this is `true`, the cursor will be rendered as a hollow box when the
   # window is not focused.
   unfocused_hollow: true
@@ -283,185 +326,322 @@ live_config_reload: true
 # You can set `shell.program` to the path of your favorite shell, e.g. `/bin/fish`.
 # Entries in `shell.args` are passed unmodified as arguments to the shell.
 #
+# Default:
+#   - (macOS) /bin/bash --login
+#   - (Linux/BSD) user login shell
+#   - (Windows) powershell
 #shell:
 #  program: /bin/bash
 #  args:
 #    - --login
 
+# Startup directory
+#
+# Directory the shell is started in. If this is unset, or `None`, the working
+# directory of the parent process will be used.
+#working_directory: None
+
+# WinPTY backend (Windows only)
+#
+# Alacritty defaults to using the newer ConPTY backend if it is available,
+# since it resolves a lot of bugs and is quite a bit faster. If it is not
+# available, the the WinPTY backend will be used instead.
+#
+# Setting this option to `true` makes Alacritty use the legacy WinPTY backend,
+# even if the ConPTY backend is available.
+#winpty_backend: false
+
+# Send ESC (\x1b) before characters when alt is pressed.
+#alt_send_esc: true
+
+mouse:
+  # Click settings
+  #
+  # The `double_click` and `triple_click` settings control the time
+  # alacritty should wait for accepting multiple clicks as one double
+  # or triple click.
+  #double_click: { threshold: 300 }
+  #triple_click: { threshold: 300 }
+
+  # If this is `true`, the cursor is temporarily hidden when typing.
+  hide_when_typing: false
+
+  url:
+    # URL launcher
+    #
+    # This program is executed when clicking on a text which is recognized as a URL.
+    # The URL is always added to the command as the last parameter.
+    #
+    # When set to `None`, URL launching will be disabled completely.
+    #
+    # Default:
+    #   - (macOS) open
+    #   - (Linux/BSD) xdg-open
+    #   - (Windows) explorer
+    launcher:
+      program: xdg-open
+      args: []
+
+    # URL modifiers
+    #
+    # These are the modifiers that need to be held down for opening URLs when clicking
+    # on them. The available modifiers are documented in the key binding section.
+    #modifiers: None
+
+# Mouse bindings
+#
+# Mouse bindings are specified as a list of objects, much like the key
+# bindings further below.
+#
+# To trigger mouse bindings when an application running within Alacritty captures the mouse, the
+# `Shift` modifier is automatically added as a requirement.
+#
+# Each mouse binding will specify a:
+#
+# - `mouse`:
+#
+#   - Middle
+#   - Left
+#   - Right
+#   - Numeric identifier such as `5`
+#
+# - `action` (see key bindings)
+#
+# And optionally:
+#
+# - `mods` (see key bindings)
+mouse_bindings:
+  - { mouse: Middle, action: PasteSelection }
+
 # Key bindings
 #
-# Key bindings are specified as a list of objects. Each binding will specify
+# Key bindings are specified as a list of objects. For example, this is the
-# a key and modifiers required to trigger it, terminal modes where the binding
+# default paste binding:
-# is applicable, and what should be done when the key binding fires. It can
-# either send a byte sequnce to the running application (`chars`), execute
-# a predefined action (`action`) or fork and execute a specified command plus
-# arguments (`command`).
 #
-# Example:
+# `- { key: V, mods: Control|Shift, action: Paste }`
-#   `- { key: V, mods: Command, action: Paste }`
 #
-# Available fields:
+# Each key binding will specify a:
-#   - key
-#   - mods (optional)
-#   - chars | action | command (exactly one required)
-#   - mode (optional)
 #
-# Values for `key`:
+# - `key`: Identifier of the key pressed
-#   - `A` -> `Z`
-#   - `F1` -> `F12`
-#   - `Key1` -> `Key0`
 #
-#   A full list with available key codes can be found here:
+#    - A-Z
-#   https://docs.rs/glutin/*/glutin/enum.VirtualKeyCode.html#variants
+#    - F1-F24
+#    - Key0-Key9
 #
-# Values for `mods`:
+#    A full list with available key codes can be found here:
-#   - Command
+#    https://docs.rs/glutin/*/glutin/event/enum.VirtualKeyCode.html#variants
-#   - Control
-#   - Shift
-#   - Alt
 #
-#   Multiple `mods` can be combined using `|` like this: `mods: Control|Shift`.
+#    Instead of using the name of the keys, the `key` field also supports using
-#   Whitespace and capitalization is relevant and must match the example.
+#    the scancode of the desired key. Scancodes have to be specified as a
+#    decimal number. This command will allow you to display the hex scancodes
+#    for certain keys:
 #
-# Values for `chars`:
+#       `showkey --scancodes`.
-#   The `chars` field writes the specified string to the terminal. This makes
-#   it possible to pass escape sequences.
-#   To find escape codes for bindings like `PageUp` ("\x1b[5~"), you can run
-#   the command `showkey -a` outside of tmux.
-#   Note that applications use terminfo to map escape sequences back to
-#   keys. It is therefore required to update the terminfo when
-#   changing an escape sequence.
 #
-# Values for `action`:
+# Then exactly one of:
+#
+# - `chars`: Send a byte sequence to the running application
+#
+#    The `chars` field writes the specified string to the terminal. This makes
+#    it possible to pass escape sequences. To find escape codes for bindings
+#    like `PageUp` (`"\x1b[5~"`), you can run the command `showkey -a` outside
+#    of tmux. Note that applications use terminfo to map escape sequences back
+#    to keys. It is therefore required to update the terminfo when changing an
+#    escape sequence.
+#
+# - `action`: Execute a predefined action
+#
+#   - ToggleViMode
+#   - Copy
 #   - Paste
 #   - PasteSelection
-#   - Copy
 #   - IncreaseFontSize
 #   - DecreaseFontSize
 #   - ResetFontSize
 #   - ScrollPageUp
 #   - ScrollPageDown
+#   - ScrollLineUp
+#   - ScrollLineDown
 #   - ScrollToTop
 #   - ScrollToBottom
 #   - ClearHistory
 #   - Hide
+#   - Minimize
 #   - Quit
+#   - ToggleFullscreen
+#   - SpawnNewInstance
+#   - ClearLogNotice
+#   - ClearSelection
+#   - ReceiveChar
+#   - None
 #
-# Values for `command`:
+#   (`mode: Vi` only):
-#   The `command` field must be a map containing a `program` string and
+#   - Open
-#   an `args` array of command line parameter strings.
+#   - Up
+#   - Down
+#   - Left
+#   - Right
+#   - First
+#   - Last
+#   - FirstOccupied
+#   - High
+#   - Middle
+#   - Low
+#   - SemanticLeft
+#   - SemanticRight
+#   - SemanticLeftEnd
+#   - SemanticRightEnd
+#   - WordRight
+#   - WordLeft
+#   - WordRightEnd
+#   - WordLeftEnd
+#   - Bracket
+#   - ToggleNormalSelection
+#   - ToggleLineSelection
+#   - ToggleBlockSelection
+#   - ToggleSemanticSelection
 #
-#   Example:
+#   (macOS only):
-#       `command: { program: "alacritty", args: ["-e", "vttest"] }`
+#   - ToggleSimpleFullscreen: Enters fullscreen without occupying another space
 #
-# Values for `mode`:
+# - `command`: Fork and execute a specified command plus arguments
-#   - ~AppCursor
+#
-#   - AppCursor
+#    The `command` field must be a map containing a `program` string and an
-#   - ~AppKeypad
+#    `args` array of command line parameter strings. For example:
-#   - AppKeypad
+#       `{ program: "alacritty", args: ["-e", "vttest"] }`
+#
+# And optionally:
+#
+# - `mods`: Key modifiers to filter binding actions
+#
+#    - Command
+#    - Control
+#    - Option
+#    - Super
+#    - Shift
+#    - Alt
+#
+#    Multiple `mods` can be combined using `|` like this:
+#       `mods: Control|Shift`.
+#    Whitespace and capitalization are relevant and must match the example.
+#
+# - `mode`: Indicate a binding for only specific terminal reported modes
+#
+#    This is mainly used to send applications the correct escape sequences
+#    when in different modes.
+#
+#    - AppCursor
+#    - AppKeypad
+#    - Alt
+#
+#    A `~` operator can be used before a mode to apply the binding whenever
+#    the mode is *not* active, e.g. `~Alt`.
+#
+# Bindings are always filled by default, but will be replaced when a new
+# binding with the same triggers is defined. To unset a default binding, it can
+# be mapped to the `ReceiveChar` action. Alternatively, you can use `None` for
+# a no-op if you do not wish to receive input characters for that binding.
+#
+# If the same trigger is assigned to multiple actions, all of them are executed
+# at once.
 key_bindings:
-  - { key: V,        mods: Control|Shift,    action: Paste               }
+  - { key: Paste,                                action: Paste          }
-  - { key: C,        mods: Control|Shift,    action: Copy                }
+  - { key: Copy,                                 action: Copy           }
-  - { key: Paste,                   action: Paste                        }
+  #- { key: L,         mods: Control,             action: ClearLogNotice }
-  - { key: Copy,                    action: Copy                         }
+  #- { key: L,         mods: Control, mode: ~Vi,  chars: "\x0c"          }
-  - { key: Q,        mods: Command, action: Quit                         }
+  #- { key: PageUp,    mods: Shift,   mode: ~Alt, action: ScrollPageUp,  }
-  - { key: W,        mods: Command, action: Quit                         }
+  #- { key: PageDown,  mods: Shift,   mode: ~Alt, action: ScrollPageDown }
-  - { key: Insert,   mods: Shift,   action: PasteSelection               }
+  #- { key: Home,      mods: Shift,   mode: ~Alt, action: ScrollToTop,   }
-  - { key: Key0,     mods: Control, action: ResetFontSize                }
+  #- { key: End,       mods: Shift,   mode: ~Alt, action: ScrollToBottom }
-  - { key: Equals,   mods: Control, action: IncreaseFontSize             }
+
-  - { key: Subtract, mods: Control, action: DecreaseFontSize             }
+  # Vi Mode
-  - { key: Home,                    chars: "\x1bOH",   mode: AppCursor   }
+  #- { key: Space,  mods: Shift|Control, mode: Vi, action: ScrollToBottom          }
-  - { key: Home,                    chars: "\x1b[H",   mode: ~AppCursor  }
+  #- { key: Space,  mods: Shift|Control,           action: ToggleViMode            }
-  - { key: End,                     chars: "\x1bOF",   mode: AppCursor   }
+  #- { key: Escape,                      mode: Vi, action: ClearSelection          }
-  - { key: End,                     chars: "\x1b[F",   mode: ~AppCursor  }
+  #- { key: I,                           mode: Vi, action: ScrollToBottom          }
-  - { key: PageUp,   mods: Shift,   chars: "\x1b[5;2~"                   }
+  #- { key: I,                           mode: Vi, action: ToggleViMode            }
-  - { key: PageUp,   mods: Control, chars: "\x1b[5;5~"                   }
+  #- { key: Y,      mods: Control,       mode: Vi, action: ScrollLineUp            }
-  - { key: PageUp,                  chars: "\x1b[5~"                     }
+  #- { key: E,      mods: Control,       mode: Vi, action: ScrollLineDown          }
-  - { key: PageDown, mods: Shift,   chars: "\x1b[6;2~"                   }
+  #- { key: G,                           mode: Vi, action: ScrollToTop             }
-  - { key: PageDown, mods: Control, chars: "\x1b[6;5~"                   }
+  #- { key: G,      mods: Shift,         mode: Vi, action: ScrollToBottom          }
-  - { key: PageDown,                chars: "\x1b[6~"                     }
+  #- { key: B,      mods: Control,       mode: Vi, action: ScrollPageUp            }
-  - { key: Tab,      mods: Shift,   chars: "\x1b[Z"                      }
+  #- { key: F,      mods: Control,       mode: Vi, action: ScrollPageDown          }
-  - { key: Back,                    chars: "\x7f"                        }
+  #- { key: U,      mods: Control,       mode: Vi, action: ScrollHalfPageUp        }
-  - { key: Back,     mods: Alt,     chars: "\x1b\x7f"                    }
+  #- { key: D,      mods: Control,       mode: Vi, action: ScrollHalfPageDown      }
-  - { key: Insert,                  chars: "\x1b[2~"                     }
+  #- { key: Y,                           mode: Vi, action: Copy                    }
-  - { key: Delete,                  chars: "\x1b[3~"                     }
+  #- { key: V,                           mode: Vi, action: ToggleNormalSelection   }
-  - { key: Left,     mods: Shift,   chars: "\x1b[1;2D"                   }
+  #- { key: V,      mods: Shift,         mode: Vi, action: ToggleLineSelection     }
-  - { key: Left,     mods: Control, chars: "\x1b[1;5D"                   }
+  #- { key: V,      mods: Control,       mode: Vi, action: ToggleBlockSelection    }
-  - { key: Left,     mods: Alt,     chars: "\x1b[1;3D"                   }
+  #- { key: V,      mods: Alt,           mode: Vi, action: ToggleSemanticSelection }
-  - { key: Left,                    chars: "\x1b[D",   mode: ~AppCursor  }
+  #- { key: Return,                      mode: Vi, action: Open                    }
-  - { key: Left,                    chars: "\x1bOD",   mode: AppCursor   }
+  #- { key: K,                           mode: Vi, action: Up                      }
-  - { key: Right,    mods: Shift,   chars: "\x1b[1;2C"                   }
+  #- { key: J,                           mode: Vi, action: Down                    }
-  - { key: Right,    mods: Control, chars: "\x1b[1;5C"                   }
+  #- { key: H,                           mode: Vi, action: Left                    }
-  - { key: Right,    mods: Alt,     chars: "\x1b[1;3C"                   }
+  #- { key: L,                           mode: Vi, action: Right                   }
-  - { key: Right,                   chars: "\x1b[C",   mode: ~AppCursor  }
+  #- { key: Up,                          mode: Vi, action: Up                      }
-  - { key: Right,                   chars: "\x1bOC",   mode: AppCursor   }
+  #- { key: Down,                        mode: Vi, action: Down                    }
-  - { key: Up,       mods: Shift,   chars: "\x1b[1;2A"                   }
+  #- { key: Left,                        mode: Vi, action: Left                    }
-  - { key: Up,       mods: Control, chars: "\x1b[1;5A"                   }
+  #- { key: Right,                       mode: Vi, action: Right                   }
-  - { key: Up,       mods: Alt,     chars: "\x1b[1;3A"                   }
+  #- { key: Key0,                        mode: Vi, action: First                   }
-  - { key: Up,                      chars: "\x1b[A",   mode: ~AppCursor  }
+  #- { key: Key4,   mods: Shift,         mode: Vi, action: Last                    }
-  - { key: Up,                      chars: "\x1bOA",   mode: AppCursor   }
+  #- { key: Key6,   mods: Shift,         mode: Vi, action: FirstOccupied           }
-  - { key: Down,     mods: Shift,   chars: "\x1b[1;2B"                   }
+  #- { key: H,      mods: Shift,         mode: Vi, action: High                    }
-  - { key: Down,     mods: Control, chars: "\x1b[1;5B"                   }
+  #- { key: M,      mods: Shift,         mode: Vi, action: Middle                  }
-  - { key: Down,     mods: Alt,     chars: "\x1b[1;3B"                   }
+  #- { key: L,      mods: Shift,         mode: Vi, action: Low                     }
-  - { key: Down,                    chars: "\x1b[B",   mode: ~AppCursor  }
+  #- { key: B,                           mode: Vi, action: SemanticLeft            }
-  - { key: Down,                    chars: "\x1bOB",   mode: AppCursor   }
+  #- { key: W,                           mode: Vi, action: SemanticRight           }
-  - { key: F1,                      chars: "\x1bOP"                      }
+  #- { key: E,                           mode: Vi, action: SemanticRightEnd        }
-  - { key: F2,                      chars: "\x1bOQ"                      }
+  #- { key: B,      mods: Shift,         mode: Vi, action: WordLeft                }
-  - { key: F3,                      chars: "\x1bOR"                      }
+  #- { key: W,      mods: Shift,         mode: Vi, action: WordRight               }
-  - { key: F4,                      chars: "\x1bOS"                      }
+  #- { key: E,      mods: Shift,         mode: Vi, action: WordRightEnd            }
-  - { key: F5,                      chars: "\x1b[15~"                    }
+  #- { key: Key5,   mods: Shift,         mode: Vi, action: Bracket                 }
-  - { key: F6,                      chars: "\x1b[17~"                    }
+
-  - { key: F7,                      chars: "\x1b[18~"                    }
+  # (Windows, Linux, and BSD only)
-  - { key: F8,                      chars: "\x1b[19~"                    }
+  - { key: V,        mods: Control|Shift, action: Paste            }
-  - { key: F9,                      chars: "\x1b[20~"                    }
+  - { key: C,        mods: Control|Shift, action: Copy             }
-  - { key: F10,                     chars: "\x1b[21~"                    }
+  - { key: Insert,   mods: Shift,         action: PasteSelection   }
-  - { key: F11,                     chars: "\x1b[23~"                    }
+  - { key: Key0,     mods: Control,       action: ResetFontSize    }
-  - { key: F12,                     chars: "\x1b[24~"                    }
+  - { key: Equals,   mods: Control,       action: ResetFontSize    }
-  - { key: F1,       mods: Shift,   chars: "\x1b[1;2P"                   }
+  - { key: Add,      mods: Control,       action: IncreaseFontSize }
-  - { key: F2,       mods: Shift,   chars: "\x1b[1;2Q"                   }
+  - { key: Subtract, mods: Control,       action: DecreaseFontSize }
-  - { key: F3,       mods: Shift,   chars: "\x1b[1;2R"                   }
+  - { key: Minus,    mods: Control,       action: DecreaseFontSize }
-  - { key: F4,       mods: Shift,   chars: "\x1b[1;2S"                   }
+
-  - { key: F5,       mods: Shift,   chars: "\x1b[15;2~"                  }
+  # (Windows only)
-  - { key: F6,       mods: Shift,   chars: "\x1b[17;2~"                  }
+  #- { key: Return,   mods: Alt,           action: ToggleFullscreen }
-  - { key: F7,       mods: Shift,   chars: "\x1b[18;2~"                  }
+
-  - { key: F8,       mods: Shift,   chars: "\x1b[19;2~"                  }
+  # (macOS only)
-  - { key: F9,       mods: Shift,   chars: "\x1b[20;2~"                  }
+  #- { key: K,      mods: Command, mode: ~Vi, chars: "\x0c"            }
-  - { key: F10,      mods: Shift,   chars: "\x1b[21;2~"                  }
+  #- { key: Key0,   mods: Command,            action: ResetFontSize    }
-  - { key: F11,      mods: Shift,   chars: "\x1b[23;2~"                  }
+  #- { key: Equals, mods: Command,            action: IncreaseFontSize }
-  - { key: F12,      mods: Shift,   chars: "\x1b[24;2~"                  }
+  #- { key: Add,    mods: Command,            action: IncreaseFontSize }
-  - { key: F1,       mods: Control, chars: "\x1b[1;5P"                   }
+  #- { key: Minus,  mods: Command,            action: DecreaseFontSize }
-  - { key: F2,       mods: Control, chars: "\x1b[1;5Q"                   }
+  #- { key: K,      mods: Command,            action: ClearHistory     }
-  - { key: F3,       mods: Control, chars: "\x1b[1;5R"                   }
+  #- { key: V,      mods: Command,            action: Paste            }
-  - { key: F4,       mods: Control, chars: "\x1b[1;5S"                   }
+  #- { key: C,      mods: Command,            action: Copy             }
-  - { key: F5,       mods: Control, chars: "\x1b[15;5~"                  }
+  #- { key: H,      mods: Command,            action: Hide             }
-  - { key: F6,       mods: Control, chars: "\x1b[17;5~"                  }
+  #- { key: M,      mods: Command,            action: Minimize         }
-  - { key: F7,       mods: Control, chars: "\x1b[18;5~"                  }
+  #- { key: Q,      mods: Command,            action: Quit             }
-  - { key: F8,       mods: Control, chars: "\x1b[19;5~"                  }
+  #- { key: W,      mods: Command,            action: Quit             }
-  - { key: F9,       mods: Control, chars: "\x1b[20;5~"                  }
+  #- { key: N,      mods: Command,            action: SpawnNewInstance }
-  - { key: F10,      mods: Control, chars: "\x1b[21;5~"                  }
+  #- { key: F,      mods: Command|Control,    action: ToggleFullscreen }
-  - { key: F11,      mods: Control, chars: "\x1b[23;5~"                  }
+
-  - { key: F12,      mods: Control, chars: "\x1b[24;5~"                  }
+debug:
-  - { key: F1,       mods: Alt,     chars: "\x1b[1;6P"                   }
+  # Display the time it takes to redraw each frame.
-  - { key: F2,       mods: Alt,     chars: "\x1b[1;6Q"                   }
+  #render_timer: false
-  - { key: F3,       mods: Alt,     chars: "\x1b[1;6R"                   }
+
-  - { key: F4,       mods: Alt,     chars: "\x1b[1;6S"                   }
+  # Keep the log file after quitting Alacritty.
-  - { key: F5,       mods: Alt,     chars: "\x1b[15;6~"                  }
+  #persistent_logging: false
-  - { key: F6,       mods: Alt,     chars: "\x1b[17;6~"                  }
+
-  - { key: F7,       mods: Alt,     chars: "\x1b[18;6~"                  }
+  # Log level
-  - { key: F8,       mods: Alt,     chars: "\x1b[19;6~"                  }
+  #
-  - { key: F9,       mods: Alt,     chars: "\x1b[20;6~"                  }
+  # Values for `log_level`:
-  - { key: F10,      mods: Alt,     chars: "\x1b[21;6~"                  }
+  #   - None
-  - { key: F11,      mods: Alt,     chars: "\x1b[23;6~"                  }
+  #   - Error
-  - { key: F12,      mods: Alt,     chars: "\x1b[24;6~"                  }
+  #   - Warn
-  - { key: F1,       mods: Super,   chars: "\x1b[1;3P"                   }
+  #   - Info
-  - { key: F2,       mods: Super,   chars: "\x1b[1;3Q"                   }
+  #   - Debug
-  - { key: F3,       mods: Super,   chars: "\x1b[1;3R"                   }
+  #   - Trace
-  - { key: F4,       mods: Super,   chars: "\x1b[1;3S"                   }
+  log_level: Info
-  - { key: F5,       mods: Super,   chars: "\x1b[15;3~"                  }
+
-  - { key: F6,       mods: Super,   chars: "\x1b[17;3~"                  }
+  # Print all received window events.
-  - { key: F7,       mods: Super,   chars: "\x1b[18;3~"                  }
+  #print_events: false
-  - { key: F8,       mods: Super,   chars: "\x1b[19;3~"                  }
-  - { key: F9,       mods: Super,   chars: "\x1b[20;3~"                  }
-  - { key: F10,      mods: Super,   chars: "\x1b[21;3~"                  }
-  - { key: F11,      mods: Super,   chars: "\x1b[23;3~"                  }
-  - { key: F12,      mods: Super,   chars: "\x1b[24;3~"                  }

.config/chromium-flags.conf

@@ -0,0 +1 @@
+--enable-features=NativeNotifications,OverlayScrollbar

.config/compton.conf

@@ -1,91 +0,0 @@
-# Shadow
-shadow = true;					# Enabled client-side shadows on windows.
-no-dock-shadow = true;			# Avoid drawing shadows on dock/panel windows.
-no-dnd-shadow = false;			# Don't draw shadows on DND windows.
-clear-shadow = true;			# Zero the part of the shadow's mask behind the
-								# window. Fix some weirdness with ARGB windows.
-shadow-radius = 12;				# The blur radius for shadows. (default 12)
-shadow-offset-x = -16;	    	# The left offset for shadows. (default -15)
-shadow-offset-y = -16;			# The top offset for shadows. (default -15)
-shadow-opacity = 0.65;			# The translucency for shadows. (default .75)
-# shadow-red = 0.0;				# Red color value of shadow. (0.0 - 1.0, defaults to 0)
-# shadow-green = 0.0;			# Green color value of shadow. (0.0 - 1.0, defaults to 0)
-# shadow-blue = 0.0;			# Blue color value of shadow. (0.0 - 1.0, defaults to 0)
-shadow-exclude = [ "class_g = 'slop'" ];	# Exclude conditions for shadows.
-shadow-ignore-shaped = false;	# Avoid drawing shadow on all shaped windows
-								# (see also: --detect-rounded-corners)
-
-# Opacity
-menu-opacity = 0.9;				# The opacity for menus. (default 1.0)
-inactive-opacity = 0.7;			# Default opacity of inactive windows. (0.0 - 1.0)
-active-opacity = 1.0;			# Default opacity for active windows. (0.0 - 1.0)
-frame-opacity = 1.0;			# Opacity of window titlebars and borders. (0.1 - 1.0)
-inactive-opacity-override = true;	# Let inactive opacity set by 'inactive-opacity' overrides
-								# value of _NET_WM_OPACITY. Bad choice.
-opacity-rule = [
-  "0:_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
-];
-alpha-step = 0.02;				# XRender backend: Step size for alpha pictures. Increasing
-								# it may result in less X resource usage,
-								# Yet f ading may look bad.
-
-# Blurring
-blur-method = "dual_kawase";
-blur-strength = 5;
-blur-background = true;		    # Blur background of transparent windows.
-blur-background-exclude  = [ "class_g = 'Peek'", "class_g = 'Onboard'", "class_g = 'slop'", "class_g = 'Polybar'" ];
-blur-background-frame = true;	# Blur background of opaque windows with transparent
-								# frames as well.
-blur-background-fixed = false;	# Do not let blur radius adjust based on window opacity.
-								# Exclude conditions for background blur.
-
-# Fading
-fading = true;					# Fade windows during opacity changes.
-# fade-delta = 16;				# The time between steps in a fade in milliseconds. (default 10).
-fade-in-step = 0.022;			# Opacity change between steps while fading in. (default 0.028).
-fade-out-step = 0.02;			# Opacity change between steps while fading out. (default 0.03).
-# no-fading-openclose = true;	# Avoid fade windows in/out when opening/closing.
-# fade-exclude = [ ];				# Exclude conditions for fading.
-
-# Other
-backend = "glx"					# Backend to use: "xrender" or "glx". GLX backend is typically
-								# much faster but depends on a sane driver.
-mark-wmwin-focused = true;		# Try to detect WM windows and mark them as active.
-mark-ovredir-focused = true;	# Mark all non-WM but override-redirect windows active (e.g. menus).
-use-ewmh-active-win = true;		# Use EWMH _NET_WM_ACTIVE_WINDOW to determine which window is focused
-								# instead of using FocusIn/Out events. Usually more reliable but
-								# depends on a EWMH-compliant WM.
-detect-rounded-corners = true;	# Detect rounded corners and treat them as rectangular when --shadow-ignore-shaped is on.
-detect-client-opacity = true;	# Detect _NET_WM_OPACITY on client windows, useful for window
-								# managers not passing _NET_WM_OPACITY of client windows to frame windows.
-refresh-rate = 0;				# For --sw-opti: Specify refresh rate of the screen. 0 for auto.
-vsync = "none";					# "none", "drm", "opengl", "opengl-oml", "opengl-swc", "opengl-mswc"
-								# See man page for more details.
-dbe = false;					# Enable DBE painting mode. Rarely needed.
-paint-on-overlay = true;		# Painting on X Composite overlay window. Recommended.
-sw-opti = false;				# Limit compton to repaint at most once every 1 / refresh_rate.
-								# Incompatible with certain VSync methods.
-unredir-if-possible = false;	# Unredirect all windows if a full-screen opaque window is
-								# detected, to maximize performance for full-screen windows.
-focus-exclude = [ "i:ai:chromium" ];	# A list of conditions of windows that should always be considered focused.
-detect-transient = true;		# Use WM_TRANSIENT_FOR to group windows, and consider windows in
-								# the same group focused at the same time.
-detect-client-leader = true;	# Use WM_CLIENT_LEADER to group windows.
-invert-color-include = [ ];		# Conditions for windows to be painted with inverted color.
-
-# GLX backend					# GLX backend fine-tune options. See man page for more info.
-glx-no-stencil = true;			# Recommended.
-glx-copy-from-front = false;	# Useful with --glx-swap-method,
-# glx-use-copysubbuffermesa = true; # Recommended if it works. Breaks VSync.
-glx-no-rebind-pixmap = true;	# Recommended if it works.
-glx-swap-method = "undefined";	# See man page.
-
-# Window type settings
-wintypes:
-{
-  tooltip = { fade = true; shadow = false; opacity = 1; focus = true; };
-  # fade: Fade the particular type of windows.
-  # shadow: Give those windows shadow
-  # opacity: Default opacity for the type of windows.
-  # focus: Whether to always consider windows of this type focused.
-};

.config/dunst/dunstrc

@@ -11,7 +11,7 @@
     # <http://developer.gnome.org/pango/stable/PangoMarkupFormat.html>.
     # If markup is not allowed, those tags will be stripped out of the
     # message.
-    markup = yes
+    markup = full
 
     # The format of the message.  Possible variables are:
     #   %a  appname

.config/gtk-3.0/gtk.css

@@ -1,7 +1,7 @@
 VteTerminal,
 TerminalScreen,
 vte-terminal {
-    padding: 1.3em;
+    padding: 1.8em;
 }
 
 .window-frame, .window-frame:backdrop {

.config/i3/alt-tab.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-# ================================================================================== #
-# Focus the next window on the current workspace in i3, e.g. for binding to Alt+Tab  #
-# Depends: jq, awk, i3wm (obviously)                                                 #
-# Author: Nervengift <dev@nerven.gift>                                               #
-# License: Don't think this deserves a license, Public Domain                        #
-# Known bugs: doesn't work with non-window container focused                         #
-# ================================================================================== #
-
-ws=$(i3-msg -t get_workspaces|jq "map(select(.focused))[]|.name")
-echo $ws
-windows=$(i3-msg -t get_tree|jq ".nodes|map(.nodes[])|map(.nodes[])|map(select(.type==\"workspace\" and .name==$ws))[0].nodes|map(recurse(.nodes[]))|map(.window)|.[]|values")
-echo $windows
-current=$(i3-msg -t get_tree|jq "recurse(.nodes[])|select(.focused)|.window")
-echo $current
-if [ "x$current" != "xnull" ]; then
-	next=$(echo $windows | awk "BEGIN {RS=\" \";FS=\"   \"};NR == 1 {w=\$1};{if (f == 1){w=\$1;f=0}else if (\$1 == \"$current\") f=1};END {print w}")
-	i3-msg [id=$next] focus > /dev/null
-fi

.config/i3/config

@@ -107,7 +107,7 @@ client.unfocused        $inactive-bg-color  $inactive-bg-color $inactive-text-co
 client.focused_inactive $inactive-bg-color  $inactive-bg-color $inactive-text-color $bg-color
 client.urgent           $urgent-bg-color    $urgent-bg-color   $text-color          $bg-color
 
-exec_always --no-startup-id killall -q polybar; while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done; exec polybar -r i3bar
+exec_always --no-startup-id feh --no-fehbg --no-xinerama --bg-fill $DOTFILES/lakesidesunrise.jpg
 
 # Window rules
 for_window [class="Pinentry"] floating enable
@@ -122,24 +122,25 @@ for_window [title="^rofi$"] floating enable
 new_window none
 new_float none
 
-gaps inner 12
+gaps inner 20
 gaps outer 4
 
 focus_follows_mouse yes
+popup_during_fullscreen smart
 
 # keybindings
 bindsym $mod+Shift+j            reload
-bindsym $mod+c                  exec chromium
+bindsym $mod+c                  exec systemd-run --user --scope --slice=chromium.slice --no-block -- chromium
+bindsym $mod+b                  exec systemd-run --user --scope --slice=firefox.slice --no-block -- firefox
 bindsym $mod+v                  exec "i3-sensible-terminal -e \\"$SHELL -c vim;$SHELL\\"
 bindsym $mod+Ctrl+v             exec "i3-sensible-terminal -r floating-term -e \\"$SHELL -c vim;$SHELL\\"
-bindsym Mod1+Tab                exec ~/.config/i3/alt-tab.sh
 bindsym $mod+Return             exec i3-sensible-terminal
 bindsym $mod+Ctrl+Return        exec i3-sensible-terminal -r floating-term
 bindsym $mod+Shift+Return       exec i3-sensible-terminal -d "`xcwd`"
 bindsym $mod+Ctrl+Shift+Return  exec i3-sensible-terminal -r floating-term -d "`xcwd`"
-bindsym $mod+l                  exec ~/.config/i3/lock.sh
+bindsym $mod+l                  exec dm-tool switch-to-greeter
 bindsym $mod+space              exec "pkill rofi; rofi -show run -sidebar-mode -terminal i3-sensible-terminal -normal-window"
-bindsym $mod+Shift+p            exec rofi-pass
+bindsym $mod+Shift+p            exec rofi-pass --root $(grep path ~/.config/gopass/config.yml | sed -E 's|^.*fs\+file://||g' | tr '\n' ':') | sed 's/:$//g'
 bindsym $mod+Shift+e            exec rofi-emoji
 bindsym $mod+Shift+i            exec rofi-fontawesome
 bindsym --release Print         exec screenshot
@@ -147,38 +148,19 @@ bindsym --release $mod+Print    exec imgur-screenshot
 bindsym $mod+$alt+space         exec --no-startup-id ~/.config/i3/cycleaudio.py && pkill -RTMIN+10 i3blocks
 bindsym $mod+numbersign         exec "i3-sensible-terminal -e 'sh -c xclip\ -o\ |\ gpg\ --decrypt\ 2>&1\ \;\ $SHELL'"
 bindsym $mod+r                  exec "bash -c 'pwgen -nc 32 1 | tee >(xargs notify-send Generated\ password\:) | xclip -i'"
-bindsym $mod+g                  exec "LINK=$(gist -PRpc); notify-send -c transfer \\"<a href=\\\\"$LINK\\\\">$LINK</a>\\""
+bindsym $mod+g                  exec "LINK=$(gist -PRpc); notify-send -c transfer \\"$LINK\\""
+bindsym --release $mod+i        exec sh -c 'sleep 0.5 && xdotool type --delay 400 "$(xclip -o -selection clipboard)"'
 
 # Media player controls
-bindsym XF86AudioPlay           exec --no-startup-id mpc toggle
+bindsym XF86AudioPlay           exec --no-startup-id playerctl -a play-pause
-bindsym XF86AudioPause          exec --no-startup-id mpc pause
+bindsym XF86AudioPause          exec --no-startup-id playerctl -a pause
-bindsym XF86AudioStop           exec --no-startup-id mpc stop
+bindsym XF86AudioStop           exec --no-startup-id playerctl -a stop
-bindsym XF86AudioNext           exec --no-startup-id mpc next
+bindsym XF86AudioNext           exec --no-startup-id playerctl -a next
-bindsym XF86AudioPrev           exec --no-startup-id mpc previous
+bindsym XF86AudioPrev           exec --no-startup-id playerctl -a previous
 bindsym XF86AudioRaiseVolume    exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@  +1000
 bindsym XF86AudioLowerVolume    exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@  -1000
 bindsym XF86AudioMute           exec --no-startup-id pactl set-sink-mute   @DEFAULT_SINK@ toggle
 bindsym XF86MonBrightnessUp     exec xbacklight -inc 5 && pkill -RTMIN+12 i3blocks
 bindsym XF86MonBrightnessDown   exec xbacklight -dec 5 && pkill -RTMIN+12 i3blocks
 
-# app launch shortcuts
-exec --no-startup-id ~/.config/i3/disable-standby-fs.py
-exec --no-startup-id feh --no-fehbg --no-xinerama --bg-fill ~/pictures/lakesidesunrise.jpg
-exec --no-startup-id xautolock -time 5 -locker 'dm-tool lock' -nocloseout -nocloseerr
-
-# startup programs
-exec --no-startup-id nextcloud
-exec --no-startup-id blueman-applet
-exec --no-startup-id redshift
-exec --no-startup-id xbindkeys
-exec --no-startup-id solaar
-exec --no-startup-id pullover
-exec --no-startup-id mailnag
-exec --no-startup-id compton -b --config ~/.config/compton.conf
-exec --no-startup-id chromium --no-startup-window
-exec --no-startup-id thunderbird
-
-exec i3-msg 'workspace 1; exec sleep 2 && chromium'
-exec i3-msg 'workspace 2; exec i3-sensible-terminal'
-
 # vim:ft=i3

.config/i3/powermenu.sh

@@ -1,9 +1,9 @@
 #!/bin/sh
  
-option=$(echo "lock|logout|sleep|hibernate|power off|reboot|windows" | rofi -sep "|" -dmenu -i -p "" -auto-select -hide-scrollbar -monitor 0 -width 8 -lines 7 -location 3 -tokenize false -matching normal | xargs)
+option=$(echo "lock|logout|sleep|hibernate|power off|reboot|windows" | rofi -sep "|" -dmenu -i -p "" -auto-select -hide-scrollbar -monitor 0 -width 10 -lines 7 -location 3 -tokenize false -matching normal | xargs)
 
 case $option in
-    lock) ./lock.sh;;
+    lock) dm-tool switch-to-greeter;;
     logout) i3-msg exit;;
     sleep) systemctl suspend;;
     hibernate) systemctl hibernate;;

.config/npm/npmrc

@@ -0,0 +1,3 @@
+prefix=${XDG_DATA_HOME}/npm
+cache=${XDG_CACHE_HOME}/npm
+tmp=${XDG_RUNTIME_DIR}/npm

.config/picom.conf

@@ -0,0 +1,100 @@
+# Logging
+log-level = "debug";
+log-file = "/home/frebib/.local/share/picom.log";
+
+# Shadow
+shadow = true;
+shadow-radius = 24;
+shadow-offset-x = -24;
+shadow-offset-y = -24;
+shadow-opacity = 0.6;
+# shadow-red = 0.0;
+# shadow-green = 0.0;
+# shadow-blue = 0.0;
+shadow-exclude = [
+	"class_g = 'slop'",
+	"class_g = 'Conky'",
+	"class_g ?= 'Notify-osd'",
+	"class_g = 'Cairo-clock'",
+	"name = 'Notification'",
+	"_GTK_FRAME_EXTENTS@:c"
+];
+# shadow-exclude = "n:e:Notification";
+# shadow-exclude-reg = "x10+0+0";
+xinerama-shadow-crop = true;
+
+# Opacity
+frame-opacity = 1.0;
+# active-opacity = 0.8;
+inactive-opacity = 0.6;
+inactive-opacity-override = true;
+# inactive-dim = 0.2;
+# inactive-dim-fixed = true;
+opacity-rule = [
+	"0:_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
+];
+
+# Blurring
+blur:
+{
+	method = "dual_kawase";
+	strength = 8;
+};
+blur-background-frame = true;
+blur-background-fixed = true;
+blur-background-exclude = [
+	"class_g = 'Peek'",
+	"class_g = 'Onboard'",
+	"class_g = 'slop'",
+	"class_g = 'Polybar'",
+	"window_type = 'dock'",
+	"window_type = 'desktop'",
+	"_GTK_FRAME_EXTENTS@:c"
+];
+
+# Fading
+fading = true;
+fade-delta = 10;
+fade-in-step = 0.03;
+fade-out-step = 0.03;
+no-fading-openclose = false;
+no-fading-destroyed-argb = false;
+# fade-exclude = [ ];
+
+# Other
+backend = "glx";
+mark-wmwin-focused = true;
+mark-ovredir-focused = true;
+use-ewmh-active-win = false;
+detect-rounded-corners = true;
+detect-client-opacity = true;
+refresh-rate = 0;
+vsync = true;
+# sw-opti = true;
+# unredir-if-possible = true;
+# unredir-if-possible-delay = 5000;
+# unredir-if-possible-exclude = [ ];
+focus-exclude = [
+	"i:ai:chromium",
+	"class_g = 'Firefox'",
+];
+detect-transient = true;
+detect-client-leader = true;
+invert-color-include = [ ];
+# resize-damage = 1;
+
+# GLX backend
+glx-no-stencil = true;
+glx-no-rebind-pixmap = true;
+xrender-sync-fence = true;
+#use-damage = true;
+
+# Window type settings
+wintypes:
+{
+  tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; full-shadow = false; };
+  dock = { shadow = false; }
+  dnd = { shadow = false; }
+  popup_menu = { opacity = 0.8; }
+  dropdown_menu = { opacity = 0.8; }
+};

.config/polybar/config

@@ -2,8 +2,9 @@
 background = transparent
 text = #eceff1
 icon = #147a82
-warning = #bd2c40
+warning = #ffcb00
 critical = #bd2c40
+urgent = #e53935
 
 [settings]
 format-foreground = ${colours.text}
@@ -12,6 +13,8 @@ format-spacing = 0
 format-margin  = 2.5
 format-offset  = 0
 
+screenchange-reload = true
+
 [bar/i3bar]
 monitor = ${env:MONITOR:HDMI-0}
 dpi  = ${xrdb:Xft.dpi:96}
@@ -19,35 +22,40 @@ fixed-center = false
 enable-ipc = true
 
 width = 100%
-height = 32
+#offset-x = 18px
+height = 16pt
 bottom = true
 radius = 0
 
+font-0 = sans:pixelsize=9;2
+font-1 = FontAwesome5ProLight:pixelsize=10;2
+
 foreground = ${colours.text}
 background = ${colours.background}
 
+padding-left = 0
+padding-right = 2pt
+
+border-size = 0
+border-left-size = 16pt
+border-right-size = 16pt
+border-bottom-size = 8pt
+
 line-size = 0
 line-colour = #f00
-padding-left = 2
-padding-right = 2
-module-margin-left = 0
-module-margin-right = 1
-
-font-0 = sans:pixelsize=9;1
-font-1 = FontAwesome5Pro:pixelsize=10;2
 
 modules-left = i3
 modules-center =
-# modules-right = volume updates weather xkeyboard wlan eth memory cpu xbacklight battery temperature date
+# modules-right = volume updates weather xkeyboard wlan gateway eth memory cpu xbacklight battery temperature date
-modules-right = volume updates weather wlan eth memory cpu xbacklight battery temperature date
+modules-right = volume updates weather wlan gateway eth memory cpu xbacklight battery temperature date
 
 tray-position = right
 tray-detached = false
-tray-background = ${root.background}
+tray-background = ${colours.background}
-tray-offset-x = -4
+#tray-offset-x = -20
-tray-offset-y = 0
+#tray-offset-y = 0
 tray-maxsize = 16
-tray-padding = 2
+tray-padding = 8pt
 tray-scale = 1.0
 
 cursor-click = pointer
@@ -68,6 +76,13 @@ exec = $XDG_CONFIG_HOME/polybar/weather.sh
 interval = 120
 click-left = i3-msg exec "i3-sensible-terminal -r floating-term -e 'sh -c \"xdotool getactivewindow windowsize 910 680 && curl wttr.in && sleep infinity\"'"
 
+[module/gateway]
+type = custom/script
+exec = for v in 4 6; do ip -$v r show default | xargs -l1 sh -c 'fping --retry=1 --quiet --iface "$4" "$2"'; done && echo  || echo '%{F#f41f1c}%{F-}'
+interval = 2
+format-prefix = "  "
+format-prefix-foreground = ${colours.icon}
+
 [module/xkeyboard]
 type = internal/xkeyboard
 
@@ -115,7 +130,7 @@ label-visible-underline = ${self.label-focused-underline}
 
 ; urgent = Workspace with urgency hint set
 label-urgent = ${self.label-focused}
-label-urgent-foreground = ${colours.warning}
+label-urgent-foreground = ${colours.urgent}
 label-urgent-padding = ${self.label-focused-padding}
 
 
@@ -226,7 +241,7 @@ ramp-volume-5 = ""
 type = internal/battery
 battery = BAT0
 adapter = AC0
-full-at = 95
+full-at = 98
 
 format-full = <label-full>
 format-charging = <label-charging>
@@ -300,12 +315,4 @@ menu-2-0-exec = sudo poweroff
 menu-2-1 = cancel
 menu-2-1-exec = menu-open-0
 
-
-[settings]
-screenchange-reload = true
-;compositing-background = xor
-;compositing-background = screen
-;compositing-foreground = source
-;compositing-border = over
-
 ; vim:ft=dosini

.config/polybar/weather.sh

@@ -71,8 +71,8 @@ get_icon() {
         522) echo  ;;		# heavy intensity shower rain
         531) echo  ;;		# ragged shower rain
         600) echo  ;;		# light snow
-        601) echo  ;;		# snow
+        601) echo  ;;		# snow
-        602) echo  ;;		# heavy snow
+        602) echo  ;;		# heavy snow
         611) echo  ;;		# sleet
         612) echo  ;;		# shower sleet
         615) echo  ;;		# light rain and snow
@@ -86,11 +86,6 @@ get_icon() {
         741) echo  ;;		# fog
         762) echo  ;;		# volcanic ash
         781) echo  ;;		# tornado
-        800) echo  ;;		# clear sky
-        801) echo  ;;		# few clouds
-        802) echo  ;;		# scattered clouds
-        803) echo  ;;		# broken clouds
-        804) echo  ;;		# overcast clouds
         # 731) echo  ;;		# sand, dust whirls
         # 751) echo  ;;		# sand
         # 761) echo  ;;		# dust

.config/systemd/user/autocutsel-primary.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=autocutsel -selection primary
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=/usr/bin/autocutsel -selection PRIMARY
+
+[Install]
+WantedBy=graphical-session.target
+

.config/systemd/user/autocutsel.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=autocutsel
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=/usr/bin/autocutsel
+
+[Install]
+WantedBy=graphical-session.target
+

.config/systemd/user/basic.target.wants/profile.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/profile.service

.config/systemd/user/blueman-applet.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Bluetooth Applet
+After=graphical-session.target bluetooth.service
+Requires=graphical-session.target bluetooth.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/blueman-applet
+Restart=on-failure
+
+[Install]
+WantedBy=desktop.target

.config/systemd/user/default.target

@@ -0,0 +1 @@
+/usr/lib/systemd/user/basic.target

.config/systemd/user/default.target.wants/dunst.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/dunst.service

.config/systemd/user/default.target.wants/redshift.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/redshift.service

.config/systemd/user/desktop.target.wants/blueman-applet.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/blueman-applet.service

.config/systemd/user/desktop.target.wants/dunst.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/dunst.service

.config/systemd/user/desktop.target.wants/networkmanager-applet.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/networkmanager-applet.service

.config/systemd/user/desktop.target.wants/nextcloud.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/nextcloud.service

.config/systemd/user/desktop.target.wants/picom.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/picom.service

.config/systemd/user/desktop.target.wants/polybar@i3bar.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/polybar@.service

.config/systemd/user/desktop.target.wants/solaar.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/solaar.service

.config/systemd/user/desktop.target.wants/xdg-user-dirs-update.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/xdg-user-dirs-update.service

.config/systemd/user/graphical-session.target.wants/autocutsel-primary.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/autocutsel-primary.service

.config/systemd/user/graphical-session.target.wants/autocutsel.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/autocutsel.service

.config/systemd/user/graphical-session.target.wants/i3.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/i3.service

.config/systemd/user/graphical-session.target.wants/xautolock.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/xautolock.service

.config/systemd/user/i3.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=i3 - an improved dynamic, tiling window manager
+Requires=xorg.target
+Before=graphical-session.target
+After=profile.service xprofile.service xorg.target
+
+[Service]
+ExecStart=/usr/bin/i3
+ExecReload=/bin/sh -c 'i3-msg restart; systemctl is-active --user -q picom && systemctl --user restart picom'
+ExecStop=/bin/systemctl --user stop desktop.target
+Restart=always
+
+[Install]
+WantedBy=graphical-session.target

.config/systemd/user/networkmanager-applet.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=NetworkManager Applet
+After=graphical-session.target NetworkManager.service
+Requires=graphical-session.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/nm-applet
+Restart=on-failure
+
+[Install]
+WantedBy=desktop.target

.config/systemd/user/nextcloud.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Nextcloud Client
+Requires=graphical-session.target
+After=graphical-session.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/nextcloud --background
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=desktop.target

.config/systemd/user/picom.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=A lightweight compositor for X11
+Requires=graphical-session.target
+After=graphical-session.target xorg.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/picom --experimental-backends --dbus
+Restart=always
+
+[Install]
+WantedBy=desktop.target

.config/systemd/user/polybar@.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Polybar
+Requires=graphical-session.target
+After=graphical-session.target pulseaudio.socket
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/polybar --reload --log=warning %i
+Restart=always
+
+[Install]
+WantedBy=desktop.target

.config/systemd/user/profile.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Load profile environment into session
+Before=graphical-session-pre.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/bash -c '. $HOME/.config/dotfiles/.profile && systemctl --user import-environment'
+
+[Install]
+WantedBy=basic.target

.config/systemd/user/sleep-i3lock@.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=Lock X session using i3lock
-
-[Service]
-User=%i
-Environment=DISPLAY=:0
-ExecStart=sh -c '~/.config/i3/lock.sh'
-
-[Install]
-WantedBy=sleep.target

.config/systemd/user/sleep-lock-lightdm.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Lock X LightDM session before sleeping
+Requires=graphical-session.target
+Before=sleep.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/dm-tool switch-to-greeter
+# Ensure enough time for the session to lock before sleeping
+ExecStartPost=/usr/bin/sleep 1
+
+[Install]
+WantedBy=sleep.target

.config/systemd/user/sleep.target.wants/sleep-lock-lightdm.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/sleep-lock-lightdm.service

.config/systemd/user/solaar.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Solaar Logitech status applet
+Requires=graphical-session.target
+After=graphical-session.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/solaar --restart-on-wake-up -d
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=desktop.target

.config/systemd/user/xautolock.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Lock desktop session after inactivity
+Requires=xorg.target
+After=xorg.target
+
+[Service]
+ExecStart=/usr/bin/xautolock -time 5 -locker 'dm-tool switch-to-greeter' -detectsleep -resetsaver -secure
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=graphical-session.target

.config/systemd/user/xbindkeys.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=XBindKeys
+Requires=profile.service
+After=profile.service
+
+[Service]
+ExecStart=/usr/bin/xbindkeys -n -f $XDG_CONFIG_HOME/X11/xbindkeysrc
+KillMode=process
+
+[Install]
+WantedBy=graphical-session.target

.config/systemd/user/xorg.target

@@ -0,0 +1,3 @@
+[Unit]
+Description=Graphical desktop environment
+Requires=basic.target

.config/systemd/user/xorg.target.wants/xprofile.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/xprofile.service

.config/systemd/user/xprofile.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Load Xorg configuration
+PartOf=xorg.target
+Requires=profile.service
+After=xorg.target profile.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/bash -cx '. $XDG_CONFIG_HOME/X11/xprofile && systemctl --user import-environment'
+
+[Install]
+WantedBy=xorg.target

.config/termite/config

@@ -7,7 +7,7 @@ size_hints = true
 [colors]
 cursor     = #5294E2
 foreground = #ECEFF1
-background = rgba(56, 60, 74, 0.95)
+background = rgba(56, 60, 74, 0.85)
 highlight  = #5294E2
 
 # Colour order:

.config/zsh/.zshrc

@@ -18,6 +18,29 @@ if exists tty && tty -s 1>/dev/null 2>/dev/null; then
     export GPG_TTY="$(tty)"
 fi
 
+# Configure less and add colours
+export LESS="-RI"
+export PAGER="less"
+export MANPAGER="less -+N"
+# Disable histfile
+export LESSHISTFILE=-
+
+if exists tput; then
+    export LESS_TERMCAP_mb=$(tput bold; tput setaf 2) # green
+    export LESS_TERMCAP_md=$(tput bold; tput setaf 6) # cyan
+    export LESS_TERMCAP_me=$(tput sgr0)
+    export LESS_TERMCAP_so=$(tput bold; tput setaf 4) # blue
+    export LESS_TERMCAP_se=$(tput rmso; tput sgr0)
+    export LESS_TERMCAP_us=$(tput smul; tput bold; tput setaf 7) # white
+    export LESS_TERMCAP_ue=$(tput rmul; tput sgr0)
+    export LESS_TERMCAP_mr=$(tput rev)
+    export LESS_TERMCAP_mh=$(tput dim)
+    export LESS_TERMCAP_ZN=$(tput ssubm)
+    export LESS_TERMCAP_ZV=$(tput rsubm)
+    export LESS_TERMCAP_ZO=$(tput ssupm)
+    export LESS_TERMCAP_ZW=$(tput rsupm)
+fi
+
 # Set some useful ZSH/Bash options
 setopt sharehistory histignorealldups histignorespace histreduceblanks
 setopt pathdirs autocd autopushd extendedglob nullglob alwaystoend interactivecomments dvorak
@@ -57,7 +80,6 @@ source "$antigen_src"
 
 antigen bundle zsh-users/zsh-completions
 antigen bundle zsh-users/zsh-autosuggestions
-antigen bundle zsh-users/zsh-history-substring-search
 antigen bundle zsh-users/zsh-syntax-highlighting@feature/redrawhook
 antigen bundle mafredri/zsh-async
 
@@ -80,8 +102,7 @@ bindkey '^[^[[3~' x-bash-backward-kill-word
 bindkey '^[^[[3^' x-bash-backward-kill-word
 bindkey '^[[A' fzf-history-widget                   # Up (fzf)
 bindkey '^[[B' fzf-history-widget                   # Down (fzf)
-bindkey '^[[1;3A' history-substring-search-up       # Alt+Up (hsh)
+bindkey '^F'   fzf-file-widget                      # Ctrl+F file search (fzf)
-bindkey '^[[1;3B' history-substring-search-down     # Alt+Down (hsh)
 
 bindkey "^V" edit-command-line
 bindkey -M vicmd "^V" edit-command-line
@@ -97,12 +118,8 @@ bindkey -M vicmd l vi-repeat-search
 
 
 ZSH_AUTOSUGGEST_USE_ASYNC=true
+ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=128
 ZSH_AUTOSUGGEST_CLEAR_WIDGETS=("${(@)ZSH_AUTOSUGGEST_CLEAR_WIDGETS:#(up|down)-line-or-history}")
-ZSH_AUTOSUGGEST_CLEAR_WIDGETS+=(history-substring-search-up history-substring-search-down)
-
-HISTORY_SUBSTRING_SEARCH_FUZZY=true
-HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE=true
-HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND='underline'
 
 default='fg=12'
 prog='fg=blue'
@@ -141,9 +158,17 @@ ZSH_HIGHLIGHT_STYLES[redirection]='fg=cyan,bold'
 
 source "$DOTFILES/aliases"
 
+# Source secret keys and values into environment
+if [ -f "$XDG_CONFIG_HOME/secrets" ]; then
+    set -o allexport
+    source $XDG_CONFIG_HOME/secrets
+    set +o allexport
+fi
+
 # Load some manual plugins
 source "$ZSH_DIR/plugins/sudo.zsh"
 source "$ZSH_DIR/plugins/fish-theme.zsh"
 source "$ZSH_DIR/plugins/git-rprompt.zsh"
 [ -f '/usr/share/fzf/key-bindings.zsh' ] && source /usr/share/fzf/key-bindings.zsh
 [ -f '/usr/share/doc/pkgfile/command-not-found.zsh' ] && source /usr/share/doc/pkgfile/command-not-found.zsh
+[ -r '/usr/share/z/z.sh' ] && source /usr/share/z/z.sh

.gitignore

@@ -1,6 +1,10 @@
 bookmarks
 .config/secrets
+
+.config/gtk-2.0/gtkfilechooser.ini
 .config/imgur-screenshot/credentials.conf
+.config/mailnag/mailnag.dat
+.config/zsh/.zshrc.zwc
 
 *.log
 .xournal/recent-files

.profile

@@ -25,6 +25,7 @@ export CARGO_HOME="$XDG_DATA_HOME/cargo"
 export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
 export GOPATH="$XDG_DATA_HOME/go"
 export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/settings.ini"
+export NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc
 export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
 export PYTHONHISTFILE="$XDG_DATA_HOME/python/histfile"
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
@@ -42,40 +43,14 @@ export PATH="${PATH}:/sbin:/usr/sbin:$DOTFILES/scripts:$GOPATH/bin"
 
 exists() { which $@ 0<&- 1>/dev/null 2>/dev/null; }
 
-# Configure less and add colours
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && exists dbus-launch; then
-export LESS="-RI"
+    eval $(dbus-launch --sh-syntax --exit-with-session)
-export PAGER="less"
-export MANPAGER="less -+N"
-# Disable histfile
-export LESSHISTFILE=-
-
-if exists tput; then
-    export LESS_TERMCAP_mb=$(tput bold; tput setaf 2) # green
-    export LESS_TERMCAP_md=$(tput bold; tput setaf 6) # cyan
-    export LESS_TERMCAP_me=$(tput sgr0)
-    export LESS_TERMCAP_so=$(tput bold; tput setaf 4) # blue
-    export LESS_TERMCAP_se=$(tput rmso; tput sgr0)
-    export LESS_TERMCAP_us=$(tput smul; tput bold; tput setaf 7) # white
-    export LESS_TERMCAP_ue=$(tput rmul; tput sgr0)
-    export LESS_TERMCAP_mr=$(tput rev)
-    export LESS_TERMCAP_mh=$(tput dim)
-    export LESS_TERMCAP_ZN=$(tput ssubm)
-    export LESS_TERMCAP_ZV=$(tput rsubm)
-    export LESS_TERMCAP_ZO=$(tput ssupm)
-    export LESS_TERMCAP_ZW=$(tput rsupm)
 fi
 
+# Execute this after updating dbus/systemd environment
 # Source secret keys and values into environment
 if [ -f "$XDG_CONFIG_HOME/secrets" ]; then
     set -o allexport
     source $XDG_CONFIG_HOME/secrets
     set +o allexport
 fi
-
-# Start a dbus session daemon for programs that require it
-if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && exists dbus-launch; then
-    eval $(dbus-launch --sh-syntax --exit-with-session)
-    dbus-update-activation-environment --systemd \
-        DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY
-fi
-

aliases

@@ -53,7 +53,7 @@ alias svim=sudoedit
 # This will enable us to use aliases in sudo.
 # (If alias finishes with a space or tab, the shell will check if the next command is also aliased.)
 # Source: https://github.com/mayah/home/blob/master/.zsh/zshrc.d/alias.zsh
-alias sudo='sudo -E '
+alias sudo='sudo '
 alias open=xdg-open
 
 # Command rewrites
@@ -105,7 +105,9 @@ mcd(){ mkdir -p -- $@ && cd -- $@; }
 randstr() { tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w $1 | head -n 1; }
 
 # System aliases
-alias s="sudo systemctl"
+alias sc="systemctl"
+alias ssc="sudo systemctl"
+alias scu="systemctl --user"
 alias j=journalctl
 alias ps='ps aux'
 alias catn='tail -n +1 --'
@@ -129,10 +131,10 @@ alias grm="git rm"
 alias gc="git commit"
 alias gcm="gc -m"
 gcmst() { git stash -u -k && git commit -m "$1" && git stash pop; }
-alias gca="git commit --amend"
+alias gca="git commit --amend --date=\"$(date -R)\""
 alias gcn="git commit --no-edit"
-alias gcan="git commit --amend --no-edit"
+alias gcan="gca --no-edit"
-alias gcam="git commit --amend -m"
+alias gcam="gca -m"
 alias gst="git status"
 
 alias gm="git merge"
@@ -140,25 +142,33 @@ alias gma="git merge --abort"
 alias grb="git rebase"
 alias grba="grb --abort"
 alias grbc="grb --continue"
+alias grbsk="grb --skip"
+alias grbsh="grb --show-current"
+alias grbom="git rebase origin/master"
 
 alias gf="git fetch"
 alias gp="git push"
 alias gpf="gp --force"
 alias gpsu="git push --set-upstream"
+alias gpoH="git push origin HEAD"
 alias gpsuom="git push --set-upstream origin master"
 alias gpall="git remote | xargs -L1 git push"
 alias gl="git pull --rebase"
 alias glp="gl && gp"
-alias gd="git diff"
+alias gd="git diff --patch-with-stat"
-alias gds="git diff --staged"
+alias gdni="gd --no-index"
-alias gsh="git show"
+alias gds="gd --staged"
-alias glg="git log --stat --color"
+alias gsh="git show --format=fuller --patch-with-stat"
-alias glog="git log --oneline --decorate --color --graph"
+alias glg="git log --color --format=fuller --stat"
+alias glgp="git log --color --format=fuller --patch-with-stat"
+alias glog="git log --color --oneline --decorate --graph"
 
 alias grst="git reset"
-alias gundo="git reset @~1"
+alias gundo="git reset --keep @~1"
 alias gclean="git clean"
 alias gbr="git branch"
+alias gtg="git tag"
+alias gbl="git blame"
 alias gr="git remote"
 alias grv="git remote -v"
 alias gra="gr add"
@@ -174,8 +184,11 @@ alias gstv="gsta show -p stash@{0}"
 
 # Docker aliases
 alias d=docker
-alias dps='docker ps'
+alias dps="docker ps --format='table {{.ID}}\t{{.Image}}\t{{.Label \"org.label-schema.version\"}}\t{{.Networks}}\t{{.RunningFor}}\t{{.Status}}\t{{.Names}}' | sed '1s/version/VERSION/'"
-alias dpsa='docker ps -a'
+alias dpsa="docker ps -a --format='table {{.ID}}\t{{.Image}}\t{{.Label \"org.label-schema.version\"}}\t{{.Networks}}\t{{.RunningFor}}\t{{.Status}}\t{{.Names}}' | sed '1s/version/VERSION/'"
+alias dnets="docker network ls -q | xargs docker inspect | jq '.[] | select(.Name != \"host\" and .Name != \"none\") | [.] | map(.Name + \"\t\" + (.IPAM.Config | map(.Subnet) | join(\"\t\")))[]' -r | sort -V -k2,3 | column -t"
+daddrs() { docker inspect ${1:-bridge} | jq '.[0].Containers | map(.Name + "\t" + .IPv4Address + "\t" + .IPv6Address)[]' -r | sort -V -k2,3 | column -t; }
+alias din='docker inspect'
 alias drm='docker rm'
 alias drmi='docker rmi'
 alias dim='docker images'
@@ -259,14 +272,14 @@ do_dsh() {
 
 alias dc='docker-compose'
 alias dm='docker-machine'
-alias dmc='eval $(docker-machine env $1)'
+dmc() { eval $(docker-machine env $1); }
 
 # ZFS aliases
 alias zfs='sudo zfs'
 alias zpool='sudo zpool'
 alias z=zfs
 alias zp=zpool
-zl() { (set -o pipefail; command zfs list $@ | grep -Ev 'docker/[0-9a-f]{64}'); return $?; }
+zl() { (set -o pipefail; command zfs list $@ | grep -Ev 'docker/[0-9a-f]{64}' | column -t -R 2,3,4); return $?; }
 _zl() { _zfs "list $@"; }
 
 # General Aliases
@@ -279,10 +292,15 @@ alias xinitrc="$EDITOR $XDG_CONFIG_HOME/X11/xinitrc"
 alias xresources="$EDITOR $XDG_CONFIG_HOME/X11/xresources ; xrdb merge $XDG_CONFIG_HOME/X11/xresources"
 alias sshc="$EDITOR ~/.ssh/config"
 alias dotfiles="cd $DOTFILES"
-alias i3c="$EDITOR $XDG_CONFIG_HOME/i3/config ; i3-msg restart"
+alias i3c="$EDITOR $XDG_CONFIG_HOME/i3/config; systemctl --user reload i3"
+alias polybarc="$EDITOR $XDG_CONFIG_HOME/polybar/config; systemctl --user restart polybar@i3bar"
 
 alias sf=screenfetch
 alias nf=neofetch
 alias rot13="tr '[A-Za-z]' '[N-ZA-Mn-za-m]'"
 
+# Networking aliases
+alias ipa="ip a"
+alias addrs="ip a | grep inet | grep -ve fe80 -e '127\\.0\\.0\\.1/8' -e '::1/128' | sort -n | sed 's/^\\s*//'"
+
 # vim: ft=sh

scripts/4screens

@@ -11,4 +11,4 @@ xrandr --output $BOTTOM_LEFT --primary --mode 1920x1080 --pos 0x1080 --rotate no
        --output $TOP_RIGHT --mode 1920x1080 --pos 1920x0 --rotate inverted \
        --output $BOTTOM_RIGHT --mode 1920x1080 --pos 1920x1080 --rotate normal
 
-feh --no-fehbg --no-xinerama --bg-fill ~/pictures/lakesidesunrise.jpg
+feh --no-fehbg --no-xinerama --bg-fill $DOTFILES/lakesidesunrise.jpg

scripts/dock-displays

@@ -16,4 +16,4 @@ xrandr --newmode $MODELINE 2>/dev/null || true
 xrandr --addmode $OUTPUT $MODENAME 2>/dev/null || true
 xrandr --output  $OUTPUT --mode $MODENAME
 
-feh --no-fehbg --no-xinerama --bg-fill ~/pictures/lakesidesunrise.jpg
+feh --no-fehbg --no-xinerama --bg-fill $DOTFILES/lakesidesunrise.jpg

scripts/rofi-emoji

@@ -89,7 +89,8 @@ function display() {
 
     if [ "${line[@]}" == "$update" ]; then
         download
-        exit 0
+        display
+        return
     fi
 
     line=($line)

scripts/rofi-fontawesome

@@ -28,9 +28,12 @@ function download() {
 
     echo -n > "$FONTAWESOME_FILE"
 
-    curl https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/advanced-options/metadata/icons.json | \
+    cat /usr/share/fontawesome/icons.json | \
-        jq '.[] | "\\u" + .unicode + "\t" + .label' -r | \
+        jq -r --argfile ctgs <(yq r -j /usr/share/fontawesome/categories.yml) \
-        xargs -0 printf \
+        '.[] | . as $icon | "\\\\u" + .unicode + "\t" + .label + "\t" + ( ([.search.terms,.styles,([select($ctgs[].icons[]|index($icon.label))|.label]|unique)]|add)|sort|join(", "))' | \
+        while IFS=$'\t' read icon name labels; do \
+            printf "%b\t%-120s\t%s\n" "$icon" "$name" "$labels";\
+        done \
         > "$FONTAWESOME_FILE"
 
     notify "$(basename "$0")" "We're all set!"
@@ -62,7 +65,8 @@ function display() {
 
     if [ "${line[@]}" == "$update" ]; then
         download
-        exit 0
+        display
+        return
     fi
 
     #IFS=$'\t'

scripts/screenshot

@@ -5,7 +5,7 @@ NOTIFY_APPNAME="$(basename "$0")"
 NOTIFY_ICONPATH="/usr/share/icons/Xenlism-Wildfire/Apps/screenshot.svg"
 
 SCROT_CMD="maim -m 10 -us %"
-FILENAME=`date "+$NOTIFY_APPNAME-%Y-%m-%d-%H%M%S.png"`
+FILENAME="$(date '+%s%N' | sha256sum | head -c7).png"
 DIRECTORY="$HOME/pictures/screenshots"
 
 SCP_HOST=frebib@Poseidon.nerdhouse.io
@@ -40,7 +40,7 @@ fi
 notif_id=$(send_notification "Screenshot uploading" "$FILENAME<br><br>The image is available in the clipboard immediately" || true)
 
 # Add image to clipboard
-xclip -i "$out_path" -selection primary -t image/png
+xclip -i "$out_path" -selection clipboard -t image/png
 
 # 'Upload' the screenshot
 if ! error=$(scp -C $out_path $SCP_HOST:$SCP_PATH 2>&1); then