diff --git a/.Xmodmap b/.Xmodmap
index 18fbee6..e62047d 100644
--- a/.Xmodmap
+++ b/.Xmodmap
@@ -19,3 +19,7 @@ add mod3 = Alt_R
keysym Alt_R = Mode_switch
+! Pgup/Down on dell
+keycode 112 = Left
+keycode 117 = Right
+
diff --git a/.Xresources b/.Xresources
index 9db39c7..ede0a08 100644
--- a/.Xresources
+++ b/.Xresources
@@ -1,4 +1,4 @@
-Xft.dpi: 96
+Xft.dpi: 240
Xft.antialias: 1
Xft.rgba: rgb
Xft.hinting: 1
diff --git a/.clusterssh/config b/.clusterssh/config
index 9a3a648..e2f84af 100644
--- a/.clusterssh/config
+++ b/.clusterssh/config
@@ -1,5 +1,5 @@
auto_close=2
ssh_args=-o StrictHostKeyChecking=no -o ForwardAgent=yes
terminal=xterm
-terminal_args=-fa "xft:Ubuntu Mono:size=15"
+terminal_args=-fa "xft:Pragmata Pro Mono:size=5"
terminal_bg_style=dark
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
deleted file mode 100644
index d7a5b41..0000000
--- a/.config/alacritty/alacritty.yml
+++ /dev/null
@@ -1,391 +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 it self.
-env:
- # TERM env customization.
- #
- # If this property is not set, alacritty will set it to xterm-256color.
- #
- # Note that some xterm terminfo databases don't declare support for italics.
- # You can verify this by checking for the presence of `smso` and `sitm` in
- # `infocmp xterm-256color`.
- TERM: xterm-256color
-
-window:
- # Window dimensions in character columns and lines
- # Falls back to size specified by window manager if set to 0x0.
- # (changes require restart)
- dimensions:
- columns: 0
- lines: 0
-
- # Adds this many blank pixels of padding around the window
- # Units are physical pixels; this is not DPI aware.
- # (change requires restart)
- padding:
- x: 0
- y: 0
-
- # Window decorations
- # Setting this to false will result in window without borders and title bar.
- decorations: false
-
-dpi:
- x: 96.0
- y: 96.0
-
-# Display tabs using this many cells (changes require restart)
-tabspaces: 8
-
-# When true, bold text is drawn using the bright variant of colors.
-draw_bold_text_with_bright_colors: true
-
-# Font configuration (changes require restart)
-#
-# Important font attributes like antialiasing, subpixel aa, and hinting can be
-# controlled through fontconfig. Specifically, the following attributes should
-# have an effect:
-#
-# * hintstyle
-# * antialias
-# * lcdfilter
-# * rgba
-#
-# For instance, if you wish to disable subpixel antialiasing, you might set the
-# rgba property to "none". If you wish to completely disable antialiasing, you
-# can set antialias to false.
-#
-# Please see these resources for more information on how to use fontconfig
-#
-# * https://wiki.archlinux.org/index.php/font_configuration#Fontconfig_configuration
-# * file:///usr/share/doc/fontconfig/fontconfig-user.html
-font:
- # The normal (roman) font face to use.
- normal:
- family: Pragmata Pro Mono
- style: Regular
-
- # The bold font face
- bold:
- family: Pragmata Pro Mono
- style: Bold
-
- # The italic font face
- italic:
- family: Pragmata Pro Mono
- style: Italic
-
- # Point size of the font
- size: 10
-
- # Offset is the extra space around each character. offset.y can be thought of
- # as modifying the linespacing, and offset.x as modifying the letter spacing.
- offset:
- x: -0.25
- y: 7
-
- # Glyph offset determines the locations of the glyphs within their cells with
- # the default being at the bottom. Increase the x offset to move the glyph to
- # the right, increase the y offset to move the glyph upward.
- glyph_offset:
- x: 0
- y: 1
-
- # OS X only: use thin stroke font rendering. Thin strokes are suitable
- # for retina displays, but for non-retina you probably want this set to
- # false.
- use_thin_strokes: true
-
-# Should display the render timer
-render_timer: false
-
-# Use custom cursor colors. If true, display the cursor in the cursor.foreground
-# and cursor.background colors, otherwise invert the colors of the cursor.
-custom_cursor_colors: true
-
-# Colors (Tomorrow Night Bright)
-colors:
- # Default colors
- primary:
- background: '0x121212'
- foreground: '0xeeeeee'
-
- # Colors the cursor will use if `custom_cursor_colors` is true
- cursor:
- text: '0xffee88'
- cursor: '0x11aa66'
-
- normal:
- black: '0x212121'
- red: '0xb7141e'
- green: '0x457b23'
- yellow: '0xfc7b08'
- blue: '0x134eb2'
- magenta: '0x550087'
- cyan: '0x0e707c'
- white: '0xeeeeee'
-
- # Bright colors
- bright:
- black: '0x424242'
- red: '0xe83a3f'
- green: '0x7aba39'
- yellow: '0xfc8e08'
- blue: '0x53a4f3'
- magenta: '0xa94dbb'
- cyan: '0x26bad1'
- white: '0xd8d8d8'
-
- # Dim colors (Optional)
- dim:
- black: '0x333333'
- red: '0xf2777a'
- green: '0x99cc99'
- yellow: '0xffcc66'
- blue: '0x6699cc'
- magenta: '0xcc99cc'
- cyan: '0x66cccc'
- white: '0xdddddd'
-
-# 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.
-#
-# Possible values for `animation`
-# `Ease`
-# `EaseOut`
-# `EaseOutSine`
-# `EaseOutQuad`
-# `EaseOutCubic`
-# `EaseOutQuart`
-# `EaseOutQuint`
-# `EaseOutExpo`
-# `EaseOutCirc`
-# `Linear`
-#
-# To completely disable the visual bell, set its duration to 0.
-#
-visual_bell:
- animation: EaseOutExpo
- duration: 0
-
-# Background opacity
-background_opacity: 1.0
-
-# Mouse bindings
-#
-# Currently doesn't support modifiers. Both the `mouse` and `action` fields must
-# be specified.
-#
-# Values for `mouse`:
-# - Middle
-# - Left
-# - Right
-# - Numeric identifier such as `5`
-#
-# Values for `action`:
-# - Paste
-# - PasteSelection
-# - Copy (TODO)
-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 }
-
- # Faux Scrollback
- #
- # The `faux_scrollback_lines` 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`.
- #
- # To disable this completely, set `faux_scrollback_lines` to 0.
- faux_scrollback_lines: 0
-
-selection:
- semantic_escape_chars: ",│`|:\"' ()[]{}<>"
-
-dynamic_title: true
-
-hide_cursor_when_typing: false
-
-# Style of the cursor
-#
-# Values for 'cursor_style':
-# - Block
-# - Underline
-# - Beam
-cursor_style: Block
-
-# 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.
-#
-# shell:
-# program: /bin/bash
-# args:
-# - --login
-
-# Key bindings
-#
-# Each binding is defined as an object with some properties. Most of the
-# properties are optional. All of the alphabetical keys should have a letter for
-# the `key` value such as `V`. Function keys are probably what you would expect
-# as well (F1, F2, ..). The number keys above the main keyboard are encoded as
-# `Key1`, `Key2`, etc. Keys on the number pad are encoded `Number1`, `Number2`,
-# etc. These all match the glutin::VirtualKeyCode variants.
-#
-# A list with all available `key` names can be found here:
-# https://docs.rs/glutin/*/glutin/enum.VirtualKeyCode.html#variants
-#
-# Possible values for `mods`
-# `Command`, `Super` refer to the super/command/windows key
-# `Control` for the control key
-# `Shift` for the Shift key
-# `Alt` and `Option` refer to alt/option
-#
-# mods may be combined with a `|`. For example, requiring control and shift
-# looks like:
-#
-# mods: Control|Shift
-#
-# The parser is currently quite sensitive to whitespace and capitalization -
-# capitalization must match exactly, and piped items must not have whitespace
-# around them.
-#
-# Either an `action`, `chars`, or `command` field must be present.
-# `action` must be one of `Paste`, `PasteSelection`, `Copy`, or `Quit`.
-# `chars` writes the specified string every time that binding is activated.
-# These should generally be escape sequences, but they can be configured to
-# send arbitrary strings of bytes.
-# `command` must be a map containing a `program` string, and `args` array of
-# strings. For example:
-# - { ... , command: { program: "alacritty", args: ["-e", "vttest"] } }
-#
-# Want to add a binding (e.g. "PageUp") but are unsure what the X sequence
-# (e.g. "\x1b[5~") is? Open another terminal (like xterm) without tmux,
-# then run `showkey -a` to get the sequence associated to a key combination.
-key_bindings:
- - { key: V, mods: Control|Shift, action: Paste }
- - { key: C, mods: Control|Shift, action: Copy }
- - { key: V, mods: Alt|Shift, action: Paste }
- - { key: C, mods: Alt|Shift, action: Copy }
- - { key: Q, mods: Command, action: Quit }
- - { key: W, mods: Command, action: Quit }
- - { key: Insert, mods: Shift, action: PasteSelection }
- - { key: Key0, mods: Control, action: ResetFontSize }
- - { key: Equals, mods: Control, action: IncreaseFontSize }
- - { key: Subtract, mods: Control, action: DecreaseFontSize }
- - { key: Home, chars: "\x1bOH", mode: AppCursor }
- - { key: Home, chars: "\x1b[H", mode: ~AppCursor }
- - { key: End, chars: "\x1bOF", mode: AppCursor }
- - { key: End, chars: "\x1b[F", mode: ~AppCursor }
- - { key: PageUp, mods: Shift, chars: "\x1b[5;2~" }
- - { key: PageUp, mods: Control, chars: "\x1b[5;5~" }
- - { key: PageUp, chars: "\x1b[5~" }
- - { key: PageDown, mods: Shift, chars: "\x1b[6;2~" }
- - { key: PageDown, mods: Control, chars: "\x1b[6;5~" }
- - { 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~" }
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
new file mode 120000
index 0000000..4f18a00
--- /dev/null
+++ b/.config/alacritty/alacritty.yml
@@ -0,0 +1 @@
+alacritty-light.yml
\ No newline at end of file
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index fd021bf..7701b27 100644
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -29,14 +29,14 @@
# the top and down respectively.
# The width can be negative. In this case the actual width is the
# screen width minus the width defined in within the geometry option.
- geometry = "593x5-0-0"
+ geometry = "2373x5-0-0"
# Show how many messages are currently hidden (because of geometry).
indicate_hidden = yes
# Shrink window if it's smaller than the width. Will be ignored if
# width is 0.
- shrink = no
+ shrink = yes
# The transparency of the window. Range: [0; 100].
# This option will only work if a compositing window manager is
@@ -61,10 +61,10 @@
# Defines width in pixels of frame around the notification window.
# Set to 0 to disable.
- frame_width = 0
+ frame_width = 1
# Defines color of the frame around the notification window.
- frame_color = "#000000"
+ frame_color = "cccccc"
# Define a color for the separator.
# possible values are:
@@ -85,7 +85,7 @@
### Text ###
- font = Pragmata Pro Mono 18
+ font = IBM Plex Sans 12
# The spacing between lines. If the height is smaller than the
# font height, it will get raised to the font height.
@@ -125,7 +125,7 @@
# %n progress value if set without any extra characters
# %% Literal %
# Markup is allowed
- format = "%a: %s\n%b"
+ format = "%a:\n%s\n%b"
# Alignment of message text.
# Possible values are "left", "center" and "right".
@@ -245,24 +245,24 @@
[urgency_low]
# IMPORTANT: colors have to be defined in quotation marks.
# Otherwise the "#" and following would be interpreted as a comment.
- background = "#222222"
- foreground = "#888888"
+ background = "#E1F5FE"
+ foreground = "#01579B"
timeout = 10
# Icon for notifications with low urgency, uncomment to enable
#icon = /path/to/icon
[urgency_normal]
# background = "#285577"
- background = "#2E7D32"
- foreground = "#ffffff"
+ background = "#DCEDC8"
+ foreground = "#1B5E20"
timeout = 10
# Icon for notifications with normal urgency, uncomment to enable
#icon = /path/to/icon
[urgency_critical]
- background = "#900000"
- foreground = "#ffff66"
- frame_color = "#ff0000"
+ background = "#BF360C"
+ foreground = "#FFF59D"
+ frame_color = "#FF7043"
timeout = 0
# Icon for notifications with critical urgency, uncomment to enable
#icon = /path/to/icon
diff --git a/.config/nvim/colors/dln-light.vim b/.config/nvim/colors/dln-light.vim
index 4f372b0..4ba13cf 100644
--- a/.config/nvim/colors/dln-light.vim
+++ b/.config/nvim/colors/dln-light.vim
@@ -1,39 +1,73 @@
-" Vim color file
-" Maintainer: Daniel Lundin
-" Last Change: Mon Oct 17 13:18:58 CEST 2016
-
-" Set 'background' back to the default. The value can't always be estimated
-" and is then guessed.
-hi clear Normal
-set bg&
-
-" Remove all existing highlighting and set the defaults.
hi clear
-
-" Load the syntax highlighting defaults, if it's enabled.
-if exists("syntax_on")
- syntax reset
+if version > 580
+ if exists("syntax_on")
+ syntax reset
+ endif
endif
-let colors_name = "dln-light"
+let colors_name="dln-light"
-hi LineNr ctermfg=252 cterm=italic
-hi Visual ctermbg=220
-hi Search ctermbg=226
+if has("gui_running")
+ set background=light
+endif
-hi CursorLine ctermbg=255 cterm=NONE
-hi CursorLineNr ctermfg=245 ctermbg=255 cterm=italic
+hi Normal guifg=#000000 guibg=#ffffff gui=NONE
+hi DiffAdd guifg=#003300 guibg=#DDFFDD gui=NONE
+hi DiffChange guibg=#ECECEC gui=NONE
+hi DiffText guifg=#000033 guibg=#DDDDFF gui=NONE
+hi DiffDelete guifg=#DDCCCC guibg=#FFDDDD gui=NONE
+hi Folded guifg=#808080 guibg=#ECECEC gui=NONE
+hi LineNr guifg=#d0d0d0 guibg=#fcfcfc gui=none
+hi NonText guifg=#808080 guibg=#fcfcfc gui=none
+hi VertSplit guifg=#BBBBBB guibg=#BBBBBB gui=NONE
+hi SignColumn guifg=#404040 guibg=#fcfcfc gui=none
+hi StatusLine guifg=#404040 guibg=#BBBBBB gui=BOLD
+hi StatusLineNC guifg=#BBBBBB guibg=#ECECEC gui=ITALIC
+hi ModeMsg guifg=#990000 gui=NONE
+hi MoreMsg guifg=#990000 gui=NONE
+hi Title guifg=#EF5939 gui=NONE
+hi WarningMsg guifg=#EF5939 gui=NONE
+hi SpecialKey guifg=#FFFFFF guibg=#FF1100 gui=ITALIC
+hi MatchParen guifg=#000000 guibg=#CDCDFD gui=NONE
+hi Underlined guifg=#000000 gui=UNDERLINE
+hi Directory guifg=#990000 gui=NONE
+hi Visual guifg=#FFFFFF guibg=#3465A4 gui=NONE
+hi VisualNOS guifg=#FFFFFF guibg=#204A87 gui=NONE
+hi IncSearch guifg=#000000 guibg=#FFF9C4 gui=none
+hi Search guifg=#000000 guibg=#FFF9C4 gui=none
+hi Ignore guifg=#808080 gui=NONE
+hi Identifier guifg=#0086B3 gui=NONE
+hi PreProc guifg=#A0A0A0 gui=BOLD
+hi Comment guifg=#607D8B gui=ITALIC
+hi Operator guifg=#8E24AA gui=bold
+hi Constant guifg=#177F80 gui=NONE
+hi String guifg=#388E3C gui=italic
+hi Function guifg=#990000 gui=BOLD
+hi Statement guifg=#000000 gui=BOLD
+hi Type guifg=#445588 gui=BOLD
+hi Number guifg=#1C9898 gui=NONE
+hi Todo guifg=#f44336 guibg=#FFF3E0 gui=none
+hi Special guifg=#9E9D24 guibg=#ffffff gui=bold
+hi rubySymbol guifg=#960B73 gui=NONE
+hi Error guifg=#F8F8FF guibg=#FF1100 gui=NONE
+hi Label guifg=#000000 gui=BOLD
+hi StorageClass guifg=#000000 gui=BOLD
+hi Structure guifg=#000000 gui=BOLD
+hi TypeDef guifg=#000000 gui=BOLD
+hi WildMenu guifg=#7FBDFF guibg=#425C78 gui=NONE
+hi Pmenu guifg=#FFFFFF guibg=#808080 gui=BOLD
+hi PmenuSel guifg=#000000 guibg=#CDCDFD gui=ITALIC
+hi PmenuSbar guifg=#444444 guibg=#000000 gui=NONE
+hi PmenuThumb guifg=#AAAAAA guibg=#AAAAAA gui=NONE
+hi TabLine guifg=#404040 guibg=#DDDDDD gui=NONE
+hi TabLineFill guifg=#404040 guibg=#DDDDDD gui=NONE
+hi TabLineSel guifg=#404040 gui=BOLD
+hi cucumberTags guifg=#333333 guibg=#FFFF66 gui=BOLD
+hi htmlTagN gui=BOLD
+hi Cursor guifg=#F8F8FF guibg=#444454 gui=NONE
+hi CursorLine guibg=#D8D8DD gui=NONE
+hi CursorColumn guibg=#D8D8DD gui=NONE
+hi goFunctionCall guifg=#512DA8 gui=NONE
+hi Bookmark guifg=#EDE7F6 guibg=#9575CD gui=italic
-hi Type ctermfg=5 cterm=NONE
-" hi Comment ctermfg=243 cterm=italic
-hi Comment ctermfg=1 cterm=italic
-hi String ctermfg=2 cterm=italic
-" hi Statement ctermfg=4 cterm=NONE
-hi Statement ctermfg=17 cterm=bold
-hi Constant ctermfg=6 cterm=NONE
-hi PreProc ctermfg=25 cterm=bold
-
-hi rustFuncName ctermfg=124 cterm=bold
-hi rustCommentLineDoc ctermfg=137 cterm=italic
-hi rustModPath ctermfg=4 cterm=NONE
-" vim: sw=2
+hi link rubyStringDelimiter String
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 4f0c74c..ef7af4d 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -4,6 +4,7 @@ call plug#begin('~/.local/share/nvim/plugged')
" Plugins
Plug 'VundleVim/Vundle.vim'
+Plug 'acarapetis/vim-colors-github'
Plug 'airblade/vim-gitgutter'
Plug 'b4b4r07/vim-hcl'
Plug 'bazelbuild/vim-bazel'
@@ -11,7 +12,9 @@ Plug 'cespare/vim-toml'
Plug 'djoshea/vim-autoread'
Plug 'ervandew/supertab'
Plug 'fatih/vim-go'
+Plug 'gerw/vim-HiLinkTrace'
Plug 'godlygeek/tabular'
+Plug 'google/vim-jsonnet'
Plug 'google/vim-maktaba'
Plug 'hashivim/vim-terraform'
Plug 'jremmen/vim-ripgrep'
@@ -21,6 +24,7 @@ Plug 'junegunn/fzf.vim'
Plug 'junegunn/goyo.vim'
Plug 'junegunn/gv.vim'
Plug 'junegunn/vim-peekaboo'
+Plug 'kshenoy/vim-signature'
Plug 'Matt-Deacalion/vim-systemd-syntax'
Plug 'NLKNguyen/papercolor-theme'
Plug 'plasticboy/vim-markdown'
@@ -34,6 +38,7 @@ Plug 'tpope/vim-fugitive'
Plug 'tyrannicaltoucan/vim-quantum'
Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'
+Plug 'vim-syntastic/syntastic'
Plug 'w0rp/ale'
" Autocomplete
@@ -253,6 +258,13 @@ au BufNewFile,BufRead SCons* set filetype=python
"" JavaScript, Json
let g:vim_json_syntax_conceal = 0
+"" Jsonnet
+
+let g:jsonnet_fmt_fail_silently = 0
+autocmd BufNewFile,BufAdd,BufRead *.libjsonnet setlocal ft=jsonnet
+
+
+
"" Scala
autocmd BufNewFile,BufAdd,BufRead build.sbt setlocal ft=scala
autocmd BufNewFile,BufAdd,BufRead *.scala setlocal ft=scala
@@ -449,6 +461,7 @@ let g:go_highlight_build_constraints = 1
let g:go_highlight_extra_types = 1
let g:go_highlight_fields = 1
let g:go_highlight_functions = 1
+let g:go_highlight_function_calls = 1
let g:go_highlight_interfaces = 1
let g:go_highlight_methods = 1
let g:go_highlight_operators = 1
@@ -516,8 +529,8 @@ set termguicolors
let &t_8f = "[38;2;%lu;%lu;%lum"
let &t_8b = "[48;2;%lu;%lu;%lum"
-" color dln-light
-color dln-dark
+color dln-light
+" color dln-dark
" highlight LineNr ctermfg=31 ctermbg=234 cterm=italic
" highlight CursorLine ctermfg=159 ctermbg=24
@@ -529,5 +542,28 @@ highlight GitGutterChange ctermbg=234 ctermfg=220
highlight GitGutterDelete ctermbg=234 ctermfg=124
highlight GitGutterChangeDelete ctermbg=234 ctermfg=88
-map ,l :color dln-dark
+map ,l :color dln-light
+
+let s:hidden_all = 1
+set noshowmode
+set noruler
+set laststatus=0
+set noshowcmd
+
+function! ToggleHiddenAll()
+ if s:hidden_all == 0
+ let s:hidden_all = 1
+ set noshowmode
+ set noruler
+ set laststatus=0
+ set noshowcmd
+ else
+ let s:hidden_all = 0
+ set showmode
+ set ruler
+ set laststatus=2
+ set showcmd
+ endif
+endfunction
+nnoremap :call ToggleHiddenAll()
diff --git a/.config/redshift.conf b/.config/redshift.conf
index 47a3003..08d4eae 100644
--- a/.config/redshift.conf
+++ b/.config/redshift.conf
@@ -1,6 +1,6 @@
[redshift]
-temp-day=3900
-temp-night=3000
+temp-day=3800
+temp-night=2900
brightness-day=0.99
brightness-night=0.75
location-provider=manual
diff --git a/.config/rofi/config b/.config/rofi/config
new file mode 100644
index 0000000..434042c
--- /dev/null
+++ b/.config/rofi/config
@@ -0,0 +1,2 @@
+rofi.font: IBM Plex Sans 16
+rofi.dpi: 240
diff --git a/.config/systemd/user/tmux.service b/.config/systemd/user/tmux.service
index 0234a2d..52bd873 100644
--- a/.config/systemd/user/tmux.service
+++ b/.config/systemd/user/tmux.service
@@ -3,9 +3,8 @@ Description=Start tmux in detached session
[Service]
Type=forking
-User=%I
ExecStart=/usr/bin/tmux new-session -s %u -d
ExecStop=/usr/bin/tmux kill-session -t %u
[Install]
-WantedBy=multi-user.target
+WantedBy=default.target
diff --git a/.tmux.conf b/.tmux.conf
index 273f09a..600367a 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -4,6 +4,7 @@ set -g base-index 1
set -g display-panes-time 3000
#set -s escape-time 7
set -s escape-time 50
+set -g status off
set -g status-interval 30
set -g terminal-overrides "xterm*:XT:smcup@:rmcup@:kUP5=\eOA:kDN5=\eOB:kLFT5=\eOD:kRIT5=\eOC"
set -g terminal-overrides ",*:colors=256:smso=\e[3m:rmso=\e[23m:sitm=\e[3m:ritm=\e[23m"
@@ -86,11 +87,6 @@ setw -g window-status-format ""
setw -g window-status-current-format "#W"
setw -g window-status-separator ""
-# set -g status-fg "#77aacc"
-# set -g status-bg "#002233"
-# set -g status-left '#[bg=#115522,fg=#99bb33] #I #[bg=#114466,fg=#4499cc] #h #[default] '
-# set -g status-right '#[bg=#002233,fg=#4477aa] | #{battery_percentage} #{battery_remain} | #(date +"%R") '
-
set -g status-fg "#aaaaaa"
set -g status-bg "#222222"
set -g status-left '#[bg=#114400,fg=#77aa22] #I #[bg=#334455,fg=#7799aa] #h #[default] '
@@ -113,7 +109,7 @@ neww -d 'exec zsh'
neww -d 'exec zsh'
selectw -t 1
-run-shell ~/src/github.com/tmux-plugins/tmux-battery/battery.tmux
+run-shell ~/.tmux/plugins/tmux-battery/battery.tmux
# source /usr/lib/python3.6/site-packages/powerline/bindings/tmux/powerline.conf
diff --git a/.xinitrc b/.xinitrc
index 922916e..61068e9 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -6,10 +6,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
unset f
fi
-. $HOME/.bashrc
-xsetroot -solid \#202020
xmodmap $HOME/.Xmodmap
-feh --bg-fill $HOME/Images/desktop.jpg || true
setxkbmap -option ctrl:nocaps,grp:switch,grp_led:scroll us,se
alacritty -e tmux attach -t0 &
-exec dwm
+exec $HOME/bin/dwm
diff --git a/.zshrc b/.zshrc
index af724e6..e0d8d61 100644
--- a/.zshrc
+++ b/.zshrc
@@ -9,6 +9,10 @@
# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
export PATH=$HOME/bin:$PATH:/bin:/sbin:/usr/sbin:/usr/local/sbin
+export EDITOR=nvim
+export DISPLAY=:0
+export GOPATH=$HOME
+
fpath=(~/.zsh/functions $fpath)
ZSH_THEME="robbyrussell"
@@ -17,16 +21,17 @@ export DIRENV_LOG_FORMAT=
export RIPGREP_CONFIG_PATH=$HOME/.ripgreprc
export HISTFILE=~/.zsh_history
-export SAVEHIST=9000
+export HISTSIZE=20000
+export SAVEHIST=20000
export LPASS_AGENT_TIMEOUT=900
typeset -A ZSH_HIGHLIGHT_STYLES
export ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern)
-export ZSH_HIGHLIGHT_STYLES[alias]='fg=155'
-export ZSH_HIGHLIGHT_STYLES[builtin]='fg=190'
-export ZSH_HIGHLIGHT_STYLES[command]='fg=155'
-export ZSH_HIGHLIGHT_STYLES[function]='fg=155'
-export ZSH_HIGHLIGHT_STYLES[path]='fg=116'
+export ZSH_HIGHLIGHT_STYLES[alias]='fg=31'
+export ZSH_HIGHLIGHT_STYLES[builtin]='fg=71'
+export ZSH_HIGHLIGHT_STYLES[command]='fg=35'
+export ZSH_HIGHLIGHT_STYLES[function]='fg=35'
+export ZSH_HIGHLIGHT_STYLES[path]='fg=31'
export PROMPT_LEAN_COLOR1=78
export PROMPT_LEAN_COLOR2=67
@@ -35,7 +40,13 @@ export PROMPT_LEAN_PATH_PERCENT=50
export PROMPT_LEAN_LEFT=_dln_prompt_left
# export PROMPT_LEAN_RIGHT=_dln_prompt_right
-setopt append_history
+setopt extended_history
+setopt hist_expire_dups_first
+setopt hist_ignore_dups
+setopt hist_ignore_space
+setopt hist_verify
+setopt inc_append_history
+# setopt append_history
setopt share_history
source ~/.zplug/init.zsh
diff --git a/bin/dwm b/bin/dwm
index 00b17e7..3939155 100755
Binary files a/bin/dwm and b/bin/dwm differ
diff --git a/bin/ktoolbox b/bin/ktoolbox
index 8194498..673bba2 100755
--- a/bin/ktoolbox
+++ b/bin/ktoolbox
@@ -1,5 +1,5 @@
#!/bin/bash
-set -ex
+set -e
name=toolbox-${USER}
image='dlneintr/toolbox:latest'
labels="app=toolbox,owner=${USER},cookie=0xdeadbeef"