Fix polybar.sh

After the last update, I started getting duplicated bars when using cloned
monitors.

This commit changes the polybar.sh script to use replace xrandr with a call to
`polybar --list-monitors`, which ignores cloned monitors by default.

.gitmodules

@@ -11,3 +11,6 @@
 [submodule "i3/.config/i3/i3blocks-contrib"]
 	path = i3/.config/i3/i3blocks-contrib
 	url = https://github.com/vivien/i3blocks-contrib.git
+[submodule "zsh/.zprezto-contrib/fzf-z"]
+	path = zsh/.zprezto-contrib/fzf-z
+	url = git@github.com:andrewferrier/fzf-z.git

Xsession/.profile

@@ -24,3 +24,9 @@ fi
 if [ -f $HOME/.Xmodmap ]; then
     /usr/bin/xmodmap $HOME/.Xmodmap 2>/dev/null &
 fi
+
+export PATH="$HOME/.cargo/bin:$PATH"
+
+#https://superuser.com/questions/114895/improve-man-page-search/114903#114903
+# saner defaults for LESS (and bat)
+export LESS="-iMRj4a"

Xsession/.xprofile

@@ -2,6 +2,8 @@
 setxkbmap "us,es" "altgr-intl," -option "ctrl:nocaps,grp:shift_toggle,terminate:ctrl_alt_bksp"
 #xmodmap ~/.Xmodmap
 #source ~/.xinitrc
-export XTERMINAL=termite
-export TERMINAL=termite
-export TERMCMD=termite
+export XTERMINAL=alacritty
+export TERMINAL=alacritty
+export TERMCMD=alacritty
+export BROWSER2=chromium
+export BROWSER=firefox

alacritty/.config/alacritty/alacritty.yml

@@ -0,0 +1,633 @@
+# 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: alacritty
+
+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
+
+  # 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
+   y: 15
+
+  # 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.
+  #history: 10000
+
+  # Number of lines the viewport will move for every line scrolled when
+  # scrollback is enabled (history > 0).
+  #multiplier: 3
+
+# Font configuration
+font:
+  # Normal (roman) font face
+  normal:
+    # Font family
+    #
+    # Default:
+    #   - (macOS) Menlo
+    #   - (Linux/BSD) monospace
+    #   - (Windows) Consolas
+    # family: MesloLGS NF
+    # family: Hack
+    family: DejaVu Sans Mono
+
+    # The `style` can be specified to pick a specific face.
+    style: Regular
+
+  # Bold font face
+  #bold:
+    # 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
+
+  # Italic font face
+  #italic:
+    # 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
+
+  # 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: 11.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:
+  #  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: false
+
+# Colors (Tomorrow Night Bright)
+#colors:
+  # Default colors
+  #primary:
+  #  background: '#000000'
+  #  foreground: '#eaeaea'
+
+    # 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'
+    #bright_foreground: '#ffffff'
+
+  # Cursor colors
+  #
+  # 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: '#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: '#404040'
+
+  # Normal colors
+  #normal:
+  #  black:   '#000000'
+  #  red:     '#d54e53'
+  #  green:   '#b9ca4a'
+  #  yellow:  '#e6c547'
+  #  blue:    '#7aa6da'
+  #  magenta: '#c397d8'
+  #  cyan:    '#70c0ba'
+  #  white:   '#eaeaea'
+
+  # Bright colors
+  #bright:
+  #  black:   '#666666'
+  #  red:     '#ff3334'
+  #  green:   '#9ec400'
+  #  yellow:  '#e7c547'
+  #  blue:    '#7aa6da'
+  #  magenta: '#b77ee0'
+  #  cyan:    '#54ced6'
+  #  white:   '#ffffff'
+
+  # 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.
+  #
+  # Example:
+  #   `- { index: 16, color: '#ff00ff' }`
+  #
+  #indexed_colors: []
+
+# 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.
+#visual_bell:
+#  animation: EaseOutExpo
+#  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: 1.0
+
+#selection:
+  #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"
+
+  # When set to `true`, selected text will be copied to the primary clipboard.
+  #save_to_clipboard: false
+
+# Allow terminal applications to change Alacritty's window title.
+#dynamic_title: true
+
+#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/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. For example, this is the
+# default paste binding:
+#
+# `- { key: V, mods: Control|Shift, action: Paste }`
+#
+# Each key binding will specify a:
+#
+# - `key`: Identifier of the key pressed
+#
+#    - A-Z
+#    - F1-F24
+#    - Key0-Key9
+#
+#    A full list with available key codes can be found here:
+#    https://docs.rs/glutin/*/glutin/event/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`.
+#
+# 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
+#
+#   - Copy
+#   - Paste
+#   - PasteSelection
+#   - IncreaseFontSize
+#   - DecreaseFontSize
+#   - ResetFontSize
+#   - ScrollPageUp
+#   - ScrollPageDown
+#   - ScrollLineUp
+#   - ScrollLineDown
+#   - ScrollToTop
+#   - ScrollToBottom
+#   - ClearHistory
+#   - Hide
+#   - Minimize
+#   - Quit
+#   - ToggleFullscreen
+#   - SpawnNewInstance
+#   - ClearLogNotice
+#   - ReceiveChar
+#   - None
+#
+#   (macOS only):
+#   - ToggleSimpleFullscreen: Enters fullscreen without occupying another space
+#
+# - `command`: Fork and execute a specified command plus arguments
+#
+#    The `command` field must be a map containing a `program` string and an
+#    `args` array of command line parameter strings. For example:
+#       `{ 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:
+  # (Windows, Linux, and BSD only)
+  - { key: Return,   mods: Control|Shift, action: SpawnNewInstance }
+  - { key: V,        mods: Control|Shift, 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: Plus,      mods: Control,       action: IncreaseFontSize }
+  - { key: Minus, mods: Control,       action: DecreaseFontSize }
+  - { key: Minus,    mods: Control,       action: DecreaseFontSize }
+
+  # (Windows only)
+  #- { 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: Command,         action: Paste            }
+  #- { key: C,      mods: Command,         action: Copy             }
+  #- { key: H,      mods: Command,         action: Hide             }
+  #- { key: M,      mods: Command,         action: Minimize         }
+  #- { 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: PageUp,    mods: Shift,   action: ScrollPageUp,   mode: ~Alt       }
+  #- { key: PageDown,  mods: Shift,   action: ScrollPageDown, mode: ~Alt       }
+  #- { key: Home,      mods: Shift,   action: ScrollToTop,    mode: ~Alt       }
+  #- { key: End,       mods: Shift,   action: ScrollToBottom, mode: ~Alt       }
+
+#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
+
+# Base16-tomorrow-night
+colors:
+  # Default colors
+  primary:
+    background: '0x1d1f21'
+    foreground: '0xc5c8c6'
+
+  # Colors the cursor will use if `custom_cursor_colors` is true
+  cursor:
+    text: '0x1d1f21'
+    cursor: '0xc5c8c6'
+
+  # Normal colors
+  normal:
+    black:   '0x1d1f21'
+    red:     '0xcc6666'
+    green:   '0xb5bd68'
+    yellow:  '0xf0c674'
+    blue:    '0x81a2be'
+    magenta: '0xb294bb'
+    cyan:    '0x8abeb7'
+    white:   '0xc5c8c6'
+
+  # Bright colors
+  bright:
+    black:   '0x969896'
+    red:     '0xde935f'
+    green:   '0x282a2e'
+    yellow:  '0x373b41'
+    blue:    '0xb4b7b4'
+    magenta: '0xe0e0e0'
+    cyan:    '0xa3685a'
+    white:   '0xffffff'
+
+draw_bold_text_with_bright_colors: true
+
+
+## base16-Atelier-dune
+#colors:
+#  # Default colors
+#  primary:
+#    background: '0x20201d'
+#    foreground: '0xa6a28c'
+#  # Colors the cursor will use if `custom_cursor_colors` is true
+#  cursor:
+#    text: '0x20201d'
+#    cursor: '0xa6a28c'
+#  # Normal colors
+#  normal:
+#    black:   '0x20201d'
+#    red:     '0xd73737'
+#    green:   '0x60ac39'
+#    yellow:  '0xae9513'
+#    blue:    '0x6684e1'
+#    magenta: '0xb854d4'
+#    cyan:    '0x1fad83'
+#    white:   '0xa6a28c'
+#  # Bright colors
+#  bright:
+#    black:   '0x7d7a68'
+#    red:     '0xb65611'
+#    green:   '0x292824'
+#    yellow:  '0x6e6b5e'
+#    blue:    '0x999580'
+#    magenta: '0xe8e4cf'
+#    cyan:    '0xd43552'
+#    white:   '0xfefbec'
+#draw_bold_text_with_bright_colors: false

