aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/install_mac.sh4
-rw-r--r--linux/tmux.conf (renamed from tmux.conf)0
-rw-r--r--linux/vim/vimrc (renamed from vim/vimrc)0
-rw-r--r--linux/zshrc (renamed from zshrc)0
-rw-r--r--mac/Hyperterm/hyper.js (renamed from Hyperterm/hyper.js)84
-rw-r--r--mac/Hyperterm/local/hideTitle/index.js (renamed from Hyperterm/local/hideTitle/index.js)0
-rw-r--r--mac/tmux.conf21
-rw-r--r--mac/zshrc64
-rw-r--r--windows/WinCmd/env.cmd (renamed from WinCmd/env.cmd)0
-rw-r--r--windows/hyperWin.js (renamed from Hyperterm/hyperWin.js)0
10 files changed, 145 insertions, 28 deletions
diff --git a/bin/install_mac.sh b/bin/install_mac.sh
index dc6c67a..5c867bf 100755
--- a/bin/install_mac.sh
+++ b/bin/install_mac.sh
@@ -1,6 +1,8 @@
#!/bin/sh
-sudo apt-get install git zsh
+
+/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+
ln -i tmux.conf ~/.tmux.conf
diff --git a/tmux.conf b/linux/tmux.conf
index 5abfeb1..5abfeb1 100644
--- a/tmux.conf
+++ b/linux/tmux.conf
diff --git a/vim/vimrc b/linux/vim/vimrc
index 84216c1..84216c1 100644
--- a/vim/vimrc
+++ b/linux/vim/vimrc
diff --git a/zshrc b/linux/zshrc
index e6c60fd..e6c60fd 100644
--- a/zshrc
+++ b/linux/zshrc
diff --git a/Hyperterm/hyper.js b/mac/Hyperterm/hyper.js
index b0c50cd..c802677 100644
--- a/Hyperterm/hyper.js
+++ b/mac/Hyperterm/hyper.js
@@ -1,3 +1,7 @@
+// 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,
@@ -8,7 +12,7 @@ module.exports = {
fontSize: 12,
// font family with optional fallbacks
- fontFamily: '"Roboto Mono", "Fira Code", Menlo, "DejaVu Sans Mono", "Lucida Console", monospace',
+ fontFamily: '"RobotoMono Nerd Font Mono", "Meslo LG S for Powerline", Menlo',
// default font weight: 'normal' or 'bold'
fontWeight: 'normal',
@@ -16,6 +20,12 @@ module.exports = {
// 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: 1,
+
// terminal cursor background color and opacity (hex, rgb, hsl, hsv, hwb or cmyk)
cursorColor: '#2C85F7',
@@ -42,7 +52,7 @@ module.exports = {
borderColor: '#323E4D',
// custom CSS to embed in the main window
- css: "",
+ css: '',
// custom CSS to embed in the terminal window
termCSS: '',
@@ -57,29 +67,29 @@ module.exports = {
showWindowControls: false,
// custom padding (CSS format, i.e.: `top right bottom left`)
- padding: '12px 14px 0 14px',
+ padding: '10px 0 0 10px',
// 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 : '#293340',
- red : '#E17E85',
- green : '#61BA86',
- yellow : '#FFEC8E',
- blue : '#4CB2FF',
- magenta : '#BE86E3',
- cyan : '#2DCED0',
- white : '#CDD2E9',
- lightBlack : '#546386',
- lightRed : '#E17E85',
- lightGreen : '#61BA86',
- lightYellow : '#FFB68E',
- lightBlue : '#4CB2FF',
- lightMagenta : '#BE86E3',
- lightCyan : '#2DCED0',
- lightWhite : '#CDD2E9'
- },
+ colors: {
+ black : '#293340',
+ red : '#E17E85',
+ green : '#61BA86',
+ yellow : '#FFEC8E',
+ blue : '#4CB2FF',
+ magenta : '#BE86E3',
+ cyan : '#2DCED0',
+ white : '#CDD2E9',
+ lightBlack : '#546386',
+ lightRed : '#E17E85',
+ lightGreen : '#61BA86',
+ lightYellow : '#FFB68E',
+ lightBlue : '#4CB2FF',
+ lightMagenta : '#BE86E3',
+ lightCyan : '#2DCED0',
+ lightWhite : '#CDD2E9'
+ },
// 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
@@ -93,7 +103,8 @@ module.exports = {
//
// PowerShell on Windows
// - Example: `C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`
- shell: '',
+ shell: '/usr/local/bin/zsh',
+ //shell: "bash",
// for setting shell arguments (i.e. for using interactive shellArgs: `['-i']`)
// by default `['--login']` will be used
@@ -113,21 +124,40 @@ module.exports = {
// 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,
+ quickEdit: false,
+
+ // choose either `'vertical'`, if you want the column mode when Option key is hold during selection (Default)
+ // or `'force'`, if you want to force selection regardless of whether the terminal is in mouse events mode
+ // (inside tmux or vim with mouse mode enabled for example).
+ macOptionSelectionMode: 'vertical',
// URL to custom bell
// bellSoundURL: 'http://example.com/bell.mp3',
+ // Whether to use the WebGL renderer. Set it to false to use canvas-based
+ // rendering (slower, but supports transparent backgrounds)
+ webGLRenderer: true,
+
// for advanced config flags please refer to https://hyper.is/#cfg
- commands: [ "tmux && exit" ],
+
+ commands: [ "tmux && exit" ],
},
- plugins: [ "hyper-startup", "hyper-dark-scrollbar", "hyperlinks", "gitrocket", "space-pull", "hyper-blink" ],
+ // a list of plugins to fetch and install from npm
+ // format: [@org/]project[#version]
+ // examples:
+ // `hyperpower`
+ // `@company/project`
+ // `project#1.0.1`
+ plugins: ["hyper-startup", "hyper-dark-scrollbar", "hyperlinks", "gitrocket", "space-pull", "hyper-blink" ],
- localPlugins: [ "hideTitle" ],
+ // 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: ["hideTitle"],
keymaps: {
+ // Example
// 'window:devtools': 'cmd+alt+o',
},
-
};
diff --git a/Hyperterm/local/hideTitle/index.js b/mac/Hyperterm/local/hideTitle/index.js
index d632cbc..d632cbc 100644
--- a/Hyperterm/local/hideTitle/index.js
+++ b/mac/Hyperterm/local/hideTitle/index.js
diff --git a/mac/tmux.conf b/mac/tmux.conf
new file mode 100644
index 0000000..6a4baab
--- /dev/null
+++ b/mac/tmux.conf
@@ -0,0 +1,21 @@
+set -g default-terminal "xterm-256color"
+run-shell "powerline-daemon -q"
+source "/usr/local/lib/python3.7/site-packages/powerline/bindings/tmux/powerline.conf"
+set -g base-index 1
+setw -g pane-base-index 1
+
+set-option -g default-shell /usr/local/bin/zsh
+
+set-option -g display-panes-active-colour colour33
+set-option -g display-panes-colour colour166
+
+unbind C-b
+set -g prefix C-a
+
+bind -n M-Left select-pane -L
+bind -n M-Right select-pane -R
+bind -n M-Up select-pane -U
+bind -n M-Down select-pane -D
+
+setw -g monitor-activity on
+set -g visual-activity on
diff --git a/mac/zshrc b/mac/zshrc
new file mode 100644
index 0000000..d6bde23
--- /dev/null
+++ b/mac/zshrc
@@ -0,0 +1,64 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+export ZSH=/Users/jakobstendahl/.oh-my-zsh
+
+source /usr/local/opt/powerlevel9k/powerlevel9k.zsh-theme
+
+COMPLETION_WAITING_DOTS="true"
+
+plugins=(
+ git
+ zsh-autosuggestions
+ zsh-syntax-highlighting
+)
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+DEFAULT_USER="jakobstendahl"
+
+# POWERLINE9K
+POWERLEVEL9K_MODE="nerdfont-complete"
+
+POWERLINE9K_PROMPT_ADD_NEWLINE=true
+
+POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context dir vcs)
+POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status root_indicator background_jobs)
+
+POWERLEVEL9K_SHORTEN_STRATERGY="truncate_to_last"
+POWERLEVEL9K_SHORTEN_DIR_LENGTH=2
+POWERLEVEL9K_DIR_SHOW_WRITABLE=true
+
+# Powerline color config
+POWERLEVEL9K_STATUS_OK_BACKGROUND='004'
+POWERLEVEL9K_STATUS_OK_FOREGROUND='015'
+POWERLEVEL9K_STATUS_ERROR_BACKGROUND='001'
+POWERLEVEL9K_STATUS_ERROR_FOREGROUND='015'
+
+# Powerline icon config
+POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR='\UE0B8'
+POWERLEVEL9K_RIGHT_SEGMENT_SEPARATOR='\UE0BE'
+
+POWERLEVEL9K_HOME_ICON='\UF7DB'
+POWERLEVEL9K_HOME_SUB_ICON='\UF07C'
+POWERLEVEL9K_FOLDER_ICON='\UF07B'
+POWERLEVEL9K_ETC_ICON='\UE5FC'
+POWERLEVEL9K_LOCK_ICON='\UF023'
+
+POWERLEVEL9K_VCS_UNSTAGED_ICON='\UF421'
+POWERLEVEL9K_VCS_STAGED='\UF055'
+POWERLEVEL9K_VCS_UNTRACKED_ICON='\UF059'
+POWERLEVEL9K_VCS_BRANCH_ICON='\UE725 '
+
+
+export LC_ALL=en_US.UTF-8
+export LANG=en_US.UTF-8
+path+=("/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/TeX/texbin:/usr/local/share/dotnet:/Library/Frameworks/Mono.framework/Versions/Current/Commands")
+export PATH
+export PATH=/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/TeX/texbin:/usr/local/share/dotnet:/Library/Frameworks/Mono.framework/Versions/Current/Commands:/opt/local/bin:/opt/local/sbin
+alias lamp='/Users/jakobstendahl/.lamp.sh'
+alias uio-linux='ssh -YC jakobste@login.ifi.uio.no'
diff --git a/WinCmd/env.cmd b/windows/WinCmd/env.cmd
index 5d9144f..5d9144f 100644
--- a/WinCmd/env.cmd
+++ b/windows/WinCmd/env.cmd
diff --git a/Hyperterm/hyperWin.js b/windows/hyperWin.js
index f3d55a9..f3d55a9 100644
--- a/Hyperterm/hyperWin.js
+++ b/windows/hyperWin.js