From c889188d70787d5353a03ca990a11cea2dd1beb6 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 6 Mar 2019 12:20:34 -0600 Subject: [PATCH] Kitty! --- apps/alacritty/alacritty.yml | 254 ----------------------------------- apps/kitty/kitty.conf | 13 ++ apps/neovim/commands.vim | 2 + apps/ranger/rc.conf | 2 +- de/sxhkd/sxhkdrc | 2 +- scripts/bin/app-launcher | 24 ++-- scripts/bin/b | 14 ++ setup | 5 +- shell/bash/aliases | 2 +- 9 files changed, 51 insertions(+), 267 deletions(-) delete mode 100644 apps/alacritty/alacritty.yml create mode 100644 apps/kitty/kitty.conf create mode 100755 scripts/bin/b diff --git a/apps/alacritty/alacritty.yml b/apps/alacritty/alacritty.yml deleted file mode 100644 index 6314d65..0000000 --- a/apps/alacritty/alacritty.yml +++ /dev/null @@ -1,254 +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 dimensions in character columns and lines -# (changes require restart) -dimensions: - columns: 80 - lines: 24 - -# The FreeType rasterizer needs to know the device DPI for best results -# (changes require restart) -dpi: - x: 180.0 - y: 180.0 - -padding: - x: 24.0 - y: 24.0 - -# Display tabs using this many cells (changes require restart) -tabspaces: 2 - -# 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: Iosevka # should be "Menlo" or something on macOS. - # Style can be specified to pick a specific face. - # style: Regular - - # The bold font face - bold: - family: Iosevka # should be "Menlo" or something on macOS. - # Style can be specified to pick a specific face. - # style: Bold - - # The italic font face - italic: - family: Iosevka # should be "Menlo" or something on macOS. - # Style can be specified to pick a specific face. - # style: Italic - - # Point size of the font - size: 10.0 - # 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: -37.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: '0x111111' - 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: '0x424242' - - # Bright colors - bright: - black: '0x666666' - red: '0xff3334' - green: '0x9ec400' - yellow: '0xe7c547' - blue: '0x7aa6da' - magenta: '0xb77ee0' - cyan: '0x54ced6' - white: '0x2a2a2a' - -# 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 - -# 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. -# -# 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` or `chars` field must be present. `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. Possible values of `action` include `Paste` and `PasteSelection`. -# -# 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: Q, mods: Command, action: Quit } - - { key: W, mods: Command, action: Quit } - - { key: Insert, mods: Shift, action: PasteSelection } - - { key: Home, chars: "\x1bOH", mode: AppCursor } - - { key: Home, chars: "\x1b[1~", mode: ~AppCursor } - - { key: End, chars: "\x1bOF", mode: AppCursor } - - { key: End, chars: "\x1b[4~", mode: ~AppCursor } - - { key: PageUp, chars: "\x1b[5~" } - - { key: PageDown, chars: "\x1b[6~" } - - { 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: Tab, mods: Shift, chars: "\x1b[Z" } - - { 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: Back, chars: "\x7f" } - - { key: Back, mods: Alt, chars: "\x1b\x7f" } - - { key: Insert, chars: "\x1b[2~" } - - { key: Delete, chars: "\x1b[3~" } - -# 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: - double_click: { threshold: 300 } - triple_click: { threshold: 300 } - -selection: - semantic_escape_chars: ",│`|:\"' ()[]{}<>" - -hide_cursor_when_typing: false - -# 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 diff --git a/apps/kitty/kitty.conf b/apps/kitty/kitty.conf new file mode 100644 index 0000000..e5d7077 --- /dev/null +++ b/apps/kitty/kitty.conf @@ -0,0 +1,13 @@ +font_family Iosevka Term +bold_font Iosevka Term Bold +italic_font Iosevka Term Italic +bold_italic_font Iosevka Term Bold Italic +# font_family Iosevka Medium Nerd Font Complete Mono +# bold_font Iosevka Bold Nerd Font Complete Mono +# italic_font Iosevka Italic Nerd Font Complete Mono +# bold_italic_font Iosevka Bold Italic Nerd Font Complete Mono +font_size 10.0 +adjust_line_height 0 +window_padding_width 8.0 +window_margin_width 0.0 + diff --git a/apps/neovim/commands.vim b/apps/neovim/commands.vim index 4804b61..7adb371 100644 --- a/apps/neovim/commands.vim +++ b/apps/neovim/commands.vim @@ -95,4 +95,6 @@ if has('autocmd') " autocmd WinLeave * call CheckCloseDistractionFreeMode() endif +" AddTabularPattern! ssv /\s/r0c0l0 + command! DistractionFreeMode call DistractionFreeModeFunc() diff --git a/apps/ranger/rc.conf b/apps/ranger/rc.conf index 91cf36c..5d88e29 100644 --- a/apps/ranger/rc.conf +++ b/apps/ranger/rc.conf @@ -1,2 +1,2 @@ set preview_images true -set preview_images_method urxvt +set preview_images_method kitty diff --git a/de/sxhkd/sxhkdrc b/de/sxhkd/sxhkdrc index aa0a187..12ca556 100755 --- a/de/sxhkd/sxhkdrc +++ b/de/sxhkd/sxhkdrc @@ -164,7 +164,7 @@ super + shift + t # spawn a terminal super + Return - urxvtc + kitty # spawn a floating terminal super + shift + Return diff --git a/scripts/bin/app-launcher b/scripts/bin/app-launcher index 31bbfe6..532e015 100755 --- a/scripts/bin/app-launcher +++ b/scripts/bin/app-launcher @@ -10,11 +10,19 @@ BACKGROUND_COLOR=$(xrdb -query | sed -ne 's/.*background:\s*\(.*\)$/\1 FOREGROUND_COLOR=$(xrdb -query | sed -ne 's/.*foreground:\s*\(.*\)$/\1/p' | head -n 1) GAP=$(xrdb -query | sed -ne 's/.*internalBorder:\s*\(.*\)$/\1/p' | head -n 1) -for i in "$@"; -do - params=" $params $i" -done - -echo "$params" >> "$HOME/.sxhkd.log" - -rofi -font "$LAUNCHER_FONT $LAUNCHER_FONT_SIZE" -padding $GAP -bw "$BORDER_WIDTH" -color-enabled -color-window "$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR" -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-active "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-urgent "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -monitor -4 -width 600 $params +rofi \ + -combi-modi run,window \ + -show combi \ + -modi combi \ + -font "$LAUNCHER_FONT $LAUNCHER_FONT_SIZE" \ + -padding $GAP \ + -bw "$BORDER_WIDTH" \ + -color-enabled \ + -color-window "$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR" \ + -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" \ + -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" \ + -color-active "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" \ + -color-urgent "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" \ + -monitor -4 \ + -width 600 \ + "$@" diff --git a/scripts/bin/b b/scripts/bin/b new file mode 100755 index 0000000..fc848b1 --- /dev/null +++ b/scripts/bin/b @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +bbin="bible" # npm i -g bible +pbin="less" + +# bible args +bargs="" + +# pager args +pargs="-R" + +[ $1 = "s" ] && bargs="$bargs --search" && shift + +"${bbin}" $bargs "$*" | "${pbin}" $pargs diff --git a/setup b/setup index 40dc6b0..6b49d43 100755 --- a/setup +++ b/setup @@ -54,6 +54,9 @@ links=( # terminal emulator "$dfp/apps/alacritty/" "$XDG_CONFIG_HOME/alacritty" + # kitty config + "$dfp/apps/kitty/" "$XDG_CONFIG_HOME/kitty" + # rofi config "$dfp/apps/rofi/config" "$XDG_CONFIG_HOME/rofi/config" @@ -88,8 +91,6 @@ read -r -p " [y/N] " response response=${response,,} # to lower case if [[ $response =~ ^(yes|y)$ ]]; then "$dfp/sudo_setup" -else - :: fi echo -e "Dotfiles Installed! Running 'exec bash'...\n" diff --git a/shell/bash/aliases b/shell/bash/aliases index 5767423..8b96a74 100644 --- a/shell/bash/aliases +++ b/shell/bash/aliases @@ -65,7 +65,7 @@ alias grbpf="git push --force-with-lease" alias gac="git add -A && git commit" alias gsur="git submodule update --remote" alias glf="git ls-files" -alias gl="git log --graph --pretty=oneline --abbrev-commit --decorate" +alias gl="git log --pretty=format:\"%h %ad%x09%an%x09%s\" --date=short" # docker aliases alias dlf="docker logs --tail=500 -f"