emacs/.emacs.d/init.el

@@ -13,15 +13,25 @@
 
 (setq quelpa-checkout-melpa-p nil)
 
-(unless (require 'quelpa nil t)
-  (with-temp-buffer
-    (url-insert-file-contents "https://raw.github.com/quelpa/quelpa/master/bootstrap.el")
-	    (eval-buffer)))
+(unless (package-installed-p 'quelpa)
+    (with-temp-buffer
+      (url-insert-file-contents "https://github.com/quelpa/quelpa/raw/master/quelpa.el")
+      (eval-buffer)
+      (quelpa-self-upgrade)))
 
-(quelpa 'use-package)
-                                        ;'(use-package
-                                        ;:fetcher github
-                                        ;:repo "quelpa/quelpa-use-package"))
+(require 'quelpa nil t)
+
+(unless (package-installed-p 'use-package)
+  (package-refresh-contents)
+  (package-install 'use-package))
+
+(eval-when-compile
+  (require 'use-package))
+
+;;(quelpa 'use-package)
+;;                                        ;'(use-package
+;;                                        ;:fetcher github
+;;                                        ;:repo "quelpa/quelpa-use-package"))
 (require 'use-package)
 (quelpa
  '(quelpa-use-package

emacs/.spacemacs

@@ -31,6 +31,8 @@ values."
    ;; List of configuration layers to load.
    dotspacemacs-configuration-layers
    '(
+     docker
+     rust
      typescript
      (auto-completion :variables
                       auto-completion-return-key-behavior 'complete
@@ -89,7 +91,9 @@ values."
    ;; A list of packages that cannot be updated.
    dotspacemacs-frozen-packages '()
    ;; A list of packages that will not be installed and loaded.
-   dotspacemacs-excluded-packages '()
+   dotspacemacs-excluded-packages '(
+                                    smartparens
+                                    )
    ;; Defines the behaviour of Spacemacs when installing packages.
    ;; Possible values are `used-only', `used-but-keep-unused' and `all'.
    ;; `used-only' installs only explicitly used packages and uninstall any
@@ -158,18 +162,20 @@ values."
    ;; Press <SPC> T n to cycle to the next theme in the list (works great
    ;; with 2 themes variants, one dark and one light)
    dotspacemacs-themes '(
+                         sanityinc-tomorrow-night
+                         monokai
                          leuven
                          spacemacs-dark
                          minimal-light
                          tango-plus
                          dichromacy
                          ample
-                         sanityinc-tomorrow-night)
+                         )
    ;; If non nil the cursor color matches the state color in GUI Emacs.
    dotspacemacs-colorize-cursor-according-to-state t
    ;; Default font, or prioritized list of fonts. `powerline-scale' allows to
    ;; quickly tweak the mode-line size to make separators look not too crappy.
-   dotspacemacs-default-font '("DejaVu Sans Mono"
+   dotspacemacs-default-font '("Hack"
                                :size 14
                                :weight normal
                                :width normal :powerline-scale 1.5)
@@ -301,7 +307,7 @@ values."
    dotspacemacs-folding-method 'evil
    ;; If non-nil smartparens-strict-mode will be enabled in programming modes.
    ;; (default nil)
-   dotspacemacs-smartparens-strict-mode nil
+   ;; dotspacemacs-smartparens-strict-mode nil
    ;; If non-nil pressing the closing parenthesis `)' key in insert mode passes
    ;; over any automatically added closing parenthesis, bracket, quote, etc…
    ;; This can be temporary disabled by pressing `C-q' before `)'. (default nil)
@@ -328,6 +334,15 @@ values."
    ;; (default nil)
    dotspacemacs-whitespace-cleanup nil
    latex-enable-auto-fill nil
+
+   undo-tree-visualizer-timestamps t
+   undo-tree-visualizer-diff t
+   ;; 10X bump of the undo limits to avoid issues with premature
+   ;; Emacs GC which truncages the undo history very aggresively
+   undo-limit 800000
+   undo-strong-limit 12000000
+   undo-outer-limit 120000000
+
    ))
 
 (defun dotspacemacs/user-init ()
@@ -379,20 +394,37 @@ you should place your code here."
  '(ansi-color-faces-vector
    [default bold shadow italic underline bold bold-italic bold])
  '(beacon-color "#cc6666")
+ '(compilation-message-face 'default)
  '(custom-safe-themes
-   (quote
-    ("c3d4af771cbe0501d5a865656802788a9a0ff9cf10a7df704ec8b8ef69017c68" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "190a9882bef28d7e944aa610aa68fe1ee34ecea6127239178c7ac848754992df" "3e335d794ed3030fefd0dbd7ff2d3555e29481fe4bbb0106ea11c660d6001767" "cc0dbb53a10215b696d391a90de635ba1699072745bf653b53774706999208e3" "ed317c0a3387be628a48c4bbdb316b4fa645a414838149069210b66dd521733f" "938d8c186c4cb9ec4a8d8bc159285e0d0f07bad46edf20aa469a89d0d2a586ea" "fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" "bffa9739ce0752a37d9b1eee78fc00ba159748f50dc328af4be661484848e476" default)))
+   '("a2cde79e4cc8dc9a03e7d9a42fabf8928720d420034b66aecc5b665bbf05d4e9" "cd4d1a0656fee24dc062b997f54d6f9b7da8f6dc8053ac858f15820f9a04a679" "a8245b7cc985a0610d71f9852e9f2767ad1b852c2bdea6f4aadc12cce9c4d6d0" "c3d4af771cbe0501d5a865656802788a9a0ff9cf10a7df704ec8b8ef69017c68" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "190a9882bef28d7e944aa610aa68fe1ee34ecea6127239178c7ac848754992df" "3e335d794ed3030fefd0dbd7ff2d3555e29481fe4bbb0106ea11c660d6001767" "cc0dbb53a10215b696d391a90de635ba1699072745bf653b53774706999208e3" "ed317c0a3387be628a48c4bbdb316b4fa645a414838149069210b66dd521733f" "938d8c186c4cb9ec4a8d8bc159285e0d0f07bad46edf20aa469a89d0d2a586ea" "fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" "bffa9739ce0752a37d9b1eee78fc00ba159748f50dc328af4be661484848e476" default))
  '(evil-want-Y-yank-to-eol nil)
  '(fci-rule-color "#373b41" t)
- '(flycheck-color-mode-line-face-to-color (quote mode-line-buffer-id))
- '(frame-background-mode (quote dark))
+ '(flycheck-color-mode-line-face-to-color 'mode-line-buffer-id)
+ '(frame-background-mode 'dark)
+ '(highlight-changes-colors '("#FD5FF0" "#AE81FF"))
+ '(highlight-tail-colors
+   '(("#3C3D37" . 0)
+     ("#679A01" . 20)
+     ("#4BBEAE" . 30)
+     ("#1DB4D0" . 50)
+     ("#9A8F21" . 60)
+     ("#A75B00" . 70)
+     ("#F309DF" . 85)
+     ("#3C3D37" . 100)))
+ '(magit-diff-use-overlays nil)
+ '(org-agenda-files '("~/sinpapel/Notes/daily.org"))
+ '(org-file-apps
+   '((auto-mode . emacs)
+     ("\\.mm\\'" . default)
+     ("\\.x?html?\\'" . default)
+     ("\\.pdf\\'" . "/usr/bin/evince %s")))
  '(package-selected-packages
