From e8194627b9553482bdfce5ab19ab7ae53bb61f53 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Tue, 13 Feb 2018 18:15:09 -0500 Subject: [PATCH] DOTFILES --- alacritty.yml | 365 +++++++++++++++++++++++++++++++++++++++++++++++++ config.fish | 3 +- fishfile | 7 + qutebrowser.py | 48 +++++++ spacemacs | 2 + symlinks.sh | 2 + vimrc | 1 + 7 files changed, 427 insertions(+), 1 deletion(-) create mode 100644 alacritty.yml create mode 100644 fishfile diff --git a/alacritty.yml b/alacritty.yml new file mode 100644 index 0000000..7593cab --- /dev/null +++ b/alacritty.yml @@ -0,0 +1,365 @@ +# 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 + # (changes require restart) + dimensions: + columns: 80 + lines: 24 + + # Adds this many blank pixels of padding around the window + # Units are physical pixels; this is not DPI aware. + # (change requires restart) + padding: + x: 2 + y: 2 + + # Window decorations + # Setting this to false will result in window without borders and title bar. + decorations: true + +# 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) +font: + # The normal (roman) font face to use. + normal: + family: Menlo + # Style can be specified to pick a specific face. + # style: Regular + + # The bold font face + bold: + family: Menlo + # Style can be specified to pick a specific face. + # style: Bold + + # The italic font face + italic: + family: Menlo + # Style can be specified to pick a specific face. + # style: Italic + + # Point size of the font + size: 12.0 + + # 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.0 + y: 0.0 + + # 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.0 + y: 0.0 + + # 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: false + +# Colors (Tomorrow Night Bright) +colors: + # Default colors + primary: + background: '0x000000' + foreground: '0xeaeaea' + + # Colors the cursor will use if `custom_cursor_colors` is true + cursor: + text: '0x000000' + cursor: '0xffffff' + + # Normal colors + normal: + black: '0x000000' + red: '0xd54e53' + green: '0xb9ca4a' + yellow: '0xe6c547' + blue: '0x7aa6da' + magenta: '0xc397d8' + cyan: '0x70c0ba' + white: '0xffffff' + + # Bright colors + bright: + black: '0x666666' + red: '0xff3334' + green: '0x9ec400' + yellow: '0xe7c547' + blue: '0x7aa6da' + magenta: '0xb77ee0' + cyan: '0x54ced6' + white: '0xffffff' + + # 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: 1 + +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"] } } +key_bindings: + - { key: V, mods: Command, action: Paste } + - { key: C, mods: Command, action: Copy } + - { key: Q, mods: Command, action: Quit } + - { key: W, mods: Command, action: Quit } + - { 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: Key0, mods: Command, action: ResetFontSize } + - { key: Equals, mods: Command, action: IncreaseFontSize } + - { key: Minus, mods: Command, action: DecreaseFontSize } + - { 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: Command, chars: "\x1b[1;3P" } + - { key: F2, mods: Command, chars: "\x1b[1;3Q" } + - { key: F3, mods: Command, chars: "\x1b[1;3R" } + - { key: F4, mods: Command, chars: "\x1b[1;3S" } + - { key: F5, mods: Command, chars: "\x1b[15;3~" } + - { key: F6, mods: Command, chars: "\x1b[17;3~" } + - { key: F7, mods: Command, chars: "\x1b[18;3~" } + - { key: F8, mods: Command, chars: "\x1b[19;3~" } + - { key: F9, mods: Command, chars: "\x1b[20;3~" } + - { key: F10, mods: Command, chars: "\x1b[21;3~" } + - { key: F11, mods: Command, chars: "\x1b[23;3~" } + - { key: F12, mods: Command, chars: "\x1b[24;3~" } diff --git a/config.fish b/config.fish index e42d76b..60d1630 100644 --- a/config.fish +++ b/config.fish @@ -34,6 +34,7 @@ set -x PATH $HOME/dotfiles/bin $PATH # set -x PATH $HOME/.local/bin $PATH set -x PATH $HOME/.npm-packages/bin $PATH # set -x PATH /usr/local/opt/python/libexec/bin $PATH +set -x PATH $HOME/.cargo/bin $PATH # Keychain if status --is-interactive @@ -46,7 +47,7 @@ end test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shell_integration.fish # Ledger -set -x LEDGER_FILE ~/Sync/Ledger/2017.ledger +set -x LEDGER_FILE ~/Sync/Ledger/ledger.ledger # Emacs term stuff function fish_title diff --git a/fishfile b/fishfile new file mode 100644 index 0000000..1aa43e7 --- /dev/null +++ b/fishfile @@ -0,0 +1,7 @@ +fisherman/await +fisherman/fzf +fisherman/get +fisherman/getopts +fisherman/imgcat +fisherman/last_job_id +fisherman/vibrant diff --git a/qutebrowser.py b/qutebrowser.py index c0f3c10..c648a30 100644 --- a/qutebrowser.py +++ b/qutebrowser.py @@ -44,11 +44,59 @@ c.colors.tabs.selected.odd.fg = 'black' # Type: QtColor c.colors.webpage.bg = 'white' +# Font used in the completion categories. +# Type: Font +c.fonts.completion.category = 'bold 12pt monospace' + +# Font used in the completion widget. +# Type: Font +c.fonts.completion.entry = '12pt monospace' + +# Font used for the debugging console. +# Type: QtFont +c.fonts.debug_console = '12pt monospace' + +# Font used for the downloadbar. +# Type: Font +c.fonts.downloads = '12pt monospace' + +# Font used for the hints. +# Type: Font +c.fonts.hints = 'bold 10pt monospace' + +# Font used in the keyhint widget. +# Type: Font +c.fonts.keyhint = '12pt monospace' + +# Font used for error messages. +# Type: Font +c.fonts.messages.error = '12pt monospace' + +# Font used for info messages. +# Type: Font +c.fonts.messages.info = '12pt monospace' + +# Font used for warning messages. +# Type: Font +c.fonts.messages.warning = '12pt monospace' + # Default monospace fonts. Whenever "monospace" is used in a font # setting, it's replaced with the fonts listed here. # Type: Font c.fonts.monospace = '"Iosevka Nerd Font"' +# Font used for prompts. +# Type: Font +c.fonts.prompts = '8pt sans-serif' + +# Font used in the statusbar. +# Type: Font +c.fonts.statusbar = '12pt monospace' + +# Font used in the tab bar. +# Type: QtFont +c.fonts.tabs = '12pt monospace' + # Open new tabs (middleclick/ctrl+click) in the background. # Type: Bool c.tabs.background = True diff --git a/spacemacs b/spacemacs index 358e14e..c579236 100644 --- a/spacemacs +++ b/spacemacs @@ -582,6 +582,8 @@ layers configuration. You are free to put any user code." (setq org-startup-indented t) + (require 'org-drill) + (setq org-agenda-files '("~/Sync/Notes")) (setq org-agenda-start-day "-0d") (setq org-agenda-span 2) diff --git a/symlinks.sh b/symlinks.sh index 247771f..8db1792 100644 --- a/symlinks.sh +++ b/symlinks.sh @@ -2,6 +2,8 @@ # ln -sf ~/dotfiles/zshrc ~/.zshrc mkdir -p ~/.config/fish; ln -sf ~/dotfiles/config.fish ~/.config/fish/config.fish +curl -Lo ~/.config/fish/functions/fisher.fish --create-dirs https://git.io/fisher +ln -s ~/dotfiles/fishfile ~/.config/fish/fishfile mkdir ~/.ghc; ln -sf ~/dotfiles/ghci.conf ~/.ghc/ghci.conf ln -sf ~/dotfiles/gitconfig ~/.gitconfig ln -sf ~/dotfiles/tmux.conf ~/.tmux.conf diff --git a/vimrc b/vimrc index 4390cf4..6a9b71d 100644 --- a/vimrc +++ b/vimrc @@ -58,6 +58,7 @@ Plug 'eagletmt/ghc-mod' Plug 'bitc/vim-hdevtools' "Plug 'eagletmt/neco-ghc' "Plug 'lukerandall/haskellmode-vim' +"Plug 'enomsg/vim-haskellConcealPlus' Plug 'ryanoasis/vim-devicons' " Themes