roled in latest changes to openbox config on Dell XPS 13

32 files changed, 153 insertions, 1352 deletions

diff --git a/.aliases b/.aliases
index ca57990..2b3e446 100644
--- a/.aliases
+++ b/.aliases
@@ -1,8 +1,12 @@
 # vi:syntax=sh
 
+# connect to wireless:
+alias jp='sudo netctl start jetpack'
+alias ngear='sudo netctl start netgear'
 alias egrep='egrep --color=auto'
 alias tmux="tmux -2"
 alias v="vim "
+#alias v="vim "
 alias dmenu="dmenu_run "
 #alias thunar="pcmanfm-qt"
 alias mpv="mpv --hwdec=vaapi -v "
@@ -66,7 +70,7 @@ alias serve='python -m http.server'
 alias servenet="python -c 'import BaseHTTPServer as bhs, SimpleHTTPServer as shs; bhs.HTTPServer(('\''192.168.1.10'\'', 8080), shs.SimpleHTTPRequestHandler).serve_forever()'"
 
 # download movies
-alias yt='youtube-dl $1 --no-check-certificate --format best'
+alias yt='yt-dlp $1 --format best'
 alias yt-audio='youtube-dl --no-check-certificate --ignore-errors --output "%(title)s.%(ext)s" --extract-audio --audio-format mp3'
 
 alias @less="fc -s | less"
@@ -98,3 +102,8 @@ alias bat='upower -i /org/freedesktop/UPower/devices/battery_BAT1 | egrep "time
 
 alias gpphoto="~/./bin/download-photos-gopro.py /mnt/card/DCIM/100GOPRO/"
 alias gpvid="~/./bin/download-videos-gopro.py /mnt/card/DCIM/100GOPRO/"