-   (quote
-    (tide typescript-mode org-projectile-helm dracula-theme darktooth-theme cyberpunk-theme color-theme-sanityinc-tomorrow sesman apropospriate-theme anti-zenburn-theme ghub helm-gitlab gitlab company-quickhelp ag white-sand-theme rebecca-theme org-mime exotica-theme inkpot-theme heroku-theme hemisu-theme hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme gandalf-theme flatui-theme flatland-theme farmhouse-theme zenburn-theme zen-and-art-theme underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme toxi-theme tao-theme tangotango-theme tango-plus-theme tango-2-theme sunny-day-theme sublime-themes subatomic256-theme subatomic-theme spacegray-theme soothe-theme solarized-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme seti-theme reverse-theme railscasts-theme purple-haze-theme professional-theme planet-theme phoenix-dark-pink-theme phoenix-dark-mono-theme organic-green-theme omtose-phellack-theme oldlace-theme occidental-theme obsidian-theme noctilux-theme naquadah-theme mustang-theme monokai-theme monochrome-theme molokai-theme moe-theme minimal-theme material-theme majapahit-theme madhat2r-theme lush-theme light-soap-theme jbeans-theme jazz-theme ir-black-theme clojure-snippets clj-refactor inflections edn paredit peg cider-eval-sexp-fu cider seq queue clojure-mode nginx-mode auctex-latexmk company-auctex auctex csv-mode web-beautify livid-mode skewer-mode simple-httpd json-mode json-snatcher json-reformat js2-refactor multiple-cursors js2-mode js-doc company-tern dash-functional tern coffee-mode yaml-mode helm-company helm-c-yasnippet fuzzy company-web web-completion-data company-statistics company-go company-anaconda company auto-yasnippet yasnippet ac-ispell auto-complete web-mode tagedit slim-mode scss-mode sass-mode pug-mode less-css-mode helm-css-scss haml-mode emmet-mode smeargle orgit magit-gitflow helm-gitignore gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link evil-magit magit magit-popup xterm-color shell-pop org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-download multi-term mmm-mode markdown-toc markdown-mode htmlize gnuplot git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-commit with-editor git-gutter gh-md flyspell-correct-helm flyspell-correct flycheck-pos-tip pos-tip flycheck eshell-z eshell-prompt-extras esh-help diff-hl auto-dictionary yapfify pyvenv pytest pyenv-mode py-isort pip-requirements live-py-mode hy-mode helm-pydoc cython-mode anaconda-mode pythonic go-guru go-eldoc go-mode ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint info+ indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation hide-comnt help-fns+ helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed dash aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async)))
- '(vc-annotate-background nil)
+   '(dockerfile-mode docker tablist docker-tramp transient espresso-theme django-theme autothemer darkokai-theme darkmine-theme darkburn-theme dakrone-theme color-theme-sanityinc-solarized clues-theme lv parseedn parseclj a cherry-blossom-theme busybee-theme bubbleberry-theme birds-of-paradise-plus-theme badwolf-theme ample-zen-theme ample-theme alect-themes afternoon-theme toml-mode racer flycheck-rust cargo rust-mode tide typescript-mode org-projectile-helm dracula-theme darktooth-theme cyberpunk-theme color-theme-sanityinc-tomorrow sesman apropospriate-theme anti-zenburn-theme ghub helm-gitlab gitlab company-quickhelp ag white-sand-theme rebecca-theme org-mime exotica-theme inkpot-theme heroku-theme hemisu-theme hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme gandalf-theme flatui-theme flatland-theme farmhouse-theme zenburn-theme zen-and-art-theme underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme toxi-theme tao-theme tangotango-theme tango-plus-theme tango-2-theme sunny-day-theme sublime-themes subatomic256-theme subatomic-theme spacegray-theme soothe-theme solarized-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme seti-theme reverse-theme railscasts-theme purple-haze-theme professional-theme planet-theme phoenix-dark-pink-theme phoenix-dark-mono-theme organic-green-theme omtose-phellack-theme oldlace-theme occidental-theme obsidian-theme noctilux-theme naquadah-theme mustang-theme monokai-theme monochrome-theme molokai-theme moe-theme minimal-theme material-theme majapahit-theme madhat2r-theme lush-theme light-soap-theme jbeans-theme jazz-theme ir-black-theme clojure-snippets clj-refactor inflections edn paredit peg cider-eval-sexp-fu cider seq queue clojure-mode nginx-mode auctex-latexmk company-auctex auctex csv-mode web-beautify livid-mode skewer-mode simple-httpd json-mode json-snatcher json-reformat js2-refactor multiple-cursors js2-mode js-doc company-tern dash-functional tern coffee-mode yaml-mode helm-company helm-c-yasnippet fuzzy company-web web-completion-data company-statistics company-go company-anaconda company auto-yasnippet yasnippet ac-ispell auto-complete web-mode tagedit slim-mode scss-mode sass-mode pug-mode less-css-mode helm-css-scss haml-mode emmet-mode smeargle orgit magit-gitflow helm-gitignore gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link evil-magit magit magit-popup xterm-color shell-pop org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-download multi-term mmm-mode markdown-toc markdown-mode htmlize gnuplot git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-commit with-editor git-gutter gh-md flyspell-correct-helm flyspell-correct flycheck-pos-tip pos-tip flycheck eshell-z eshell-prompt-extras esh-help diff-hl auto-dictionary yapfify pyvenv pytest pyenv-mode py-isort pip-requirements live-py-mode hy-mode helm-pydoc cython-mode anaconda-mode pythonic go-guru go-eldoc go-mode ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint info+ indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation hide-comnt help-fns+ helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed dash aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async))
+ '(pos-tip-background-color "#FFFACE")
+ '(pos-tip-foreground-color "#272822")
+ '(vc-annotate-background nil)          ;
  '(vc-annotate-color-map
-   (quote
-    ((20 . "#cc6666")
+   '((20 . "#cc6666")
      (40 . "#de935f")
      (60 . "#f0c674")
      (80 . "#b5bd68")
@@ -409,8 +441,11 @@ you should place your code here."
      (300 . "#cc6666")
      (320 . "#de935f")
      (340 . "#f0c674")
-     (360 . "#b5bd68"))))
- '(vc-annotate-very-old-color nil))
+     (360 . "#b5bd68")))
+ '(vc-annotate-very-old-color nil)
+ '(vc-follow-symlinks t)
+ '(weechat-color-list
+   '(unspecified "#272822" "#3C3D37" "#F70057" "#F92672" "#86C30D" "#A6E22E" "#BEB244" "#E6DB74" "#40CAE4" "#66D9EF" "#FB35EA" "#FD5FF0" "#74DBCD" "#A1EFE4" "#F8F8F2" "#F8F8F0")))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

