diff options
| -rwxr-xr-x | install/install_mac.sh | 5 | ||||
| -rw-r--r-- | mac/Hyperterm/hyper.js | 45 | ||||
| l--------- | mac/Hyperterm/local/local | 1 | ||||
| -rw-r--r-- | mac/tmux.conf | 36 | ||||
| -rw-r--r-- | mac/zshrc | 16 | ||||
| -rw-r--r-- | themer/gen/themer-hyper/themer-hyper-dark/index.js | 28 | ||||
| -rw-r--r-- | themer/gen/themer-hyper/themer-hyper-dark/package.json | 11 | ||||
| -rw-r--r-- | themer/package-lock.json | 43 | ||||
| -rw-r--r-- | themer/package.json | 5 |
9 files changed, 158 insertions, 32 deletions
diff --git a/install/install_mac.sh b/install/install_mac.sh index 04666cc..e4d5a9a 100755 --- a/install/install_mac.sh +++ b/install/install_mac.sh @@ -53,6 +53,7 @@ fi dlgYN "> Install Powerline" res if [ $res -eq 1 ]; then tput sc + pip3 install pygments pip3 install powerline-status tput rc; tput ed fi @@ -73,10 +74,12 @@ if [ $res -eq 1 ]; then ln -isf "$CWD/mac/tmux.conf" ~/.tmux.conf ln -isf "$CWD/mac/Hyperterm/hyper.js" ~/.hyper.js ln -isf "$CWD/mac/Hyperterm/local" ~/.hyper_plugins/local - ln -isf "$CWD/Common/vim/vimrc" ~/.vimrc + ln -isf "$CWD/Common/vimrc" ~/.vimrc + ln -isf "$CWD/Common/vim" ~/.vim tput rc; tput ed fi tput setaf 3 echo "\nPlease install the font Roboto mono nerd, and enable it in your terminal." +echo "\nPlease run ':PlugInstall' in vim" tput sgr0 diff --git a/mac/Hyperterm/hyper.js b/mac/Hyperterm/hyper.js index cea0141..1b17ec3 100644 --- a/mac/Hyperterm/hyper.js +++ b/mac/Hyperterm/hyper.js @@ -9,7 +9,7 @@ module.exports = { updateChannel: 'stable', // default font size in pixels for all tabs - fontSize: 12, + fontSize: 11, // font family with optional fallbacks fontFamily: '"RobotoMono Nerd Font Mono", "Meslo LG S for Powerline", Menlo', @@ -27,7 +27,7 @@ module.exports = { letterSpacing: 1, // terminal cursor background color and opacity (hex, rgb, hsl, hsv, hwb or cmyk) - cursorColor: '#2C85F7', + cursorColor: 'rgba(80, 115, 184, 0.5)', // terminal text color under BLOCK cursor cursorAccentColor: '#000', @@ -39,17 +39,17 @@ module.exports = { cursorBlink: false, // color of the text - foregroundColor: '#00ff00', + foregroundColor: '#dedfdf', // terminal background color // opacity is only supported on macOS - backgroundColor: '#293340', + backgroundColor: '#23292d', // terminal selection color selectionColor: 'rgba(248,28,229,0.3)', // border color (window, tabs) - borderColor: '#323E4D', + borderColor: '#23292d', // custom CSS to embed in the main window css: '', @@ -73,22 +73,22 @@ module.exports = { // 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' + black : '#23292d', + red : '#ef4e7c', + green : '#6ebb82', + yellow : '#f79532', + blue : '#1299ad', + magenta : '#a067ab', + cyan : '#09b399', + white : '#dedfdf', + lightBlack : '#42474b', + lightRed : '#f37055', + lightGreen : '#6ebb82', + lightYellow : '#f79532', + lightBlue : '#1299ad', + lightMagenta : '#a067ab', + lightCyan : '#09b399', + lightWhite : '#fdfdfd' }, // the shell to run when spawning a new session (i.e. /usr/local/bin/fish) @@ -114,7 +114,7 @@ module.exports = { env: {}, // set to `false` for no bell - bell: 'SOUND', + bell: '/System/Library/Sounds/Pop.aiff', // if `true` (without backticks and without quotes), selected text will automatically be copied to the clipboard copyOnSelect: false, @@ -151,7 +151,6 @@ module.exports = { // `project#1.0.1` plugins: [ "hyper-startup", - "hyper-dark-scrollbar", "hyperlinks", "gitrocket", diff --git a/mac/Hyperterm/local/local b/mac/Hyperterm/local/local new file mode 120000 index 0000000..bc83d7b --- /dev/null +++ b/mac/Hyperterm/local/local @@ -0,0 +1 @@ +/Users/jakobstendahl/_code/Personal projects/dotfiles/mac/Hyperterm/local
\ No newline at end of file diff --git a/mac/tmux.conf b/mac/tmux.conf index 6a4baab..c5b8b55 100644 --- a/mac/tmux.conf +++ b/mac/tmux.conf @@ -1,14 +1,39 @@ -set -g default-terminal "xterm-256color" +# -- general ------------------------------------------------------------------- +#set -g default-terminal "xterm-256color" +set -g default-terminal "screen-256color" +set -as terminal-overrides ",*:U8=0" +set -s escape-time 10 # faster command sequences +set -s focus-events on + run-shell "powerline-daemon -q" source "/usr/local/lib/python3.7/site-packages/powerline/bindings/tmux/powerline.conf" + +# -- display ------------------------------------------------------------------- set -g base-index 1 setw -g pane-base-index 1 +setw -g automatic-rename on # rename window to reflect current program +set -g renumber-windows on # renumber windows when a window is closed + +set -g display-panes-time 800 # slightly longer pane indicators display time +set -g display-time 1000 # slightly longer status messages display time + +set -g status-interval 10 # redraw status line every 10 seconds set-option -g default-shell /usr/local/bin/zsh set-option -g display-panes-active-colour colour33 set-option -g display-panes-colour colour166 +# activity +set -g monitor-activity on +set -g visual-activity off + +# -- navigation ---------------------------------------------------------------- + +# Set window notification +setw -g monitor-activity on +set -g visual-activity on + unbind C-b set -g prefix C-a @@ -17,5 +42,10 @@ 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 +# Bells +set -g visual-bell on +set -g bell-action any + +# Scroll in shell +set -g terminal-overrides 'xterm*:smcup@:rmcup@' +set -wg xterm-keys 1
\ No newline at end of file @@ -68,7 +68,21 @@ export PATH=/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbi alias lamp='/Users/jakobstendahl/.lamp.sh' alias uio-linux='ssh -YC jakobste@login.ifi.uio.no' +alias uio-send='scp $1 jakobste@login.ifi.uio.no:/uio/hume/student-u27/jakobste/Downloads/' +alias uio-get='scp jakonste@login.ifi.uio.no:/uio/hume/student-u27/jakobste/$1 .' alias krak='/Applications/GitKraken.app/Contents/MacOS/GitKraken -p "$(PWD)" &>> /dev/null &' - +alias lsp="ps -ax | grep" +alias lsa="ls -la" + +# man pages in colors +man() { + LESS_TERMCAP_md=$'\e[01;31m' \ + LESS_TERMCAP_me=$'\e[0m' \ + LESS_TERMCAP_se=$'\e[0m' \ + LESS_TERMCAP_so=$'\e[01;44;33m' \ + LESS_TERMCAP_ue=$'\e[0m' \ + LESS_TERMCAP_us=$'\e[01;32m' \ + command man "$@" +} clear diff --git a/themer/gen/themer-hyper/themer-hyper-dark/index.js b/themer/gen/themer-hyper/themer-hyper-dark/index.js new file mode 100644 index 0000000..513bcf9 --- /dev/null +++ b/themer/gen/themer-hyper/themer-hyper-dark/index.js @@ -0,0 +1,28 @@ + + module.exports.decorateConfig = config => { + return Object.assign({}, config, { + cursorColor: 'rgba(80, 115, 184, 0.5)', + foregroundColor: '#dedfdf', + backgroundColor: '#23292d', + borderColor: '#23292d', + colors: { + black: '#23292d', + red: '#ef4e7c', + green: '#6ebb82', + yellow: '#f79532', + blue: '#1299ad', + magenta: '#a067ab', + cyan: '#09b399', + white: '#dedfdf', + lightBlack: '#42474b', + lightRed: '#f37055', + lightGreen: '#6ebb82', + lightYellow: '#f79532', + lightBlue: '#1299ad', + lightMagenta: '#a067ab', + lightCyan: '#09b399', + lightWhite: '#fdfdfd', + }, + }); + }; +
\ No newline at end of file diff --git a/themer/gen/themer-hyper/themer-hyper-dark/package.json b/themer/gen/themer-hyper/themer-hyper-dark/package.json new file mode 100644 index 0000000..1be985e --- /dev/null +++ b/themer/gen/themer-hyper/themer-hyper-dark/package.json @@ -0,0 +1,11 @@ +{ + "name": "themer-hyper-dark", + "version": "3.0.2", + "description": "dark theme for Hyper.app, generated by themer", + "keywords": [ + "themer", + "dark", + "hyper" + ], + "main": "themer-hyper-dark/index.js" +}
\ No newline at end of file diff --git a/themer/package-lock.json b/themer/package-lock.json index 3c161ed..b76dba3 100644 --- a/themer/package-lock.json +++ b/themer/package-lock.json @@ -31,11 +31,19 @@ "supports-color": "^5.3.0" } }, + "color": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz", + "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==", + "requires": { + "color-convert": "^1.9.1", + "color-string": "^1.5.2" + } + }, "color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, "requires": { "color-name": "1.1.3" } @@ -43,8 +51,7 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "color-steps": { "version": "1.0.2", @@ -55,6 +62,15 @@ "onecolor": "^3.0.5" } }, + "color-string": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz", + "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", + "requires": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -73,6 +89,11 @@ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, + "is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" + }, "js-yaml": { "version": "3.13.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", @@ -136,6 +157,14 @@ "tslib": "^1.9.0" } }, + "simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", + "requires": { + "is-arrayish": "^0.3.1" + } + }, "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -179,6 +208,14 @@ "integrity": "sha512-AQuoPeLubKaWLwlRAygydTp8LjP9v06dQcY5/6ggchag4zo6FJEJYYVtSKhn7M7jmeNuPlt/rDDA+bQlHBavew==", "dev": true }, + "themer-hyper": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/themer-hyper/-/themer-hyper-3.0.2.tgz", + "integrity": "sha512-K37/pOZYNOJGRjBJzFOILf/9kIqDNnbSCcV0WB7FZOsSNVXtWw49rRx0UQYfB3AunkVhWAq4U0OGKyHAVoZE2w==", + "requires": { + "color": "^3.0.0" + } + }, "themer-terminal": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/themer-terminal/-/themer-terminal-2.0.3.tgz", diff --git a/themer/package.json b/themer/package.json index 1fe6b3e..967875e 100644 --- a/themer/package.json +++ b/themer/package.json @@ -1,6 +1,6 @@ { "scripts": { - "build": "themer -c theme.js -t themer-terminal -t themer-vim -t themer-atom-ui -t themer-atom-syntax -t themer-wallpaper-octagon -o gen" + "build": "themer -c theme.js -t themer-terminal -t themer-hyper -t themer-vim -t themer-atom-ui -t themer-atom-syntax -t themer-wallpaper-octagon -o gen" }, "devDependencies": { "themer": "^3.1.6", @@ -9,5 +9,8 @@ "themer-terminal": "^2.0.3", "themer-vim": "^3.0.2", "themer-wallpaper-octagon": "^3.0.3" + }, + "dependencies": { + "themer-hyper": "^3.0.2" } } |