invert scroll-zoom (fixes #184)

Start an interactive logon shell for Git Bash

.gitlab-ci.yml

@@ -1,108 +0,0 @@
-cache:
-  untracked: true
-  key: "$CI_BUILD_REF_NAME"
-  paths:
-    - app/node_modules
-    - node_modules
-    - typings
-
-stages:
-    - Build
-    - Test
-    - Package
-    - Upload
-
-Build:
-  stage: Build
-  script:
-    - npm prune
-    - npm install
-    - cd app; npm prune && npm install; cd ..
-    - ./node_modules/.bin/typings install
-  tags:
-    - Linux
-  artifacts:
-    paths:
-      - node_modules
-      - typings
-      - app
-
-Test:
-  stage: Test
-  dependencies:
-    - Build
-  script:
-    - apt-get install -y xvfb libxtst6 libxss1 libgconf2-4 libnss3 libasound2
-    - xvfb-run -a make coverage
-  tags:
-    - Linux
-
-Windows package:
-  stage: Package
-  dependencies:
-    - Build
-  script:
-    - call npm install
-    - call npm install webpack # regenerate the .cmd launcher
-    - cd app
-    - call npm install
-    - cd ..
-    - call ./node_modules/.bin/webpack.cmd --progress
-    - call make package-windows
-    - call copy dist\Elements-Electron.exe Elements-Windows-%CI_BUILD_REF_NAME%.exe
-  artifacts:
-    name: Elements-Windows-%CI_BUILD_REF_NAME%
-    paths:
-    - Elements-Windows-%CI_BUILD_REF_NAME%.exe
-  tags:
-    - Windows
-
-macOS package:
-  stage: Package
-  dependencies:
-    - Build
-  script:
-    - npm install
-    - rm -rf node_modules/electron-macos-sign || true
-    - cp -r node_modules/electron-osx-sign node_modules/electron-macos-sign
-    - cd app; npm install; cd ..
-    - ./node_modules/.bin/webpack --progress
-    - security unlock-keychain -p rjvg login.keychain
-    - make package-mac
-    - cp dist/Elements-Electron.pkg ./Elements-macOS-$CI_BUILD_REF_NAME.pkg
-  artifacts:
-    name: Elements-macOS-$CI_BUILD_REF_NAME
-    paths:
-    - Elements-macOS-$CI_BUILD_REF_NAME.pkg
-  tags:
-    - macOS
-
-Linux package:
-  stage: Package
-  dependencies:
-    - Build
-  script:
-    - npm install
-    - cd app; npm install; cd ..
-    - ./node_modules/.bin/webpack --progress
-    - make build-linux
-    - cp dist/ELEMENTS*.AppImage ./Elements-Linux-$CI_BUILD_REF_NAME.AppImage
-  artifacts:
-    name: Elements-Linux-$CI_BUILD_REF_NAME
-    paths:
-    - Elements-Linux-$CI_BUILD_REF_NAME.AppImage
-  tags:
-    - Linux
-
-Upload packages:
-  stage: Upload
-  dependencies:
-    - Windows package
-    - macOS package
-    - Linux package
-  script:
-    - scp Elements-Windows-$CI_BUILD_REF_NAME.exe root@cloud.elements.tv:/mnt/elements/www/clients/
-    - scp Elements-macOS-$CI_BUILD_REF_NAME.pkg root@cloud.elements.tv:/mnt/elements/www/clients/
-    - scp Elements-Linux-$CI_BUILD_REF_NAME.AppImage root@cloud.elements.tv:/mnt/elements/www/clients/
-  tags:
-    - Local

HACKING.md

@@ -10,12 +10,14 @@ First, install the dependencies:
 
 ```
 # macOS/Linux:
-npm i
+sudo npm -g install yarn node-gyp
+yarn install
 ./scripts/install-deps.js
 ./scripts/build-native.js
 
 # Windows:
-npm i
+npm -g install yarn node-gyp windows-build-tools
+yarn install
 node scripts\install-deps.js
 node scripts\build-native.js
 ```

README.md

@@ -1,7 +1,16 @@
-# Terminus α
-*A terminal for a more modern age*
+<div align="center">
+    <img src="https://raw.githubusercontent.com/Eugeny/terminus/master/build/icons/128x128.png">
+    <h1>Terminus α</h1>
+    <p>
+        <i>A terminal for a more modern age</i>
+    </p>
+    <br/>
+    <br/>
+    <br/>
+</div>
 
 [![Build Status](https://travis-ci.org/Eugeny/terminus.svg?branch=master)](https://travis-ci.org/Eugeny/terminus) [![Build status](https://ci.appveyor.com/api/projects/status/wnnq4hm5mbd9rgoy?svg=true)](https://ci.appveyor.com/project/Eugeny/terminus) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/Eugeny/terminus/master/LICENSE) [![Downloads](https://img.shields.io/badge/downloads-latest_release-brightgreen.svg)](https://github.com/Eugeny/terminus/releases/latest)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus?ref=badge_shield)
 
 ----
 
@@ -18,6 +27,7 @@
   * Tab persistence on macOS and Linux
   * Proper shell-like experience on Windows including tab completion (thanks, Clink!)
   * CMD, PowerShell, Cygwin, Git-Bash and Bash on Windows support
+  * Default Linux style hotkeys for copy (`Ctrl`+`Shift`+`C`) and paste (`Ctrl`+`Shift`+`V`)
 
 ---
 
@@ -27,6 +37,7 @@ Plugins can be installed directly from the Settings view inside Terminus.
 
   * [clickable-links](https://github.com/Eugeny/terminus-clickable-links) - makes paths and URLs in the terminal clickable
   * [theme-hype](https://github.com/Eugeny/terminus-theme-hype) - a Hyper inspired theme
+  * [shell-selector](https://github.com/Eugeny/terminus-shell-selector) - a quick shell selector pane
 
 ---
 
@@ -35,3 +46,7 @@ Plugins can be installed directly from the Settings view inside Terminus.
 Pull requests and plugins are welcome! Publish your plugin on NPM with a `terminus-plugin` keyword to make them appear in the Plugin Manager.
 
 See [HACKING.md](https://github.com/Eugeny/terminus/blob/master/HACKING.md) for a very brief plugin development tutorial!
+
+
+## License
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus.svg?type=large)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus?ref=badge_large)

app/index.pug

@@ -13,22 +13,9 @@ html
         app-root
             .preload-logo
                 div
-                    .terminus-logo.animated
-                        .part(style='transform: rotateZ(0deg)')
-                            div
-                        .part(style='transform: rotateZ(51deg)')
-                            div
-                        .part(style='transform: rotateZ(102deg)')
-                            div
-                        .part(style='transform: rotateZ(154deg)')
-                            div
-                        .part(style='transform: rotateZ(205deg)')
-                            div
-                        .part(style='transform: rotateZ(257deg)')
-                            div
-                        .part(style='transform: rotateZ(308deg)')
-                            div
+                    .terminus-logo
                     h1.terminus-title Terminus
+                        sup α 
                     .progress
                         .bar(style='width: 0%')
 

app/main.js

@@ -8,8 +8,8 @@ if (process.argv.indexOf('--debug') !== -1) {
 
 let app = electron.app
 
-let secondInstance = app.makeSingleInstance((argv) => {
-  app.window.webContents.send('host:second-instance')
+let secondInstance = app.makeSingleInstance((argv, cwd) => {
+  app.window.webContents.send('host:second-instance', argv, cwd)
 })
 
 if (secondInstance) {
@@ -30,28 +30,18 @@ if (!process.env.TERMINUS_PLUGINS) {
 }
 
 setupWindowManagement = () => {
-    let windowCloseable
-
     app.window.on('show', () => {
       app.window.webContents.send('host:window-shown')
     })
 
     app.window.on('close', (e) => {
         windowConfig.set('windowBoundaries', app.window.getBounds())
-        if (!windowCloseable) {
-            app.window.minimize()
-            e.preventDefault()
-        }
     })
 
     app.window.on('closed', () => {
         app.window = null
     })
 
-    electron.ipcMain.on('window-closeable', (event, flag) => {
-        windowCloseable = flag
-    })
-
     electron.ipcMain.on('window-focus', () => {
         app.window.focus()
     })
@@ -86,6 +76,8 @@ setupWindowManagement = () => {
 
     electron.ipcMain.on('window-set-bounds', (event, bounds) => {
         let actualBounds = app.window.getBounds()
+        actualBounds.width -= bounds.x - actualBounds.x
+        actualBounds.height -= bounds.y - actualBounds.y
         actualBounds.x = bounds.x
         actualBounds.y = bounds.y
         app.window.setBounds(actualBounds)
@@ -102,31 +94,83 @@ setupWindowManagement = () => {
     electron.ipcMain.on('window-set-always-on-top', (event, flag) => {
         app.window.setAlwaysOnTop(flag)
     })
-
-    app.on('before-quit', () => windowCloseable = true)
 }
 
 
 setupMenu = () => {
-    var template = [{
+    let template = [{
         label: "Application",
         submenu: [
-            { type: "separator" },
-            { label: "Quit", accelerator: "CmdOrCtrl+Q", click: () => {
-                app.window.webContents.send('host:quit-request')
-            }}
+            { role: 'about', label: 'About Terminus' },
+            { type: 'separator' },
+            {
+                label: 'Preferences',
+                accelerator: 'Cmd+,',
+                click () {
+                    app.window.webContents.send('host:preferences-menu')
+                }
+            },
+            { type: 'separator' },
+            { role: 'services', submenu: [] },
+            { type: 'separator' },
+            { role: 'hide' },
+            { role: 'hideothers' },
+            { role: 'unhide' },
+            { type: 'separator' },
+            {
+                label: 'Quit',
+                accelerator: 'Cmd+Q',
+                click () {
+                    app.quit()
+                }
+            }
         ]
-      },
-      {
+    },
+    {
         label: "Edit",
         submenu: [
-            { label: "Undo", accelerator: "CmdOrCtrl+Z", selector: "undo:" },
-            { label: "Redo", accelerator: "Shift+CmdOrCtrl+Z", selector: "redo:" },
-            { type: "separator" },
-            { label: "Cut", accelerator: "CmdOrCtrl+X", selector: "cut:" },
-            { label: "Copy", accelerator: "CmdOrCtrl+C", selector: "copy:" },
-            { label: "Paste", accelerator: "CmdOrCtrl+V", selector: "paste:" },
-            { label: "Select All", accelerator: "CmdOrCtrl+A", selector: "selectAll:" }
+            {role: 'undo'},
+            {role: 'redo'},
+            {type: 'separator'},
+            {role: 'cut'},
+            {role: 'copy'},
+            {role: 'paste'},
+            {role: 'pasteandmatchstyle'},
+            {role: 'delete'},
+            {role: 'selectall'}
+        ]
+    },
+    {
+        label: 'View',
+        submenu: [
+            {role: 'reload'},
+            {role: 'forcereload'},
+            {role: 'toggledevtools'},
+            {type: 'separator'},
+            {role: 'resetzoom'},
+            {role: 'zoomin'},
+            {role: 'zoomout'},
+            {type: 'separator'},
+            {role: 'togglefullscreen'}
+        ]
+    },
+    {
+        role: 'window',
+        submenu: [
+            {role: 'close'},
+            {role: 'minimize'},
+            {role: 'zoom'},
+            {type: 'separator'},
+            {role: 'front'}
+        ]
+    },
+    {
+        role: 'help',
+        submenu: [
+            {
+                label: 'Website',
+                click () { electron.shell.openExternal('https://eugeny.github.io/terminus') }
+            }
         ]
     }]
 
@@ -148,7 +192,6 @@ start = () => {
     let options = {
         width: 800,
         height: 600,
-        //icon: `${app.getAppPath()}/assets/img/icon.png`,
         title: 'Terminus',
         minWidth: 400,
         minHeight: 300,

app/package.json

@@ -12,14 +12,14 @@
     "watch": "webpack --progress --color --watch"
   },
   "dependencies": {
-    "@angular/animations": "4.0.1",
-    "@angular/common": "4.0.1",
-    "@angular/compiler": "4.0.1",
-    "@angular/core": "4.0.1",
-    "@angular/forms": "4.0.1",
-    "@angular/platform-browser": "4.0.1",
-    "@angular/platform-browser-dynamic": "4.0.1",
-    "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22",
+    "@angular/animations": "4.3.0",
+    "@angular/common": "4.3.0",
+    "@angular/compiler": "4.3.0",
+    "@angular/core": "4.3.0",
+    "@angular/forms": "4.3.0",
+    "@angular/platform-browser": "4.3.0",
+    "@angular/platform-browser-dynamic": "4.3.0",
+    "@ng-bootstrap/ng-bootstrap": "^1.0.0-alpha.28",
     "devtron": "1.4.0",
     "electron-config": "0.2.1",
     "electron-debug": "^1.0.1",
@@ -29,7 +29,7 @@
     "mz": "^2.6.0",
     "path": "0.12.7",
     "rxjs": "5.3.0",
-    "zone.js": "0.8.4"
+    "zone.js": "0.8.12"
   },
   "devDependencies": {
     "@types/mz": "0.0.31"

app/src/app.module.ts

@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 
-export async function getRootModule (plugins: any[]): Promise<any> {
+export function getRootModule (plugins: any[]) {
     let imports = [
         BrowserModule,
         ...(plugins.map(x => x.default.forRoot ? x.default.forRoot() : x.default)),

app/src/entry.preload.ts

@@ -31,3 +31,7 @@ process.on('uncaughtException', (err) => {
     Raven.captureException(err)
     console.error(err)
 })
+
+const childProcess = require('child_process')
+childProcess.spawn = require('electron').remote.require('child_process').spawn
+childProcess.exec = require('electron').remote.require('child_process').exec

app/src/entry.ts

@@ -6,11 +6,15 @@ import 'rxjs'
 // Always land on the start view
 location.hash = ''
 
-import { enableProdMode } from '@angular/core'
+import { enableProdMode, NgModuleRef } from '@angular/core'
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
 
 import { getRootModule } from './app.module'
-import { findPlugins, loadPlugins } from './plugins'
+import { findPlugins, loadPlugins, IPluginInfo } from './plugins'
+
+if (process.platform === 'win32') {
+    process.env.HOME = process.env.HOMEDRIVE + process.env.HOMEPATH
+}
 
 if (require('electron-is-dev')) {
     console.warn('Running in debug mode')
@@ -18,10 +22,29 @@ if (require('electron-is-dev')) {
     enableProdMode()
 }
 
-findPlugins().then(async plugins => {
+async function bootstrap (plugins: IPluginInfo[], safeMode = false): Promise<NgModuleRef<any>> {
+    if (safeMode) {
+        plugins = plugins.filter(x => x.isBuiltin)
+    }
     let pluginsModules = await loadPlugins(plugins, (current, total) => {
         (document.querySelector('.progress .bar') as HTMLElement).style.width = 100 * current / total + '%'
     })
-    let module = await getRootModule(pluginsModules)
-    platformBrowserDynamic().bootstrapModule(module)
+    let module = getRootModule(pluginsModules)
+    return await platformBrowserDynamic().bootstrapModule(module)
+}
+
+findPlugins().then(async plugins => {
+    console.log('Starting with plugins:', plugins)
+    try {
+        await bootstrap(plugins)
+    } catch (error) {
+        console.error('Angular bootstrapping error:', error)
+        console.warn('Trying safe mode')
+        window['safeModeReason'] = error
+        try {
+            await bootstrap(plugins, true)
+        } catch (error) {
+            console.error('Bootstrap failed:', error)
+        }
+    }
 })

app/src/logo.svg

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="150mm"
+   height="150mm"
+   viewBox="0 0 150 150"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="logo.svg"
+   inkscape:export-filename="/home/eugene/Work/term/build/icons/16x16.png"
+   inkscape:export-xdpi="2.7093334"
+   inkscape:export-ydpi="2.7093334">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="134.39743"
+     inkscape:cy="340.43068"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:snap-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="692"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-10.356544,-82.309525)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path138"
+       style="opacity:0.9;fill:#ccccff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 39.305965,108.47713 60.922105,35.13225 0.0945,21.68327 -61.016595,-37.11662 z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path116"
+       style="opacity:0.9;fill:#6666cc;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 136.19445,144.4429 0.0455,20.67266 -78.028381,44.11611 -0.0031,-19.78119 z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path118"
+       style="opacity:0.9;fill:#ccccff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 39.471179,178.6501 18.737341,10.818 0.0031,19.78099 -18.740409,-10.88245 z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="opacity:0.9;fill:#b4e2ff;fill-rule:evenodd;stroke:none;stroke-width:1.00546169px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 56.43263,98.242186 -17.391087,10.041014 61.186527,35.32618 -61.020778,35.23005 18.839694,10.87703 61.020784,-35.23005 17.39108,-10.04102 z"
+       id="path134"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+  </g>
+</svg>

app/src/plugins.ts

@@ -20,7 +20,7 @@ if (process.env.DEV) {
     nodeModule.globalPaths.unshift(path.dirname(require('electron').remote.app.getAppPath()))
 }
 
-const builtinPluginsPath = path.join((process as any).resourcesPath, 'builtin-plugins')
+const builtinPluginsPath = process.env.DEV ? path.dirname(require('electron').remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins')
 
 const userPluginsPath = path.join(
     require('electron').remote.app.getPath('appData'),
@@ -44,6 +44,7 @@ export interface IPluginInfo {
     packageName: string
     isBuiltin: boolean
     version: string
+    author: string
     homepage?: string
     path?: string
     info?: any
@@ -107,8 +108,9 @@ export async function findPlugins (): Promise<IPluginInfo[]> {
             continue
         }
 
-        if (foundPlugins.some(x => x.name === pluginName)) {
-            console.info(`Plugin ${pluginName} already exists`)
+        if (foundPlugins.some(x => x.name === pluginName.substring('terminus-'.length))) {
+            console.info(`Plugin ${pluginName} already exists, overriding`)
+            foundPlugins = foundPlugins.filter(x => x.name !== pluginName.substring('terminus-'.length))
         }
 
         try {
@@ -116,12 +118,15 @@ export async function findPlugins (): Promise<IPluginInfo[]> {
             if (!info.keywords || info.keywords.indexOf('terminus-plugin') === -1) {
                 continue
             }
+            let author = info.author
+            author = author.name || author
             foundPlugins.push({
                 name: pluginName.substring('terminus-'.length),
                 packageName: pluginName,
                 isBuiltin: pluginDir === builtinPluginsPath,
                 version: info.version,
                 description: info.description,
+                author,
                 path: pluginPath,
                 info,
             })

app/src/preload.scss

@@ -1,6 +1,3 @@
-$color: rgba(66, 142, 173, 0.75);
-
-
 .preload-logo {
   -webkit-app-region: drag;
   position: fixed;
@@ -24,7 +21,7 @@ $color: rgba(66, 142, 173, 0.75);
 
       .bar {
         transition: 1s ease-out width;
-        background: $color;
+        background: #a1c5e4;
         height: 3px;
       }
     }
@@ -42,63 +39,22 @@ $color: rgba(66, 142, 173, 0.75);
 .terminus-logo {
   width: 160px;
   height: 160px;
+  background: url('./logo.svg');
+  background-repeat: none;
+  background-size: contain;
   margin: auto;
-  position: relative;
-  transform: rotateZ(-14.5deg);
-
-  .part {
-    position: absolute;
-    width: 160px;
-    height: 160px;
-
-    div {
-      position: absolute;
-      top: 33px;
-      left: 24px;
-      width: 44px;
-      height: 44px;
-      background: $color;
-      transform: rotateX(52deg) rotateY(-42deg);
-      animation: terminusLogoPartOnce ease-out 1s;
-    }
-  }
-
-  &.animated .part div {
-    animation: terminusLogoPart infinite ease-out 2s;
-  }
 }
 
 
 .terminus-title {
-  color: $color;
+  color: #a1c5e4;
   font-family: 'Source Sans Pro';
   text-align: center;
   font-weight: normal;
   font-size: 42px;
   margin: 0;
-}
 
-
-@keyframes terminusLogoPart {
-  0% {
-    transform: rotateX(90deg) rotateY(-90deg);
-  }
-  25% {
-    transform: rotateX(52deg) rotateY(-42deg);
-  }
-  75% {
-    transform: rotateX(52deg) rotateY(-42deg);
-  }
-  100% {
-    transform: rotateX(-90deg) rotateY(-90deg);
-  }
-}
-
-@keyframes terminusLogoPartOnce {
-  0% {
-    transform: rotateX(90deg) rotateY(-90deg);
-  }
-  100% {
-    transform: rotateX(52deg) rotateY(-42deg);
+  sup {
+      color: #842fe0;
   }
 }

app/webpack.config.js

@@ -55,6 +55,7 @@ module.exports = {
     '@angular/forms': 'commonjs @angular/forms',
     '@angular/common': 'commonjs @angular/common',
     '@ng-bootstrap/ng-bootstrap': 'commonjs @ng-bootstrap/ng-bootstrap',
+    'child_process': 'commonjs child_process',
     'electron': 'commonjs electron',
     'electron-is-dev': 'commonjs electron-is-dev',
     'module': 'commonjs module',

app/yarn.lock

@@ -0,0 +1,273 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@angular/animations@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-4.3.0.tgz#56f34b84649379202ac359929b82eb0b915e9c72"
+  dependencies:
+    tslib "^1.7.1"
+
+"@angular/common@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-4.3.0.tgz#13a54a6929dd52f9729b16ae446fad58fe163053"
+  dependencies:
+    tslib "^1.7.1"
+
+"@angular/compiler@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-4.3.0.tgz#55503bf27a1f062f71b9495393f3311903a8fc43"
+  dependencies:
+    tslib "^1.7.1"
+
+"@angular/core@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-4.3.0.tgz#bd2249c3de1224a7c6536c4aba728d6565329334"
+  dependencies:
+    tslib "^1.7.1"
+
+"@angular/forms@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-4.3.0.tgz#7d0c7a854737e9a30a5fd9665f8d4f56a1b91bd8"
+  dependencies:
+    tslib "^1.7.1"
+
+"@angular/platform-browser-dynamic@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.0.tgz#551fb18851b27ee8f3e4b0ee25aad10bd7b312e3"
+  dependencies:
+    tslib "^1.7.1"
+
+"@angular/platform-browser@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-4.3.0.tgz#02389489185185c3becf06359346100e5479c7e1"
+  dependencies:
+    tslib "^1.7.1"
+
+"@ng-bootstrap/ng-bootstrap@^1.0.0-alpha.28":
+  version "1.0.0-alpha.28"
+  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-1.0.0-alpha.28.tgz#30a6503bf7f94f9d3187591fb3267b59cc0cdaad"
+
+"@types/mz@0.0.31":
+  version "0.0.31"
+  resolved "https://registry.yarnpkg.com/@types/mz/-/mz-0.0.31.tgz#a4d80c082fefe71e40a7c0f07d1e6555bbbc7b52"
+  dependencies:
+    "@types/node" "*"
+
+"@types/node@*":
+  version "8.0.13"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.13.tgz#530f0f9254209b0335bf5cc6387822594ef47093"
+
+accessibility-developer-tools@^2.11.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/accessibility-developer-tools/-/accessibility-developer-tools-2.12.0.tgz#3da0cce9d6ec6373964b84f35db7cfc3df7ab514"
+
+any-promise@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+
+argparse@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+conf@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/conf/-/conf-0.11.2.tgz#879f479267600483e502583462ca4063fc9779b2"
+  dependencies:
+    dot-prop "^3.0.0"
+    env-paths "^0.3.0"
+    mkdirp "^0.5.1"
+    pkg-up "^1.0.0"
+
+debug@^2.2.0, debug@^2.6.8:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
+  dependencies:
+    ms "2.0.0"
+
+devtron@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/devtron/-/devtron-1.4.0.tgz#b5e748bd6e95bbe70bfcc68aae6fe696119441e1"
+  dependencies:
+    accessibility-developer-tools "^2.11.0"
+    highlight.js "^9.3.0"
+    humanize-plus "^1.8.1"
+
+dot-prop@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
+  dependencies:
+    is-obj "^1.0.0"
+
+electron-config@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/electron-config/-/electron-config-0.2.1.tgz#7e12c26412d06bf3ed3896d0479df162986b95ba"
+  dependencies:
+    conf "^0.11.1"
+
+electron-debug@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-1.2.0.tgz#22e51a73e1bf095d0bb51a6c3d97a203364c4222"
+  dependencies:
+    electron-is-dev "^0.1.0"
+    electron-localshortcut "^2.0.0"
+
+electron-is-accelerator@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz#509e510c26a56b55e17f863a4b04e111846ab27b"
+
+electron-is-dev@0.1.2, electron-is-dev@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.1.2.tgz#8a1043e32b3a1da1c3f553dce28ce764246167e3"
+
+electron-localshortcut@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-2.0.2.tgz#6a1adcd6514c957328ec7912f5ccb5e1c10706db"
+  dependencies:
+    debug "^2.6.8"
+    electron-is-accelerator "^0.1.0"
+
+electron-squirrel-startup@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/electron-squirrel-startup/-/electron-squirrel-startup-1.0.0.tgz#19b4e55933fa0ef8f556784b9c660f772546a0b8"
+  dependencies:
+    debug "^2.2.0"
+
+env-paths@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-0.3.1.tgz#c30ccfcbc30c890943dc08a85582517ef00da463"
+
+esprima@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+highlight.js@^9.3.0:
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
+
+humanize-plus@^1.8.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/humanize-plus/-/humanize-plus-1.8.2.tgz#a65b34459ad6367adbb3707a82a3c9f916167030"
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+
+is-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+
+js-yaml@3.8.2:
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.2.tgz#02d3e2c0f6beab20248d412c352203827d786721"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^3.1.1"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+mkdirp@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+mz@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/mz/-/mz-2.6.0.tgz#c8b8521d958df0a4f2768025db69c719ee4ef1ce"
+  dependencies:
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.0"
+
+object-assign@^4.0.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  dependencies:
+    pinkie-promise "^2.0.0"
+
+path@0.12.7:
+  version "0.12.7"
+  resolved "https://registry.yarnpkg.com/path/-/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"
+  dependencies:
+    process "^0.11.1"
+    util "^0.10.3"
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+
+pkg-up@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-1.0.0.tgz#3e08fb461525c4421624a33b9f7e6d0af5b05a26"
+  dependencies:
+    find-up "^1.0.0"
+
+process@^0.11.1:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+
+rxjs@5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.3.0.tgz#d88ccbdd46af290cbdb97d5d8055e52453fabe2d"
+  dependencies:
+    symbol-observable "^1.0.1"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+symbol-observable@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
+
+thenify-all@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
+  dependencies:
+    thenify ">= 3.1.0 < 4"
+
+"thenify@>= 3.1.0 < 4":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
+  dependencies:
+    any-promise "^1.0.0"
+
+tslib@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec"
+
+util@^0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  dependencies:
+    inherits "2.0.1"
+
+zone.js@0.8.12:
+  version "0.8.12"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.12.tgz#86ff5053c98aec291a0bf4bbac501d694a05cfbb"

build/icons/icon.svg

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="150mm"
+   height="150mm"
+   viewBox="0 0 150 150"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="icon.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4649">
+      <stop
+         style="stop-color:#000916;stop-opacity:1"
+         offset="0"
+         id="stop4645" />
+      <stop
+         style="stop-color:#004565;stop-opacity:1"
+         offset="1"
+         id="stop4647" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4649"
+       id="linearGradient4651"
+       x1="89.26284"
+       y1="85.146751"
+       x2="89.26284"
+       y2="229.47229"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="134.39743"
+     inkscape:cy="340.43068"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:snap-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="692"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-10.356544,-82.309525)">
+    <rect
+       id="rect168"
+       width="150"
+       height="150"
+       x="10.356544"
+       y="82.309525"
+       style="fill:url(#linearGradient4651);fill-opacity:1;stroke-width:0.26458332"
+       rx="10"
+       ry="10" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path138"
+       style="opacity:0.9;fill:#ccccff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 39.305965,108.47713 60.922105,35.13225 0.0945,21.68327 -61.016595,-37.11662 z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path116"
+       style="opacity:0.9;fill:#6666cc;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 136.19445,144.4429 0.0455,20.67266 -78.028381,44.11611 -0.0031,-19.78119 z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path118"
+       style="opacity:0.9;fill:#ccccff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 39.471179,178.6501 18.737341,10.818 0.0031,19.78099 -18.740409,-10.88245 z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="opacity:0.9;fill:#b4e2ff;fill-rule:evenodd;stroke:none;stroke-width:1.00546169px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 56.43263,98.242186 -17.391087,10.041014 61.186527,35.32618 -61.020778,35.23005 18.839694,10.87703 61.020784,-35.23005 17.39108,-10.04102 z"
+       id="path134"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+  </g>
+</svg>

package.json

@@ -9,7 +9,7 @@
     "core-js": "2.4.1",
     "cross-env": "4.0.0",
     "css-loader": "0.28.0",
-    "electron": "1.7.2",
+    "electron": "1.6.11",
     "electron-builder": "17.1.1",
     "electron-builder-squirrel-windows": "17.0.1",
     "electron-rebuild": "1.5.11",
@@ -20,7 +20,7 @@
     "less": "2.7.1",
     "less-loader": "2.2.3",
     "node-abi": "2.0.3",
-    "node-gyp": "3.4.0",
+    "node-gyp": "^3.6.2",
     "node-sass": "^4.5.3",
     "npmlog": "4.1.0",
     "pug": "2.0.0-beta11",
@@ -67,16 +67,28 @@
       "icon": "./build/icons"
     },
     "deb": {
-      "depends": ["screen", "gconf2", "gconf-service", "libnotify4", "libappindicator1", "libxtst6", "libnss3"]
+      "depends": [
+        "screen",
+        "gconf2",
+        "gconf-service",
+        "libnotify4",
+        "libappindicator1",
+        "libxtst6",
+        "libnss3",
+        "tmux"
+      ]
     },
     "rpm": {
-      "depends": ["screen"]
+      "depends": [
+        "screen"
+      ]
     }
   },
   "scripts": {
     "build": "webpack --color --config app/webpack.config.js && webpack --color --config terminus-core/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-terminal/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-plugin-manager/webpack.config.js && webpack --color --config terminus-community-color-schemes/webpack.config.js",
     "watch": "webpack --progress --color --watch",
     "start": "cross-env DEV=1 electron --js-flags='--ignition' app --debug",
+    "prod": "cross-env DEV=1 electron --js-flags='--ignition' app",
     "lint": "tslint -c tslint.json -t stylish terminus-*/src/**/*.ts terminus-*/src/*.ts app/src/*.ts",
     "postinstall": "install-app-deps"
   },

scripts/install-deps.js

@@ -5,21 +5,18 @@ const vars = require('./vars')
 const log = require('npmlog')
 
 log.info('deps', 'app')
-sh.exec('npm prune')
-sh.exec('npm install')
-sh.exec('npm update --dev')
+sh.exec('yarn prune')
+sh.exec('yarn install')
 
 sh.cd('app')
-sh.exec('npm prune')
-sh.exec('npm install')
-sh.exec('npm update --dev')
+sh.exec('yarn prune')
+sh.exec('yarn install')
 sh.cd('..')
 
 vars.builtinPlugins.forEach(plugin => {
   log.info('deps', plugin)
   sh.cd(plugin)
-  sh.exec('npm prune')
-  sh.exec('npm install')
-  sh.exec('npm update --dev')
+  sh.exec('yarn prune')
+  sh.exec('yarn install')
   sh.cd('..')
 })

terminus-community-color-schemes/package.json

@@ -1,8 +1,10 @@
 {
   "name": "terminus-community-color-schemes",
-  "version": "1.0.0-alpha.14",
+  "version": "1.0.0-alpha.24",
   "description": "Community color schemes for Terminus",
-  "keywords": ["terminus-plugin"],
+  "keywords": [
+    "terminus-plugin"
+  ],
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {

terminus-community-color-schemes/schemes/Base16 Default Dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xreources.py
+!
+*.foreground:  #d8d8d8
+*.background:  #181818
+*.cursorColor: #d8d8d8
+!
+! Black
+*.color0:      #181818
+*.color8:      #585858
+!
+! Red
+*.color1:      #ab4642
+*.color9:      #ab4642
+!
+! Green
+*.color2:      #a1b56c
+*.color10:     #a1b56c
+!
+! Yellow
+*.color3:      #f7ca88
+*.color11:     #f7ca88
+!
+! Blue
+*.color4:      #7cafc2
+*.color12:     #7cafc2
+!
+! Magenta
+*.color5:      #ba8baf
+*.color13:     #ba8baf
+!
+! Cyan
+*.color6:      #86c1b9
+*.color14:     #86c1b9
+!
+! White
+*.color7:      #d8d8d8
+*.color15:     #f8f8f8
+!
+! Bold, Italic, Underline
+*.colorBD:     #d8d8d8
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-cave-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #9f999b
+*.background:  #222021
+*.cursorColor: #996e00
+!
+! Black
+*.color0:      #222021
+*.color8:      #635f60
+!
+! Red
+*.color1:      #936c7a
+*.color9:      #ddaf3c
+!
+! Green
+*.color2:      #cca133
+*.color10:     #2f2d2e
+!
+! Yellow
+*.color3:      #ffcc4d
+*.color11:     #565254
+!
+! Blue
+*.color4:      #9c818b
+*.color12:     #706b6d
+!
+! Magenta
+*.color5:      #cca133
+*.color13:     #f0a8c1
+!
+! Cyan
+*.color6:      #d27998
+*.color14:     #c39622
+!
+! White
+*.color7:      #9f999b
+*.color15:     #ffebf2
+!
+! Bold, Italic, Underline
+*.colorBD:     #9f999b
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-desert-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #ada594
+*.background:  #292724
+*.cursorColor: #bc672f
+!
+! Black
+*.color0:      #292724
+*.color8:      #7e7767
+!
+! Red
+*.color1:      #816f4b
+*.color9:      #f29d63
+!
+! Green
+*.color2:      #ec9255
+*.color10:     #3d3a34
+!
+! Yellow
+*.color3:      #ffb380
+*.color11:     #615c51
+!
+! Blue
+*.color4:      #957e50
+*.color12:     #908774
+!
+! Magenta
+*.color5:      #ec9255
+*.color13:     #ddcba6
+!
+! Cyan
+*.color6:      #ac8e53
+*.color14:     #e58748
+!
+! White
+*.color7:      #ada594
+*.color15:     #f2ead9
+!
+! Bold, Italic, Underline
+*.colorBD:     #ada594
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-drawbridge-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #9094a7
+*.background:  #1b1f32
+*.cursorColor: #289dbd
+!
+! Black
+*.color0:      #1b1f32
+*.color8:      #51587b
+!
+! Red
+*.color1:      #627af4
+*.color9:      #75d5f0
+!
+! Green
+*.color2:      #67c9e4
+*.color10:     #252a41
+!
+! Yellow
+*.color3:      #99e9ff
+*.color11:     #444b6f
+!
+! Blue
+*.color4:      #7289fd
+*.color12:     #5e6587
+!
+! Magenta
+*.color5:      #67c9e4
+*.color13:     #c3cdfe
+!
+! Cyan
+*.color6:      #8b9efd
+*.color14:     #5cbcd6
+!
+! White
+*.color7:      #9094a7
+*.color15:     #e1e6ff
+!
+! Bold, Italic, Underline
+*.colorBD:     #9094a7
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-evening-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #a4a1b5
+*.background:  #2a2734
+*.cursorColor: #b37537
+!
+! Black
+*.color0:      #2a2734
+*.color8:      #6c6783
+!
+! Red
+*.color1:      #8a75f5
+*.color9:      #ffb870
+!
+! Green
+*.color2:      #ffad5c
+*.color10:     #363342
+!
+! Yellow
+*.color3:      #ffcc99
+*.color11:     #545167
+!
+! Blue
+*.color4:      #9a86fd
+*.color12:     #787391
+!
+! Magenta
+*.color5:      #ffad5c
+*.color13:     #d9d2fe
+!
+! Cyan
+*.color6:      #afa0fe
+*.color14:     #ffa142
+!
+! White
+*.color7:      #a4a1b5
+*.color15:     #eeebff
+!
+! Bold, Italic, Underline
+*.colorBD:     #a4a1b5
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-forest-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #a1b5a1
+*.background:  #2a2d2a
+*.cursorColor: #656b47
+!
+! Black
+*.color0:      #2a2d2a
+*.color8:      #535f53
+!
+! Red
+*.color1:      #5c705c
+*.color9:      #cbe25a
+!
+! Green
+*.color2:      #bfd454
+*.color10:     #353b35
+!
+! Yellow
+*.color3:      #e5fb79
+*.color11:     #485148
+!
+! Blue
+*.color4:      #687d68
+*.color12:     #5e6e5e
+!
+! Magenta
+*.color5:      #bfd454
+*.color13:     #c8e4c8
+!
+! Cyan
+*.color6:      #8fae8f
+*.color14:     #b1c44f
+!
+! White
+*.color7:      #a1b5a1
+*.color15:     #f0fff0
+!
+! Bold, Italic, Underline
+*.colorBD:     #a1b5a1
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-heath-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #9e999f
+*.background:  #222022
+*.cursorColor: #995900
+!
+! Black
+*.color0:      #222022
+*.color8:      #635f63
+!
+! Red
+*.color1:      #8f6c93
+*.color9:      #d9b98c
+!
+! Green
+*.color2:      #cc8c33
+*.color10:     #2f2d2f
+!
+! Yellow
+*.color3:      #ffd599
+*.color11:     #575158
+!
+! Blue
+*.color4:      #9a819c
+*.color12:     #6f6b70
+!
+! Magenta
+*.color5:      #cc8c33
+*.color13:     #eaa8f0
+!
+! Cyan
+*.color6:      #cb79d2
+*.color14:     #c38022
+!
+! White
+*.color7:      #9e999f
+*.color15:     #fdebff
+!
+! Bold, Italic, Underline
+*.colorBD:     #9e999f
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-heath-light

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #575158
+*.background:  #fbfaf9
+*.cursorColor: #eaa8f0
+!
+! Black
+*.color0:      #222022
+*.color8:      #635f63
+!
+! Red
+*.color1:      #8f6c93
+*.color9:      #d9b98c
+!
+! Green
+*.color2:      #cc8c33
+*.color10:     #2f2d2f
+!
+! Yellow
+*.color3:      #ffd599
+*.color11:     #575158
+!
+! Blue
+*.color4:      #9a819c
+*.color12:     #6f6b70
+!
+! Magenta
+*.color5:      #b87414
+*.color13:     #eaa8f0
+!
+! Cyan
+*.color6:      #cb79d2
+*.color14:     #c38022
+!
+! White
+*.color7:      #9e999f
+*.color15:     #fbfaf9
+!
+! Bold, Italic, Underline
+*.colorBD:     #575158
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-lake-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #7ba8b7
+*.background:  #192d34
+*.cursorColor: #84740b
+!
+! Black
+*.color0:      #192d34
+*.color8:      #3d6876
+!
+! Red
+*.color1:      #3e91ac
+*.color9:      #d6c65c
+!
+! Green
+*.color2:      #cbbb4d
+*.color10:     #223c44
+!
+! Yellow
+*.color3:      #ffeb66
+*.color11:     #335966
+!
+! Blue
+*.color4:      #499fbc
+*.color12:     #467686
+!
+! Magenta
+*.color5:      #cbbb4d
+*.color13:     #a5d8e9
+!
+! Cyan
+*.color6:      #62b1cb
+*.color14:     #c4b031
+!
+! White
+*.color7:      #7ba8b7
+*.color15:     #e1f7ff
+!
+! Bold, Italic, Underline
+*.colorBD:     #7ba8b7
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-meadow-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #7b9eb7
+*.background:  #192834
+*.cursorColor: #4d8217
+!
+! Black
+*.color0:      #192834
+*.color8:      #3d5e76
+!
+! Red
+*.color1:      #277fbe
+*.color9:      #8cdd3c
+!
+! Green
+*.color2:      #80bf40
+*.color10:     #223644
+!
+! Yellow
+*.color3:      #a6f655
+*.color11:     #335166
+!
+! Blue
+*.color4:      #4299d7
+*.color12:     #466b86
+!
+! Magenta
+*.color5:      #80bf40
+*.color13:     #afddfe
+!
+! Cyan
+*.color6:      #47adf5
+*.color14:     #73b234
+!
+! White
+*.color7:      #7b9eb7
+*.color15:     #d1ecff
+!
+! Bold, Italic, Underline
+*.colorBD:     #7b9eb7
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-morning-light

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #4f5664
+*.background:  #faf8f5
+*.cursorColor: #b7c9eb
+!
+! Black
+*.color0:      #232834
+*.color8:      #656e81
+!
+! Red
+*.color1:      #1659df
+*.color9:      #c6b28b
+!
+! Green
+*.color2:      #b29762
+*.color10:     #31363f
+!
+! Yellow
+*.color3:      #e5ddcd
+*.color11:     #4f5664
+!
+! Blue
+*.color4:      #3d75e6
+*.color12:     #707a8f
+!
+! Magenta
+*.color5:      #896724
+*.color13:     #b7c9eb
+!
+! Cyan
+*.color6:      #728fcb
+*.color14:     #9a7c42
+!
+! White
+*.color7:      #8d95a5
+*.color15:     #faf8f5
+!
+! Bold, Italic, Underline
+*.colorBD:     #4f5664
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-pool-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #9a90a7
+*.background:  #2a2433
+*.cursorColor: #cf504a
+!
+! Black
+*.color0:      #2a2433
+*.color8:      #635775
+!
+! Red
+*.color1:      #aa75f5
+*.color9:      #fc8983
+!
+! Green
+*.color2:      #f87972
+*.color10:     #372f42
+!
+! Yellow
+*.color3:      #ffb6b3
+*.color11:     #574b68
+!
+! Blue
+*.color4:      #b886fd
+*.color12:     #706383
+!
+! Magenta
+*.color5:      #f87972
+*.color13:     #e4d2fe
+!
+! Cyan
+*.color6:      #c7a0fe
+*.color14:     #f36f68
+!
+! White
+*.color7:      #9a90a7
+*.color15:     #f3ebff
+!
+! Bold, Italic, Underline
+*.colorBD:     #9a90a7
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-sea-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #a1aab5
+*.background:  #1d262f
+*.cursorColor: #067953
+!
+! Black
+*.color0:      #1d262f
+*.color8:      #4a5f78
+!
+! Red
+*.color1:      #34659d
+*.color9:      #14e19d
+!
+! Green
+*.color2:      #0fc78a
+*.color10:     #27323f
+!
+! Yellow
+*.color3:      #47ebb4
+*.color11:     #405368
+!
+! Blue
+*.color4:      #57718e
+*.color12:     #738191
+!
+! Magenta
+*.color5:      #0fc78a
+*.color13:     #afd4fe
+!
+! Cyan
+*.color6:      #6e9bcf
+*.color14:     #0db57d
+!
+! White
+*.color7:      #a1aab5
+*.color15:     #ebf4ff
+!
+! Bold, Italic, Underline
+*.colorBD:     #a1aab5
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-space-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #a1a1b5
+*.background:  #24242e
+*.cursorColor: #b25424
+!
+! Black
+*.color0:      #24242e
+*.color8:      #5b5b76
+!
+! Red
+*.color1:      #7676f4
+*.color9:      #f37b3f
+!
+! Green
+*.color2:      #ec7336
+*.color10:     #333342
+!
+! Yellow
+*.color3:      #fe8c52
+*.color11:     #515167
+!
+! Blue
+*.color4:      #767693
+*.color12:     #737391
+!
+! Magenta
+*.color5:      #ec7336
+*.color13:     #cecee3
+!
+! Cyan
+*.color6:      #8a8aad
+*.color14:     #e66e33
+!
+! White
+*.color7:      #a1a1b5
+*.color15:     #ebebff
+!
+! Bold, Italic, Underline
+*.colorBD:     #a1a1b5
+!*.colorIT:
+!*.colorUL:

terminus-core/package.json

@@ -1,8 +1,10 @@
 {
   "name": "terminus-core",
-  "version": "1.0.0-alpha.14",
+  "version": "1.0.0-alpha.24",
   "description": "Terminus core",
-  "keywords": ["terminus-plugin"],
+  "keywords": [
+    "terminus-plugin"
+  ],
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -15,14 +17,13 @@
   "author": "Eugene Pankov",
   "license": "MIT",
   "devDependencies": {
-    "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22",
-    "@types/js-yaml": "^3.5.29",
-    "@types/node": "^7.0.12",
+    "@types/js-yaml": "^3.9.0",
+    "@types/node": "^7.0.37",
     "@types/webpack-env": "^1.13.0",
     "bootstrap": "4.0.0-alpha.6",
     "core-js": "^2.4.1",
     "ngx-perfect-scrollbar": "4.0.0",
-    "typescript": "^2.4.0"
+    "typescript": "^2.4.1"
   },
   "peerDependencies": {
     "@angular/animations": "4.0.1",
@@ -35,8 +36,8 @@
     "zone.js": "0.8.4"
   },
   "dependencies": {
-    "deepmerge": "^1.4.4",
-    "js-yaml": "^3.8.4"
+    "deepmerge": "^1.5.0",
+    "js-yaml": "^3.9.0"
   },
   "false": {}
 }

terminus-core/src/api/index.ts

@@ -1,5 +1,5 @@
 export { BaseTabComponent } from '../components/baseTab.component'
-export { TabRecoveryProvider } from './tabRecovery'
+export { TabRecoveryProvider, RecoveredTab } from './tabRecovery'
 export { ToolbarButtonProvider, IToolbarButton } from './toolbarButtonProvider'
 export { ConfigProvider } from './configProvider'
 export { HotkeyProvider, IHotkeyDescription } from './hotkeyProvider'

terminus-core/src/api/tabRecovery.ts

@@ -1,3 +1,10 @@
-export abstract class TabRecoveryProvider {
-    abstract async recover (recoveryToken: any): Promise<void>
+import { TabComponentType } from '../services/app.service'
+
+export interface RecoveredTab {
+    type: TabComponentType,
+    options?: any,
+}
+
+export abstract class TabRecoveryProvider {
+    abstract async recover (recoveryToken: any): Promise<RecoveredTab|null>
 }

terminus-core/src/components/appRoot.component.pug

@@ -19,7 +19,7 @@ title-bar(
                 [class.drag-region]='hostApp.platform == Platform.macOS',
                 @animateTab,
                 (click)='app.selectTab(tab)',
-                (closeClicked)='app.closeTab(tab)',
+                (closeClicked)='app.closeTab(tab, true)',
             )
         
         .btn-group

terminus-core/src/components/appRoot.component.ts

@@ -1,16 +1,17 @@
 import { Component, Inject, Input, HostListener } from '@angular/core'
 import { trigger, style, animate, transition, state } from '@angular/animations'
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 
 import { ElectronService } from '../services/electron.service'
 import { HostAppService, Platform } from '../services/hostApp.service'
 import { HotkeysService } from '../services/hotkeys.service'
 import { Logger, LogService } from '../services/log.service'
-import { QuitterService } from '../services/quitter.service'
 import { ConfigService } from '../services/config.service'
 import { DockingService } from '../services/docking.service'
 import { TabRecoveryService } from '../services/tabRecovery.service'
 import { ThemesService } from '../services/themes.service'
 
+import { SafeModeModalComponent } from './safeModeModal.component'
 import { AppService, IToolbarButton, ToolbarButtonProvider } from '../api'
 
 @Component({
@@ -28,9 +29,16 @@ import { AppService, IToolbarButton, ToolbarButtonProvider } from '../api'
                     'flex-basis': '1px',
                     'width': '1px',
                 }),
-                animate('250ms ease-in-out')
+                animate('250ms ease-in-out', style({
+                    'flex-basis': '200px',
+                    'width': '200px',
+                }))
             ]),
             transition(':leave', [
+                style({
+                    'flex-basis': '200px',
+                    'width': '200px',
+                }),
                 animate('250ms ease-in-out', style({
                     'flex-basis': '1px',
                     'width': '1px',
@@ -50,14 +58,14 @@ export class AppRootComponent {
         private docking: DockingService,
         private electron: ElectronService,
         private tabRecovery: TabRecoveryService,
+        private hotkeys: HotkeysService,
         public hostApp: HostAppService,
-        public hotkeys: HotkeysService,
         public config: ConfigService,
         public app: AppService,
         @Inject(ToolbarButtonProvider) private toolbarButtonProviders: ToolbarButtonProvider[],
         log: LogService,
+        ngbModal: NgbModal,
         _themes: ThemesService,
-        _quitter: QuitterService,
     ) {
         this.logger = log.create('main')
         this.logger.info('v', electron.app.getVersion())
@@ -74,7 +82,7 @@ export class AppRootComponent {
             }
             if (this.app.activeTab) {
                 if (hotkey === 'close-tab') {
-                    this.app.closeTab(this.app.activeTab)
+                    this.app.closeTab(this.app.activeTab, true)
                 }
                 if (hotkey === 'toggle-last-tab') {
                     this.app.toggleLastTab()
@@ -93,12 +101,16 @@ export class AppRootComponent {
             this.docking.dock()
         })
 
-        this.hostApp.secondInstance.subscribe(() => {
+        this.hostApp.secondInstance$.subscribe(() => {
             this.onGlobalHotkey()
         })
         this.hotkeys.globalHotkey.subscribe(() => {
             this.onGlobalHotkey()
         })
+
+        if (window['safeModeReason']) {
+            ngbModal.open(SafeModeModalComponent)
+        }
     }
 
     onGlobalHotkey () {
@@ -133,16 +145,6 @@ export class AppRootComponent {
         }
     }
 
-    private getToolbarButtons (aboveZero: boolean): IToolbarButton[] {
-        let buttons: IToolbarButton[] = []
-        this.toolbarButtonProviders.forEach((provider) => {
-            buttons = buttons.concat(provider.provide())
-        })
-        return buttons
-            .filter((button) => (button.weight > 0) === aboveZero)
-            .sort((a: IToolbarButton, b: IToolbarButton) => (a.weight || 0) - (b.weight || 0))
-    }
-
     @HostListener('dragover')
     onDragOver () {
         return false
@@ -152,4 +154,14 @@ export class AppRootComponent {
     onDrop () {
         return false
     }
+
+    private getToolbarButtons (aboveZero: boolean): IToolbarButton[] {
+        let buttons: IToolbarButton[] = []
+        this.toolbarButtonProviders.forEach((provider) => {
+            buttons = buttons.concat(provider.provide())
+        })
+        return buttons
+            .filter((button) => (button.weight > 0) === aboveZero)
+            .sort((a: IToolbarButton, b: IToolbarButton) => (a.weight || 0) - (b.weight || 0))
+    }
 }

terminus-core/src/components/baseTab.component.ts

@@ -1,10 +1,11 @@
-import { Subject, BehaviorSubject } from 'rxjs'
+import { Subject } from 'rxjs'
 import { ViewRef } from '@angular/core'
 
 export abstract class BaseTabComponent {
     private static lastTabID = 0
     id: number
-    title$ = new BehaviorSubject<string>(null)
+    title: string
+    customTitle: string
     scrollable: boolean
     hasActivity = false
     focused$ = new Subject<void>()
@@ -30,9 +31,12 @@ export abstract class BaseTabComponent {
         return null
     }
 
+    async canClose (): Promise<boolean> {
+        return true
+    }
+
     destroy (): void {
         this.focused$.complete()
         this.blurred$.complete()
-        this.title$.complete()
     }
 }

terminus-core/src/components/renameTabModal.component.pug

@@ -0,0 +1,6 @@
+.modal-body
+    input.form-control(type='text', [(ngModel)]='value', (keyup.enter)='save()', autofocus)
+
+.modal-footer
+    button.btn.btn-outline-primary((click)='save()') Save
+    button.btn.btn-outline-secondary((click)='close()') Cancel

terminus-core/src/components/renameTabModal.component.ts

@@ -0,0 +1,22 @@
+import { Component, Input } from '@angular/core'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
+
+@Component({
+    selector: 'rename-tab-modal',
+    template: require('./renameTabModal.component.pug'),
+})
+export class RenameTabModalComponent {
+    @Input() value: string
+
+    constructor (
+        private modalInstance: NgbActiveModal
+    ) { }
+
+    save () {
+        this.modalInstance.close(this.value)
+    }
+
+    close () {
+        this.modalInstance.dismiss()
+    }
+}

terminus-core/src/components/safeModeModal.component.pug

@@ -0,0 +1,7 @@
+.modal-body
+    .alert.alert-danger Terminus could not start with your plugins, so all third party plugins have been disabled in this session. The error was:
+        
+    pre {{error}}
+
+.modal-footer
+    button.btn.btn-outline-primary((click)='close()') Close

terminus-core/src/components/safeModeModal.component.ts

@@ -0,0 +1,19 @@
+import { Component, Input } from '@angular/core'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
+
+@Component({
+    template: require('./safeModeModal.component.pug'),
+})
+export class SafeModeModalComponent {
+    @Input() error: Error
+
+    constructor (
+        public modalInstance: NgbActiveModal,
+    ) {
+        this.error = window['safeModeReason']
+    }
+
+    close () {
+        this.modalInstance.dismiss()
+    }
+}

terminus-core/src/components/startPage.component.pug

@@ -1,30 +1,20 @@
 div
     .terminus-logo
-        .part(style='transform: rotateZ(0deg)')
-            div
-        .part(style='transform: rotateZ(51deg)')
-            div
-        .part(style='transform: rotateZ(102deg)')
-            div
-        .part(style='transform: rotateZ(154deg)')
-            div
-        .part(style='transform: rotateZ(205deg)')
-            div
-        .part(style='transform: rotateZ(257deg)')
-            div
-        .part(style='transform: rotateZ(308deg)')
-            div
     h1.terminus-title Terminus
-        span.text-muted α 
+        sup α 
 
-    button.btn.btn-primary.btn-lg.btn-block(
-        *ngFor='let button of getButtons()',
-        (click)='button.click()',
-    )
-        i.fa([class]='"fa fa-" + button.icon')
-        span {{button.title}}
+    .list-group
+        a.list-group-item.list-group-item-action(
+            *ngFor='let button of getButtons()',
+            (click)='button.click()',
+        )
+            i([class]='"fa fa-fw fa-" + button.icon')
+            span {{button.title}}
 
 footer
+    .pull-right
+        .form-control-static Version: {{version}}
+            
     .btn-group
         button.btn.btn-secondary((click)='openGitHub()')
             i.fa.fa-github

terminus-core/src/components/startPage.component.scss

@@ -24,6 +24,6 @@ footer {
     background: rgba(0,0,0,.5);
 }
 
-button {
+a, button {
     -webkit-app-region: no-drag;
 }

terminus-core/src/components/startPage.component.ts

@@ -1,3 +1,4 @@
+import * as os from 'os'
 import { Component, Inject } from '@angular/core'
 import { ElectronService } from '../services/electron.service'
 import { IToolbarButton, ToolbarButtonProvider } from '../api'
@@ -8,10 +9,14 @@ import { IToolbarButton, ToolbarButtonProvider } from '../api'
     styles: [require('./startPage.component.scss')],
 })
 export class StartPageComponent {
+    version: string
+
     constructor (
         private electron: ElectronService,
         @Inject(ToolbarButtonProvider) private toolbarButtonProviders: ToolbarButtonProvider[],
-    ) { }
+    ) {
+        this.version = electron.app.getVersion()
+    }
 
     getButtons (): IToolbarButton[] {
         return this.toolbarButtonProviders
@@ -25,6 +30,13 @@ export class StartPageComponent {
     }
 
     reportBug () {
-        this.electron.shell.openExternal('https://github.com/eugeny/terminus/issues/new')
+        let body = `Version: ${this.version}\n`
+        body += `Platform: ${os.platform()} ${os.release()}\n\n`
+        let label = {
+            darwin: 'macOS',
+            windows: 'Windows',
+            linux: 'Linux',
+        }[os.platform()]
+        this.electron.shell.openExternal(`https://github.com/eugeny/terminus/issues/new?body=${encodeURIComponent(body)}&labels=${label}`)
     }
 }

terminus-core/src/components/tabHeader.component.pug

@@ -1,3 +1,3 @@
 .index {{index + 1}}
-.name {{tab.title$ | async}}
+.name([title]='tab.customTitle || tab.title') {{tab.customTitle || tab.title}}
 button((click)='closeClicked.emit()') ×

terminus-core/src/components/tabHeader.component.scss

@@ -54,6 +54,10 @@ $tabs-height: 36px;
 
         text-align: center;
         font-size: 20px;
+
+        &:focus {
+          outline: 0;
+        }
     }
 
     &:hover button {

terminus-core/src/components/tabHeader.component.ts

@@ -1,5 +1,7 @@
-import { Component, Input, Output, EventEmitter, HostBinding } from '@angular/core'
-import { BaseTabComponent } from '../components/baseTab.component'
+import { Component, Input, Output, EventEmitter, HostBinding, HostListener } from '@angular/core'
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
+import { BaseTabComponent } from './baseTab.component'
+import { RenameTabModalComponent } from './renameTabModal.component'
 
 @Component({
     selector: 'tab-header',
@@ -12,4 +14,22 @@ export class TabHeaderComponent {
     @Input() @HostBinding('class.has-activity') hasActivity: boolean
     @Input() tab: BaseTabComponent
     @Output() closeClicked = new EventEmitter()
+
+    constructor (
+        private ngbModal: NgbModal,
+    ) { }
+
+    @HostListener('dblclick') onDoubleClick (): void {
+        let modal = this.ngbModal.open(RenameTabModalComponent)
+        modal.componentInstance.value = this.tab.customTitle || this.tab.title
+        modal.result.then(result => {
+            this.tab.customTitle = result
+        }).catch(() => null)
+    }
+
+    @HostListener('auxclick', ['$event']) onAuxClick ($event: MouseEvent): void {
+        if ($event.which === 2) {
+            this.closeClicked.emit()
+        }
+    }
 }

terminus-core/src/index.ts

@@ -11,17 +11,18 @@ import { ElectronService } from './services/electron.service'
 import { HostAppService } from './services/hostApp.service'
 import { LogService } from './services/log.service'
 import { HotkeysService, AppHotkeyProvider } from './services/hotkeys.service'
-import { QuitterService } from './services/quitter.service'
 import { DockingService } from './services/docking.service'
 import { TabRecoveryService } from './services/tabRecovery.service'
 import { ThemesService } from './services/themes.service'
 
 import { AppRootComponent } from './components/appRoot.component'
 import { TabBodyComponent } from './components/tabBody.component'
+import { SafeModeModalComponent } from './components/safeModeModal.component'
 import { StartPageComponent } from './components/startPage.component'
 import { TabHeaderComponent } from './components/tabHeader.component'
 import { TitleBarComponent } from './components/titleBar.component'
 import { WindowControlsComponent } from './components/windowControls.component'
+import { RenameTabModalComponent } from './components/renameTabModal.component'
 
 import { HotkeyProvider } from './api/hotkeyProvider'
 import { ConfigProvider } from './api/configProvider'
@@ -42,7 +43,6 @@ const PROVIDERS = [
     LogService,
     TabRecoveryService,
     ThemesService,
-    QuitterService,
     { provide: HotkeyProvider, useClass: AppHotkeyProvider, multi: true },
     { provide: Theme, useClass: StandardTheme, multi: true },
     { provide: ConfigProvider, useClass: CoreConfigProvider, multi: true },
@@ -65,7 +65,13 @@ const PROVIDERS = [
         TabHeaderComponent,
         TitleBarComponent,
         WindowControlsComponent,
+        RenameTabModalComponent,
+        SafeModeModalComponent,
     ],
+    entryComponents: [
+        RenameTabModalComponent,
+        SafeModeModalComponent,
+    ]
 })
 export default class AppModule {
     static forRoot (): ModuleWithProviders {

terminus-core/src/services/app.service.ts

@@ -82,10 +82,16 @@ export class AppService {
         }
     }
 
-    closeTab (tab: BaseTabComponent) {
+    async closeTab (tab: BaseTabComponent, checkCanClose?: boolean): Promise<void> {
+        if (!this.tabs.includes(tab)) {
+            return
+        }
+        if (checkCanClose && !await tab.canClose()) {
+            return
+        }
+        this.tabs = this.tabs.filter((x) => x !== tab)
         tab.destroy()
         let newIndex = Math.max(0, this.tabs.indexOf(tab) - 1)
-        this.tabs = this.tabs.filter((x) => x !== tab)
         if (tab === this.activeTab) {
             this.selectTab(this.tabs[newIndex])
         }

terminus-core/src/services/config.service.ts

@@ -38,7 +38,7 @@ export class ConfigProxy {
                     {
                         enumerable: true,
                         configurable: false,
-                        get: () => real[key] || defaults[key],
+                        get: () => (real[key] !== undefined) ? real[key] : defaults[key],
                         set: (value) => {
                             real[key] = value
                         }
@@ -67,7 +67,7 @@ export class ConfigService {
         this.defaults = configProviders.map(provider => {
             let defaults = {}
             if (provider.platformDefaults) {
-                defaults = configMerge(defaults, provider.platformDefaults[hostApp.platform])
+                defaults = configMerge(defaults, provider.platformDefaults[hostApp.platform] || {})
             }
             if (provider.defaults) {
                 defaults = configMerge(defaults, provider.defaults)

terminus-core/src/services/docking.service.ts

@@ -40,12 +40,12 @@ export class DockingService {
             newBounds.height = Math.round(fill * display.bounds.height)
         }
         if (dockSide === 'right') {
-            newBounds.x = display.bounds.x + Math.round(display.bounds.width * (1.0 - fill))
+            newBounds.x = display.bounds.x + display.bounds.width - newBounds.width
         } else {
             newBounds.x = display.bounds.x
         }
         if (dockSide === 'bottom') {
-            newBounds.y = display.bounds.y + Math.round(display.bounds.height * (1.0 - fill))
+            newBounds.y = display.bounds.y + display.bounds.height - newBounds.height
         } else {
             newBounds.y = display.bounds.y
         }

terminus-core/src/services/electron.service.ts

@@ -9,12 +9,12 @@ export class ElectronService {
     clipboard: any
     globalShortcut: any
     screen: any
+    remote: any
     private electron: any
-    private remoteElectron: any
 
     constructor () {
         this.electron = require('electron')
-        this.remoteElectron = this.remoteRequire('electron')
+        this.remote = this.electron.remote
         this.app = this.electron.remote.app
         this.screen = this.electron.remote.screen
         this.dialog = this.electron.remote.dialog
@@ -25,6 +25,10 @@ export class ElectronService {
     }
 
     remoteRequire (name: string): any {
-        return this.electron.remote.require(name)
+        return this.remote.require(name)
+    }
+
+    remoteRequirePluginModule (plugin: string, module: string, globals: any): any {
+        return this.remoteRequire(globals.require.resolve(`${plugin}/node_modules/${module}`))
     }
 }

terminus-core/src/services/hostApp.service.ts

@@ -1,3 +1,4 @@
+import { Subject } from 'rxjs'
 import { Injectable, NgZone, EventEmitter } from '@angular/core'
 import { ElectronService } from '../services/electron.service'
 import { Logger, LogService } from '../services/log.service'
@@ -17,10 +18,10 @@ export interface Bounds {
 export class HostAppService {
     platform: Platform
     nodePlatform: string
-    quitRequested = new EventEmitter<any>()
+    preferencesMenu$ = new Subject<void>()
     ready = new EventEmitter<any>()
     shown = new EventEmitter<any>()
-    secondInstance = new EventEmitter<any>()
+    secondInstance$ = new Subject<{ argv: string[], cwd: string }>()
 
     private logger: Logger
 
@@ -37,18 +38,18 @@ export class HostAppService {
             linux: Platform.Linux
         }[this.nodePlatform]
 
-        electron.ipcRenderer.on('host:quit-request', () => this.zone.run(() => this.quitRequested.emit()))
+        electron.ipcRenderer.on('host:preferences-menu', () => this.zone.run(() => this.preferencesMenu$.next()))
 
-        electron.ipcRenderer.on('uncaughtException', (err) => {
+        electron.ipcRenderer.on('uncaughtException', ($event, err) => {
             this.logger.error('Unhandled exception:', err)
         })
 
         electron.ipcRenderer.on('host:window-shown', () => {
-            this.shown.emit()
+            this.zone.run(() => this.shown.emit())
         })
 
-        electron.ipcRenderer.on('host:second-instance', () => {
-            this.secondInstance.emit()
+        electron.ipcRenderer.on('host:second-instance', ($event, argv: string[], cwd: string) => {
+            this.zone.run(() => this.secondInstance$.next({ argv, cwd }))
         })
 
         this.ready.subscribe(() => {
@@ -76,10 +77,6 @@ export class HostAppService {
         this.getWindow().webContents.openDevTools()
     }
 
-    setCloseable (flag: boolean) {
-        this.electron.ipcRenderer.send('window-set-closeable', flag)
-    }
-
     focusWindow () {
         this.electron.ipcRenderer.send('window-focus')
     }

terminus-core/src/services/hotkeys.service.ts

@@ -178,10 +178,6 @@ export class AppHotkeyProvider extends HotkeyProvider {
             id: 'toggle-window',
             name: 'Toggle terminal window',
         },
-        {
-            id: 'new-tab',
-            name: 'New tab',
-        },
         {
             id: 'close-tab',
             name: 'Close tab',

terminus-core/src/services/hotkeys.util.ts

@@ -45,7 +45,9 @@ export function stringifyKeySequence (events: NativeKeyEvent[]): string[] {
                 // TODO make this optional?
                 continue
             }
-            if (event.key.length === 1) {
+            if (event.key === ' ') {
+                itemKeys.push('Space')
+            } else if (event.key.length === 1) {
                 itemKeys.push(event.key.toUpperCase())
             } else {
                 itemKeys.push(event.key)

terminus-core/src/services/log.service.ts

@@ -5,14 +5,15 @@ export class Logger {
         private name: string,
     ) {}
 
-    log (level: string, ...args: any[]) {
+    doLog (level: string, ...args: any[]) {
         console[level](`%c[${this.name}]`, 'color: #aaa', ...args)
     }
 
-    debug (...args: any[]) { this.log('debug', ...args) }
-    info (...args: any[]) { this.log('info', ...args) }
-    warn (...args: any[]) { this.log('warn', ...args) }
-    error (...args: any[]) { this.log('error', ...args) }
+    debug (...args: any[]) { this.doLog('debug', ...args) }
+    info (...args: any[]) { this.doLog('info', ...args) }
+    warn (...args: any[]) { this.doLog('warn', ...args) }
+    error (...args: any[]) { this.doLog('error', ...args) }
+    log (...args: any[]) { this.doLog('log', ...args) }
 }
 
 @Injectable()

terminus-core/src/services/quitter.service.ts

@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core'
-import { HostAppService } from '../services/hostApp.service'
-
-@Injectable()
-export class QuitterService {
-    constructor (
-        private hostApp: HostAppService,
-    ) {
-        hostApp.quitRequested.subscribe(() => {
-            this.quit()
-        })
-    }
-
-    quit () {
-        this.hostApp.setCloseable(true)
-        this.hostApp.quit()
-    }
-}

terminus-core/src/services/tabRecovery.service.ts

@@ -1,5 +1,5 @@
 import { Injectable, Inject } from '@angular/core'
-import { TabRecoveryProvider } from '../api/tabRecovery'
+import { TabRecoveryProvider, RecoveredTab } from '../api/tabRecovery'
 import { BaseTabComponent } from '../components/baseTab.component'
 import { Logger, LogService } from '../services/log.service'
 import { AppService } from '../services/app.service'
@@ -10,7 +10,7 @@ export class TabRecoveryService {
 
     constructor (
         @Inject(TabRecoveryProvider) private tabRecoveryProviders: TabRecoveryProvider[],
-        app: AppService,
+        private app: AppService,
         log: LogService
     ) {
         this.logger = log.create('tabRecovery')
@@ -29,15 +29,22 @@ export class TabRecoveryService {
 
     async recoverTabs (): Promise<void> {
         if (window.localStorage.tabsRecovery) {
+            let tabs: RecoveredTab[] = []
             for (let token of JSON.parse(window.localStorage.tabsRecovery)) {
                 for (let provider of this.tabRecoveryProviders) {
                     try {
-                        await provider.recover(token)
+                        let tab = await provider.recover(token)
+                        if (tab) {
+                            tabs.push(tab)
+                        }
                     } catch (error) {
                         this.logger.warn('Tab recovery crashed:', token, provider, error)
                     }
                 }
             }
+            tabs.forEach(tab => {
+                this.app.openNewTab(tab.type, tab.options)
+            })
         }
     }
 

terminus-core/src/services/themes.service.ts

@@ -13,7 +13,6 @@ export class ThemesService {
         this.applyCurrentTheme()
         config.changed$.subscribe(() => {
             this.applyCurrentTheme()
-            document.querySelector('style#custom-css').innerHTML = config.store.appearance.css
         })
     }
 
@@ -32,6 +31,7 @@ export class ThemesService {
             document.querySelector('head').appendChild(this.styleElement)
         }
         this.styleElement.textContent = theme.css
+        document.querySelector('style#custom-css').innerHTML = this.config.store.appearance.css
     }
 
     applyCurrentTheme (): void {

terminus-core/src/theme.scss

@@ -23,6 +23,7 @@ $body-color: #aaa;
 $font-family-sans-serif: "Source Sans Pro";
 $font-size-base: 14rem / 16;
 
+$btn-border-radius: 0;
 $btn-secondary-color:            #ccc;
 $btn-secondary-bg:               #222;
 $btn-secondary-border:           #444;
@@ -70,7 +71,18 @@ $dropdown-link-disabled-color:   #333;
 $dropdown-header-color:          #333;
 
 $list-group-color: $body-color;
-$list-group-bg: $body-bg2;
+$list-group-bg: rgba(255,255,255,.05);
+$list-group-border-color:  rgba(255,255,255,.1);
+$list-group-hover-bg: rgba(255,255,255,.1);
+$list-group-link-active-bg: rgba(255,255,255,.2);
+
+$pre-bg: $dropdown-bg;
+$pre-color: $dropdown-link-color;
+
+$alert-danger-bg: $body-bg2;
+$alert-danger-text: $red;
+$alert-danger-border: $red;
+
 
 @import '~bootstrap/scss/bootstrap.scss';
 
@@ -270,12 +282,6 @@ hotkey-input-modal {
     }
 }
 
-start-page {
-    .terminus-title {
-        color: $blue;
-    }
-}
-
 .form-group label {
     margin-bottom: 2px;
 }
@@ -313,3 +319,11 @@ ngb-tabset .tab-content {
 .input-group > select.form-control {
     flex-direction: row;
 }
+
+.list-group-item {
+    transition: 0.25s background;
+
+    i + * {
+        margin-left: 10px;
+    }
+}

terminus-plugin-manager/package.json

@@ -1,8 +1,10 @@
 {
   "name": "terminus-plugin-manager",
-  "version": "1.0.0-alpha.14",
+  "version": "1.0.0-alpha.24",
   "description": "Terminus' plugin manager",
-  "keywords": ["terminus-plugin"],
+  "keywords": [
+    "terminus-plugin"
+  ],
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -17,10 +19,10 @@
   "devDependencies": {
     "@types/mz": "0.0.31",
     "@types/node": "7.0.12",
-    "@types/semver": "^5.3.31",
+    "@types/semver": "^5.3.32",
     "@types/webpack-env": "1.13.0",
-    "ngx-pipes": "^1.6.1",
     "css-loader": "^0.28.0",
+    "ngx-pipes": "^1.6.1",
     "semver": "^5.3.0"
   },
   "peerDependencies": {
@@ -34,7 +36,8 @@
     "rxjs": "5.3.0"
   },
   "dependencies": {
-    "axios": "^0.16.2"
+    "axios": "^0.16.2",
+    "mz": "^2.6.0"
   },
   "false": {}
 }

terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug

@@ -15,7 +15,9 @@ h3 Installed
                 .mr-auto.d-flex.flex-column
                     strong {{plugin.name}}
                     small.text-muted.mb-0 {{plugin.description}}
-                p.mb-0.mr-3 {{plugin.version}}
+                .d-flex.flex-column.align-items-end.mr-3
+                    div {{plugin.version}}
+                    small.text-muted {{plugin.author}}
                 button.btn.btn-outline-primary(
                     *ngIf='npmInstalled',
                     (click)='upgradePlugin(plugin)',
@@ -31,7 +33,10 @@ h3 Installed
                 .mr-auto.d-flex.flex-column
                     strong {{plugin.name}}
                     small.text-muted.mb-0 {{plugin.description}}
-                p.mb-0.mr-3 {{plugin.version}}
+                .d-flex.flex-column.align-items-end.mr-3 
+                    div {{plugin.version}}
+                    small.text-muted {{plugin.author}}
+                        i.fa.fa-check.text-success.ml-1(*ngIf='plugin.isOfficial', title='Official')
                 button.btn.btn-outline-danger(
                     (click)='uninstallPlugin(plugin)', 
                     *ngIf='!plugin.isBuiltin && npmInstalled',
@@ -41,12 +46,12 @@ h3 Installed
                     i.fa.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Uninstalling')
 
 .text-center.mt-5(*ngIf='npmMissing')
-    h4 NPM not installed
-    p.mb-2 The Node Package Manager is required to install Terminus plugins.
+    h4 npm not installed
+    p.mb-2 npm is required to install Terminus plugins.
     .btn-group
         button.btn.btn-outline-primary((click)='downloadNPM()')
             i.fa.fa-download
-            span Download NPM
+            span Get npm
         button.btn.btn-outline-info((click)='checkNPM()')
             i.fa.fa-refresh
             span Try again
@@ -73,7 +78,10 @@ div(*ngIf='npmInstalled')
                     .mr-auto.d-flex.flex-column
                         strong {{plugin.name}}
                         small.text-muted.mb-0 {{plugin.description}}
-                    p.mb-0.mr-3 {{plugin.version}}
+                    .d-flex.flex-column.align-items-end.mr-3 
+                        div {{plugin.version}}
+                        small.text-muted {{plugin.author}}
+                            i.fa.fa-check.text-success.ml-1(*ngIf='plugin.isOfficial', title='Official')
                     button.btn.btn-outline-primary(
                         (click)='installPlugin(plugin)',
                         [disabled]='busy[plugin.name] != undefined'

terminus-plugin-manager/src/config.ts

@@ -0,0 +1,7 @@
+import { ConfigProvider } from 'terminus-core'
+
+export class PluginsConfigProvider extends ConfigProvider {
+    defaults = {
+        npm: 'npm',
+    }
+}

terminus-plugin-manager/src/index.ts

@@ -4,10 +4,12 @@ import { FormsModule } from '@angular/forms'
 import { NgPipesModule } from 'ngx-pipes'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 
+import { ConfigProvider } from 'terminus-core'
 import { SettingsTabProvider } from 'terminus-settings'
 
 import { PluginsSettingsTabComponent } from './components/pluginsSettingsTab.component'
 import { PluginManagerService } from './services/pluginManager.service'
+import { PluginsConfigProvider } from './config'
 import { PluginsSettingsTabProvider } from './settings'
 
 @NgModule({
@@ -19,6 +21,7 @@ import { PluginsSettingsTabProvider } from './settings'
     ],
     providers: [
         { provide: SettingsTabProvider, useClass: PluginsSettingsTabProvider, multi: true },
+        { provide: ConfigProvider, useClass: PluginsConfigProvider, multi: true },
         PluginManagerService,
     ],
     entryComponents: [

terminus-plugin-manager/src/services/pluginManager.service.ts

@@ -1,19 +1,24 @@
-import { Observable } from 'rxjs'
-import { Injectable } from '@angular/core'
-import { Logger, LogService } from 'terminus-core'
+import * as path from 'path'
+import * as fs from 'mz/fs'
 import { exec } from 'mz/child_process'
 import axios from 'axios'
+import { Observable } from 'rxjs'
+import { Injectable } from '@angular/core'
+import { Logger, LogService, ConfigService, HostAppService, Platform } from 'terminus-core'
 
 const NAME_PREFIX = 'terminus-'
 const KEYWORD = 'terminus-plugin'
+const OFFICIAL_NPM_ACCOUNT = 'eugenepankov'
 
 export interface IPluginInfo {
     name: string
     description: string
     packageName: string
     isBuiltin: boolean
+    isOfficial: boolean
     version: string
     homepage?: string
+    author: string
     path?: string
 }
 
@@ -23,17 +28,38 @@ export class PluginManagerService {
     builtinPluginsPath: string = (window as any).builtinPluginsPath
     userPluginsPath: string = (window as any).userPluginsPath
     installedPlugins: IPluginInfo[] = (window as any).installedPlugins
-    npmBinary = 'npm'
+    npmPath: string
 
     constructor (
         log: LogService,
+        private config: ConfigService,
+        private hostApp: HostAppService,
     ) {
         this.logger = log.create('pluginManager')
+        this.detectPath()
+    }
+
+    async detectPath () {
+        this.npmPath = this.config.store.npm
+        if (await fs.exists(this.npmPath)) {
+            return
+        }
+        if (this.hostApp.platform !== Platform.Windows) {
+            let searchPaths = (await exec('bash -c -l "echo $PATH"'))[0].toString().trim().split(':')
+            for (let searchPath of searchPaths) {
+                if (await fs.exists(path.join(searchPath, 'npm'))) {
+                    this.logger.debug('Found npm in', searchPath)
+                    this.npmPath = path.join(searchPath, 'npm')
+                    return
+                }
+            }
+        }
     }
 
     async isNPMInstalled (): Promise<boolean> {
+        await this.detectPath()
         try {
-            await exec(`${this.npmBinary} -v`)
+            await exec(`${this.npmPath} -v`)
             return true
         } catch (_) {
             return false
@@ -45,25 +71,28 @@ export class PluginManagerService {
             .fromPromise(
                 axios.get(`https://www.npmjs.com/-/search?text=keywords:${KEYWORD}+${encodeURIComponent(query || '')}&from=0&size=1000`)
             )
+            .do(response => console.log(response.data.objects))
             .map(response => response.data.objects.map(item => ({
                 name: item.package.name.substring(NAME_PREFIX.length),
                 packageName: item.package.name,
                 description: item.package.description,
                 version: item.package.version,
                 homepage: item.package.links.homepage,
+                author: (item.package.author || {}).name,
+                isOfficial: item.package.publisher.username === OFFICIAL_NPM_ACCOUNT,
             })))
             .map(plugins => plugins.filter(x => x.packageName.startsWith(NAME_PREFIX)))
     }
 
     async installPlugin (plugin: IPluginInfo) {
-        let result = await exec(`${this.npmBinary} --prefix "${this.userPluginsPath}" install ${plugin.packageName}@${plugin.version}`)
+        let result = await exec(`${this.npmPath} --prefix "${this.userPluginsPath}" install ${plugin.packageName}@${plugin.version}`)
         console.log(result)
         this.installedPlugins = this.installedPlugins.filter(x => x.packageName !== plugin.packageName)
         this.installedPlugins.push(plugin)
     }
 
     async uninstallPlugin (plugin: IPluginInfo) {
-        await exec(`${this.npmBinary} --prefix "${this.userPluginsPath}" remove ${plugin.packageName}`)
+        await exec(`${this.npmPath} --prefix "${this.userPluginsPath}" remove ${plugin.packageName}`)
         this.installedPlugins = this.installedPlugins.filter(x => x.packageName !== plugin.packageName)
     }
 }

terminus-plugin-manager/webpack.config.js

@@ -37,10 +37,10 @@ module.exports = {
   },
   externals: [
     'fs',
-    'fs-promise',
     'font-manager',
     'path',
     'node-pty',
+    'mz/fs',
     'mz/child_process',
     'winreg',
     /^rxjs/,

terminus-settings/package.json

@@ -1,8 +1,10 @@
 {
   "name": "terminus-settings",
-  "version": "1.0.0-alpha.14",
+  "version": "1.0.0-alpha.24",
   "description": "Terminus terminal settings page",
-  "keywords": ["terminus-plugin"],
+  "keywords": [
+    "terminus-plugin"
+  ],
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {

terminus-settings/src/buttonProvider.ts

@@ -1,14 +1,16 @@
 import { Injectable } from '@angular/core'
-import { ToolbarButtonProvider, IToolbarButton, AppService } from 'terminus-core'
+import { ToolbarButtonProvider, IToolbarButton, AppService, HostAppService } from 'terminus-core'
 
 import { SettingsTabComponent } from './components/settingsTab.component'
 
 @Injectable()
 export class ButtonProvider extends ToolbarButtonProvider {
     constructor (
+        hostApp: HostAppService,
         private app: AppService,
     ) {
         super()
+        hostApp.preferencesMenu$.subscribe(() => this.open())
     }
 
     provide (): IToolbarButton[] {
@@ -16,14 +18,16 @@ export class ButtonProvider extends ToolbarButtonProvider {
             icon: 'sliders',
             title: 'Settings',
             weight: 10,
-            click: () => {
-                let settingsTab = this.app.tabs.find((tab) => tab instanceof SettingsTabComponent)
-                if (settingsTab) {
-                    this.app.selectTab(settingsTab)
-                } else {
-                    this.app.openNewTab(SettingsTabComponent)
-                }
-            }
+            click: () => this.open(),
         }]
     }
+
+    open (): void {
+        let settingsTab = this.app.tabs.find((tab) => tab instanceof SettingsTabComponent)
+        if (settingsTab) {
+            this.app.selectTab(settingsTab)
+        } else {
+            this.app.openNewTab(SettingsTabComponent)
+        }
+    }
 }

terminus-settings/src/components/hotkeyInputModal.component.ts

@@ -73,6 +73,7 @@ export class HotkeyInputModalComponent {
     }
 
     ngOnDestroy () {
+        this.hotkeys.clearCurrentKeystrokes()
         this.hotkeys.enable()
         clearInterval(this.keyTimeoutInterval)
     }

terminus-settings/src/components/settingsTab.component.pug

@@ -2,9 +2,9 @@ button.btn.btn-outline-warning.btn-block(*ngIf='config.restartRequested', '(clic
 
 ngb-tabset.vertical(type='tabs')
     ngb-tab
-        template(ngbTabTitle)
+        ng-template(ngbTabTitle)
             | Application
-        template(ngbTabContent)
+        ng-template(ngbTabContent)
             .row
                 .col.col-lg-6
                     .form-group
@@ -153,9 +153,9 @@ ngb-tabset.vertical(type='tabs')
                 )
                     
     ngb-tab
-        template(ngbTabTitle)
+        ng-template(ngbTabTitle)
             | Hotkeys
-        template(ngbTabContent)
+        ng-template(ngbTabContent)
             input.form-control(type='search', placeholder='Search hotkeys', [(ngModel)]='hotkeyFilter')
             .form-group
                 table.hotkeys-table
@@ -173,7 +173,7 @@ ngb-tabset.vertical(type='tabs')
                             )
                     
     ngb-tab(*ngFor='let provider of settingsProviders')
-        template(ngbTabTitle)
+        ng-template(ngbTabTitle)
             | {{provider.title}}
-        template(ngbTabContent)
+        ng-template(ngbTabContent)
             settings-tab-body([provider]='provider')

terminus-settings/src/components/settingsTab.component.ts

@@ -27,7 +27,7 @@ export class SettingsTabComponent extends BaseTabComponent {
     ) {
         super()
         this.hotkeyDescriptions = hotkeyProviders.map(x => x.hotkeys).reduce((a, b) => a.concat(b))
-        this.title$.next('Settings')
+        this.title = 'Settings'
         this.scrollable = true
         this.screens = this.docking.getScreens()
     }

terminus-settings/src/recoveryProvider.ts

@@ -1,19 +1,14 @@
 import { Injectable } from '@angular/core'
-import { TabRecoveryProvider, AppService } from 'terminus-core'
+import { TabRecoveryProvider, RecoveredTab } from 'terminus-core'
 
 import { SettingsTabComponent } from './components/settingsTab.component'
 
 @Injectable()
 export class RecoveryProvider extends TabRecoveryProvider {
-    constructor (
-        private app: AppService
-    ) {
-        super()
-    }
-
-    async recover (recoveryToken: any): Promise<void> {
+    async recover (recoveryToken: any): Promise<RecoveredTab> {
         if (recoveryToken.type === 'app:settings') {
-            this.app.openNewTab(SettingsTabComponent)
+            return { type: SettingsTabComponent }
         }
+        return null
     }
 }

terminus-settings/webpack.config.js

@@ -38,10 +38,8 @@ module.exports = {
   },
   externals: [
     'fs',
-    'fs-promise',
     'path',
     'node-pty',
-    'fs-promise',
     /^rxjs/,
     /^@angular/,
     /^@ng-bootstrap/,

terminus-terminal/package.json

@@ -1,8 +1,10 @@
 {
   "name": "terminus-terminal",
-  "version": "1.0.0-alpha.14",
+  "version": "1.0.0-alpha.24",
   "description": "Terminus' terminal emulation core",
-  "keywords": ["terminus-plugin"],
+  "keywords": [
+    "terminus-plugin"
+  ],
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -21,7 +23,8 @@
     "@types/webpack-env": "1.13.0",
     "@types/winreg": "^1.2.30",
     "dataurl": "0.1.0",
-    "deep-equal": "1.0.1"
+    "deep-equal": "1.0.1",
+    "file-loader": "^0.11.2"
   },
   "peerDependencies": {
     "@angular/common": "4.0.1",
@@ -29,16 +32,19 @@
     "@angular/forms": "4.0.1",
     "@angular/platform-browser": "4.0.1",
     "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22",
+    "rxjs": "5.3.0",
     "terminus-core": "*",
-    "terminus-settings": "*",
-    "rxjs": "5.3.0"
+    "terminus-settings": "*"
   },
   "dependencies": {
+    "@types/async-lock": "0.0.19",
+    "async-lock": "^1.0.0",
     "font-manager": "0.2.2",
-    "fs-promise": "2.0.2",
     "hterm-umdjs": "1.1.3",
     "mz": "^2.6.0",
-    "node-pty": "0.6.2",
+    "node-pty": "0.6.8",
+    "ps-node": "^0.1.6",
+    "runes": "^0.4.2",
     "winreg": "^1.2.3"
   },
   "false": {}

terminus-terminal/src/api.ts

@@ -1,6 +1,7 @@
 import { Observable } from 'rxjs'
 import { TerminalTabComponent } from './components/terminalTab.component'
 export { TerminalTabComponent }
+export { IChildProcess } from './services/sessions.service'
 
 export abstract class TerminalDecorator {
     // tslint:disable-next-line no-empty
@@ -27,6 +28,10 @@ export interface SessionOptions {
 }
 
 export abstract class SessionPersistenceProvider {
+    abstract id: string
+    abstract displayName: string
+
+    abstract isAvailable (): boolean
     abstract async attachSession (recoveryId: any): Promise<SessionOptions>
     abstract async startSession (options: SessionOptions): Promise<any>
     abstract async terminateSession (recoveryId: string): Promise<void>
@@ -43,3 +48,15 @@ export interface ITerminalColorScheme {
 export abstract class TerminalColorSchemeProvider {
     abstract async getSchemes (): Promise<ITerminalColorScheme[]>
 }
+
+export interface IShell {
+    id: string
+    name: string
+    command: string
+    args?: string[]
+    env?: any
+}
+
+export abstract class ShellProvider {
+    abstract async provide (): Promise<IShell[]>
+}

terminus-terminal/src/buttonProvider.ts

@@ -1,72 +1,63 @@
-import * as path from 'path'
-import { exec } from 'mz/child_process'
+import { AsyncSubject } from 'rxjs'
 import * as fs from 'mz/fs'
-import { Injectable } from '@angular/core'
-import { HotkeysService, ToolbarButtonProvider, IToolbarButton, AppService, ConfigService, ElectronService, HostAppService, Platform } from 'terminus-core'
+import * as path from 'path'
+import { Injectable, Inject } from '@angular/core'
+import { HotkeysService, ToolbarButtonProvider, IToolbarButton, ConfigService, HostAppService, ElectronService, Logger, LogService } from 'terminus-core'
 
-import { SessionsService } from './services/sessions.service'
-import { TerminalTabComponent } from './components/terminalTab.component'
+import { IShell, ShellProvider } from './api'
+import { TerminalService } from './services/terminal.service'
 
 @Injectable()
 export class ButtonProvider extends ToolbarButtonProvider {
+    private shells$ = new AsyncSubject<IShell[]>()
+    private logger: Logger
+
     constructor (
-        private app: AppService,
-        private sessions: SessionsService,
+        private terminal: TerminalService,
         private config: ConfigService,
-        private electron: ElectronService,
-        private hostApp: HostAppService,
+        log: LogService,
+        hostApp: HostAppService,
+        @Inject(ShellProvider) shellProviders: ShellProvider[],
+        electron: ElectronService,
         hotkeys: HotkeysService,
     ) {
         super()
+        this.logger = log.create('newTerminalButton')
+        Promise.all(shellProviders.map(x => x.provide())).then(shellLists => {
+            this.shells$.next(shellLists.reduce((a, b) => a.concat(b)))
+            this.shells$.complete()
+        })
         hotkeys.matchedHotkey.subscribe(async (hotkey) => {
             if (hotkey === 'new-tab') {
                 this.openNewTab()
             }
         })
-    }
-
-    async openNewTab (): Promise<void> {
-        let cwd = null
-        if (this.app.activeTab instanceof TerminalTabComponent) {
-            cwd = await this.app.activeTab.session.getWorkingDirectory()
-        }
-        let command = this.config.store.terminal.shell
-        let args = []
-        // TODO move this?
-        if (command === '~clink~') {
-            command = 'cmd.exe'
-            args = [
-                '/k',
-                path.join(
-                    path.dirname(this.electron.app.getPath('exe')),
-                    (process.platform === 'darwin') ? '../Resources' : 'resources',
-                    'clink',
-                    `clink_${process.arch}.exe`,
-                ),
-                'inject',
-            ]
-        }
-        if (command === '~default-shell~') {
-            if (this.hostApp.platform === Platform.Linux) {
-                let line = (await fs.readFile('/etc/passwd', { encoding: 'utf-8' }))
-                    .split('\n').find(x => x.startsWith(process.env.LOGNAME + ':'))
-                if (!line) {
-                    console.warn('Could not detect user shell')
-                    command = '/bin/sh'
-                } else {
-                    command = line.split(':')[6]
+        hostApp.secondInstance$.subscribe(async ({argv, cwd}) => {
+            if (argv.length === 2) {
+                let arg = path.resolve(cwd, argv[1])
+                if (await fs.exists(arg)) {
+                    this.openNewTab(arg)
                 }
             }
-            if (this.hostApp.platform === Platform.macOS) {
-                let shellEntry = (await exec(`dscl . -read /Users/${process.env.LOGNAME} UserShell`))[0].toString()
-                command = shellEntry.split(':')[1].trim()
-            }
+        })
+        if (!electron.remote.process.env.DEV) {
+            setImmediate(async () => {
+                let argv: string[] = electron.remote.process.argv
+                for (let arg of argv.slice(1).concat([electron.remote.process.argv0])) {
+                    if (await fs.exists(arg)) {
+                        if ((await fs.stat(arg)).isDirectory()) {
+                            this.openNewTab(arg)
+                        }
+                    }
+                }
+            })
         }
-        let sessionOptions = await this.sessions.prepareNewSession({ command, args, cwd })
-        this.app.openNewTab(
-            TerminalTabComponent,
-            { sessionOptions }
-        )
+    }
+
+    async openNewTab (cwd?: string): Promise<void> {
+        let shells = await this.shells$.first().toPromise()
+        let shell = shells.find(x => x.id === this.config.store.terminal.shell) || shells[0]
+        this.terminal.openTab(shell, cwd)
     }
 
     provide (): IToolbarButton[] {

terminus-terminal/src/colorSchemes.ts

@@ -1,4 +1,4 @@
-import * as fs from 'fs-promise'
+import * as fs from 'mz/fs'
 import * as path from 'path'
 import { Injectable } from '@angular/core'
 import { TerminalColorSchemeProvider, ITerminalColorScheme } from './api'
@@ -6,7 +6,7 @@ import { TerminalColorSchemeProvider, ITerminalColorScheme } from './api'
 @Injectable()
 export class HyperColorSchemes extends TerminalColorSchemeProvider {
     async getSchemes (): Promise<ITerminalColorScheme[]> {
-        let pluginsPath = path.join(process.env.HOME || (process.env.HOMEDRIVE + process.env.HOMEPATH), '.hyper_plugins', 'node_modules')
+        let pluginsPath = path.join(process.env.HOME, '.hyper_plugins', 'node_modules')
         if (!(await fs.exists(pluginsPath))) return []
         let plugins = await fs.readdir(pluginsPath)
 

terminus-terminal/src/components/terminalSettingsTab.component.pug

@@ -174,26 +174,53 @@
                 [title]='idx',
             )
 
-        .form-group
-            label Terminal background
-            br
-            div(
-                '[(ngModel)]'='config.store.terminal.background',
-                (ngModelChange)='config.save()',
-                ngbRadioGroup
-            )
-                label.btn.btn-secondary
-                    input(
-                        type='radio',
-                        [value]='"theme"'
-                    )
-                    | From theme
-                label.btn.btn-secondary
-                    input(
-                        type='radio',
-                        [value]='"colorScheme"'
-                    )
-                    | From colors
+        .d-flex
+            .form-group.mr-3
+                label Terminal background
+                br
+                div(
+                    '[(ngModel)]'='config.store.terminal.background',
+                    (ngModelChange)='config.save()',
+                    ngbRadioGroup
+                )
+                    label.btn.btn-secondary
+                        input(
+                            type='radio',
+                            [value]='"theme"'
+                        )
+                        | From theme
+                    label.btn.btn-secondary
+                        input(
+                            type='radio',
+                            [value]='"colorScheme"'
+                        )
+                        | From colors
+            .form-group
+                label Cursor shape
+                br
+                div(
+                    [(ngModel)]='config.store.terminal.cursor',
+                    (ngModelChange)='config.save()',
+                    ngbRadioGroup
+                )
+                    label.btn.btn-secondary
+                        input(
+                            type='radio',
+                            [value]='"block"'
+                        )
+                        | █
+                    label.btn.btn-secondary
+                        input(
+                            type='radio',
+                            [value]='"beam"'
+                        )
+                        | |
+                    label.btn.btn-secondary
+                        input(
+                            type='radio',
+                            [value]='"underline"'
+                        )
+                        | ▁
 
         .form-group
             label Shell
@@ -203,7 +230,7 @@
             )
                 option(
                     *ngFor='let shell of shells',
-                    [ngValue]='shell.command'
+                    [ngValue]='shell.id'
                 ) {{shell.name}}
 
         .form-group
@@ -232,3 +259,15 @@
                         [value]='"audible"'
                     )
                     | Audible
+
+        .form-group
+            label Session persistence
+            select.form-control(
+                '[(ngModel)]'='config.store.terminal.persistence',
+                (ngModelChange)='config.save()',
+            )
+                option([ngValue]='null') Off
+                option(
+                    *ngFor='let provider of persistenceProviders',
+                    [ngValue]='provider.id'
+                ) {{provider.displayName}}

terminus-terminal/src/components/terminalSettingsTab.component.ts

@@ -1,23 +1,11 @@
 import { Observable } from 'rxjs'
-import * as fs from 'mz/fs'
-import * as path from 'path'
 import { exec } from 'mz/child_process'
 const equal = require('deep-equal')
 const fontManager = require('font-manager')
 
 import { Component, Inject } from '@angular/core'
 import { ConfigService, HostAppService, Platform } from 'terminus-core'
-import { TerminalColorSchemeProvider, ITerminalColorScheme } from '../api'
-
-let Registry = null
-try {
-    Registry = require('winreg')
-} catch (_) { } // tslint:disable-line no-empty
-
-interface IShell {
-    name: string
-    command: string
-}
+import { TerminalColorSchemeProvider, ITerminalColorScheme, IShell, ShellProvider, SessionPersistenceProvider } from '../api'
 
 @Component({
     template: require('./terminalSettingsTab.component.pug'),
@@ -26,6 +14,7 @@ interface IShell {
 export class TerminalSettingsTabComponent {
     fonts: string[] = []
     shells: IShell[] = []
+    persistenceProviders: SessionPersistenceProvider[]
     colorSchemes: ITerminalColorScheme[] = []
     equalComparator = equal
     editingColorScheme: ITerminalColorScheme
@@ -34,8 +23,12 @@ export class TerminalSettingsTabComponent {
     constructor (
         public config: ConfigService,
         private hostApp: HostAppService,
+        @Inject(ShellProvider) private shellProviders: ShellProvider[],
         @Inject(TerminalColorSchemeProvider) private colorSchemeProviders: TerminalColorSchemeProvider[],
-    ) { }
+        @Inject(SessionPersistenceProvider) persistenceProviders: SessionPersistenceProvider[],
+    ) {
+        this.persistenceProviders = persistenceProviders.filter(x => x.isAvailable())
+    }
 
     async ngOnInit () {
         if (this.hostApp.platform === Platform.Windows || this.hostApp.platform === Platform.macOS) {
@@ -53,58 +46,8 @@ export class TerminalSettingsTabComponent {
                 this.fonts.sort()
             })
         }
-        if (this.hostApp.platform === Platform.Windows) {
-            this.shells = [
-                { name: 'CMD (clink)', command: '~clink~' },
-                { name: 'CMD (stock)', command: 'cmd.exe' },
-                { name: 'PowerShell', command: 'powershell.exe' },
-            ]
-
-            // Detect whether BoW is installed
-            const wslPath = `${process.env.windir}\\system32\\bash.exe`
-            if (await fs.exists(wslPath)) {
-                this.shells.push({ name: 'Bash on Windows', command: wslPath })
-            }
-
-            // Detect Cygwin
-            let cygwinPath = await new Promise<string>(resolve => {
-                let reg = new Registry({ hive: Registry.HKLM, key: '\\Software\\Cygwin\\setup' })
-                reg.get('rootdir', (err, item) => {
-                    if (err) {
-                        resolve(null)
-                        return
-                    }
-                    resolve(item.value)
-                })
-            })
-            if (cygwinPath) {
-                this.shells.push({ name: 'Cygwin', command: path.join(cygwinPath, 'bin', 'bash.exe') })
-            }
-
-            // Detect Git-Bash
-            let gitBashPath = await new Promise<string>(resolve => {
-                let reg = new Registry({ hive: Registry.HKLM, key: '\\Software\\GitForWindows' })
-                reg.get('InstallPath', (err, item) => {
-                    if (err) {
-                        resolve(null)
-                        return
-                    }
-                    resolve(item.value)
-                })
-            })
-            if (gitBashPath) {
-                this.shells.push({ name: 'Git-Bash', command: path.join(gitBashPath, 'bin', 'bash.exe') })
-            }
-        }
-        if (this.hostApp.platform === Platform.Linux || this.hostApp.platform === Platform.macOS) {
-            this.shells = [{ name: 'Default shell', command: '~default-shell~' }]
-            this.shells = this.shells.concat((await fs.readFile('/etc/shells', { encoding: 'utf-8' }))
-                .split('\n')
-                .map(x => x.trim())
-                .filter(x => x && !x.startsWith('#'))
-                .map(x => ({ name: x, command: x })))
-        }
         this.colorSchemes = (await Promise.all(this.colorSchemeProviders.map(x => x.getSchemes()))).reduce((a, b) => a.concat(b))
+        this.shells = (await Promise.all(this.shellProviders.map(x => x.provide()))).reduce((a, b) => a.concat(b))
     }
 
     fontAutocomplete = (text$: Observable<string>) => {

terminus-terminal/src/components/terminalTab.component.scss

@@ -9,7 +9,7 @@
         display: block;
         overflow: hidden;
         margin: 15px;
-        transition: opacity ease-out 0.1s;
+        transition: opacity ease-out 0.25s;
         opacity: 0;
 
         div[style]:last-child {

terminus-terminal/src/components/terminalTab.component.ts

@@ -1,7 +1,7 @@
-import { BehaviorSubject, ReplaySubject, Subject, Subscription } from 'rxjs'
+import { BehaviorSubject, Subject, Subscription } from 'rxjs'
 import 'rxjs/add/operator/bufferTime'
 import { Component, NgZone, Inject, Optional, ViewChild, HostBinding, Input } from '@angular/core'
-import { AppService, ConfigService, BaseTabComponent, ThemesService, HostAppService, Platform } from 'terminus-core'
+import { AppService, ConfigService, BaseTabComponent, ThemesService, HostAppService, HotkeysService, Platform } from 'terminus-core'
 
 import { Session, SessionsService } from '../services/sessions.service'
 
@@ -16,13 +16,14 @@ import { hterm, preferenceManager } from '../hterm'
 export class TerminalTabComponent extends BaseTabComponent {
     session: Session
     @Input() sessionOptions: SessionOptions
+    @Input() zoom = 0
     @ViewChild('content') content
     @HostBinding('style.background-color') backgroundColor: string
     hterm: any
-    configSubscription: Subscription
     sessionCloseSubscription: Subscription
+    hotkeysSubscription: Subscription
     bell$ = new Subject()
-    size$ = new ReplaySubject<ResizeEvent>(1)
+    size: ResizeEvent
     resize$ = new Subject<ResizeEvent>()
     input$ = new Subject<string>()
     output$ = new Subject<string>()
@@ -30,6 +31,7 @@ export class TerminalTabComponent extends BaseTabComponent {
     alternateScreenActive$ = new BehaviorSubject(false)
     mouseEvent$ = new Subject<Event>()
     htermVisible = false
+    private bellPlayer: HTMLAudioElement
     private io: any
 
     constructor (
@@ -37,20 +39,21 @@ export class TerminalTabComponent extends BaseTabComponent {
         private app: AppService,
         private themes: ThemesService,
         private hostApp: HostAppService,
+        private hotkeys: HotkeysService,
         private sessions: SessionsService,
         public config: ConfigService,
         @Optional() @Inject(TerminalDecorator) private decorators: TerminalDecorator[],
     ) {
         super()
         this.decorators = this.decorators || []
-        this.title$.next('Terminal')
-        this.configSubscription = config.changed$.subscribe(() => {
-            this.configure()
-        })
+        this.title = 'Terminal'
         this.resize$.first().subscribe(async (resizeEvent) => {
             this.session = this.sessions.addSession(
                 Object.assign({}, this.sessionOptions, resizeEvent)
             )
+            setTimeout(() => {
+                this.session.resize(resizeEvent.width, resizeEvent.height)
+            }, 1000)
             // this.session.output$.bufferTime(10).subscribe((datas) => {
             this.session.output$.subscribe(data => {
                 // let data = datas.join('')
@@ -64,6 +67,28 @@ export class TerminalTabComponent extends BaseTabComponent {
             })
             this.session.releaseInitialDataBuffer()
         })
+        this.hotkeysSubscription = this.hotkeys.matchedHotkey.subscribe(hotkey => {
+            if (!this.hasFocus) {
+                return
+            }
+            if (hotkey === 'copy') {
+                this.hterm.copySelectionToClipboard()
+            }
+            if (hotkey === 'clear') {
+                this.clear()
+            }
+            if (hotkey === 'zoom-in') {
+                this.zoomIn()
+            }
+            if (hotkey === 'zoom-out') {
+                this.zoomOut()
+            }
+            if (hotkey === 'reset-zoom') {
+                this.resetZoom()
+            }
+        })
+        this.bellPlayer = document.createElement('audio')
+        this.bellPlayer.src = require<string>('../bell.ogg')
     }
 
     getRecoveryToken (): any {
@@ -75,6 +100,7 @@ export class TerminalTabComponent extends BaseTabComponent {
 
     ngOnInit () {
         this.focused$.subscribe(() => {
+            this.configure()
             setTimeout(() => {
                 this.hterm.scrollPort_.resize()
                 this.hterm.scrollPort_.focus()
@@ -105,13 +131,15 @@ export class TerminalTabComponent extends BaseTabComponent {
         }, 1000)
 
         this.bell$.subscribe(() => {
-            if (this.config.store.terminal.bell !== 'off') {
-                let bg = preferenceManager.get('background-color')
+            if (this.config.store.terminal.bell === 'visual') {
                 preferenceManager.set('background-color', 'rgba(128,128,128,.25)')
                 setTimeout(() => {
-                    preferenceManager.set('background-color', bg)
+                    this.configure()
                 }, 125)
             }
+            if (this.config.store.terminal.bell === 'audible') {
+                this.bellPlayer.play()
+            }
             // TODO audible
         })
     }
@@ -119,7 +147,7 @@ export class TerminalTabComponent extends BaseTabComponent {
     attachHTermHandlers (hterm: any) {
         hterm.setWindowTitle = (title) => {
             this.zone.run(() => {
-                this.title$.next(title)
+                this.title = title
             })
         }
 
@@ -131,6 +159,8 @@ export class TerminalTabComponent extends BaseTabComponent {
 
         hterm.primaryScreen_.syncSelectionCaret = () => null
         hterm.alternateScreen_.syncSelectionCaret = () => null
+        hterm.primaryScreen_.terminal = hterm
+        hterm.alternateScreen_.terminal = hterm
 
         const _onPaste = hterm.scrollPort_.onPaste_.bind(hterm.scrollPort_)
         hterm.scrollPort_.onPaste_ = (event) => {
@@ -150,10 +180,18 @@ export class TerminalTabComponent extends BaseTabComponent {
         const _onMouse = hterm.onMouse_.bind(hterm)
         hterm.onMouse_ = (event) => {
             this.mouseEvent$.next(event)
-            if ((event.ctrlKey || event.metaKey) && event.type === 'mousewheel') {
-                event.preventDefault()
-                let delta = Math.round(event.wheelDeltaY / 50)
-                this.sendInput(((delta > 0) ? '\u001bOA' : '\u001bOB').repeat(Math.abs(delta)))
+            if (event.type === 'mousewheel') {
+                if (event.ctrlKey || event.metaKey) {
+                    if (event.wheelDeltaY > 0) {
+                        this.zoomIn()
+                    } else {
+                        this.zoomOut()
+                    }
+                } else if (event.altKey) {
+                    event.preventDefault()
+                    let delta = Math.round(event.wheelDeltaY / 50)
+                    this.sendInput(((delta > 0) ? '\u001bOA' : '\u001bOB').repeat(Math.abs(delta)))
+                }
             }
             _onMouse(event)
         }
@@ -176,6 +214,13 @@ export class TerminalTabComponent extends BaseTabComponent {
                 return ret
             }
         }
+
+        const _measureCharacterSize = hterm.scrollPort_.measureCharacterSize.bind(hterm.scrollPort_)
+        hterm.scrollPort_.measureCharacterSize = () => {
+            let size = _measureCharacterSize()
+            size.height += this.config.store.terminal.linePadding
+            return size
+        }
     }
 
     attachIOHandlers (io: any) {
@@ -188,11 +233,11 @@ export class TerminalTabComponent extends BaseTabComponent {
         io.onTerminalResize = (columns, rows) => {
             // console.log(`Resizing to ${columns}x${rows}`)
             this.zone.run(() => {
-                this.size$.next({ width: columns, height: rows })
-                this.resize$.next({ width: columns, height: rows })
+                this.size = { width: columns, height: rows }
                 if (this.session) {
                     this.session.resize(columns, rows)
                 }
+                this.resize$.next(this.size)
             })
         }
     }
@@ -205,12 +250,17 @@ export class TerminalTabComponent extends BaseTabComponent {
         this.io.writeUTF8(data)
     }
 
+    clear () {
+        this.hterm.wipeContents()
+        this.hterm.onVTKeystroke('\f')
+    }
+
     async configure (): Promise<void> {
         let config = this.config.store
-        preferenceManager.set('font-family', config.terminal.font)
-        preferenceManager.set('font-size', config.terminal.fontSize)
+        preferenceManager.set('font-family', `"${config.terminal.font}", "monospace-fallback", monospace`)
+        this.setFontSize()
         preferenceManager.set('enable-bold', true)
-        preferenceManager.set('audible-bell-sound', '')
+        // preferenceManager.set('audible-bell-sound', '')
         preferenceManager.set('desktop-notification-bell', config.terminal.bell === 'notification')
         preferenceManager.set('enable-clipboard-notice', false)
         preferenceManager.set('receive-encoding', 'raw')
@@ -218,6 +268,8 @@ export class TerminalTabComponent extends BaseTabComponent {
         preferenceManager.set('ctrl-plus-minus-zero-zoom', false)
         preferenceManager.set('scrollbar-visible', this.hostApp.platform === Platform.macOS)
         preferenceManager.set('copy-on-select', false)
+        preferenceManager.set('alt-sends-what', 'browser-key')
+        preferenceManager.set('alt-gr-mode', 'ctrl-alt')
 
         if (config.terminal.colorScheme.foreground) {
             preferenceManager.set('foreground-color', config.terminal.colorScheme.foreground)
@@ -239,16 +291,56 @@ export class TerminalTabComponent extends BaseTabComponent {
             preferenceManager.set('cursor-color', config.terminal.colorScheme.cursor)
         }
 
+        let css = require('../hterm.userCSS.scss')
+        if (!config.terminal.ligatures) {
+            css += `
+                * {
+                    font-feature-settings: "liga" 0;
+                    font-variant-ligatures: none;
+                }
+            `
+        } else {
+            css += `
+                * {
+                    font-feature-settings: "liga" 1;
+                    font-variant-ligatures: initial;
+                }
+            `
+        }
+        css += config.appearance.css
+        this.hterm.setCSS(css)
         this.hterm.setBracketedPaste(config.terminal.bracketedPaste)
+        this.hterm.defaultCursorShape = {
+            block: hterm.hterm.Terminal.cursorShape.BLOCK,
+            underline: hterm.hterm.Terminal.cursorShape.UNDERLINE,
+            beam: hterm.hterm.Terminal.cursorShape.BEAM,
+        }[config.terminal.cursor]
+        this.hterm.applyCursorShape()
+    }
+
+    zoomIn () {
+        this.zoom++
+        this.setFontSize()
+    }
+
+    zoomOut () {
+        this.zoom--
+        this.setFontSize()
+    }
+
+    resetZoom () {
+        this.zoom = 0
+        this.setFontSize()
     }
 
     ngOnDestroy () {
-        this.decorators.forEach((decorator) => {
+        this.decorators.forEach(decorator => {
             decorator.detach(this)
         })
-        this.configSubscription.unsubscribe()
-        this.sessionCloseSubscription.unsubscribe()
-        this.size$.complete()
+        this.hotkeysSubscription.unsubscribe()
+        if (this.sessionCloseSubscription) {
+            this.sessionCloseSubscription.unsubscribe()
+        }
         this.resize$.complete()
         this.input$.complete()
         this.output$.complete()
@@ -260,6 +352,23 @@ export class TerminalTabComponent extends BaseTabComponent {
 
     async destroy () {
         super.destroy()
-        await this.session.destroy()
+        if (this.session && this.session.open) {
+            await this.session.destroy()
+        }
+    }
+
+    async canClose (): Promise<boolean> {
+        if (this.hostApp.platform === Platform.Windows) {
+            return true
+        }
+        let children = await this.session.getChildProcesses()
+        if (children.length === 0) {
+            return true
+        }
+        return confirm(`"${children[0].command}" is still running. Close?`)
+    }
+
+    private setFontSize () {
+        preferenceManager.set('font-size', this.config.store.terminal.fontSize * Math.pow(1.1, this.zoom))
     }
 }

terminus-terminal/src/config.ts

@@ -4,9 +4,12 @@ export class TerminalConfigProvider extends ConfigProvider {
     defaults = {
         terminal: {
             fontSize: 14,
+            linePadding: 0,
             bell: 'off',
             bracketedPaste: false,
             background: 'theme',
+            ligatures: false,
+            cursor: 'block',
             colorScheme: {
                 __nonStructural: true,
                 name: 'Material',
@@ -40,9 +43,27 @@ export class TerminalConfigProvider extends ConfigProvider {
         [Platform.macOS]: {
             terminal: {
                 font: 'Menlo',
-                shell: '~default-shell~',
+                shell: 'default',
+                persistence: 'screen',
             },
             hotkeys: {
+                'copy': [
+                    '⌘-C',
+                ],
+                'clear': [
+                    '⌘-K',
+                ],
+                'zoom-in': [
+                    '⌘-=',
+                    '⌘-Shift-+',
+                ],
+                'zoom-out': [
+                    '⌘--',
+                    '⌘-Shift-_',
+                ],
+                'reset-zoom': [
+                    '⌘-0',
+                ],
                 'new-tab': [
                     ['Ctrl-A', 'C'],
                     ['Ctrl-A', 'Ctrl-C'],
@@ -54,9 +75,27 @@ export class TerminalConfigProvider extends ConfigProvider {
         [Platform.Windows]: {
             terminal: {
                 font: 'Consolas',
-                shell: '~clink~',
+                shell: 'clink',
+                persistence: null,
             },
             hotkeys: {
+                'copy': [
+                    'Ctrl-Shift-C',
+                ],
+                'clear': [
+                    'Ctrl-L',
+                ],
+                'zoom-in': [
+                    'Ctrl-=',
+                    'Ctrl-Shift-+',
+                ],
+                'zoom-out': [
+                    'Ctrl--',
+                    'Ctrl-Shift-_',
+                ],
+                'reset-zoom': [
+                    'Ctrl-0',
+                ],
                 'new-tab': [
                     ['Ctrl-A', 'C'],
                     ['Ctrl-A', 'Ctrl-C'],
@@ -67,9 +106,27 @@ export class TerminalConfigProvider extends ConfigProvider {
         [Platform.Linux]: {
             terminal: {
                 font: 'Liberation Mono',
-                shell: '~default-shell~',
+                shell: 'default',
+                persistence: 'tmux',
             },
             hotkeys: {
+                'copy': [
+                    'Ctrl-Shift-C',
+                ],
+                'clear': [
+                    'Ctrl-L',
+                ],
+                'zoom-in': [
+                    'Ctrl-=',
+                    'Ctrl-Shift-+',
+                ],
+                'zoom-out': [
+                    'Ctrl--',
+                    'Ctrl-Shift-_',
+                ],
+                'reset-zoom': [
+                    'Ctrl-0',
+                ],
                 'new-tab': [
                     ['Ctrl-A', 'C'],
                     ['Ctrl-A', 'Ctrl-C'],

terminus-terminal/src/hotkeys.ts

@@ -0,0 +1,32 @@
+import { Injectable } from '@angular/core'
+import { IHotkeyDescription, HotkeyProvider } from 'terminus-core'
+
+@Injectable()
+export class TerminalHotkeyProvider extends HotkeyProvider {
+    hotkeys: IHotkeyDescription[] = [
+        {
+            id: 'copy',
+            name: 'Copy to clipboard',
+        },
+        {
+            id: 'clear',
+            name: 'Clear terminal',
+        },
+        {
+            id: 'zoom-in',
+            name: 'Zoom in',
+        },
+        {
+            id: 'zoom-out',
+            name: 'Zoom out',
+        },
+        {
+            id: 'reset-zoom',
+            name: 'Reset zoom',
+        },
+        {
+            id: 'new-tab',
+            name: 'New tab',
+        },
+    ]
+}

terminus-terminal/src/hterm.ts

@@ -1,4 +1,3 @@
-const dataurl = require('dataurl')
 export const hterm = require('hterm-umdjs')
 hterm.hterm.defaultStorage = new hterm.lib.Storage.Memory()
 export const preferenceManager = new hterm.hterm.PreferenceManager('default')
@@ -16,14 +15,63 @@ hterm.hterm.VT.ESC['k'] = function (parseState) {
     parseState.func = parseOSC
 }
 
-preferenceManager.set('user-css', dataurl.convert({
-    data: require('./hterm.userCSS.scss'),
-    mimetype: 'text/css',
-    charset: 'utf8',
-}))
 preferenceManager.set('background-color', '#1D272D')
 preferenceManager.set('color-palette-overrides', {
     0: '#1D272D',
 })
 
 hterm.hterm.Terminal.prototype.showOverlay = () => null
+
+hterm.hterm.Terminal.prototype.setCSS = function (css) {
+    const doc = this.scrollPort_.document_
+    if (!doc.querySelector('#user-css')) {
+        const node = doc.createElement('style')
+        node.id = 'user-css'
+        doc.head.appendChild(node)
+    }
+    doc.querySelector('#user-css').innerText = css
+}
+
+const oldCharWidthDisregardAmbiguous = hterm.lib.wc.charWidthDisregardAmbiguous
+hterm.lib.wc.charWidthDisregardAmbiguous = codepoint => {
+    if ((codepoint >= 0x1f300 && codepoint <= 0x1f64f) ||
+        (codepoint >= 0x1f680 && codepoint <= 0x1f6ff)) {
+        return 2
+    }
+    return oldCharWidthDisregardAmbiguous(codepoint)
+}
+
+hterm.hterm.Terminal.prototype.applyCursorShape = function () {
+    let modes = [
+        [hterm.hterm.Terminal.cursorShape.BLOCK, true],
+        [this.defaultCursorShape || hterm.hterm.Terminal.cursorShape.BLOCK, false],
+        [hterm.hterm.Terminal.cursorShape.BLOCK, false],
+        [hterm.hterm.Terminal.cursorShape.UNDERLINE, true],
+        [hterm.hterm.Terminal.cursorShape.UNDERLINE, false],
+        [hterm.hterm.Terminal.cursorShape.BEAM, true],
+        [hterm.hterm.Terminal.cursorShape.BEAM, false],
+    ]
+    let modeNumber = this.cursorMode || 1
+    console.log('mode', modeNumber)
+    if (modeNumber >= modes.length) {
+        console.warn('Unknown cursor style: ' + modeNumber)
+        return
+    }
+    this.setCursorShape(modes[modeNumber][0])
+    this.setCursorBlink(modes[modeNumber][1])
+}
+
+hterm.hterm.VT.CSI[' q'] = function (parseState) {
+    const arg = parseState.args[0]
+    this.terminal.cursorMode = arg
+    this.terminal.applyCursorShape()
+}
+
+const _collapseToEnd = Selection.prototype.collapseToEnd
+Selection.prototype.collapseToEnd = function () {
+    try {
+        _collapseToEnd.apply(this)
+    } catch (err) {
+        // tslint-disable-line
+    }
+}

terminus-terminal/src/hterm.userCSS.scss

@@ -6,11 +6,16 @@ a:hover {
     text-decoration: underline;
 }
 
-* {
-    font-feature-settings: "liga" 0; // disable ligatures (they break monospacing)
-}
-
 x-screen {
     transition: 0.125s ease background;
-    padding-right: 15px;
+}
+
+x-row > span {
+    display: inline-block;
+    height: inherit;
+}
+
+@font-face {
+    font-family: "monospace-fallback";
+    src: url(fonts/Meslo.otf) format("opentype");
 }

terminus-terminal/src/index.ts

@@ -3,7 +3,7 @@ import { BrowserModule } from '@angular/platform-browser'
 import { FormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 
-import { HostAppService, Platform, ToolbarButtonProvider, TabRecoveryProvider, ConfigProvider, HotkeysService } from 'terminus-core'
+import { ToolbarButtonProvider, TabRecoveryProvider, ConfigProvider, HotkeysService, HotkeyProvider } from 'terminus-core'
 import { SettingsTabProvider } from 'terminus-settings'
 
 import { TerminalTabComponent } from './components/terminalTab.component'
@@ -11,15 +11,28 @@ import { TerminalSettingsTabComponent } from './components/terminalSettingsTab.c
 import { ColorPickerComponent } from './components/colorPicker.component'
 
 import { SessionsService } from './services/sessions.service'
+import { TerminalService } from './services/terminal.service'
 
-import { ScreenPersistenceProvider } from './persistenceProviders'
+import { ScreenPersistenceProvider } from './persistence/screen'
+import { TMuxPersistenceProvider } from './persistence/tmux'
 import { ButtonProvider } from './buttonProvider'
 import { RecoveryProvider } from './recoveryProvider'
-import { SessionPersistenceProvider, TerminalColorSchemeProvider, TerminalDecorator } from './api'
+import { SessionPersistenceProvider, TerminalColorSchemeProvider, TerminalDecorator, ShellProvider } from './api'
 import { TerminalSettingsTabProvider } from './settings'
 import { PathDropDecorator } from './pathDrop'
 import { TerminalConfigProvider } from './config'
+import { TerminalHotkeyProvider } from './hotkeys'
 import { HyperColorSchemes } from './colorSchemes'
+
+import { Cygwin32ShellProvider } from './shells/cygwin32'
+import { Cygwin64ShellProvider } from './shells/cygwin64'
+import { GitBashShellProvider } from './shells/gitBash'
+import { LinuxDefaultShellProvider } from './shells/linuxDefault'
+import { MacOSDefaultShellProvider } from './shells/macDefault'
+import { POSIXShellsProvider } from './shells/posix'
+import { WindowsStockShellsProvider } from './shells/windowsStock'
+import { WSLShellProvider } from './shells/wsl'
+
 import { hterm } from './hterm'
 
 @NgModule({
@@ -30,24 +43,27 @@ import { hterm } from './hterm'
     ],
     providers: [
         SessionsService,
-        ScreenPersistenceProvider,
+        TerminalService,
+
         { provide: ToolbarButtonProvider, useClass: ButtonProvider, multi: true },
         { provide: TabRecoveryProvider, useClass: RecoveryProvider, multi: true },
-        {
-            provide: SessionPersistenceProvider,
-            useFactory: (hostApp: HostAppService, screen: ScreenPersistenceProvider) => {
-                if (hostApp.platform === Platform.Windows) {
-                    return null
-                } else {
-                    return screen
-                }
-            },
-            deps: [HostAppService, ScreenPersistenceProvider],
-        },
         { provide: SettingsTabProvider, useClass: TerminalSettingsTabProvider, multi: true },
         { provide: ConfigProvider, useClass: TerminalConfigProvider, multi: true },
+        { provide: HotkeyProvider, useClass: TerminalHotkeyProvider, multi: true },
         { provide: TerminalColorSchemeProvider, useClass: HyperColorSchemes, multi: true },
         { provide: TerminalDecorator, useClass: PathDropDecorator, multi: true },
+
+        { provide: SessionPersistenceProvider, useClass: ScreenPersistenceProvider, multi: true },
+        { provide: SessionPersistenceProvider, useClass: TMuxPersistenceProvider, multi: true },
+
+        { provide: ShellProvider, useClass: WindowsStockShellsProvider, multi: true },
+        { provide: ShellProvider, useClass: MacOSDefaultShellProvider, multi: true },
+        { provide: ShellProvider, useClass: LinuxDefaultShellProvider, multi: true },
+        { provide: ShellProvider, useClass: Cygwin32ShellProvider, multi: true },
+        { provide: ShellProvider, useClass: Cygwin64ShellProvider, multi: true },
+        { provide: ShellProvider, useClass: GitBashShellProvider, multi: true },
+        { provide: ShellProvider, useClass: POSIXShellsProvider, multi: true },
+        { provide: ShellProvider, useClass: WSLShellProvider, multi: true },
     ],
     entryComponents: [
         TerminalTabComponent,
@@ -89,3 +105,4 @@ export default class TerminalModule {
 }
 
 export * from './api'
+export { TerminalService }

terminus-terminal/src/pathDrop.ts

@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core'
 import { TerminalDecorator } from './api'
 import { TerminalTabComponent } from './components/terminalTab.component'
 
-
 @Injectable()
 export class PathDropDecorator extends TerminalDecorator {
     attach (terminal: TerminalTabComponent): void {

terminus-terminal/src/persistence/screen.ts

@@ -1,11 +1,12 @@
-import * as fs from 'fs-promise'
+import * as fs from 'mz/fs'
+import * as path from 'path'
 import { exec, spawn } from 'mz/child_process'
-import { exec as execCallback } from 'child_process'
+import { exec as execAsync, execFileSync } from 'child_process'
 
 import { AsyncSubject } from 'rxjs'
 import { Injectable } from '@angular/core'
-import { Logger, LogService } from 'terminus-core'
-import { SessionOptions, SessionPersistenceProvider } from './api'
+import { Logger, LogService, ElectronService } from 'terminus-core'
+import { SessionOptions, SessionPersistenceProvider } from '../api'
 
 declare function delay (ms: number): Promise<void>
 
@@ -29,18 +30,30 @@ async function listProcesses (): Promise<IChildProcess[]> {
 
 @Injectable()
 export class ScreenPersistenceProvider extends SessionPersistenceProvider {
+    id = 'screen'
+    displayName = 'GNU Screen'
     private logger: Logger
 
     constructor (
         log: LogService,
+        private electron: ElectronService,
     ) {
         super()
         this.logger = log.create('main')
     }
 
+    isAvailable () {
+        try {
+            execFileSync('sh', ['-c', 'which screen'])
+            return true
+        } catch (_) {
+            return false
+        }
+    }
+
     async attachSession (recoveryId: any): Promise<SessionOptions> {
         let lines = await new Promise<string[]>(resolve => {
-            execCallback('screen -list', (_err, stdout) => {
+            execAsync('screen -list', (_err, stdout) => {
                 // returns an error code on macOS
                 resolve(stdout.split('\n'))
             })
@@ -64,12 +77,13 @@ export class ScreenPersistenceProvider extends SessionPersistenceProvider {
             recoveryId,
             recoveredTruePID$: truePID$.asObservable(),
             command: 'screen',
-            args: ['-r', recoveryId],
+            args: ['-d', '-r', recoveryId, '-c', await this.prepareConfig()],
         }
     }
 
     async extractShellPID (screenPID: number): Promise<number> {
-        let child = (await listProcesses()).find(x => x.ppid === screenPID)
+        let processes = await listProcesses()
+        let child = processes.find(x => x.ppid === screenPID)
 
         if (!child) {
             throw new Error(`Could not find any children of the screen process (PID ${screenPID})!`)
@@ -77,30 +91,15 @@ export class ScreenPersistenceProvider extends SessionPersistenceProvider {
 
         if (child.command === 'login') {
             await delay(1000)
-            child = (await listProcesses()).find(x => x.ppid === child.pid)
+            child = processes.find(x => x.ppid === child.pid)
         }
 
         return child.pid
     }
 
     async startSession (options: SessionOptions): Promise<any> {
-        let configPath = '/tmp/.termScreenConfig'
-        await fs.writeFile(configPath, `
-            escape ^^^
-            vbell on
-            deflogin off
-            term xterm-color
-            bindkey "^[OH" beginning-of-line
-            bindkey "^[OF" end-of-line
-            bindkey "\\027[?1049h" stuff ----alternate enter-----
-            bindkey "\\027[?1049l" stuff ----alternate leave-----
-            termcapinfo xterm* 'hs:ts=\\E]0;:fs=\\007:ds=\\E]0;\\007'
-            defhstatus "^Et"
-            hardstatus off
-            altscreen on
-        `, 'utf-8')
         let recoveryId = `term-tab-${Date.now()}`
-        let args = ['-d', '-m', '-c', configPath, '-U', '-S', recoveryId, '-T', 'xterm-256color', '--', '-' + options.command].concat(options.args || [])
+        let args = ['-d', '-m', '-c', await this.prepareConfig(), '-U', '-S', recoveryId, '-T', 'xterm-256color', '--', '-' + options.command].concat(options.args || [])
         this.logger.debug('Spawning screen with', args.join(' '))
         await spawn('screen', args, {
             cwd: options.cwd,
@@ -110,6 +109,34 @@ export class ScreenPersistenceProvider extends SessionPersistenceProvider {
     }
 
     async terminateSession (recoveryId: string): Promise<void> {
-        await exec(`screen -S ${recoveryId} -X quit`)
+        try {
+            await exec(`screen -S ${recoveryId} -X quit`)
+        } catch (_) {
+            // screen has already quit
+        }
+    }
+
+    private async prepareConfig (): Promise<string> {
+        let configPath = path.join(this.electron.app.getPath('userData'), 'screen-config.tmp')
+        await fs.writeFile(configPath, `
+            escape ^^^
+            vbell off
+            deflogin on
+            defflow off
+            term xterm-color
+            bindkey "^[OH" beginning-of-line
+            bindkey "^[OF" end-of-line
+            bindkey "^[[H" beginning-of-line
+            bindkey "^[[F" end-of-line
+            bindkey "\\027[?1049h" stuff ----alternate enter-----
+            bindkey "\\027[?1049l" stuff ----alternate leave-----
+            termcapinfo xterm* 'hs:ts=\\E]0;:fs=\\007:ds=\\E]0;\\007'
+            defhstatus "^Et"
+            hardstatus off
+            altscreen on
+            defutf8 on
+            defencoding utf8
+        `, 'utf-8')
+        return configPath
     }
 }