git/.gitconfig

@@ -22,3 +22,5 @@ lg = !"git lg1"
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
+[pull]
+	rebase = false

i3/.config/i3/config

@@ -23,7 +23,7 @@ floating_modifier $mod
 #bindsym $mod+Return exec --no-startup-id i3-one-tmux
 bindsym $mod+Return [title="^scratch"] scratchpad show
 bindsym Control+Mod1+t exec --no-startup-id i3-sensible-terminal
-bindsym Control+Mod1+Shift+t exec --no-startup-id i3-sensible-terminal --title=scratch -e 'tmux attach'
+bindsym Control+Mod1+Shift+t exec --no-startup-id i3-sensible-terminal --title=scratch -e 'tmux new-session -A -s scratch'
 
 # File manager
 bindsym Control+Mod1+f exec --no-startup-id i3-sensible-terminal --title=filemanager -e 'zsh -c ranger'
@@ -31,7 +31,7 @@ bindsym Control+Mod1+f exec --no-startup-id i3-sensible-terminal --title=fileman
 # start lock
 bindsym Control+Mod1+l exec --no-startup-id i3-exit.sh lock
 
-bindsym Control+Mod1+Shift+w exec --no-startup-id chromium || chromium-browser
+bindsym Control+Mod1+Shift+w exec --no-startup-id $BROWSER2
 bindsym Control+Mod1+w exec --no-startup-id $BROWSER
 bindsym Control+Mod1+v exec --no-startup-id pavucontrol
 bindsym Control+Mod1+g exec --no-startup-id gvim
@@ -43,6 +43,7 @@ bindsym $mod+period [instance="emacs" title="^(?!myagenda$)"] scratchpad show
 bindsym $mod+shift+comma exec --no-startup-id myemacs -nc --eval '(progn (find-file "~/Dropbox/Todo/org/rules.org") (org-agenda-list) (set-frame-name "myagenda"))'
 bindsym $mod+c exec myemacs -n -e '(make-capture-frame)' 
 bindsym $mod+comma [title="^myagenda"] scratchpad show
+bindsym $mod+Control+s exec --no-startup-id flameshot gui
 
 # Spotify
 bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause
@@ -145,6 +146,7 @@ bindsym $mod+d focus child
 
 # switch to workspace
 
+bindsym $mod+grave workspace 0: Personal
 bindsym $mod+1 workspace 1: Term
 bindsym $mod+2 workspace 2: Web
 bindsym $mod+3 workspace 3: Edit
@@ -159,6 +161,7 @@ bindsym $mod+Control+h workspace prev
 bindsym $mod+Control+l workspace next 
 
 # move focused container to workspace
+bindsym $mod+Shift+grave move container to workspace             0: Personal
 bindsym $mod+Shift+exclam move container to workspace            1: Term
 bindsym $mod+Shift+at move container to workspace                2: Web
 bindsym $mod+Shift+numbersign move container to workspace        3: Edit
@@ -247,12 +250,12 @@ bindsym $mod+n exec i3-input -F 'rename workspace to %s' -P 'New name: '
 #     }
 # }
 # class                 border  backgr. text    indicator
-client.focused          #4c7899 #4c7899 fefef #93a1a1 #2e9ef4
+client.focused          #4c7899 #4c7899 #fefef #93a1a1 #2e9ef4
 client.focused_inactive #4c7899 #101010 #93a1a1 #484e50
 client.unfocused        #ffffff #101010 #93a1a1 #292d2e
 client.urgent           #2f343a #101010 #93a1a1 #900000
 
-default_border pixel 5
+default_border pixel 3
 # smart_borders on
 workspace_layout tabbed
 
@@ -287,15 +290,16 @@ assign [class="^Audacious$"] 6: Music
 assign [class="^Xchat$"] 7: Chat
 #for_window [class="Pcmanfm"] floating enable
 
-workspace "1: Term" output DP1
-workspace "2: Web" output DP1
-workspace "3: Edit" output DP1
-workspace "4: Viewer" output eDP1
-workspace "5: Files" output eDP1
-workspace "6: Music" output eDP1
-workspace "7: Chat" output eDP1
-workspace "8: Misc Big" output DP1
-workspace "9: Misc Small" output eDP1
+workspace "0: Personal" output DP-2
+workspace "1: Term" output DP-1
+workspace "2: Web" output DP-1
+workspace "3: Edit" output DP-1
+workspace "4: Viewer" output eDP-1
+workspace "5: Files" output eDP-1
+workspace "6: Music" output eDP-1
+workspace "7: Chat" output eDP-1
+workspace "8: Misc Big" output DP-1
+workspace "9: Misc Small" output eDP-1
 
 gaps inner 8
 gaps outer 5
@@ -317,14 +321,14 @@ bindsym $mod+Delete mode "$mode_system"
 bindsym $mod+Escape exec xfce4-session-logout
 #exec --no-startup-id xautolock -corners '----' -time 10 -locker 'dm-tool lock' # lightdm
 #exec xautolock -time 10 -corners "----" -locker 'i3lock -t -c 000000 -i ~/Pictures/Wallpapers/Game\ Over\ Hacker.png' &
-exec --no-startup-id compton -b --config ~/.compton.conf 
+exec --no-startup-id picom -b --config ~/.picom.conf 
 exec --no-startup-id dropbox start
 exec --no-startup-id i3-sensible-terminal --title=filemanager -e 'ranger'
 exec --no-startup-id nitrogen --restore
 exec --no-startup-id nm-applet
 exec --no-startup-id pasystray 
 exec --no-startup-id syndaemon -i 0.5 -d
-exec --no-startup-id i3-sensible-terminal --title=scratch -e 'tmux attach'
+exec --no-startup-id i3-sensible-terminal --title=scratch -e 'tmux new-session -A -s scratch'
 exec --no-startup-id i3-exit.sh autolock
 exec --no-startup-id xfce4-power-manager
 #exec --no-startup-id xfsettingsd --sm-client-disable &

keep/.keep/commands.json

@@ -0,0 +1 @@
+{"pandoc --filter pandoc-include-code -i index.md --metadata pagetitle=yourtitle -s --highlight-style=pygments -o index.docx": {"desc": "generate docx (Word, Office) from a markdown file with code highlighting", "alias": "md2doc"}}

keep/.keep/update_check.txt

@@ -0,0 +1 @@
+06/21/2019

not_dots/52-tablet.conf

@@ -0,0 +1,15 @@
+# Config for the HUION tablet
+#
+## Install:
+# yay linux-headers
+# yay digimend
+## To also control the buttons, install wacom and use xsetwacom
+# 	yay wacom 
+
+Section "InputClass"
+	Identifier "Huion on wacom"
+	# MatchIsTablet "on"
+	MatchProduct "HUION"
+	MatchDevicePath "/dev/input/event*"
+	Driver "wacom"
+EndSection

nvim/.config/nvim/init.vim