+
+# plain text accounting:
+alias ebean="vim documents/_fin.beancount"
+alias bean-school='bean-report documents/_fin.beancount journal -a Assets:SchoolsFirst:Checking --balance'
+alias bean-schwab='bean-report documents/_fin.beancount journal -a Assets:Schwab:Checking --balance'
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
deleted file mode 100644
index be06481..0000000
--- a/.config/alacritty/alacritty.yml
+++ /dev/null
@@ -1,602 +0,0 @@
-# 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.
-#env:
-  # TERM variable
-  #
-  # 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
-  # available, otherwise `xterm-256color` is used.
-  #TERM: xterm-256color
-
-window:
-  # Window dimensions (changes require restart)
-  #
-  # Specified in number of columns/lines, not pixels.
-  # If both are `0`, this setting is ignored.
-  dimensions:
-    columns: 0
-    lines: 0
-
-# Allow terminal applications to change Alacritty's window title.
-  dynamic_title: true
-  # 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: 0
-    y: 0
-
-  # 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 only):
-  #class: Alacritty
-
-scrolling:
-  # Maximum number of lines in the scrollback buffer.
-  # Specifying '0' will disable scrolling.
-  history: 10000
-
-  # Number of lines the viewport will move for every line scrolled when
-  # scrollback is enabled (history > 0).
-  multiplier: 3
-
-  # Faux Scrolling
-  #
-  # 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.
-
-# 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.
-
-# Font configuration (changes require restart)
-font:
-  # The normal (roman) font face to use.
-  normal:
-    family: Inconsolata # should be "Menlo" or something on macOS.
-    # Style can be specified to pick a specific face.
-    # style: Regular
-
-  # The bold font face
-  bold:
-    family: Inconsolata # should be "Menlo" or something on macOS.
-    # Style can be specified to pick a specific face.
-    # style: Bold
-
-  # The italic font face
-  italic:
-    family: Inconsolata # should be "Menlo" or something on macOS.
-    # Style can be specified to pick a specific face.
-    # style: Italic
-
-  # Point size of the font
-  #size: 10.0
-  size: 14
-
-  # 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:
-    x: 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:
-    x: 0
-    y: 0
-
-  # Thin stroke font rendering (macOS only)
-  #
-  # 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 (Solarized Dark)
-colors:
-  # Default colors
-  primary:
-    background: '0x002b36'
-    foreground: '0x839496'
-
-  # Normal colors
-  normal:
-    black:   '0x073642'
-    red:     '0xdc322f'
-    green:   '0x859900'
-    yellow:  '0xb58900'
-    blue:    '0x268bd2'
-    magenta: '0xd33682'
-    cyan:    '0x2aa198'
-    white:   '0xeee8d5'
-
-  # Bright colors
-  bright:
-    black:   '0x002b36'
-    red:     '0xcb4b16'
-    green:   '0x586e75'
-    yellow:  '0x657b83'
-    blue:    '0x839496'
-    magenta: '0x6c71c4'
-    cyan:    '0x93a1a1'
-    white:   '0xfdf6e3'
-
-    # Colors (Solarized Light)
-    #colors:
-    #  # Default colors
-    #  primary:
-    #    background: '0xfdf6e3'
-    #    foreground: '0x586e75'
-    #
-    #  # Normal colors
-    #  normal:
-    #    black:   '0x073642'
-    #    red:     '0xdc322f'
-    #    green:   '0x859900'
-    #    yellow:  '0xb58900'
-    #    blue:    '0x268bd2'
-    #    magenta: '0xd33682'
-    #    cyan:    '0x2aa198'
-    #    white:   '0xeee8d5'
-    #
-    #  # Bright colors
-    #  bright:
-    #    black:   '0x002b36'
-    #    red:     '0xcb4b16'
-    #    green:   '0x586e75'
-    #    yellow:  '0x657b83'
-    #    blue:    '0x839496'
-    #    magenta: '0x6c71c4'
-    #    cyan:    '0x93a1a1'
-    #    white:   '0xfdf6e3'
-# Visual Bell
-#
-# Any time the BEL code is received, Alacritty "rings" the visual bell. Once
-# rung, the terminal background will be set to white and transition back to the
-# default background color. You can control the rate of this transition by
-# setting the `duration` property (represented in milliseconds). You can also
-# configure the transition function by setting the `animation` property.
-#
-# Values for `animation`:
-#   - Ease
-#   - EaseOut
-#   - EaseOutSine
-#   - EaseOutQuad
-#   - EaseOutCubic
-#   - EaseOutQuart
-#   - EaseOutQuint
-#   - EaseOutExpo
-#   - EaseOutCirc
-#   - Linear
-#
-# Specifying a `duration` of `0` will disable the visual bell.
-bell:
-  animation: EaseOutExpo
-  duration: 0
-  color: '0xffffff'
-
-# 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.8
-
-# 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.
-    #
-    # When set to `None`, URL launching will be disabled completely.
-    #
-    # Default:
-    #   - (macOS) open
-    #   - (Linux) 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
-
-selection:
-  semantic_escape_chars: ",│`|:\"' ()[]{}<>"
-
-  # When set to `true`, selected text will be copied to the primary clipboard.
-  save_to_clipboard: false
-
-
-cursor:
-  # Cursor style
-  #
-  # Values for `style`:
-  #   - ▇ Block
-  #   - _ Underline
-  #   - | Beam
-  style: Block
-
-  # If this is `true`, the cursor will be rendered as a hollow box when the
-  # window is not focused.
-  unfocused_hollow: true
-
-# Live config reload (changes require restart)
-live_config_reload: true
-
-# Shell
-#
-# 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) 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
-
-# Windows 10 ConPTY backend (Windows only)
-#
-# This will enable better color support and may resolve other issues,
-# however this API and its implementation is still young and so is
-# disabled by default, as stability may not be as good as the winpty
-# backend.
-#
-# Alacritty will fall back to the WinPTY automatically if the ConPTY
-# backend cannot be initialized.
-enable_experimental_conpty_backend: false
-
-# Send ESC (\x1b) before characters when alt is pressed.
-alt_send_esc: true
-
-debug:
-  # Display the time it takes to redraw each frame.
-  render_timer: false
-
-  # Keep the log file after quitting Alacritty.
-  persistent_logging: false
-
-  # Log level
-  #
-  # Values for `log_level`:
-  #   - None
-  #   - Error
-  #   - Warn
-  #   - Info
-  #   - Debug
-  #   - Trace
-  log_level: Warn
-
-  # Print all received window events.
-  print_events: false
-
-  # Record all characters and escape sequences as test data.
-  ref_test: false
-
-# Key bindings
-#
-# Key bindings are specified as a list of objects. Each binding will specify a
-# key and modifiers required to trigger it, terminal modes where the binding is
-# applicable, and what should be done when the key binding fires. It can either
-# send a byte sequence to the running application (`chars`), execute a
-# predefined action (`action`) or fork and execute a specified command plus
-# arguments (`command`).
-#
-# 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 `None` action.
-#
-# Example:
-#   `- { key: V, mods: Control|Shift, action: Paste }`
-#
-# Available fields:
-#   - key
-#   - mods (optional)
-#   - chars | action | command (exactly one required)
-#   - mode (optional)
-#
-# Values for `key`:
-#   - `A` -> `Z`
-#   - `F1` -> `F12`
-#   - `Key1` -> `Key0`
-#
-#   A full list with available key codes can be found here:
-#   https://docs.rs/glutin/*/glutin/enum.VirtualKeyCode.html#variants
-#
-#   Instead of using the name of the keys, the `key` field also supports using
-#   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:
-#     `showkey --scancodes`
-#
-# Values for `mods`:
-#   - Command
-#   - Control
-#   - Option
-#   - Super
-#   - Shift
-#   - Alt
-#
-#   Multiple `mods` can be combined using `|` like this: `mods: Control|Shift`.
-#   Whitespace and capitalization is relevant and must match the example.
-#
-# Values for `chars`:
-#   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`:
-#   - Paste
-#   - PasteSelection
-#   - Copy
-#   - IncreaseFontSize
-#   - DecreaseFontSize
-#   - ResetFontSize
-#   - ScrollPageUp
-#   - ScrollPageDown
-#   - ScrollLineUp
-#   - ScrollLineDown
-#   - ScrollToTop
-#   - ScrollToBottom
-#   - ClearHistory
-#   - Hide
-#   - Quit
-#   - ClearLogNotice
-#   - SpawnNewInstance
-#   - ToggleFullscreen
-#   - None
-#
-# Values for `action` (macOS only):
-#   - ToggleSimpleFullscreen: Enters fullscreen without occupying another space
-#
-# Values for `command`:
-#   The `command` field must be a map containing a `program` string and
-#   an `args` array of command line parameter strings.
-#
-#   Example:
-#       `command: { program: "alacritty", args: ["-e", "vttest"] }`
-#
-# Values for `mode`:
-#   - ~AppCursor
-#   - AppCursor
-#   - ~AppKeypad
-#   - AppKeypad
-key_bindings:
-  # (Windows/Linux only)
-  #- { key: v,        mods: Control|Alt, action: Paste            }
-  #- { key: C,        mods: Control|Shift, action: Copy             }
-  #- { key: Insert,   mods: Shift,         action: PasteSelection   }
-  #- { key: Key0,     mods: Control,       action: ResetFontSize    }
-  #- { key: Equals,   mods: Control,       action: IncreaseFontSize }
-  #- { key: Add,      mods: Control,       action: IncreaseFontSize }
-  #- { key: Subtract, mods: Control,       action: DecreaseFontSize }
-  #- { key: Minus,    mods: Control,       action: DecreaseFontSize }
-  #- { key: Return,   mods: Alt,           action: ToggleFullscreen }
-
-  # (macOS only)
-  #- { key: Key0,   mods: Command,         action: ResetFontSize    }
-  #- { key: Equals, mods: Command,         action: IncreaseFontSize }
-  #- { key: Add,    mods: Command,         action: IncreaseFontSize }
-  #- { key: Minus,  mods: Command,         action: DecreaseFontSize }
-  #- { key: K,      mods: Command,         action: ClearHistory     }
-  #- { key: K,      mods: Command,         chars: "\x0c"            }
-  - { key: V,      mods: Control|Shift,         action: Paste            }
-  #- { key: C,      mods: Command,         action: Copy             }
-  #- { key: H,      mods: Command,         action: Hide             }
-  #- { key: Q,      mods: Command,         action: Quit             }
-  #- { key: W,      mods: Command,         action: Quit             }
-  #- { key: F,      mods: Command|Control, action: ToggleFullscreen }
-
-  - { key: Paste,                   action: Paste                            }
-  - { key: Copy,                    action: Copy                             }
-  - { key: L,        mods: Control, action: ClearLogNotice                   }
-  - { key: L,        mods: Control, chars: "\x0c"                            }
-  - { key: Home,     mods: Alt,     chars: "\x1b[1;3H"                       }
-  - { key: Home,                    chars: "\x1bOH",        mode: AppCursor  }
-  - { key: Home,                    chars: "\x1b[H",        mode: ~AppCursor }
-  - { key: End,      mods: Alt,     chars: "\x1b[1;3F"                       }
-  - { key: End,                     chars: "\x1bOF",        mode: AppCursor  }
-  - { key: End,                     chars: "\x1b[F",        mode: ~AppCursor }
-  - { key: PageUp,   mods: Shift,   action: ScrollPageUp,   mode: ~Alt       }
-  - { key: PageUp,   mods: Shift,   chars: "\x1b[5;2~",     mode: Alt        }
-  - { key: PageUp,   mods: Control, chars: "\x1b[5;5~"                       }
-  - { key: PageUp,   mods: Alt,     chars: "\x1b[5;3~"                       }
-  - { key: PageUp,                  chars: "\x1b[5~"                         }
-  - { key: PageDown, mods: Shift,   action: ScrollPageDown, mode: ~Alt       }
-  - { key: PageDown, mods: Shift,   chars: "\x1b[6;2~",     mode: Alt        }
-  - { key: PageDown, mods: Control, chars: "\x1b[6;5~"                       }
-  - { key: PageDown, mods: Alt,     chars: "\x1b[6;3~"                       }
-  - { key: PageDown,                chars: "\x1b[6~"                         }
-  - { key: Tab,      mods: Shift,   chars: "\x1b[Z"                          }
-  - { key: Back,                    chars: "\x7f"                            }
-  - { key: Back,     mods: Alt,     chars: "\x1b\x7f"                        }
-  - { key: Insert,                  chars: "\x1b[2~"                         }
-  - { key: Delete,                  chars: "\x1b[3~"                         }
-  - { key: Left,     mods: Shift,   chars: "\x1b[1;2D"                       }
-  - { key: Left,     mods: Control, chars: "\x1b[1;5D"                       }
-  - { key: Left,     mods: Alt,     chars: "\x1b[1;3D"                       }
-  - { key: Left,                    chars: "\x1b[D",        mode: ~AppCursor }
-  - { key: Left,                    chars: "\x1bOD",        mode: AppCursor  }
-  - { key: Right,    mods: Shift,   chars: "\x1b[1;2C"                       }
-  - { key: Right,    mods: Control, chars: "\x1b[1;5C"                       }
-  - { key: Right,    mods: Alt,     chars: "\x1b[1;3C"                       }
-  - { key: Right,                   chars: "\x1b[C",        mode: ~AppCursor }
-  - { key: Right,                   chars: "\x1bOC",        mode: AppCursor  }
-  - { key: Up,       mods: Shift,   chars: "\x1b[1;2A"                       }
-  - { key: Up,       mods: Control, chars: "\x1b[1;5A"                       }
-  - { key: Up,       mods: Alt,     chars: "\x1b[1;3A"                       }
-  - { key: Up,                      chars: "\x1b[A",        mode: ~AppCursor }
-  - { key: Up,                      chars: "\x1bOA",        mode: AppCursor  }
-  - { key: Down,     mods: Shift,   chars: "\x1b[1;2B"                       }
-  - { key: Down,     mods: Control, chars: "\x1b[1;5B"                       }
-  - { key: Down,     mods: Alt,     chars: "\x1b[1;3B"                       }
-  - { key: Down,                    chars: "\x1b[B",        mode: ~AppCursor }
-  - { key: Down,                    chars: "\x1bOB",        mode: AppCursor  }
-  - { key: F1,                      chars: "\x1bOP"                          }
-  - { key: F2,                      chars: "\x1bOQ"                          }
-  - { key: F3,                      chars: "\x1bOR"                          }
-  - { key: F4,                      chars: "\x1bOS"                          }
-  - { key: F5,                      chars: "\x1b[15~"                        }
-  - { key: F6,                      chars: "\x1b[17~"                        }
-  - { key: F7,                      chars: "\x1b[18~"                        }
-  - { key: F8,                      chars: "\x1b[19~"                        }
-  - { key: F9,                      chars: "\x1b[20~"                        }
-  - { key: F10,                     chars: "\x1b[21~"                        }
-  - { key: F11,                     chars: "\x1b[23~"                        }
-  - { key: F12,                     chars: "\x1b[24~"                        }
-  - { key: F1,       mods: Shift,   chars: "\x1b[1;2P"                       }
-  - { key: F2,       mods: Shift,   chars: "\x1b[1;2Q"                       }
-  - { key: F3,       mods: Shift,   chars: "\x1b[1;2R"                       }
-  - { key: F4,       mods: Shift,   chars: "\x1b[1;2S"                       }
-  - { key: F5,       mods: Shift,   chars: "\x1b[15;2~"                      }
-  - { key: F6,       mods: Shift,   chars: "\x1b[17;2~"                      }
-  - { key: F7,       mods: Shift,   chars: "\x1b[18;2~"                      }
-  - { key: F8,       mods: Shift,   chars: "\x1b[19;2~"                      }
-  - { key: F9,       mods: Shift,   chars: "\x1b[20;2~"                      }
-  - { key: F10,      mods: Shift,   chars: "\x1b[21;2~"                      }
-  - { key: F11,      mods: Shift,   chars: "\x1b[23;2~"                      }
-  - { key: F12,      mods: Shift,   chars: "\x1b[24;2~"                      }
-  - { key: F1,       mods: Control, chars: "\x1b[1;5P"                       }
-  - { key: F2,       mods: Control, chars: "\x1b[1;5Q"                       }
-  - { key: F3,       mods: Control, chars: "\x1b[1;5R"                       }
-  - { key: F4,       mods: Control, chars: "\x1b[1;5S"                       }
-  - { key: F5,       mods: Control, chars: "\x1b[15;5~"                      }
-  - { key: F6,       mods: Control, chars: "\x1b[17;5~"                      }
-  - { key: F7,       mods: Control, chars: "\x1b[18;5~"                      }
-  - { key: F8,       mods: Control, chars: "\x1b[19;5~"                      }
-  - { key: F9,       mods: Control, chars: "\x1b[20;5~"                      }
-  - { key: F10,      mods: Control, chars: "\x1b[21;5~"                      }
-  - { key: F11,      mods: Control, chars: "\x1b[23;5~"                      }
-  - { key: F12,      mods: Control, chars: "\x1b[24;5~"                      }
-  - { key: F1,       mods: Alt,     chars: "\x1b[1;6P"                       }
-  - { key: F2,       mods: Alt,     chars: "\x1b[1;6Q"                       }
-  - { key: F3,       mods: Alt,     chars: "\x1b[1;6R"                       }
-  - { key: F4,       mods: Alt,     chars: "\x1b[1;6S"                       }
-  - { key: F5,       mods: Alt,     chars: "\x1b[15;6~"                      }
-  - { key: F6,       mods: Alt,     chars: "\x1b[17;6~"                      }
-  - { key: F7,       mods: Alt,     chars: "\x1b[18;6~"                      }
-  - { key: F8,       mods: Alt,     chars: "\x1b[19;6~"                      }
-  - { key: F9,       mods: Alt,     chars: "\x1b[20;6~"                      }
-  - { key: F10,      mods: Alt,     chars: "\x1b[21;6~"                      }
-  - { key: F11,      mods: Alt,     chars: "\x1b[23;6~"                      }
-  - { key: F12,      mods: Alt,     chars: "\x1b[24;6~"                      }
-  - { key: F1,       mods: Super,   chars: "\x1b[1;3P"                       }
-  - { key: F2,       mods: Super,   chars: "\x1b[1;3Q"                       }
-  - { key: F3,       mods: Super,   chars: "\x1b[1;3R"                       }
-  - { key: F4,       mods: Super,   chars: "\x1b[1;3S"                       }
-  - { key: F5,       mods: Super,   chars: "\x1b[15;3~"                      }
-  - { key: F6,       mods: Super,   chars: "\x1b[17;3~"                      }
-  - { key: F7,       mods: Super,   chars: "\x1b[18;3~"                      }
-  - { 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~"                      }
-  - { key: NumpadEnter,             chars: "\n"                              }
diff --git a/.config/gammastep/gammastep.conf b/.config/gammastep/gammastep.conf
deleted file mode 100644
index 1e67f07..0000000
--- a/.config/gammastep/gammastep.conf
+++ /dev/null
@@ -1,68 +0,0 @@
-; Global settings
-[general]
-; Set the day and night screen temperatures
-temp-day=5700
-temp-night=3500
-
-; Disable the smooth fade between temperatures when Redshift starts and stops.
-; 0 will cause an immediate change between screen temperatures.
-; 1 will gradually apply the new screen temperature over a couple of seconds.
-fade=1
-
-; Solar elevation thresholds.
-; By default, Redshift will use the current elevation of the sun to determine
-; whether it is daytime, night or in transition (dawn/dusk). When the sun is
-; above the degrees specified with elevation-high it is considered daytime and
-; below elevation-low it is considered night.
-;elevation-high=3
-;elevation-low=-6
-
-; Custom dawn/dusk intervals.
-; Instead of using the solar elevation, the time intervals of dawn and dusk
-; can be specified manually. The times must be specified as HH:MM in 24-hour
-; format.
-dawn-time=6:00-7:45
-dusk-time=18:35-20:15
-
-; Set the screen brightness. Default is 1.0.
-;brightness=0.9
-; It is also possible to use different settings for day and night
-; since version 1.8.
-;brightness-day=0.7
-;brightness-night=0.4
-; Set the screen gamma (for all colors, or each color channel
-; individually)
-gamma=0.8
-;gamma=0.8:0.7:0.8
-; This can also be set individually for day and night since
-; version 1.10.
-;gamma-day=0.8:0.7:0.8
-;gamma-night=0.6
-
-; Set the location-provider: 'geoclue2', 'manual'.
-; The location provider settings are in a different section.
-location-provider=manual
-
-; Set the adjustment-method: 'randr', 'vidmode', 'drm', 'wayland'.
-; 'randr' is the preferred X11 method, 'vidmode' is an older API
-; that works in some cases when 'randr' does not.
-; The adjustment method settings are in a different section.
-adjustment-method=wayland
-
-; Configuration of the location-provider:
-; type 'gammastep -l PROVIDER:help' to see the settings.
-; ex: 'gammastep -l manual:help'
-; Keep in mind that longitudes west of Greenwich (e.g. the Americas)
-; are negative numbers.
-[manual]
-lat=34.33
-lon=-82.65
-
-; Configuration of the adjustment-method
-; type 'gammastep -m METHOD:help' to see the settings.
-; ex: 'gammastep -m randr:help'
-; In this example, randr is configured to adjust only screen 0.
-; Note that the numbering starts from 0, so this is actually the first screen.
-; If this option is not specified, Redshift will try to adjust _all_ screens.
-[randr]
-screen=0
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
deleted file mode 100644
index 41bb8e1..0000000
--- a/.config/kitty/kitty.conf
+++ /dev/null
@@ -1,83 +0,0 @@
-# The foreground color
-foreground       #839496
-
-# The background color
-background       #002b36
-
-# The opacity of the background. A number between 0 and 1, where 1 is opaque and 0 is fully transparent.
-# This will only work if supported by the OS (for instance, when using a compositor under X11). Note
-# that it only sets the default background color's opacity. This is so that
-# things like the status bar in vim, powerline prompts, etc. still look good.
-# But it means that if you use a color theme with a background color in your
-# editor, it will not be rendered as transparent.  Instead you should change the
-# default background color in your kitty config and not use a background color
-# in the editor color scheme. Or use the escape codes to set the terminals
-# default colors in a shell script to launch your editor.
-# Be aware that using a value less than 1.0 is a (possibly significant) performance hit.
-background_opacity .9
-
-# The foreground for selections
-selection_foreground #002b36
-
-# The background for selections
-selection_background #586e75
-
-# The 16 terminal colors. There are 8 basic colors, each color has a dull and
-# bright version.
-
-# solarized dark
-color0   #073642
-color8   #002b36
-
-color1   #dc322f
-color9   #cb4b16
-
-color2   #859900
-color10  #586e75
-
-color3   #b58900
-color11  #657b83
-
-color4   #268bd2
-color12  #839496
-
-color5   #d33682
-color13  #6c71c4
-
-color6   #2aa198
-color14  #93a1a1
-
-color7   #eee8d5
-color15  #fdf6e3
-
-## black
-#color0   #000000
-#color8   #4d4d4d
-#
-## red
-#color1   #cc0403
-#color9   #f2201f
-#
-## green
-#color2   #19cb00
-#color10  #23fd00
-#
-## yellow
-#color3   #cecb00
-#color11  #fffd00
-#
-## blue
-#color4  #0d73cc
-#color12 #1a8fff
-#
-## magenta
-#color5   #cb1ed1
-#color13  #fd28ff
-#
-## cyan
-#color6   #0dcdcd
-#color14  #14ffff
-#
-## white
-#color7   #dddddd
-#color15  #ffffff
diff --git a/.config/nvim/.netrwhist b/.config/nvim/.netrwhist
deleted file mode 100644
index 78b0009..0000000
--- a/.config/nvim/.netrwhist
+++ /dev/null
@@ -1,12 +0,0 @@
-let g:netrw_dirhistmax  =10
-let g:netrw_dirhistcnt =5
-let g:netrw_dirhist_5='/home/lxf/.local/share/applications'
-let g:netrw_dirhist_4='/home/lxf/sites/corrinne-site/app'
-let g:netrw_dirhist_3='/home/lxf/sites/corrinne-site/app/clients'
-let g:netrw_dirhist_2='/home/lxf/sites/corrinne-site/app'
-let g:netrw_dirhist_1='/home/lxf/sites/corrinne-site/app/utils'
-let g:netrw_dirhist_0='/home/lxf/sites/corrinne-site/app/pages'
-let g:netrw_dirhist_9='/home/lxf/sites/corrinne-site/app/lib'
-let g:netrw_dirhist_8='/home/lxf/sites/corrinne-site/app/builder'
-let g:netrw_dirhist_7='/home/lxf/sites/corrinne-site/design'
-let g:netrw_dirhist_6='/home/lxf/sites/corrinne-site/config'
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
deleted file mode 100644
index f182e5b..0000000
--- a/.config/nvim/init.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-set runtimepath^=~/.vim runtimepath+=~/.vim/after
-let &packpath = &runtimepath
-source ~/.vimrc
diff --git a/.config/openbox/autostart b/.config/openbox/autostart
index d0ec159..ddf9b66 100644
--- a/.config/openbox/autostart
+++ b/.config/openbox/autostart
@@ -8,5 +8,6 @@ nextcloud &
 xset r rate 251 25 &
 xset -b 
 xcape -e 'Control_L=Escape'
+xinput --set-prop "DELL07E6:00 06CB:76AF Touchpad" "libinput Click Method Enabled" 0 1
 xinput set-prop 14 "libinput Natural Scrolling Enabled" 1
 feh --bg-fill ~/pictures/desktops/delos.png
diff --git a/.config/openbox/rc.xml b/.config/openbox/rc.xml
index 1ad53e4..55dff8a 100644
--- a/.config/openbox/rc.xml
+++ b/.config/openbox/rc.xml
@@ -43,7 +43,7 @@
   </placement>
   <theme>
     <name>Arc-Dark</name>
-    <titleLayout>NLIMC</titleLayout>
+    <titleLayout>LIMC</titleLayout>
     <!--
       available characters are NDSLIMC, each can occur at most once.
       N: window icon
@@ -120,7 +120,7 @@
 
        use obconf if you want to change these without having to log out
        and back in -->
-    <number>1</number>
+    <number>3</number>
     <firstdesk>1</firstdesk>
     <names>
       <name>1</name>
@@ -282,6 +282,11 @@
         <command>urxvt -e sh -c "fzsnip"</command>
       </action>
     </keybind>
+    <keybind key="A-P">
+      <action name="Execute">
+        <command>urxvt -e sh -c "pass clip --fzf"</command>
+      </action>
+    </keybind>
     <keybind key="XF86AudioRaiseVolume">
       <action name="Execute">
         <command>pactl set-sink-volume 0 +10%</command>
diff --git a/.config/ranger/bookmarks b/.config/ranger/bookmarks
index b5c890f..21d5de2 100644
--- a/.config/ranger/bookmarks
+++ b/.config/ranger/bookmarks
@@ -9,4 +9,4 @@ s:/home/lxf/sites/luxagraf.net
 c:/home/lxf/pictures/nextcloud-ccg-phone
 t:/home/lxf/temp
 p:/home/lxf/temp/wired
-':/home/lxf
+':/home/lxf/.dotfiles
diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf
index c1c5793..4ace566 100644
--- a/.config/ranger/rc.conf
+++ b/.config/ranger/rc.conf
@@ -98,7 +98,7 @@ set show_hidden_bookmarks true
 
 # Which colorscheme to use?  These colorschemes are available by default:
 # default, jungle, snow, solarized
-set colorscheme default
+set colorscheme solarized
 
 # Preview files on the rightmost column?
 # And collapse (shrink) the last column if there is nothing to preview?
diff --git a/.config/sway/config b/.config/sway/config
deleted file mode 100644
index d40c186..0000000
--- a/.config/sway/config
+++ /dev/null
@@ -1,240 +0,0 @@
-set $mod Mod1
-set $mod2 Mod4
-set $term alacritty
-set $background ~/.mountains_night_sky_dark.jpg
-set $screenshot grim ~/pictures/screenshots/scrn-$(date +"%Y-%m-%d-%H-%M-%S").png
-set $screenclip slurp | grim -g - ~/pictures/screenshots/scrn-$(date +"%Y-%m-%d-%H-%M-%S").png
-
-font pango:Inconsolata, Icons 13
-
-# kill focused window
-bindsym $mod+Shift+q kill
-
-# Mouse behaviour wrt windows.
-focus_follows_mouse no
-
-# sleep and lock
-exec swayidle -w \
-    timeout 300 'swaylock -f -c 000000' \
-    timeout 600 'swaymsg "output * dpms off"' \
-    resume 'swaymsg "output * dpms on"' \
-    before-sleep 'swaylock -f -c 000000'
-
-# Shortcuts
-bindsym $mod+Return exec $term
-bindsym $mod+F11 exec $screenshot
-bindsym $mod+F12 exec $screenclip
-
-# background
-output * bg $background fill
-
-input "1739:30383:DELL07E6:00_06CB:76AF_Touchpad" {
-    natural_scroll enabled
-}
-# change focus
-bindsym $mod2+j focus left
-bindsym $mod2+k focus right 
-#bindsym $mod+l focus up
-#bindsym $mod+semicolon focus down 
-
-# move focused window
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move right
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+semicolon move down 
-
-# split in horizontal orientation
-bindsym $mod+Shift+h split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+Shift+f fullscreen toggle
-bindsym $mod+f floating toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+Shift+s layout stacking
-bindsym $mod+t layout tabbed
-bindsym $mod+e layout toggle split
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-bindsym $mod+d focus child
-
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $ws5 "5"
-set $ws6 "6"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-
-
-# switch to workspace
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-bindsym $mod+9 workspace $ws9
-bindsym $mod+0 workspace $ws10
-
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace $ws1
-bindsym $mod+Shift+2 move container to workspace $ws2
-bindsym $mod+Shift+3 move container to workspace $ws3
-bindsym $mod+Shift+4 move container to workspace $ws4
-bindsym $mod+Shift+5 move container to workspace $ws5
-bindsym $mod+Shift+6 move container to workspace $ws6
-bindsym $mod+Shift+7 move container to workspace $ws7
-bindsym $mod+Shift+8 move container to workspace $ws8
-bindsym $mod+Shift+9 move container to workspace $ws9
-bindsym $mod+Shift+0 move container to workspace $ws10
-
-# Scratchpad:
-#
-# Sway has a "scratchpad", which is a bag of holding for windows.
-# You can send windows there and get them back later.
-
-# Move the currently focused window to the scratchpad
-bindsym $mod+Shift+minus move scratchpad
-
-# Show the next scratchpad window or hide the focused scratchpad window.
-# If there are multiple scratchpad windows, this command cycles through them.
-bindsym $mod+minus scratchpad show
-
-for_window [class="^Chromium$"] border none
-for_window [title="Oracle VM VirtualBox Manager"]  floating enable 
-for_window [class="^Pcmanfm"] floating enable 
-for_window [class="^lxf$"] floating enable 
-for_window [app_id="darktable"] border none
-for_window [class="Darktable"] border none
-for_window [app_id="python3"] border none, floating enable
-for_window [app_id="org.qutebrowser.qutebrowser"] border none
-for_window [app_id="kitty"] border none
-for_window [app_id="qutebrowser"] border none
-for_window [class="^URxvt"] border none
-for_window [app_id="firefoxdeveloperedition"] border none
-for_window [class="firefoxdeveloperedition"] border none
-for_window [app_id="Vivaldi-snapshot"] border none
-for_window [class="^qutebrowser"] border none
-for_window [app_id="^Alacritty"] border none
-for_window [class="Slack"] border none
-for_window [class="Pavucontrol"] floating enable
-for_window [window_role="pop-up"] floating enable
-for_window [class="Yad"] floating enable
-for_window [class="feh"] floating enable
-for_window [class="QtPass"] floating enable
-for_window [class="hangouts.google.com"] floating disable
-for_window [class="hangouts.google.com"] border normal
-for_window [app_id="gedit"] floating enable
-
-assign [class="qutebrowser"] $ws2
-assign [app_id="org.qutebrowser.qutebrowser"] $ws2
-assign [class="Firefox Developer"] $ws4
-assign [class="Slack"] $ws6
-assign [class="Vivaldi"] $ws2
-assign [class="Darktable"] $ws3
-assign [app_id="darktable"] $ws3
-assign [title="Oracle VM VirtualBox Manager"] $ws4
-
-#workspace switching
-bindsym $mod+k workspace next
-bindsym $mod+j workspace prev
-#bindsym $mod+space exec dmenu_run
-
-#Volumn and Brightness
-bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
-bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
-bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
-bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
-bindsym --locked XF86MonBrightnessUp exec --no-startup-id light -A 10
-bindsym --locked XF86MonBrightnessDown exec --no-startup-id light -U 10
-
-set $alsacard 1
-
-bindsym $mod+Shift+c reload
-bindsym $mod+Shift+r restart
-bindsym $mod+Shift+e exit 
-# resize window (you can also use the mouse for that)
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-
-        # Pressing left will shrink the window’s width.
-        # Pressing right will grow the window’s width.
-        # Pressing up will shrink the window’s height.
-        # Pressing down will grow the window’s height.
-        bindsym j resize shrink width 10 px or 10 ppt
-        bindsym k resize grow height 10 px or 10 ppt
-        bindsym l resize shrink height 10 px or 10 ppt
-        bindsym semicolon resize grow width 10 px or 10 ppt
-
-        # same bindings, but for the arrow keys
-        bindsym Left resize shrink width 10 px or 10 ppt
-        bindsym Down resize grow height 10 px or 10 ppt
-        bindsym Up resize shrink height 10 px or 10 ppt
-        bindsym Right resize grow width 10 px or 10 ppt
-
-        # back to normal: Enter or Escape
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-}
-
-bindsym $mod+r mode "resize"
-
-# Input configuration
-input * {
-    xkb_variant nodeadkeys
-    xkb_options ctrl:nocaps
-}
-input "1:1:AT_Translated_Set_2_keyboard" {
-    repeat_delay 250
-    repeat_rate 25
-}
-#exec xrdb ~/.Xresources
-exec --no-startup-id gammastep
-exec --no-startup-id vivaldi-snapshot --ozone-platform=wayland --enable-features=UseOzonePlatform,UseSkiaRenderer,Vulkan &
-#exec --no-startup-id urxvt &
-exec --no-startup-id alacritty &
-exec --no-startup-id nextcloud &
-#exec --no-startup-id xset r rate 250 25 &
-#exec --no-startup-id xset -b 
-#exec --no-startup-id xcape -e 'Control_L=Escape'
-
-# clipboard manager
-exec wl-paste -t text --watch clipman store --max-items=60 --histpath="~/.local/share/clipman-primary.json"
-# exec wl-paste -w 'wl-paste >> ~/.clipboard'
-bindsym $mod+h exec clipman pick --tool="wofi" --max-items=60 --histpath="~/.local/share/clipman-primary.json"
-
-# app launcher
-bindsym $mod+Space exec alacritty --class 'launcher' --command bash -c 'compgen -c | sort -u | fzf | xargs -r swaymsg -t command exec'
-
-# pass chooser
-bindsym $mod+p exec alacritty --class 'launcher' --command bash -c 'pass clip --fzf | xargs -r swaymsg -t command exec'
-
-for_window [app_id="^launcher$"] floating enable, border none, resize set width 25 ppt height 20 ppt, move position 0 px 0 px
-
-#snippet manager old
-#bindsym $mod+s exec alacritty --class 'launcher' --command bash -c 'pet exec | wl-copy | xargs -r swaymsg -t command exec'
-
-#snippet manager 
-bindsym $mod+s exec alacritty --class 'smsearch' --command bash -c 'fzsnip | xargs -r swaymsg -t command exec'
-
-bindsym $mod+b exec alacritty --class 'smsearch' --command bash -c 'url=$(cat .config/qutebrowser/bookmarks/urls | fzf | cut -d \" \" -f 1) && qutebrowser "$url" | xargs -r swaymsg -t command exec'
-
-for_window [app_id="^smsearch$"] floating enable, border none, resize set width 80 ppt height 60 ppt, move position 0 px 0 px
-
-
-bindsym $mod+n exec alacritty --class 'smsearch' --command bash -c 'notes'
-
-for_window [app_id="^smsearch$"] floating enable, border none, resize set width 80 ppt height 60 ppt, move position 0 px 0 px
-
-exec_always ~/.config/waybar/waybar.sh
diff --git a/.config/waybar/config b/.config/waybar/config
deleted file mode 100644
index 9d3deb3..0000000
--- a/.config/waybar/config
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-    "layer": "bottom",
-    "position": "bottom",
-    "height": 24,
-    "modules-left": ["sway/workspaces", "sway/mode"],
-    "modules-center": [""],
-    "modules-right": ["mpd", "network", "idle_inhibitor", "battery", "custom/storage", "cpu", "memory", "custom/weather", "tray", "clock"],
-    "sway/mode": {
-        "format": " {}"
-    },
-    "sway/workspaces": {
-        "format": "{name}",
-        "disable-scroll": true
-    },
-    "clock": {
-        "format": "{:%a, %b %d | %H:%M}",
-        "tooltip": true,
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-    },
-    "battery": {
-        "format": "| {capacity}% {icon} | ",
-        "format-alt": "{time} {icon}",
-        "format-icons": ["", "", "", "", ""],
-        "format-charging": "{capacity}% CHR",
-        "interval": 30,
-        "states": {
-            "warning": 25,
-            "critical": 10
-        },
-        "tooltip": false
-    },
-    "network": {
-        "interface": "wlp2s0",
-        "format": "{ifname}",
-        "format-wifi": "{essid} ({signalStrength}%) | ",
-        "format-ethernet": "{ifname} ",
-        "format-disconnected": "", //An empty format will hide the module.
-        "tooltip-format": "{ifname}",
-        "tooltip-format-wifi": "{essid} ({signalStrength}%) ",
-        "tooltip-format-ethernet": "{ifname} ",
-        "tooltip-format-disconnected": "Disconnected",
-        "on-click": "alacritty -e nmtui",
-        "tooltip": false
-    },
-    "pulseaudio": {
-        "format": "{icon}",
-        "format-alt": "{volume} {icon} | ",
-        "format-alt-click": "click-right",
-        "format-muted": "",
-        "format-icons": {
-            "phone": [" ", " ", " ", " "],
-            "default": ["", "", "", ""]
-        },
-        "scroll-step": 10,
-        "on-click": "pavucontrol",
-        "tooltip": false
-    },
-    "mpd": {
-        "format": "{stateIcon} {artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) | ",
-        "format-disconnected": "Disconnected ",
-        "format-stopped": "Stopped ",
-        "interval": 2,
-        "state-icons": {
-            "paused": "",
-            "playing": ""
-        },
-        "tooltip": false,
-        "on-click": "mpc toggle",
-        "on-click-right": "mpc next"
-    },
-    "custom/storage": {
-        "format": "{}   |",
-        "format-alt": "{percentage}% ",
-        "format-alt-click": "click-right",
-        "return-type": "json",
-        "interval": 60,
-        "exec": "$HOME/.config/waybar/modules/storage.sh"
-    },
-    "backlight": {
-        "format": "{icon}",
-        "format-alt": "{percent}% {icon} | ",
-        "format-alt-click": "click-right",
-        "format-icons": ["", ""],
-        "on-scroll-down": "light -A 1",
-        "on-scroll-up": "light -U 1"
-    },
-    "custom/weather": {
-        "format": "{} |",
-        "format-alt": "{alt}: {}",
-        "format-alt-click": "click-right",
-        "interval": 1800,
-        "return-type": "json",
-        "exec": "$HOME/.config/waybar/modules/weather.sh",
-        "exec-if": "ping wttr.in -c1"
-    },
-    "idle_inhibitor": {
-        "format": "{icon}",
-        "format-icons": {
-            "activated": "",
-            "deactivated": ""
-        },
-        "tooltip": false
-    },
-    "cpu": {
-        "format": "{usage}%  | ",
-        "tooltip": false
-    },
-    "memory": {
-        "format": "{used:0.1f}G/{total:0.1f}G | "
-    },
-    "tray": {
-        "icon-size": 14
-    }
-}
diff --git a/.config/waybar/modules/storage.sh b/.config/waybar/modules/storage.sh
deleted file mode 100755
index d495da4..0000000
--- a/.config/waybar/modules/storage.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-mount="/"
-warning=20
-critical=10
-
-df -h -P -l "$mount" | awk -v warning=$warning -v critical=$critical '
-/\/.*/ {
-  text=$4
-  tooltip="Filesystem: "$1"\rSize: "$2"\rUsed: "$3"\rAvail: "$4"\rUse%: "$5"\rMounted on: "$6
-  use=$5
-  exit 0
-}
-END {
-  class=""
-  gsub(/%$/,"",use)
-  if ((100 - use) < critical) {
-      class="critical"
-  } else if ((100 - use) < warning) {
-      class="warning"
-  }
-  print "{\"text\":\""text"\", \"percentage\":"use",\"tooltip\":\""tooltip"\", \"class\":\""class"\"}"
-}
-            '
diff --git a/.config/waybar/modules/weather.sh b/.config/waybar/modules/weather.sh
deleted file mode 100755
index d64acd0..0000000
--- a/.config/waybar/modules/weather.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-w=$(curl -s wttr.in/ahn?format="%l:+%c+%t+%C+%w+%h+%m")
-w=${w:7}
-w="$(echo -e "${w}" | sed -e 's/^[[:space:]]*//')"
-m=$(python ~/bin/moonphase-waybar.py)
-echo "{\"text\":\""$w ""$m"\", \"tooltip\":\""tooltip"\", \"class\":\""lxf-weather"\"}"
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
deleted file mode 100644
index e05c395..0000000
--- a/.config/waybar/style.css
+++ /dev/null
@@ -1,71 +0,0 @@
-* {
-    border:        none;
-    border-radius: 0;
-    font-family:   Sans;
-    font-size:     15px;
-    box-shadow:    none;
-    text-shadow:   none;
-    transition-duration: 0s;
-}
-
-window {
-    color:      rgba(217, 216, 216, 1);
-    background: rgba(35, 31, 32, 0.00);
-}
-
-window#waybar.solo {
-    color:      rgba(217, 216, 216, 1);
-    background: rgba(35, 31, 32, 0.85);
-}
-
-#workspaces {
-    margin: 0 5px;
-}
-
-#workspaces button {
-    padding:    0 5px;
-    color:      rgba(217, 216, 216, 0.4);
-}
-
-#workspaces button.visible {
-    color:      rgba(217, 216, 216, 1);
-}
-
-#workspaces button.focused {
-    border-top: 3px solid rgba(217, 216, 216, 1);
-    border-bottom: 3px solid rgba(217, 216, 216, 0);
-}
-
-#workspaces button.urgent {
-    color:      rgba(238, 46, 36, 1);
-}
-
-#mode, #battery, #cpu, #memory, #network, #pulseaudio, #idle_inhibitor, #backlight, #custom-storage, #custom-spotify, #custom-weather, #custom-mail {
-    margin:     0px 6px 0px 10px;
-    min-width:  25px;
-}
-
-#clock {
-    margin:     0px 4px 0px 6px;
-    min-width:  140px;
-}
-
-#battery.warning {
-   color:       rgba(255, 210, 4, 1);
-}
-
-#battery.critical {
-    color:      rgba(238, 46, 36, 1);
-}
-
-#battery.charging {
-    color:      rgba(217, 216, 216, 1);
-}
-
-#custom-storage.warning {
-    color:      rgba(255, 210, 4, 1);
-}
-
-#custom-storage.critical {
-    color:      rgba(238, 46, 36, 1);
-}
diff --git a/.config/waybar/waybar.sh b/.config/waybar/waybar.sh
deleted file mode 100755
index 720620c..0000000
--- a/.config/waybar/waybar.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env sh
-
-# Terminate already running bar instances
-killall -q waybar
-
-# Wait until the processes have been shut down
-while pgrep -x waybar >/dev/null; do sleep 1; done
-
-# Launch main
-waybar
diff --git a/.mbsyncrc b/.mbsyncrc
new file mode 100644
index 0000000..91d1fa3
--- /dev/null
+++ b/.mbsyncrc
@@ -0,0 +1,22 @@
+IMAPAccount personal
+# Address to connect to
+Host echo.mxrouting.net
+Port 993
+User sng@luxagraf.net 
+Pass LAv['q_N:|Mn<?)-6MfIK]3=M
+SSLType IMAPS
+
+IMAPStore personal-remote
+account personal
+
+MaildirStore personal-local
+Subfolders Verbatim
+Path ~/.mail/
+Inbox ~/.mail/INBOX
+
+Channel personal
+Far :personal-remote:
+Near :personal-local:
+Patterns *
+Create Both
+SyncState *
diff --git a/.msmtprc b/.msmtprc
index cfaaeb5..842b234 100644
--- a/.msmtprc
+++ b/.msmtprc
@@ -19,3 +19,4 @@ user wired@scottgilbertson.net
 passwordeval "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/wired@scottgilbertson.net.gpg"
 
 account default : personal
+
diff --git a/.mutt/mutt-colors-solarized-dark-16.muttrc b/.mutt/mutt-colors-solarized-dark-16.muttrc
index e9d6def..d499e3a 100644
--- a/.mutt/mutt-colors-solarized-dark-16.muttrc
+++ b/.mutt/mutt-colors-solarized-dark-16.muttrc
@@ -41,7 +41,9 @@ mono  bold          bold
 mono  underline     underline
 mono  indicator     reverse
 mono  error         bold
-
+color normal default default
+color normal yellow default
+color normal default default
 # index ----------------------------------------------------------------
 
 #color index         red             default         "~D(!~p|~p)"               # deleted
@@ -120,8 +122,6 @@ color body          cyan            default         "(Good signature)"
 color body          brightblack     default         "^gpg: Good signature .*"
 color body          brightyellow    default         "^gpg: "
 color body          brightyellow    red             "^gpg: BAD signature from.*"
-mono  body          bold                            "^gpg: Good signature"
-mono  body          bold                            "^gpg: BAD signature from.*"
 
 # yes, an insance URL regex
 color body          red             default         "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
@@ -149,3 +149,12 @@ color body          red             default         "([a-z][a-z0-9+-]*://(((([a-
 #folder-hook gmail/inbox        "color status        J_black         yellow          "
 #folder-hook gmail/important    "color status        J_black         yellow          "
 
+color body blue default "[\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+" # Email addresses
+color body brightblue default "(https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+" # URL
+color body green default "\`[^\`]*\`" # Green text between ` and `
+color body brightblue default "^# \.*" # Headings as bold blue
+color body brightcyan default "^## \.*" # Subheadings as bold cyan
+color body brightgreen default "^### \.*" # Subsubheadings as bold green
+color body yellow default "^(\t| )*(-|\\*) \.*" # List items as yellow
+color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
+
diff --git a/.mutt/muttrc b/.mutt/muttrc
index da04d60..ee7f6ba 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -1,5 +1,5 @@
 # Paths ----------------------------------------------
-set folder           = ~/mail                # mailbox location
+set folder           = ~/.mail                # mailbox location
 #set alias_file       = ~/.mutt/alias         # where to store aliases
 set header_cache     = ~/.mutt/cache/headers # where to store headers
 set message_cachedir = ~/.mutt/cache/bodies  # where to store bodies
@@ -63,8 +63,8 @@ bind index <space>  collapse-thread
 macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
 
 # Sync email
-macro index O "<shell-escape>offlineimap<enter>"           "run offlineimap to sync all mail"
-macro index i "<shell-escape>offlineimap -qf INBOX<enter>" "run offlineimap to sync inbox"
+macro index O "<shell-escape>mbsync personal<enter>" "run mbsync to sync all mail"
+macro index o "<shell-escape>mbsync personal:INBOX<enter>" "run mbsync to sync inbox"
 
 # Saner copy/move dialogs
 # macro index C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
@@ -72,11 +72,11 @@ macro index M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
 
 # Gmail style archiving and starring
 macro index,pager a "<save-message>=Archive<enter><sync-mailbox>" "Archive"
-macro index,pager s "<save-message>=starred<enter><sync-mailbox>" "Starred"
+macro index,pager s "<save-message>=Starred<enter><sync-mailbox>" "Starred"
 macro index,pager gi "<change-folder>=INBOX<enter>" "Go to inbox"
 macro index,pager ga "<change-folder>=Archive<enter>" "Go to all mail"
 macro index,pager gb "<change-folder>=Bookmarks<enter>" "Go to Bookmarks"
-#macro index,pager gs "<change-folder>=starred<enter>" "Go to starred messages"
+macro index,pager gt "<change-folder>=Starred<enter>" "Go to starred messages"
 macro index,pager gs "<change-folder>=Sent<enter>" "Go to starred messages"
 #Save a message to my notes folder
 macro index,pager N "<pipe-message>~/bin/mqq.sh " 
@@ -157,8 +157,8 @@ macro index <F9> "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt
 #macro generic,index,pager \ca "<shell-escape>abook<return>" "launch abook"
 macro index,pager A "<pipe-message>abook --add-email<return>" "add the sender address to abook"
 
-set spoolfile = "+personal/INBOX"
+set spoolfile = "+INBOX"
 source ~/.mutt/personal
 
-folder-hook personal/* source ~/.mutt/personal
+#folder-hook personal/* source ~/.mutt/personal
 #folder-hook wired/*     source ~/.mutt/work
diff --git a/.mutt/offlineimap.py b/.mutt/offlineimap.py
index f84b6bc..a885aef 100644
--- a/.mutt/offlineimap.py
+++ b/.mutt/offlineimap.py
@@ -3,3 +3,5 @@ from subprocess import check_output
 
 def get_password(account):
     return check_output("pass " + account, shell=True).splitlines()[0]
+
+
diff --git a/.mutt/personal b/.mutt/personal
index 748b1bf..e90d825 100644
--- a/.mutt/personal
+++ b/.mutt/personal
@@ -1,5 +1,6 @@
 set from = "sng@luxagraf.net"
-set folder = ~/mail/personal
+set reverse_name = yes
+set folder = ~/.mail
 set sendmail = "/usr/bin/msmtp -a personal"
 set sendmail_wait = 0
 set trash = "+Trash"
@@ -7,7 +8,7 @@ set mbox = "+Archive"
 set postponed = "+Drafts"
 set record="+Sent"
 # Alternate email addresses.
-alternates "luxagraf@gmail.com"
+alternates "wired@scottgilbertson.net"
 
 # Mailboxes to show
 mailboxes =INBOX \
diff --git a/.mutt/work b/.mutt/work
new file mode 100644
index 0000000..e0578cd
--- /dev/null
+++ b/.mutt/work
@@ -0,0 +1,19 @@
+set from = "wired@scottgilbertson.net"
+set folder = ~/mail/wired
+set sendmail = "/usr/bin/msmtp -a work"
+set trash = "+Trash"
+set mbox = "+Archive"
+set postponed = "+Drafts"
+set record="+Sent"
+# Alternate email addresses.
+alternates "scott_gilbertson@wired.com"
+
+# Mailboxes to show
+mailboxes =INBOX \
+          +Archive \
+          +Trash \
+          +Sent \
+          +Drafts \
+          +temporary/search \
+
+
diff --git a/.newsboat/config b/.newsboat/config
index ea42dd5..3507a3e 100644
--- a/.newsboat/config
+++ b/.newsboat/config
@@ -16,13 +16,16 @@ bind-key g home
 bind-key G end
 
 #macro y set browser "mpv %u" ; open-in-browser ; set browser "browser %u"
-
+macro y set browser "tsp yt-dlp %u"; open-in-browser ; set browser "$BROWSER %u"
+macro d set browser "yt-dlp %u &"; open-in-browser-noninteractively; set browser $BROWSER
+confirm-mark-all-feeds-read no
+confirm-mark-feed-read no
 download-full-page yes 
 confirm-exit yes
 #browser "~/bin/open-in-pane"
-browser "$BROWSER"
-#browser "qutebrowser -l critical "
-#browser "xvivaldi-snap %u"
+browser ~/bin/newsboat-browser.sh
+#browser "$BROWSER"
+#browser "xvivaldi-stable & >> /dev/null "
 #browser "firefox-developer-edition"
 bind-key v open-in-browser-and-mark-read 
 #bind-key o open-in-browser-and-mark-read 
diff --git a/.newsboat/history.cmdline b/.newsboat/history.cmdline
new file mode 100644
index 0000000..2935811
--- /dev/null
+++ b/.newsboat/history.cmdline
@@ -0,0 +1,2 @@
+q
+q
diff --git a/.tmux/dev-ccg b/.tmux/dev-ccg
new file mode 100644
index 0000000..490802b
--- /dev/null
+++ b/.tmux/dev-ccg
@@ -0,0 +1,5 @@
+neww -n '' 
+splitw -h -p 36
+send "cd ~/sites/cumuluslearning.net/ && lxc exec ccg -- su - lxf" enter #open vim
+selectp -t 1 # select the original pane
+send "cd ~/sites/cumuluslearning.net/ && v" enter #open vim
diff --git a/.tmux/dev-lbh b/.tmux/dev-lbh
new file mode 100644
index 0000000..4010e3f
--- /dev/null
+++ b/.tmux/dev-lbh
@@ -0,0 +1,5 @@
+neww -n '' 
+splitw -h -p 36
+send "cd ~/sites/libregraf.net/ && lxc exec lbh -- su - lxf" enter #open vim
+selectp -t 1 # select the original pane
+send "cd ~/sites/libregraf.net/ && v" enter #open vim
diff --git a/.tmux/dev_ b/.tmux/dev_
new file mode 100644
index 0000000..e18f035
--- /dev/null
+++ b/.tmux/dev_
@@ -0,0 +1,5 @@
+neww -n '' 
+splitw -h -p 36
+send "cd ~/sites/luxagraf.net/ && lxc exec lxf -- su - lxf" enter #open vim
+selectp -t 1 # select the original pane
+send "cd ~/sites/luxagraf.net/ && v" enter #open vim
diff --git a/.tmux/write-wire b/.tmux/write-wire
index da7c7bd..e2c5cb9 100644
--- a/.tmux/write-wire
+++ b/.tmux/write-wire
@@ -3,4 +3,4 @@ rename-window "wir"
 splitw -h -p 22
 selectp -t 1 # select the original pane
 splitw -h -p 69
-send "cd ~/writing/conde/wired/ && v wired.txt" enter #open vim
+send "cd ~/work/wired/ && v wired.txt" enter #open vim
diff --git a/.vim/.netrwhist b/.vim/.netrwhist
new file mode 100644
index 0000000..c1508ba
--- /dev/null
+++ b/.vim/.netrwhist
@@ -0,0 +1,5 @@
+let g:netrw_dirhistmax  =10
+let g:netrw_dirhistcnt =3
+let g:netrw_dirhist_3='/home/lxf/.dotfiles/.config/ranger'
+let g:netrw_dirhist_2='/home/lxf/.config/ranger'
+let g:netrw_dirhist_1='/home/lxf/.dotfiles/.config/qutebrowser'
diff --git a/.vimrc b/.vimrc
index d119ace..3343717 100644
--- a/.vimrc
+++ b/.vimrc
@@ -67,8 +67,7 @@ let @a ='Sr%a()h'
 let @s ='Sr%a(){: rel=nofollow}17h'
 " email signature:
 let @c ='icheers 
Scott Gilbertson 
sng@luxagraf.net '
-let @w ='icheers 
Scott Gilbertson 
scott_gilbertson@condenast.com'
-
+let @w ='i

cheers 
Scott Gilbertson
--
<wired@scottgilbertson.net>
<scott_gilbertson@wired.com>
<https://www.wired.com/author/scott-gilbertson/>'
 let @t ='iThank you for your help.

'
 let @h ="iHello, my name is Scott Gilbertson and and I am a product writer with WIRED's Gear team. I am reaching out because we're working on an article about "
 let @b ='tag=w050b-20'
@@ -76,6 +75,7 @@ let @n ='tag=wirednl-20'
 let @d ='<div class="cluster">
<span class="row-2">
</span>
</div>'
 " get rid of line breaks in paragraphs
 let @p ='g/^./ .,/^$/-1 join'
+let @v='/a bit|a little|sort of|kind of|rather|quite|very|too|pretty much'
 " }}}
 " Convenience mappings {{{
 
diff --git a/apps.txt b/apps.txt
index b80c241..272721c 100644
--- a/apps.txt
+++ b/apps.txt
@@ -1,137 +1,77 @@
-abiword
-abook
-acpi
-acpi_call
-adbfs-git
-alacritty
 alsa-tools
-alsa-utils
-android-file-transfer
-archey3
+arc-icon-theme
 atool
-awesome-terminal-fonts-git
 base
-bat
-blueman
-bluez-utils
-breeze
-breeze-gtk
-brother-hll2390dw
+brightnessctl
 calc
 calibre
-chromium
-clipman
+clipmenu
 darktable
-dcraw
-dhcpcd
-espeak
-exfat-utils
 feh
-firefox-developer-edition
 fzf
 gedit
 gimp-plugin-saveforweb
 gnome-keyring
-gnumeric
 grim
-gsimplecal
-gvfs-afc
-gvfs-gphoto2
-hplip
+gvim
 htop
-hwinfo
-imv
-inkscape
-intel-media-driver
-interception-caps2esc
-jpegoptim
+intel-ucode
+isync
+jgmenu
 kdenlive
-kitty
-krathalans-waybar-modules
+khard
+krita
 libreoffice-still
-light-git
+linux
 linux-firmware
-linux-headers
-lwks-beta
+lsof
+lxappearance
 lxd
 mako
-man-db
-masterpdfeditor-free
-mp3splt
-mpc
-mpd
 mpv
 msmtp
 mutt
 ncdu
-ncmpcpp
-neovim
+network-manager-applet
 newsboat
 nextcloud-client
-nmap
-notmuch
 notmuch-mutt
-nss-mdns
-offlineimap
-oxygen
-oxygen-icons
-pandoc
+obconf
+odt2txt
+openbox-arc-git
+otf-font-awesome
 pass-clip
 pavucontrol
-pcmanfm-qt
-pdfjs
-pianobar
-picard
-powertop
-pulseaudio-ctl
-qutebrowser
+psuinfo
+pulseaudio
+python-adblock
+python-pyalsa
 ranger-git
-rclone
-recordmydesktop
-remmina
+redshift-minimal
 ripgrep
-s3cmd
-sassc
+rxvt-unicode
 scrot
-sdcv
-signal-desktop
-simple-mtpfs
-simplescreenrecorder
-skypeforlinux-stable-bin
-slack-desktop
-slurp
-sway
-swayidle
-swaylock
-system-config-printer
+tastyworks
+thunar
 tint2
-tlp
 tmux
 transmission-gtk
-trash-cli
 ttf-hack
-ttf-inconsolata
 ttf-roboto
-ttf-ubuntu-font-family
-ttf-dejavu
 unrar
 unzip
 urlscan
+vdirsyncer
 vi
-virtualbox
-virtualbox-guest-iso
 vivaldi-snapshot
-vnstat
 w3m
-waybar
-wl-clipboard-x11
-wf-recorder
-whois
-wofi
-xorg-server-xwayland
-xorg-xeyes
+xcape
+xclip
+xcompmgr
+xorg-server
+xorg-xinit
+xorg-xinput
 yay
-youtube-dl
-zathura-pdf-mupdf
-zeal
-zoom
+yt-dlp
+zathura-pdf-poppler
+zip