dotfiles: sync from prime
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1 +1,4 @@
|
|||||||
.netrwhist
|
.netrwhist
|
||||||
|
.DS_Store
|
||||||
|
karabiner/.config/karabiner/automatic_backups/
|
||||||
|
karabiner/.config/karabiner/assets/
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ window:
|
|||||||
y: 0
|
y: 0
|
||||||
decorations: none
|
decorations: none
|
||||||
startup_mode: Maximized
|
startup_mode: Maximized
|
||||||
|
dynamic_title: true
|
||||||
draw_bold_text_with_bright_colors: true
|
draw_bold_text_with_bright_colors: true
|
||||||
font:
|
font:
|
||||||
normal:
|
normal:
|
||||||
@@ -18,7 +19,7 @@ font:
|
|||||||
italic:
|
italic:
|
||||||
family: Fira Code
|
family: Fira Code
|
||||||
style: Light
|
style: Light
|
||||||
size: 18.0
|
size: 22.0
|
||||||
offset:
|
offset:
|
||||||
x: 0
|
x: 0
|
||||||
y: 0
|
y: 0
|
||||||
@@ -75,14 +76,13 @@ colors:
|
|||||||
cyan: '0x8FBCBB'
|
cyan: '0x8FBCBB'
|
||||||
white: '0xECEFF4'
|
white: '0xECEFF4'
|
||||||
|
|
||||||
visual_bell:
|
# visual_bell:
|
||||||
duration: 0
|
# duration: 0
|
||||||
background_opacity: 1.0
|
# background_opacity: 1.0
|
||||||
mouse:
|
mouse:
|
||||||
hide_when_typing: true
|
hide_when_typing: true
|
||||||
selection:
|
selection:
|
||||||
semantic_escape_chars: ",│`|:\"' ()[]{}<>"
|
semantic_escape_chars: ",│`|:\"' ()[]{}<>"
|
||||||
dynamic_title: true
|
|
||||||
cursor:
|
cursor:
|
||||||
style: Block
|
style: Block
|
||||||
unfocused_hollow: true
|
unfocused_hollow: true
|
||||||
|
|||||||
14
bash/.bashrc
14
bash/.bashrc
@@ -17,17 +17,7 @@ shopt -s checkhash
|
|||||||
shopt -s cmdhist # save multi-line commands in one
|
shopt -s cmdhist # save multi-line commands in one
|
||||||
|
|
||||||
export BASH_SILENCE_DEPRECATION_WARNING=1
|
export BASH_SILENCE_DEPRECATION_WARNING=1
|
||||||
|
export RUBY_CONFIGURE_OPTS="--with-openssl-dir=/usr/local/opt/openssl@1.1"
|
||||||
# ruby-build installs a non-Homebrew OpenSSL for each Ruby version installed and these are never upgraded.
|
|
||||||
|
|
||||||
# To link Rubies to Homebrew's OpenSSL 1.1 (which is upgraded) add the following
|
|
||||||
# to your /Users/madundead/.bash_profile:
|
|
||||||
# export RUBY_CONFIGURE_OPTS="--with-openssl-dir=$(brew --prefix openssl@1.1)"
|
|
||||||
|
|
||||||
# Note: this may interfere with building old versions of Ruby (e.g <2.4) that use
|
|
||||||
# OpenSSL <1.1.
|
|
||||||
|
|
||||||
# export RUBY_CONFIGURE_OPTS="--with-openssl-dir=$(brew --prefix openssl@1.1)"
|
|
||||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.:/usr/local/lib
|
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.:/usr/local/lib
|
||||||
export EDITOR=nvim
|
export EDITOR=nvim
|
||||||
export LANG=en_US.UTF-8
|
export LANG=en_US.UTF-8
|
||||||
@@ -53,6 +43,7 @@ alias md='mkdir -p'
|
|||||||
|
|
||||||
alias gco='git checkout'
|
alias gco='git checkout'
|
||||||
alias gcom='git checkout master'
|
alias gcom='git checkout master'
|
||||||
|
alias gcob='git checkout -b'
|
||||||
alias gd='git diff'
|
alias gd='git diff'
|
||||||
alias gdc='git diff --cached'
|
alias gdc='git diff --cached'
|
||||||
alias gc='git commit'
|
alias gc='git commit'
|
||||||
@@ -130,7 +121,6 @@ function q() { if [ -z "$1" ]; then return 1; fi; kubectl exec -n $1 -it $(kubec
|
|||||||
function o() { if [ -z "$1" ]; then return 1; fi; kubectl exec -n $1 -it $(kubectl get pods -n $1 -l product=origin,app=origin-rails-webserver -o=custom-columns=NAME:.metadata.name | tail -1) ${@:2}; }
|
function o() { if [ -z "$1" ]; then return 1; fi; kubectl exec -n $1 -it $(kubectl get pods -n $1 -l product=origin,app=origin-rails-webserver -o=custom-columns=NAME:.metadata.name | tail -1) ${@:2}; }
|
||||||
function olb() { if [ -z "$1" ]; then return 1; fi; kubectl exec -n $1 -it $(kubectl get pods -n $1 -l product=online-bind,app=online-bind-rails-webserver -o=custom-columns=NAME:.metadata.name | tail -1) ${@:2}; }
|
function olb() { if [ -z "$1" ]; then return 1; fi; kubectl exec -n $1 -it $(kubectl get pods -n $1 -l product=online-bind,app=online-bind-rails-webserver -o=custom-columns=NAME:.metadata.name | tail -1) ${@:2}; }
|
||||||
function qstag() { kubectl exec -n staging -it $(kubectl get pods -n staging -l product=quoting,app=quoting-rails-webserver -o=custom-columns=NAME:.metadata.name | tail -1) ${@:2}; }
|
function qstag() { kubectl exec -n staging -it $(kubectl get pods -n staging -l product=quoting,app=quoting-rails-webserver -o=custom-columns=NAME:.metadata.name | tail -1) ${@:2}; }
|
||||||
# bash ops-deployment/tools/debug quoting production rails c
|
|
||||||
|
|
||||||
function _calcram() {
|
function _calcram() {
|
||||||
local sum
|
local sum
|
||||||
|
|||||||
@@ -27,13 +27,14 @@ for i, mapping in ipairs(hyperModeAppMappings) do
|
|||||||
end
|
end
|
||||||
--------------------------------------------------------------------------
|
--------------------------------------------------------------------------
|
||||||
hs.window.animationDuration = 0
|
hs.window.animationDuration = 0
|
||||||
|
window = hs.getObjectMetatable("hs.window")
|
||||||
|
|
||||||
-- +-----------------+
|
-- +-----------------+
|
||||||
-- | | |
|
-- | | |
|
||||||
-- | HERE | |
|
-- | HERE | |
|
||||||
-- | | |
|
-- | | |
|
||||||
-- +-----------------+
|
-- +-----------------+
|
||||||
function hs.window.left(win)
|
function window.left(win)
|
||||||
local f = win:frame()
|
local f = win:frame()
|
||||||
local screen = win:screen()
|
local screen = win:screen()
|
||||||
local max = screen:frame()
|
local max = screen:frame()
|
||||||
@@ -50,7 +51,7 @@ end
|
|||||||
-- | | HERE |
|
-- | | HERE |
|
||||||
-- | | |
|
-- | | |
|
||||||
-- +-----------------+
|
-- +-----------------+
|
||||||
function hs.window.right(win)
|
function window.right(win)
|
||||||
local f = win:frame()
|
local f = win:frame()
|
||||||
local screen = win:screen()
|
local screen = win:screen()
|
||||||
local max = screen:frame()
|
local max = screen:frame()
|
||||||
@@ -67,7 +68,7 @@ end
|
|||||||
-- +-----------------+
|
-- +-----------------+
|
||||||
-- | |
|
-- | |
|
||||||
-- +-----------------+
|
-- +-----------------+
|
||||||
function hs.window.up(win)
|
function window.up(win)
|
||||||
local f = win:frame()
|
local f = win:frame()
|
||||||
local screen = win:screen()
|
local screen = win:screen()
|
||||||
local max = screen:frame()
|
local max = screen:frame()
|
||||||
@@ -84,7 +85,7 @@ end
|
|||||||
-- +-----------------+
|
-- +-----------------+
|
||||||
-- | HERE |
|
-- | HERE |
|
||||||
-- +-----------------+
|
-- +-----------------+
|
||||||
function hs.window.down(win)
|
function window.down(win)
|
||||||
local f = win:frame()
|
local f = win:frame()
|
||||||
local screen = win:screen()
|
local screen = win:screen()
|
||||||
local max = screen:frame()
|
local max = screen:frame()
|
||||||
@@ -101,7 +102,7 @@ end
|
|||||||
-- +--------+ |
|
-- +--------+ |
|
||||||
-- | |
|
-- | |
|
||||||
-- +-----------------+
|
-- +-----------------+
|
||||||
function hs.window.upLeft(win)
|
function window.upLeft(win)
|
||||||
local f = win:frame()
|
local f = win:frame()
|
||||||
local screen = win:screen()
|
local screen = win:screen()
|
||||||
local max = screen:fullFrame()
|
local max = screen:fullFrame()
|
||||||
@@ -118,7 +119,7 @@ end
|
|||||||
-- +--------+ |
|
-- +--------+ |
|
||||||
-- | HERE | |
|
-- | HERE | |
|
||||||
-- +-----------------+
|
-- +-----------------+
|
||||||
function hs.window.downLeft(win)
|
function window.downLeft(win)
|
||||||
local f = win:frame()
|
local f = win:frame()
|
||||||
local screen = win:screen()
|
local screen = win:screen()
|
||||||
local max = screen:fullFrame()
|
local max = screen:fullFrame()
|
||||||
@@ -135,7 +136,7 @@ end
|
|||||||
-- | +--------|
|
-- | +--------|
|
||||||
-- | | HERE |
|
-- | | HERE |
|
||||||
-- +-----------------+
|
-- +-----------------+
|
||||||
function hs.window.downRight(win)
|
function window.downRight(win)
|
||||||
local f = win:frame()
|
local f = win:frame()
|
||||||
local screen = win:screen()
|
local screen = win:screen()
|
||||||
local max = screen:fullFrame()
|
local max = screen:fullFrame()
|
||||||
@@ -153,7 +154,7 @@ end
|
|||||||
-- | +--------|
|
-- | +--------|
|
||||||
-- | |
|
-- | |
|
||||||
-- +-----------------+
|
-- +-----------------+
|
||||||
function hs.window.upRight(win)
|
function window.upRight(win)
|
||||||
local f = win:frame()
|
local f = win:frame()
|
||||||
local screen = win:screen()
|
local screen = win:screen()
|
||||||
local max = screen:fullFrame()
|
local max = screen:fullFrame()
|
||||||
@@ -170,7 +171,7 @@ end
|
|||||||
-- | | HERE | |
|
-- | | HERE | |
|
||||||
-- | | | |
|
-- | | | |
|
||||||
-- +---------------+
|
-- +---------------+
|
||||||
function hs.window.centerWithFullHeight(win)
|
function window.centerWithFullHeight(win)
|
||||||
local f = win:frame()
|
local f = win:frame()
|
||||||
local screen = win:screen()
|
local screen = win:screen()
|
||||||
local max = screen:fullFrame()
|
local max = screen:fullFrame()
|
||||||
@@ -187,7 +188,7 @@ end
|
|||||||
-- | HERE | |
|
-- | HERE | |
|
||||||
-- | | |
|
-- | | |
|
||||||
-- +-----------------+
|
-- +-----------------+
|
||||||
function hs.window.left40(win)
|
function window.left40(win)
|
||||||
local f = win:frame()
|
local f = win:frame()
|
||||||
local screen = win:screen()
|
local screen = win:screen()
|
||||||
local max = screen:frame()
|
local max = screen:frame()
|
||||||
@@ -204,7 +205,7 @@ end
|
|||||||
-- | | HERE |
|
-- | | HERE |
|
||||||
-- | | |
|
-- | | |
|
||||||
-- +-----------------+
|
-- +-----------------+
|
||||||
function hs.window.right60(win)
|
function window.right60(win)
|
||||||
local f = win:frame()
|
local f = win:frame()
|
||||||
local screen = win:screen()
|
local screen = win:screen()
|
||||||
local max = screen:frame()
|
local max = screen:frame()
|
||||||
@@ -216,7 +217,7 @@ function hs.window.right60(win)
|
|||||||
win:setFrame(f)
|
win:setFrame(f)
|
||||||
end
|
end
|
||||||
|
|
||||||
function hs.window.nextScreen(win)
|
function window.nextScreen(win)
|
||||||
local currentScreen = win:screen()
|
local currentScreen = win:screen()
|
||||||
local allScreens = hs.screen.allScreens()
|
local allScreens = hs.screen.allScreens()
|
||||||
currentScreenIndex = hs.fnutils.indexOf(allScreens, currentScreen)
|
currentScreenIndex = hs.fnutils.indexOf(allScreens, currentScreen)
|
||||||
@@ -248,32 +249,9 @@ end
|
|||||||
|
|
||||||
local status, windowMappings = pcall(require, 'keyboard.windows-bindings')
|
local status, windowMappings = pcall(require, 'keyboard.windows-bindings')
|
||||||
|
|
||||||
-- if not status then
|
if not status then
|
||||||
-- windowMappings = require('keyboard.windows-bindings-defaults')
|
windowMappings = require('keyboard.windows-bindings-defaults')
|
||||||
-- end
|
end
|
||||||
|
|
||||||
local windowMappings = {
|
|
||||||
modifiers = {'ctrl'},
|
|
||||||
showHelp = false,
|
|
||||||
trigger = 's',
|
|
||||||
mappings = {
|
|
||||||
{ {}, 'return', 'maximize' },
|
|
||||||
{ {}, 'space', 'centerWithFullHeight' },
|
|
||||||
{ {}, 'h', 'left' },
|
|
||||||
{ {}, 'j', 'down' },
|
|
||||||
{ {}, 'k', 'up' },
|
|
||||||
{ {}, 'l', 'right' },
|
|
||||||
{ {'shift'}, 'h', 'left40' },
|
|
||||||
{ {'shift'}, 'l', 'right60' },
|
|
||||||
{ {}, 'i', 'upLeft' },
|
|
||||||
{ {}, 'o', 'upRight' },
|
|
||||||
{ {}, ',', 'downLeft' },
|
|
||||||
{ {}, '.', 'downRight' },
|
|
||||||
{ {}, 'n', 'nextScreen' },
|
|
||||||
{ {}, 'right', 'moveOneScreenEast' },
|
|
||||||
{ {}, 'left', 'moveOneScreenWest' },
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
local modifiers = windowMappings.modifiers
|
local modifiers = windowMappings.modifiers
|
||||||
local showHelp = windowMappings.showHelp
|
local showHelp = windowMappings.showHelp
|
||||||
@@ -323,3 +301,48 @@ end)
|
|||||||
windowLayoutMode:bind(modifiers, trigger, function()
|
windowLayoutMode:bind(modifiers, trigger, function()
|
||||||
windowLayoutMode:exit()
|
windowLayoutMode:exit()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
||||||
|
-- https://github.com/dbalatero/VimMode.spoon/tree/21805205e39cc693dbf6ea671d47f2c5ba920262#manual-instructions
|
||||||
|
--------------------------------
|
||||||
|
-- TODO: check this out, seems cool
|
||||||
|
--------------------------------
|
||||||
|
--local VimMode = hs.loadSpoon("VimMode")
|
||||||
|
--local vim = VimMode:new()
|
||||||
|
|
||||||
|
---- Configure apps you do *not* want Vim mode enabled in
|
||||||
|
---- For example, you don't want this plugin overriding your control of Terminal
|
||||||
|
---- vim
|
||||||
|
--vim
|
||||||
|
-- :disableForApp('Code')
|
||||||
|
-- :disableForApp('zoom.us')
|
||||||
|
-- :disableForApp('iTerm')
|
||||||
|
-- :disableForApp('iTerm2')
|
||||||
|
-- :disableForApp('Terminal')
|
||||||
|
|
||||||
|
---- If you want the screen to dim (a la Flux) when you enter normal mode
|
||||||
|
---- flip this to true.
|
||||||
|
--vim:shouldDimScreenInNormalMode(false)
|
||||||
|
|
||||||
|
---- If you want to show an on-screen alert when you enter normal mode, set
|
||||||
|
---- this to true
|
||||||
|
--vim:shouldShowAlertInNormalMode(true)
|
||||||
|
|
||||||
|
---- You can configure your on-screen alert font
|
||||||
|
--vim:setAlertFont("Courier New")
|
||||||
|
|
||||||
|
---- Enter normal mode by typing a key sequence
|
||||||
|
--vim:enterWithSequence('jk')
|
||||||
|
|
||||||
|
---- if you want to bind a single key to entering vim, remove the
|
||||||
|
---- :enterWithSequence('jk') line above and uncomment the bindHotKeys line
|
||||||
|
---- below:
|
||||||
|
----
|
||||||
|
---- To customize the hot key you want, see the mods and key parameters at:
|
||||||
|
---- https://www.hammerspoon.org/docs/hs.hotkey.html#bind
|
||||||
|
----
|
||||||
|
---- vim:bindHotKeys({ enter = { {'ctrl'}, ';' } })
|
||||||
|
|
||||||
|
----------------------------------
|
||||||
|
---- END VIM CONFIG
|
||||||
|
----------------------------------
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -19,6 +19,9 @@ set -g renumber-windows on
|
|||||||
# https://github.com/tmux/tmux/issues/353#issuecomment-265154018
|
# https://github.com/tmux/tmux/issues/353#issuecomment-265154018
|
||||||
set -g focus-events off
|
set -g focus-events off
|
||||||
|
|
||||||
|
set-option -g default-terminal "screen-256color"
|
||||||
|
set-option -ga terminal-overrides ',*-256color*:Tc'
|
||||||
|
|
||||||
# => Theme
|
# => Theme
|
||||||
set -g status-style fg=white,bg=black
|
set -g status-style fg=white,bg=black
|
||||||
set -g window-status-current-style fg=black,bg=white,bold
|
set -g window-status-current-style fg=black,bg=white,bold
|
||||||
|
|||||||
Reference in New Issue
Block a user