@@ -0,0 +1,332 @@
+"Balkian
+
+" Auto-install plug-vim
+if empty(glob('~/.local/share/nvim/site/autoload/plug.vim'))
+  !curl -fLo $HOME/.local/share/nvim/site/autoload/plug.vim --create-dirs "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim"
+  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
+endif
+
+"set nocompatible               " be iMproved
+"filetype off                   " required!
+
+
+call plug#begin(stdpath('data') . '/plugged')
+echo stdpath('data')
+
+Plug 'gmarik/vundle'
+Plug 'LaTeX-Box-Team/LaTeX-Box'
+Plug 'tpope/vim-repeat'
+Plug 'tpope/vim-unimpaired'
+Plug 'tpope/vim-fugitive'
+Plug 'tpope/vim-surround'
+Plug 'tpope/vim-abolish'
+Plug 'scrooloose/nerdtree'
+Plug 'scrooloose/nerdcommenter'
+Plug 'scrooloose/syntastic'
+Plug 'ervandew/supertab'
+Plug 'majutsushi/tagbar'
+Plug 'MarcWeber/vim-addon-mw-utils'
+" for vim-snippets
+Plug 'tomtom/tlib_vim'
+Plug 'honza/vim-snippets'
+Plug 'garbas/vim-snipmate'
+Plug 'mattn/webapi-vim'
+Plug 'mattn/gist-vim'
+Plug 'klen/python-mode'
+Plug 'ivanov/vim-ipython'
+Plug 'jamessan/vim-gnupg'
+Plug 'Lokaltog/vim-easymotion'
+Plug 'vim-scripts/YankRing.vim'
+Plug 'kien/ctrlp.vim'
+Plug 'sgur/ctrlp-extensions.vim'
+Plug 'sjl/gundo.vim'
+Plug 'bling/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+Plug 'xolox/vim-misc'
+Plug 'xolox/vim-notes'
+Plug 'beloglazov/vim-online-thesaurus'
+Plug 'vim-scripts/ShowMarks'
+Plug 'atweiden/vim-dragvisuals'
+"Plug 'tomasr/molokai'
+Plug 'chriskempson/base16-vim'
+Plug 'elzr/vim-json'
+Plug 'Rykka/riv.vim'
+Plug 'niklasl/vim-rdf'
+Plug 'lepture/vim-jinja'
+
+call plug#end()
+
+filetype plugin indent on     " required!
+
+set hidden " To start working with buffers instead of tabs
+
+"highlight SpecialKey ctermfg=DarkGray
+set listchars=tab:>-,trail:~
+set list
+set tabstop=4
+set softtabstop=4
+set shiftwidth=4
+autocmd BufRead *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class
+au FileType py set textwidth=79
+au FileType html set tabstop=2 shiftwidth=2
+autocmd Filetype javascript set ts=4 sts=4 sw=4 expandtab smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class
+set expandtab
+set smarttab
+set autoindent
+set smartindent
+syntax on
+set ignorecase
+set smartcase
+set number
+"set paste
+set mouse=a
+set autochdir
+set showmatch
+set incsearch
+set hlsearch 
+
+set ruler
+set wildmenu
+set autoread
+
+" faster commands
+noremap <space> :
+" Better Map Leader
+let mapleader=","
+noremap \ ,
+
+" Commenting blocks of code. I don't need it with NerdCommenter
+" autocmd FileType c,cpp,java,scala,javascript let b:comment_leader = '// '
+" autocmd FileType sh,ruby,python   let b:comment_leader = '# '
+" autocmd FileType conf,fstab       let b:comment_leader = '# '
+" autocmd FileType tex              let b:comment_leader = '% '
+" autocmd FileType mail             let b:comment_leader = '> '
+" autocmd FileType vim              let b:comment_leader = '" '
+" noremap <silent> ,cc :<C-B>silent <C-E>s/^/<C-R>=escape(b:comment_leader,'\/')<CR>/<CR>:nohlsearch<CR>
+" noremap <silent> ,cu :<C-B>silent <C-E>s/^\V<C-R>=escape(b:comment_leader,'\/')<CR>//e<CR>:nohlsearch<CR>
+" 
+map <leader>p "+gp
+map <leader>P "+gP
+noremap <C-S>  :w<CR>
+imap <C-S>  <C-O>:w<CR>
+
+"Custom maps
+noremap <Leader>n :NERDTreeToggle<CR>
+noremap <Leader>t :TagbarOpen fj<CR>
+noremap <Leader>f :CtrlPMixed<CR>
+noremap <Leader>b :CtrlPBookmarkDir<CR>
+noremap <Leader>l :CtrlPLine<CR>
+"Omni
+
+set completeopt=longest,menuone
+inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
+inoremap <expr> <C-n> pumvisible() ? '<C-n>' :
+  \ '<C-n><C-r>=pumvisible() ? "\<lt>Down>" : ""<CR>'
+inoremap <expr> <M-,> pumvisible() ? '<C-n>' :
+            \ '<C-x><C-o><C-n><C-p><C-r>=pumvisible() ? "\<lt>Down>" : ""<CR>'
+inoremap <expr> <C-Space> (pumvisible() ? (col('.') > 1 ? '<Esc>i<Right>' : '<Esc>i') : '') .
+            \ '<C-x><C-o><C-r>=pumvisible() ? "\<lt>C-n>\<lt>C-p>\<lt>Down>" : ""<CR>'
+set spell spelllang=en_gb
+
+" tab navigation like firefox
+nnoremap <C-S-tab> :tabprevious<CR>
+nnoremap <C-tab>   :tabnext<CR>
+nnoremap <C-t>     :tabnew<CR>
+inoremap <C-S-tab> <Esc>:tabprevious<CR>i
+inoremap <C-tab>   <Esc>:tabnext<CR>i
+"inoremap <C-t>     <Esc>:tabnew<CR>
+nnoremap <Leader>dd :bd<CR>
+
+
+" Save sessions
+function! RestoreSession()
+if argc() == 0 "vim called without arguments
+    execute 'source ~/.vim/Session.vim'
+  end
+endfunction
+
+nmap Sq <ESC>:mksession! ~/.vim/Session.vim<CR>:qa!<CR>
+nmap SQ <ESC>:mksession! ~/.vim/Session.vim<CR>:wqa<CR>
+nmap SO :so ~/.vim/Session.vim<CR>
+
+set sessionoptions+=resize,winpos
+
+"autocmd VimEnter * call RestoreSession()
+
+"Make tabs and buffers work better
+":se switchbuf=usetab,newtab
+
+" Color and shit
+"set t_Co=256
+"set background=dark
+"colo solarized 
+colo base16-tomorrow-night
+"hi SpellBad ctermfg=Red
+
+"Statusline
+
+set statusline=%t%h%m%r%y%{fugitive#statusline()}\%=[%{strlen(&fenc)?&fenc:'none'},%{&ff}]\ \ %c,%l/%L\ %P
+set laststatus=2
+
+" Now that I use Airline, there is no need for this :)
+"function! InsertStatuslineColor(mode)
+  "if a:mode == 'i'
+    "hi statusline guibg=Red ctermbg=Red guifg=White ctermfg=White
+  "elseif a:mode == 'r'
+    "hi statusline guibg=Blue ctermfg=White guifg=White ctermbg=Blue
+  "else
+    "hi statusline ctermbg=Yellow guibg=Yellow ctermfg=Black guifg=Black
+  "endif
+"endfunction
+
+"call InsertStatuslineColor('')
+"au InsertEnter * call InsertStatuslineColor(v:insertmode)
+"au InsertLeave * call InsertStatuslineColor('')
+
+au BufRead,BufNewFile *.md set filetype=markdown
+
+"Diff the buffer and the original
+command DiffOrig let g:diffline = line('.') | vert new | set bt=nofile | r # | 0d_ | diffthis | :exe "norm! ".g:diffline."G" | wincmd p | diffthis | wincmd p
+nnoremap <Leader>do :DiffOrig<cr>
+nnoremap <leader>dc :q<cr>:diffoff<cr>:exe "norm! ".g:diffline."G"<cr>
+
+set guifont=DejaVu\ Sans\ Mono
+
+set foldmethod=syntax
+set foldclose=all
+set foldopen+=insert,jump
+set nofoldenable
+
+" Matching for html
+if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# ''
+  runtime! macros/matchit.vim
+endif
+
+""""""""""""""""""""
+" GnuPG Extensions "
+""""""""""""""""""""
+
+" Tell the GnuPG plugin to armor new files.
+let g:GPGPreferArmor=1
+
+" Tell the GnuPG plugin to sign new files.
+let g:GPGPreferSign=1
+
+augroup GnuPGExtra
+" Set extra file options.
+    autocmd BufReadCmd,FileReadCmd *.\(gpg\|asc\|pgp\) call SetGPGOptions()
+" Automatically close unmodified files after inactivity.
+    autocmd CursorHold *.\(gpg\|asc\|pgp\) quit
+augroup END
+
+function SetGPGOptions()
+" Set updatetime to 1 minute.
+    set updatetime=60000
+" Fold at markers.
+    "set foldmethod=marker
+    setlocal foldmethod=expr
+    setlocal foldexpr=(getline(v:lnum)=~'^$')?-1:((indent(v:lnum)<indent(v:lnum+1))?('>'.indent(v:lnum+1)):indent(v:lnum))
+    set foldtext=getline(v:foldstart)
+
+" Automatically close all folds.
+    set foldclose=all
+" Only open folds with insert commands.
+    set foldopen=insert
+endfunction
+
+" CtrlP
+" Do not clear the file cache on exit
+let g:ctrlp_clear_cache_on_exit = 0
+let g:ctrlp_extensions = [ 'mixed' ]
+let g:ctrlp_regexp = 0
+let g:ctrlp_cmd = 'CtrlPMixed'
+
+" Git things
+nmap <leader>gs :Gstatus<cr>
+nmap <leader>gd :Gdiff<cr>
+nmap <leader>gl :Glog<cr>
+
+" Gundo magic
+nnoremap <leader>u :GundoToggle<CR>
+
+" YankRing+Ctrl-P
+map <leader>y :YRShow<CR>
+let g:yankring_replace_n_pkey = '<c-j>'
+let g:yankring_replace_n_nkey = '<c-k>'
+
+
+let g:airline_left_sep=''
+let g:airline_right_sep='|'
+let g:airline#extensions#tabline#enabled = 1
+let g:airline#extensions#tabline#left_sep = ' '
+let g:airline#extensions#tabline#left_alt_sep = '|'
+let g:airline_theme='base16'
+
+" Notes
+:let g:notes_directories = ['~/Dropbox/Notes']
+
+" Block move
+vmap  <expr>  <LEFT>   DVB_Drag('left')
+vmap  <expr>  <RIGHT>  DVB_Drag('right')
+vmap  <expr>  <DOWN>   DVB_Drag('down')
+vmap  <expr>  <UP>     DVB_Drag('up')
+vmap  <expr>  D        DVB_Duplicate()
+
+function! s:get_visual_selection()
+  " Why is this not a built-in Vim script function?!
+  let [lnum1, col1] = getpos("'<")[1:2]
+  let [lnum2, col2] = getpos("'>")[1:2]
+  let lines = getline(lnum1, lnum2)
+  let lines[-1] = lines[-1][: col2 - (&selection == 'inclusive' ? 1 : 2)]
+  let lines[0] = lines[0][col1 - 1:]
+  return join(lines, "\n")
+endfunction
+
+" Thesaurus
+let g:online_thesaurus_map_keys = 0
+nnoremap <leader>k :OnlineThesaurusCurrentWord<CR>
+vnoremap <leader>k <Esc>:Thesaurus <C-R><C-R>=<SID>get_visual_selection()<CR><CR>
+
+" Resizing
+nnoremap <silent> <Leader>+ :exe "resize " . (winheight(0) * 3/2)<CR>
+nnoremap <silent> <Leader>- :exe "resize " . (winheight(0) * 2/3)<CR>
+nnoremap <silent> <Leader>+ :exe "resize " . (winheight(0) * 3/2)<CR>
+nnoremap <silent> <Leader>> :exe "vertical resize " . (winwidth(0) * 3/2)<CR>
+nnoremap <silent> <Leader>< :exe "vertical resize " . (winwidth(0) * 2/3)<CR>
+
+" Clipboard magic
+if has('unnamedplus')
+  set clipboard=unnamed,unnamedplus
+endif
+
+set cursorline
+
+set guioptions-=m  "remove menu bar
+set guioptions-=T  "remove toolbar
+set guioptions-=r  "remove right-hand scroll bar
+set guioptions-=L  "remove left-hand scroll bar
+
+let g:pymode_rope_project_root = "~/.ropeprojects"
+
+" backup to ~/.tmp 
+set backup
+set backupdir=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp 
+set backupskip=/tmp/*,/private/tmp/* 
+set directory=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp 
+set writebackup
+
+" Easymotion
+let g:EasyMotion_do_mapping = 0 " Disable default mappings
+
+" Bi-directional find motion
+" Jump to anywhere you want with minimal keystrokes, with just one key binding.
+" `s{char}{label}`
+nmap s <Plug>(easymotion-s)
+nmap <Leader>w <Plug>(easymotion-bd-w)
+" or
+" `s{char}{char}{label}`
+" Need one more keystroke, but on average, it may be more comfortable.
+nmap s <Plug>(easymotion-s2)
+
+" Turn on case sensitive feature
+let g:EasyMotion_smartcase = 1

picom/.picom.conf

@@ -24,12 +24,12 @@ shadow-exclude = [
 # Opacity
 #mark-override-focused = true;
 #menu-opacity = 0.9;
-inactive-opacity = 0.95;
+# inactive-opacity = 0.95;
 # active-opacity = 0.8;
 # frame-opacity = 0.7;
 inactive-opacity-override = false;
-alpha-step = 0.06;
-inactive-dim = 0.2;
+#alpha-step = 0.06;
+inactive-dim = 0.4;
 #inactive-dim-fixed = false;
 # blur-background = true;
 # blur-background-frame = true;
@@ -43,7 +43,13 @@ blur-background-exclude = [
 ];
 # opacity-rule = [ "80:class_g = 'URxvt'" ];
 #
-opacity-rule = [ "99:_NET_WM_STATE@:32a = '_NET_WM_STATE_FULLSCREEN'" ];
+opacity-rule = [
+  "99:_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_FULLSCREEN'",
+  "99:_NET_WM_STATE@[1]:32a = '_NET_WM_STATE_FULLSCREEN'",
+  "99:_NET_WM_STATE@[2]:32a = '_NET_WM_STATE_FULLSCREEN'",
+  "99:_NET_WM_STATE@[3]:32a = '_NET_WM_STATE_FULLSCREEN'",
+  "99:_NET_WM_STATE@[4]:32a = '_NET_WM_STATE_FULLSCREEN'",
+];
 
 
 
@@ -66,13 +72,21 @@ detect-client-opacity = true;
 refresh-rate = 0;
 vsync = "none";
 dbe = false;
-paint-on-overlay = true;
+#paint-on-overlay = true;
 # sw-opti = true;
-# unredir-if-possible = true;
+unredir-if-possible = true;
 # unredir-if-possible-delay = 5000;
 # unredir-if-possible-exclude = [ ];
 focus-exclude = [ "class_g = 'Cairo-clock'",
-    "class_g = 'Popcorn Time'" ];
+  "class_g = 'Popcorn Time'",
+    # "class_g = 'firefox'",
+    # prevents dimming fullscreen windows
+  "_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_FULLSCREEN'",
+  "_NET_WM_STATE@[1]:32a = '_NET_WM_STATE_FULLSCREEN'",
+  "_NET_WM_STATE@[2]:32a = '_NET_WM_STATE_FULLSCREEN'",
+  "_NET_WM_STATE@[3]:32a = '_NET_WM_STATE_FULLSCREEN'",
+  "_NET_WM_STATE@[4]:32a = '_NET_WM_STATE_FULLSCREEN'",
+];
 detect-transient = true;
 detect-client-leader = false;
 invert-color-include = [ ];

ranger/.config/ranger/rc.conf

@@ -270,7 +270,7 @@ map !  console shell%space
 map @  console -p6 shell  %%s
 map #  console shell -p%space
 map s  console shell%space
-map r  chain draw_possible_programs; console open_with%%space
+map r  chain draw_possible_programs; console open_with%space
 map f  console find%space
 map cd console cd%space
 
@@ -414,7 +414,11 @@ map cm search_next order=mtime
 map ca search_next order=atime
 
 
-map <C-t>     terminal
+map <C-T>     terminal
+map T         eval fm.execute_console("shell tmux send-keys -t 1 'cd " + str(fm.thisdir) + "' 'Enter' \; select-pane -t 1") if 'TMUX' in os.environ.keys() else fm.execute_console("terminal")
+#map <C-e>    eval cmd("myemacs -n {0}".format(f.thisfile.relative_path))
+map <C-e>     shell myemacs -n %s
+copymap  <C-e> e
 # Tabs
 map <C-n>     tab_new ~
 map <C-w>     tab_close

ranger/.config/ranger/rifle.conf

@@ -83,9 +83,10 @@ ext x?html?, has w3m,             terminal = w3m "$@"
 # Misc
 #-------------------------------------------
 # Define the "editor" for text files as first action
-mime ^text,  label editor = myemacs "-nc" -- "$@"
+mime ^text,  label editor = $VISUAL -- "$@"
 mime ^text,  label pager  = "$PAGER" -- "$@"
-!mime ^text, label editor, ext xml|json|csv|tex|py|pl|rb|js|sh|php = myemacs "-nc" -- "$@"
+mime ^text,  label external = $VISUAL -nc -- "$@"
+!mime ^text, label editor, ext xml|json|csv|tex|py|pl|rb|js|sh|php = $VISUAL -- "$@"
 !mime ^text, label pager,  ext xml|json|csv|tex|py|pl|rb|js|sh|php = "$PAGER" -- "$@"
 
 ext 1                         = man "$1"
@@ -204,7 +205,7 @@ label wallpaper, number 14, mime ^image, has feh, X = feh --bg-fill "$1"
 
 # Define the editor for non-text files + pager as last action
               !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php  = ask
-label editor, !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php  = myemacs "-nc" -- "$@"
+label editor, !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php  = $VISUAL -- "$@"
 label pager,  !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php  = "$PAGER" -- "$@"
 
 # The very last action, so that it's never triggered accidentally, is to execute a program:

screenlayouts/.screenlayout/auto.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+xrandr --auto

screenlayouts/.screenlayout/dual-wide.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-xrandr --output VIRTUAL1 --off --output eDP-1 --mode 1920x1080 --pos 328x1080 --rotate normal --output DP-1 --primary --mode 2560x1080 --pos 0x0 --rotate normal --output HDMI-2 --off --output HDMI-1 --off --output DP-2 --off
+xrandr --output eDP-1-1 --primary --mode 1920x1080 --pos 320x1080 --rotate normal --output DP-1-1 --mode 2560x1080 --pos 0x0 --rotate normal --output HDMI-1-1 --off --output DP-1-2 --off --output HDMI-1-2 --off

screenlayouts/.screenlayout/single.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-xrandr --output HDMI1 --off --output DVI-1 --off --output DP-1 --off --output eDP-1 --mode 1920x1080 --pos 0x0 --rotate normal --output VGA1 --off
+xrandr --output HDMI1 --off --output DVI-1 --off --output DP-1 --off --output eDP-1 --mode 1920x1080 --pos 0x0 --rotate normal --output VGA1 --off --auto

screenlayouts/.screenlayout/triple-screen.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+xrandr --output eDP-1 --primary --mode 1920x1080 --pos 2240x1080 --rotate normal --output DP-1 --off --output HDMI-1 --mode 1920x1080 --pos 0x0 --rotate normal --output DP-2 --mode 2560x1080 --pos 1920x0 --rotate normal --output HDMI-2 --off

scripts/.bin/colors.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+for i in {0..255} ; do
+    printf "\x1b[38;5;${i}mcolour${i}\n"
+done

scripts/.bin/gnome-terminal

@@ -1,2 +0,0 @@
-#!/bin/bash
-one-window 'gnome-terminal' 'xdotool windowfocus $WID & xdotool key ctrl+shift+t'

scripts/.bin/polybar.sh

@@ -6,10 +6,8 @@ killall -q polybar
 # Wait until the processes have been shut down
 while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
 
-if type "xrandr"; then
-    for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do
-        MONITOR=$m polybar --reload main &
-    done
-else
+for m in $(polybar --list-monitors | cut -d":" -f1); do
+    MONITOR=$m polybar --reload main &
+done
     polybar --reload main &
 fi

scripts/.bin/terminator

@@ -1,2 +0,0 @@
-#!/bin/bash
-one-window "terminator" "xdotool windowfocus \$WID & xdotool key ctrl+shift+t;" "/usr/bin/terminator $*"

termite/.config/termite/config

@@ -1,6 +1,8 @@
 [colors]
 # hard contrast:
-background = #1d2021
+#background = #1d2021
+background = rgba(29, 32, 33, 0.9)
+#background = rgba(63, 63, 63, 0.8)
 #background = #282828
 # soft contrast:
 #background = #32302f
@@ -45,7 +47,7 @@ allow_bold = true
 mouse_autohide = false
 dynamic_title = true
 urgent_on_bell = true
-browser = chromium
+browser = firefox
 clickable_url = true
 cursor_blink = system
 cursor_shape = block

tmux/.tmux.conf

@@ -19,6 +19,9 @@ bind j select-pane -D
 bind k select-pane -U
 bind l select-pane -R
 
+
+bind C break-pane
+
 # use vim motion keys while in copy mode
 setw -g mode-keys vi
 # use the vim resize keys.
@@ -33,17 +36,23 @@ bind > resize-pane -R 1
 bind b set-window-option synchronize-panes
 
 # Set status bar
-set -g status-bg black
-set -g status-fg white
-set -g status-left '#[fg=green]#H'
+set -g status-style bg=black,fg=white
+set -g status-left '#[fg=yellow]#H #{?window_zoomed_flag,🔍, }'
 set -g status-right '#[fg=yellow]#(uptime | sed -e "s/load average/load/g" -e "s/  / /g")' # | cut -d "," -f 2-)'
 set -g status-right-length 50
 
-set -g pane-border-status bottom
-set -g pane-border-format '#(ps --no-headers -t #{pane_tty} -o args -O-c)'
-
 # Highlight active window
-set-window-option -g window-status-current-bg red
+set-window-option -g window-status-current-style bg=yellow,fg=black
+#set -g window-status-format "#I:#{pane_current_path}"
+#set -g window-status-current-format "#I:#{pane_current_path}"
+
+
+set -g pane-border-status top
+set -g pane-border-format '#(ps --no-headers -t #{pane_tty} -o args -O-c)    @#{pane_current_path}'
+
+# Dividing pane colors
+set -g pane-border-style fg=magenta
+set -g pane-active-border-style fg=yellow,bg=default
 
 # Set window notifications
 setw -g monitor-activity on
@@ -52,7 +61,11 @@ set -g visual-activity on
 # Automatically set window title
 set-option -g status-interval 5
 set-option -g automatic-rename on
-set-option -g automatic-rename-format '#(basename "#{pane_current_path}")'
+set-option -g automatic-rename-format '#(dirname "#{pane_current_path}"| xargs -0 basename)/#(basename "#{pane_current_path}")'
+
+# WM windows
+set-option -g set-titles on
+set-option -g set-titles-string "#S | #W"
 
 # Mouse and panes
  #set -g mouse-utf8 on
@@ -98,9 +111,11 @@ set-option -g default-shell ${SHELL}
 unbind m
 bind m run "tmux-zoom.sh"
 
+# reload config file (change file location to your the tmux.conf you want to use)
+bind r source-file ~/.tmux.conf
+
 # Fix for emacs and the like
 set -s escape-time 0
 
 # Start new-session as default
-new-session
-
+#new-session

vscode/.config/Code - OSS/User/settings.json

@@ -1,10 +1,9 @@
 {
-    "diffEditor.ignoreTrimWhitespace": false,
+    "diffEditor.ignoreTrimWhitespace": true,
     "gitlens.advanced.messages": {
         "suppressShowKeyBindingsNotice": true,
         "suppressResultsExplorerNotice": true
     },
-    "gitlens.keymap": "chorded",
     "vim.handleKeys": {
         "<C-K>": false,
         "[q": false,
@@ -20,12 +19,14 @@
     "window.titleBarStyle": "custom",
     "vim.hlsearch": true,
     "vim.statusBarColorControl": true,
-    "workbench.iconTheme": "vscode-icons",
     "workbench.colorCustomizations": {
-        "statusBar.background": "#005f5f",
-        "statusBar.noFolderBackground": "#005f5f",
-        "statusBar.debuggingBackground": "#005f5f"
+        "statusBar.background": "#5f0000",
+        "statusBar.noFolderBackground": "#5f0000",
+        "statusBar.debuggingBackground": "#5f0000"
     },
     "gitlab.instanceUrl": "https://lab.gsi.upm.es",
-    "editor.wordWrap": "on"
+    "editor.wordWrap": "on",
+    "window.zoomLevel": 1,
+    "explorer.confirmDragAndDrop": false,
+    "workbench.colorTheme": "Default Light+"
 }

zsh/.zpreztorc

@@ -23,6 +23,9 @@ zstyle ':prezto:*:*' color 'yes'
 # Set the Zsh functions to load (man zshcontrib).
 # zstyle ':prezto:load' zfunction 'zargs' 'zmv'
 
+
+zstyle ':prezto:load' pmodule-dirs $HOME/.zprezto-contrib
+
 # Set the Prezto modules to load (browse modules).
 # The order matters.
 zstyle ':prezto:load' pmodule \
@@ -35,13 +38,16 @@ zstyle ':prezto:load' pmodule \
   'spectrum' \
   'utility' \
   'completion' \
-  'fasd' \
+  'fzf-z' \
   'pacman' \
   'git' \
   'autosuggestions' \
-  'syntax-highlighting' \
   'ssh' \
-  'prompt'
+  'prompt' \
+  'syntax-highlighting'
+
+#  'fasd' \
+
 
 
 zstyle ':prezto:module:autosuggestions' color 'yes'
@@ -110,7 +116,8 @@ zstyle ':prezto:module:pacman' frontend 'yaourt'
 # Set the prompt theme to load.
 # Setting it to 'random' loads a random theme.
 # Auto set to 'off' on dumb terminals.
-zstyle ':prezto:module:prompt' theme 'balkian'
+#zstyle ':prezto:module:prompt' theme 'balkian'
+zstyle :prezto:module:prompt theme powerlevel10k
 
 #
 # Ruby

zsh/.zshenv

@@ -14,11 +14,12 @@ fi
 #
 
 export EDITOR='vim'
-export VISUAL="myemacs -c"
+export VISUAL="$(command -v myemacs) -t"
 export ALTERNATE_EDITOR=""
-export PAGER='less'
+
 export TERMCMD='i3-sensible-terminal'
 
+
 #
 # Language
 #
@@ -49,4 +50,7 @@ path=(
 
 export PATH
 export GOPATH=$HOME/go
-export PATH=$PATH:$GOPATH/bin/
+export PATH=$PATH:$GOPATH/bin/:$HOME/.npm/bin
+
+export WASMTIME_HOME="$HOME/.wasmtime"
+export PATH="$WASMTIME_HOME/bin:$PATH"

zsh/.zshrc

@@ -1,3 +1,10 @@
+# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# Initialization code that may require console input (password prompts, [y/n]
+# confirmations, etc.) must go above this block; everything else may go below.
+if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+fi
+
 #
 # Executes commands at the start of an interactive session.
 #
@@ -15,6 +22,27 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
   source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
 fi
 
+if [[ -s "/usr/share/fzf/key-bindings.zsh" ]]; then
+    source "/usr/share/fzf/key-bindings.zsh"
+    source "/usr/share/fzf/completion.zsh"
+fi
+
+
+# Change find to fd in fzf
+
+if command -v fd  > /dev/null 2>&1; then
+
+_fzf_compgen_path() {
+    fd --hidden --follow --exclude ".git" . "$1"
+}
+
+# Use fd to generate the list for directory completion
+_fzf_compgen_dir() {
+    fd --type d --hidden --follow --exclude ".git" . "$1"
+}
+
+fi
+
 # Customize to your needs...
 
 #
@@ -24,7 +52,8 @@ fi
 # Set the default Less options.
 # Mouse-wheel scrolling has been disabled by -X (disable screen clearing).
 # Remove -X and -F (exit if the content fits on one screen) to enable it.
-export LESS='-F -g -i -M -R -S -w -X -z-4'
+export LESS='-g -i -M -R -S -w -z-4 -j4a'
+
 
 # Handy alias
 alias fail="less +F"
@@ -123,6 +152,8 @@ alias drm="docker rm"
 alias drmi="docker rmi"
 alias drun="docker run"
 
+alias t="tmux new-session -A -s "
+
 
 # GSI
 alias gsicluster='ssh balkian@shannon.gsi.dit.upm.es -p 1337'      
@@ -147,6 +178,15 @@ function kube (){
     kubectl --context="$context" "$@"
 }
 
+function ds () {
+    du -xsh "$@" | sort -h
+
+}
+
+function sag () {
+    ag -0 -l $1 | xargs -0 sed -ri.bak -e "s/$1/$2/g"
+}
+
 # Dircolors for termite
 
 if [[ -s "$HOME/.dircolors" ]]; then
@@ -154,3 +194,9 @@ if [[ -s "$HOME/.dircolors" ]]; then
 fi
 
 setopt interactivecomments
+
+
+export FZFZ_RECENT_DIRS_TOOL=fasd
+
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh