From 34eeb8ba1c35a4a77a281bb4dd0d2ac8e1017ffb Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Tue, 7 May 2019 15:57:52 -0400 Subject: [PATCH 1/2] More home manager, back to alacritty, etc. --- bin/backup_to_thumb.sh | 8 +-- home-common.nix | 109 ++++++++++++++++++++++++++--------------- 2 files changed, 74 insertions(+), 43 deletions(-) diff --git a/bin/backup_to_thumb.sh b/bin/backup_to_thumb.sh index b063707..c30053c 100755 --- a/bin/backup_to_thumb.sh +++ b/bin/backup_to_thumb.sh @@ -1,4 +1,4 @@ -rsync -a --delete --progress Sync /Volumes/NO\ NAME/ -rsync -a --delete --progress Pictures /Volumes/NO\ NAME/ -rsync -a --delete --progress Contacts /Volumes/NO\ NAME/ -rsync -a --delete --progress Calendars /Volumes/NO\ NAME/ +rsync --ignore-times --checksum -a --delete --progress Sync /Volumes/NO\ NAME/ +rsync --ignore-times --checksum -a --delete --progress Pictures /Volumes/NO\ NAME/ +rsync --ignore-times --checksum -a --delete --progress Contacts /Volumes/NO\ NAME/ +rsync --ignore-times --checksum -a --delete --progress Calendars /Volumes/NO\ NAME/ diff --git a/home-common.nix b/home-common.nix index 1f06881..f0eef51 100644 --- a/home-common.nix +++ b/home-common.nix @@ -2,7 +2,7 @@ { home.packages = with pkgs; [ - bat wget silver-searcher tree ranger nodejs yarn mu mosh newsboat msmtp w3m urlview nmap rtv gnupg youtube-dl mpv alacritty + bat wget silver-searcher tree ranger nodejs yarn mu mosh newsboat msmtp w3m urlview nmap rtv gnupg youtube-dl ]; home.sessionVariables = { @@ -19,6 +19,36 @@ programs.home-manager.enable = true; + programs.alacritty = { + enable = true; + settings = { + window = { + padding = { + x = 12; + y = 12; + }; + dimentions = { + columns = 0; + lines = 0; + }; + }; + font = { + normal.family = "Iosevka Nerd Font"; + bold.family = "Iosevka Nerd Font"; + italic.family = "Iosevka Nerd Font"; + size = 16.0; + }; + key_bindings = [ + { + key = "N"; + mods = "Control|Shift"; + action = "SpawnNewInstance"; + } + ]; + background_opacity = 0.95; + }; + }; + programs.tmux = { enable = true; shortcut = "a"; @@ -27,44 +57,44 @@ newSession = true; plugins = with pkgs.tmuxPlugins; [ sensible resurrect pain-control continuum copycat open urlview yank ]; extraConfig = '' - set -g set-titles on - set -g set-titles-string "#H (#S)" - set -g status-right "" - set -g status-left "" - - set-option -g mouse on - set-option -g status-bg default - set-option -g status-fg "#666666" - set-option -g status-attr default - set-option -g pane-border-fg "#666666" - set-option -g pane-active-border-fg "#666666" - set-option -g message-bg black - set-option -g message-fg white - set-option -g display-panes-active-colour white - set-option -g display-panes-colour white - - set-window-option -g window-status-fg "#666666" - set-window-option -g window-status-bg default - set-window-option -g window-status-current-fg white - set-window-option -g window-status-current-bg default - set-window-option -g window-status-format " #W" - set-window-option -g window-status-current-format " #W" - set-window-option -g window-status-separator " " - set-window-option -g clock-mode-colour white - - # remove when tmux-plugin-navigator plugin is added - is_vim="ps -o state= -o comm= -t '#{pane_tty}' \ - | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'" - tmux bind-key -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L" - tmux bind-key -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D" - tmux bind-key -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U" - tmux bind-key -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R" - tmux bind-key -n C-\\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l" - tmux bind-key -T copy-mode-vi C-h select-pane -L - tmux bind-key -T copy-mode-vi C-j select-pane -D - tmux bind-key -T copy-mode-vi C-k select-pane -U - tmux bind-key -T copy-mode-vi C-l select-pane -R - tmux bind-key -T copy-mode-vi C-\\ select-pane -l + set -g set-titles on + set -g set-titles-string "#H (#S)" + set -g status-right "" + set -g status-left "" + + set-option -g mouse on + set-option -g status-bg default + set-option -g status-fg "#666666" + set-option -g status-attr default + set-option -g pane-border-fg "#666666" + set-option -g pane-active-border-fg "#666666" + set-option -g message-bg black + set-option -g message-fg white + set-option -g display-panes-active-colour white + set-option -g display-panes-colour white + + set-window-option -g window-status-fg "#666666" + set-window-option -g window-status-bg default + set-window-option -g window-status-current-fg white + set-window-option -g window-status-current-bg default + set-window-option -g window-status-format " #W" + set-window-option -g window-status-current-format " #W" + set-window-option -g window-status-separator " " + set-window-option -g clock-mode-colour white + + # remove when tmux-plugin-navigator plugin is added + is_vim="ps -o state= -o comm= -t '#{pane_tty}' \ + | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'" + tmux bind-key -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L" + tmux bind-key -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D" + tmux bind-key -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U" + tmux bind-key -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R" + tmux bind-key -n C-\\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l" + tmux bind-key -T copy-mode-vi C-h select-pane -L + tmux bind-key -T copy-mode-vi C-j select-pane -D + tmux bind-key -T copy-mode-vi C-k select-pane -U + tmux bind-key -T copy-mode-vi C-l select-pane -R + tmux bind-key -T copy-mode-vi C-\\ select-pane -l ''; }; @@ -78,6 +108,7 @@ }; shellAliases = { l = "ls -la"; + n = "nnn -isl"; ta = "tmux attach -d"; e = "emacsclient -a \"\" -t -nw"; weather = "curl http://wttr.in"; From 70cbcdc62a78298636100c70db0c606e7288701f Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Tue, 7 May 2019 16:01:02 -0400 Subject: [PATCH 2/2] OMG deleting stuff feels great. Even though it's really mostly just been moved to home manager --- alacritty.yml | 501 -------------------------------------------------- fishfile | 6 - hyper.js | 152 --------------- tmux.conf | 89 --------- zshrc | 80 -------- 5 files changed, 828 deletions(-) delete mode 100644 alacritty.yml delete mode 100644 fishfile delete mode 100644 hyper.js delete mode 100644 tmux.conf delete mode 100644 zshrc diff --git a/alacritty.yml b/alacritty.yml deleted file mode 100644 index e991186..0000000 --- a/alacritty.yml +++ /dev/null @@ -1,501 +0,0 @@ -# Configuration for Alacritty, the GPU enhanced terminal emulator. - -# Any items in the `env` entry below will be added as -# environment variables. Some entries may override variables -# set by alacritty itself. -#env: - # TERM variable - # - # This value is used to set the `$TERM` environment variable for - # each instance of Alacritty. If it is not present, alacritty will - # check the local terminfo database and use 'alacritty' if it is - # available, otherwise 'xterm-256color' is used. - #TERM: xterm-256color - -window: - # Window dimensions (changes require restart) - # - # Specified in number of columns/lines, not pixels. - # If both are `0`, this setting is ignored. - dimensions: - columns: 80 - lines: 24 - - # 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: 12 - y: 12 - - # 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 - decorations: full - - # When true, alacritty starts maximized. - start_maximized: false - -scrolling: - # Maximum number of lines in the scrollback buffer. - # Specifying '0' will disable scrolling. - history: 10000 - - # Number of lines the viewport will move for every line scrolled when - # scrollback is enabled (history > 0). - multiplier: 3 - - # Faux Scrolling - # - # The `faux_multiplier` setting controls the number of lines the terminal - # should scroll when the alternate screen buffer is active. This is used - # to allow mouse scrolling for applications like `man`. - # - # Specifying `0` will disable faux scrolling. - faux_multiplier: 3 - - # Scroll to the bottom when new text is written to the terminal. - auto_scroll: false - -# Spaces per Tab (changes require restart) -# -# This setting defines the width of a tab in cells. -# -# Some applications, like Emacs, rely on knowing about the width of a tab. -# To prevent unexpected behavior in these applications, it's also required to -# change the `it` value in terminfo when altering this setting. -tabspaces: 8 - -# 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: - # Normal (roman) font face - normal: - # family: monospace - family: Iosevka Nerd Font - # The `style` can be specified to pick a specific face. - #style: Regular - - # Bold font face - bold: - # family: monospace - family: Iosevka Nerd Font - # The `style` can be specified to pick a specific face. - #style: Bold - - # Italic font face - italic: - # family: monospace - family: Iosevka Nerd Font - # The `style` can be specified to pick a specific face. - #style: Italic - - # Point size - # size: 11.0 - size: 14.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 - -# Display the time it takes to redraw each frame. -render_timer: false - -# Keep the log file after quitting Alacritty. -persistent_logging: false - -# If `true`, bold text is drawn using the bright color variants. -draw_bold_text_with_bright_colors: true - -# Colors (Tomorrow Night Bright) -colors: - # Default colors - primary: - background: '0x000000' - foreground: '0xeaeaea' - - # 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: '0x9a9a9a' - #bright_foreground: '0xffffff' - - # 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: '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 - # - # If the dim colors are not set, they will be calculated automatically based - # on the `normal` colors. - dim: - black: '0x333333' - red: '0xf2777a' - green: '0x99cc99' - yellow: '0xffcc66' - blue: '0x6699cc' - magenta: '0xcc99cc' - cyan: '0x66cccc' - white: '0xdddddd' - - # Indexed Colors - # - # The indexed colors include all colors from 16 to 256. - # When these are not set, they're filled with sensible defaults. - #indexed_colors: - # - { index: 16, color: '0x000000' } - -# 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: '0xffffff' - -# Background opacity -# -# Window opacity as a floating point number from `0.0` to `1.0`. -# The value `0.0` is completely transparent and `1.0` is opaque. -background_opacity: 0.95 - -# Mouse bindings -# -# Available fields: -# - mouse -# - action -# - mods (optional) -# -# Values for `mouse`: -# - Middle -# - Left -# - Right -# - Numeric identifier such as `5` -# -# All available `mods` and `action` values are documented in the key binding -# section. -mouse_bindings: - - { mouse: Middle, action: PasteSelection } - -mouse: - # Click settings - # - # The `double_click` and `triple_click` settings control the time - # alacritty should wait for accepting multiple clicks as one double - # or triple click. - double_click: { threshold: 300 } - triple_click: { threshold: 300 } - - # If this is `true`, the cursor is temporarily hidden when typing. - hide_when_typing: false - - url: - # URL launcher - # - # This program is executed when clicking on a text which is recognized as a URL. - # The URL is always added to the command as the last parameter. - launcher: xdg-open - - # 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: Control|Shift - -selection: - semantic_escape_chars: ",│`|:\"' ()[]{}<>" - - # When set to `true`, selected text will be copied to both the primary and - # the selection clipboard. Otherwise, it will only be copied to the selection - # clipboard. - save_to_clipboard: false - -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. -#shell: -# program: /bin/bash -# args: -# - --login - -# Key bindings -# -# Key bindings are specified as a list of objects. Each binding will specify -# a key and modifiers required to trigger it, terminal modes where the binding -# is applicable, and what should be done when the key binding fires. It can -# either send a byte sequnce to the running application (`chars`), execute -# a predefined action (`action`) or fork and execute a specified command plus -# arguments (`command`). -# -# Example: -# `- { key: V, mods: Command, action: Paste }` -# -# Available fields: -# - key -# - mods (optional) -# - chars | action | command (exactly one required) -# - mode (optional) -# -# Values for `key`: -# - `A` -> `Z` -# - `F1` -> `F12` -# - `Key1` -> `Key0` -# -# A full list with available key codes can be found here: -# https://docs.rs/glutin/*/glutin/enum.VirtualKeyCode.html#variants -# -# Instead of using the name of the keys, the `key` field also supports using -# the scancode of the desired key. Scancodes have to be specified as a -# decimal number. -# This command will allow you to display the hex scancodes for certain keys: -# `showkey --scancodes` -# -# Values for `mods`: -# - Command -# - Control -# - Shift -# - Alt -# -# Multiple `mods` can be combined using `|` like this: `mods: Control|Shift`. -# Whitespace and capitalization is relevant and must match the example. -# -# Values for `chars`: -# The `chars` field writes the specified string to the terminal. This makes -# it possible to pass escape sequences. -# To find escape codes for bindings like `PageUp` ("\x1b[5~"), you can run -# the command `showkey -a` outside of tmux. -# Note that applications use terminfo to map escape sequences back to -# keys. It is therefore required to update the terminfo when -# changing an escape sequence. -# -# Values for `action`: -# - Paste -# - PasteSelection -# - Copy -# - IncreaseFontSize -# - DecreaseFontSize -# - ResetFontSize -# - ScrollPageUp -# - ScrollPageDown -# - ScrollToTop -# - ScrollToBottom -# - ClearHistory -# - Hide -# - Quit -# - ClearLogNotice -# -# Values for `command`: -# The `command` field must be a map containing a `program` string and -# an `args` array of command line parameter strings. -# -# Example: -# `command: { program: "alacritty", args: ["-e", "vttest"] }` -# -# Values for `mode`: -# - ~AppCursor -# - AppCursor -# - ~AppKeypad -# - AppKeypad -key_bindings: - - { key: V, mods: Control|Shift, action: Paste } - - { key: C, mods: Control|Shift, action: Copy } - - { key: Paste, action: Paste } - - { key: Copy, 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: L, mods: Control, action: ClearLogNotice } - - { key: L, mods: Control, chars: "\x0c" } - - { 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/fishfile b/fishfile deleted file mode 100644 index 3f3b925..0000000 --- a/fishfile +++ /dev/null @@ -1,6 +0,0 @@ -fisherman/await -fisherman/fzf -fisherman/get -fisherman/getopts -fisherman/imgcat -fisherman/last_job_id diff --git a/hyper.js b/hyper.js deleted file mode 100644 index 62eafeb..0000000 --- a/hyper.js +++ /dev/null @@ -1,152 +0,0 @@ -// Future versions of Hyper may add additional config options, -// which will not automatically be merged into this file. -// See https://hyper.is#cfg for all currently supported options. - -module.exports = { - config: { - // choose either `'stable'` for receiving highly polished, - // or `'canary'` for less polished but more frequent updates - updateChannel: 'stable', - - // default font size in pixels for all tabs - fontSize: 14, - - // font family with optional fallbacks - // fontFamily: 'Menlo, "DejaVu Sans Mono", Consolas, "Lucida Console", monospace', - fontFamily: 'Iosevka Nerd Font', - - // default font weight: 'normal' or 'bold' - fontWeight: 'normal', - - // font weight for bold characters: 'normal' or 'bold' - fontWeightBold: 'bold', - - // line height as a relative unit - lineHeight: 1, - - // letter spacing as a relative unit - letterSpacing: 0, - - // terminal cursor background color and opacity (hex, rgb, hsl, hsv, hwb or cmyk) - cursorColor: 'rgba(248,28,229,0.8)', - - // terminal text color under BLOCK cursor - cursorAccentColor: '#000', - - // `'BEAM'` for |, `'UNDERLINE'` for _, `'BLOCK'` for █ - cursorShape: 'BLOCK', - - // set to `true` (without backticks and without quotes) for blinking cursor - cursorBlink: false, - - // color of the text - foregroundColor: '#fff', - - // terminal background color - // opacity is only supported on macOS - backgroundColor: '#000', - - // terminal selection color - selectionColor: 'rgba(248,28,229,0.3)', - - // border color (window, tabs) - borderColor: '#333', - - // custom CSS to embed in the main window - css: '', - - // custom CSS to embed in the terminal window - termCSS: '', - - // if you're using a Linux setup which show native menus, set to false - // default: `true` on Linux, `true` on Windows, ignored on macOS - showHamburgerMenu: false, - - // set to `false` (without backticks and without quotes) if you want to hide the minimize, maximize and close buttons - // additionally, set to `'left'` if you want them on the left, like in Ubuntu - // default: `true` (without backticks and without quotes) on Windows and Linux, ignored on macOS - showWindowControls: false, - - // custom padding (CSS format, i.e.: `top right bottom left`) - padding: '12px', - - // the full list. if you're going to provide the full color palette, - // including the 6 x 6 color cubes and the grayscale map, just provide - // an array here instead of a color map object - colors: { - black: '#000000', - red: '#C51E14', - green: '#1DC121', - yellow: '#C7C329', - blue: '#0A2FC4', - magenta: '#C839C5', - cyan: '#20C5C6', - white: '#C7C7C7', - lightBlack: '#686868', - lightRed: '#FD6F6B', - lightGreen: '#67F86F', - lightYellow: '#FFFA72', - lightBlue: '#6A76FB', - lightMagenta: '#FD7CFC', - lightCyan: '#68FDFE', - lightWhite: '#FFFFFF', - }, - - // the shell to run when spawning a new session (i.e. /usr/local/bin/fish) - // if left empty, your system's login shell will be used by default - // - // Windows - // - Make sure to use a full path if the binary name doesn't work - // - Remove `--login` in shellArgs - // - // Bash on Windows - // - Example: `C:\\Windows\\System32\\bash.exe` - // - // PowerShell on Windows - // - Example: `C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\powershell.exe` - shell: '', - - // for setting shell arguments (i.e. for using interactive shellArgs: `['-i']`) - // by default `['--login']` will be used - shellArgs: ['--login'], - - // for environment variables - env: {}, - - // set to `false` for no bell - bell: 'SOUND', - - // if `true` (without backticks and without quotes), selected text will automatically be copied to the clipboard - copyOnSelect: false, - - // if `true` (without backticks and without quotes), hyper will be set as the default protocol client for SSH - defaultSSHApp: true, - - // if `true` (without backticks and without quotes), on right click selected text will be copied or pasted if no - // selection is present (`true` by default on Windows and disables the context menu feature) - // quickEdit: true, - - // URL to custom bell - // bellSoundURL: 'http://example.com/bell.mp3', - - // for advanced config flags please refer to https://hyper.is/#cfg - }, - - // a list of plugins to fetch and install from npm - // format: [@org/]project[#version] - // examples: - // `hyperpower` - // `@company/project` - // `project#1.0.1` - plugins: [], - - // in development, you can create a directory under - // `~/.hyper_plugins/local/` and include it here - // to load it and avoid it being `npm install`ed - localPlugins: [], - - keymaps: { - // Example - // 'window:devtools': 'cmd+alt+o', - }, -}; diff --git a/tmux.conf b/tmux.conf deleted file mode 100644 index beebd47..0000000 --- a/tmux.conf +++ /dev/null @@ -1,89 +0,0 @@ -# Set the prefix to ^A -unbind C-b -set -g prefix C-a - -bind C-d detach - -bind-key -n C-0 select-window -t :0 -bind-key -n C-1 select-window -t :1 -bind-key -n C-2 select-window -t :2 -bind-key -n C-3 select-window -t :3 -bind-key -n C-4 select-window -t :4 -bind-key -n C-5 select-window -t :5 -bind-key -n C-6 select-window -t :6 -bind-key -n C-7 select-window -t :7 -bind-key -n C-8 select-window -t :8 -bind-key -n C-9 select-window -t :9 - -set -g mode-keys vi - -# Terminal Titles -set -g set-titles on -set -g set-titles-string "#H (#S)" - -# Status -set -g status on - -# Escape delay -# set -s escape-time 1 # should be taken care of by sensible now - -# Plugins -set -g @plugin 'tmux-plugins/tpm' -set -g @plugin 'tmux-plugins/tmux-sensible' -set -g @plugin 'tmux-plugins/tmux-resurrect' -set -g @plugin 'tmux-plugins/tmux-continuum' -set -g @plugin 'tmux-plugins/tmux-copycat' -set -g @plugin 'tmux-plugins/tmux-yank' -set -g @plugin 'tmux-plugins/tmux-open' -set -g @plugin 'tmux-plugins/tmux-pain-control' -set -g @plugin 'jbnicolai/tmux-urlview' -set -g @plugin 'christoomey/vim-tmux-navigator' -set -g @plugin 'nhdaly/tmux-better-mouse-mode' - -set -g @continuum-restore 'on' -set -g @yank_selection_mouse 'primary' - -set -g status-right '' -set -g status-left '' - -# default statusbar colors -set-option -g status-bg default -set-option -g status-fg '#666666' -set-option -g status-attr default - -# default window title colors -set-window-option -g window-status-fg '#666666' -set-window-option -g window-status-bg default - -# active window title colors -set-window-option -g window-status-current-fg white -set-window-option -g window-status-current-bg default - -# set-window-option -g window-status-format ' #I #W' -set-window-option -g window-status-format ' #W' -# set-window-option -g window-status-current-format ' #I #W' -set-window-option -g window-status-current-format ' #W' -set-window-option -g window-status-separator ' ' - -set-window-option -g base-index 1 - -# pane border -set-option -g pane-border-fg '#666666' -set-option -g pane-active-border-fg '#666666' - -# message text -set-option -g message-bg black -set-option -g message-fg white - -# pane number display -set-option -g display-panes-active-colour white -set-option -g display-panes-colour white - -# clock -set-window-option -g clock-mode-colour white - -# mouse -set-option -g mouse on - -# Initialize TMUX plugin manager -run '~/.tmux/plugins/tpm/tpm' diff --git a/zshrc b/zshrc deleted file mode 100644 index 4e8e6db..0000000 --- a/zshrc +++ /dev/null @@ -1,80 +0,0 @@ -# source ~/dotfiles/antigen.zsh -source /usr/local/share/antigen/antigen.zsh -antigen use oh-my-zsh -antigen bundle zsh-users/zsh-syntax-highlighting -antigen bundle git -# antigen theme S1cK94/minimal minimal -antigen theme https://github.com/denysdovhan/spaceship-prompt spaceship -antigen apply - -autoload -U select-word-style -select-word-style bash - -HISTSIZE=1000 -SAVEHIST=1000 -HISTFILE=~/.history - -bindkey -e - -alias l="ls -la" -alias ta="tmux attach -d" -alias e='emacsclient -a "" -t -nw' -alias emacs='emacs -q' # typing 'emacs' should not load any config -alias weather='curl http://wttr.in' - -# nvim -if [ -x "$(command -v nvim)" ]; then - alias vi=nvim - alias vim=nvim - export EDITOR=nvim -else - alias vi=vim - export EDITOR=vim -fi - -# Mac only -[ -x "$(command -v open)" ] && export BROWSER=open - -# IOCOM stuff -alias er='rm -rf logs; unzip -o' -if [ -x "$(command -v p4)" ]; then - export P4USER=dswan - export P4PORT="humu.iocom.com:1666" - export P4CONFIG=p4.cfg - export P4EDITOR=vim - export P4IGNORE=.ignore -fi - -# PATH -[ -e ~/dotfiles/bin ] && export PATH=$HOME/dotfiles/bin:$PATH -[ -e ~/.local/bin ] && export PATH=$HOME/.local/bin:$PATH # Stack -[ -e ~/.npm-packages/bin ] && export PATH=$HOME/.npm-packages/bin:$PATH # NPM - -# Keychain -if [ -x "$(command -v keychain)" ]; then - export GPG_AGENT_INFO="~/.gnupg/S.gpg-agent:$(pgrep gpg-agent):1" # Take this out when keychain fixes this bug - eval `keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377` -fi - -# FZF -[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh - -# iTerm2 -[ -f ~/.iterm2_shell_integration.zsh ] && source ~/.iterm2_shell_integration.zsh - -# Chruby -[ -f /usr/local/opt/chruby/share/chruby/chruby.sh ] && source /usr/local/opt/chruby/share/chruby/chruby.sh -[ -f /usr/local/opt/chruby/share/chruby/auto.sh ] && source /usr/local/opt/chruby/share/chruby/auto.sh - -# Colored Man Pages -man() { - env \ - LESS_TERMCAP_mb=$(printf "\e[1;31m") \ - LESS_TERMCAP_md=$(printf "\e[1;31m") \ - LESS_TERMCAP_me=$(printf "\e[0m") \ - LESS_TERMCAP_se=$(printf "\e[0m") \ - LESS_TERMCAP_so=$(printf "\e[1;44;33m") \ - LESS_TERMCAP_ue=$(printf "\e[0m") \ - LESS_TERMCAP_us=$(printf "\e[1;32m") \ - man "$@" -}