From 01956739500fdcab3fe373ddd934c420a1a0f823 Mon Sep 17 00:00:00 2001 From: Nikita Voloboev Date: Tue, 6 Nov 2018 18:12:27 +0000 Subject: [PATCH] update --- hammerspoon/meta.lua | 3 +++ karabiner/karabiner.edn | 8 ++++---- nix/darwin.nix | 1 + sublime/JsPrettier.sublime-settings | 2 +- vscode/keybindings.json | 10 +++++----- vscode/settings.json | 5 ++++- zsh/env.zsh | 4 +++- 7 files changed, 21 insertions(+), 12 deletions(-) diff --git a/hammerspoon/meta.lua b/hammerspoon/meta.lua index 1929ed4a..d5434e36 100644 --- a/hammerspoon/meta.lua +++ b/hammerspoon/meta.lua @@ -16,6 +16,9 @@ _asm = {} -- TODO: ? _asm.hs_default_require = require require = rawrequire +-- Make the console dark +hs.console.darkMode(true) + -- Link Spoons dir -- TODO: doesn't work -- package.path = hs.configdir .. "/Spoons/?.spoon/init.lua;" diff --git a/karabiner/karabiner.edn b/karabiner/karabiner.edn index 71e5f1bd..f2f4d62e 100644 --- a/karabiner/karabiner.edn +++ b/karabiner/karabiner.edn @@ -142,7 +142,7 @@ {:des "wkey (apps)" :rules[:w-mode [:k [:km "open: Safari"]] - [:a [:km "open: Activity Monitor"]] + [:h [:km "open: Activity Monitor"]] [:i [:km "open: Chrome Canary"]] [:u [:km "open: Firefox Dev"]] [:g [:km "open: Bee"]] @@ -154,7 +154,7 @@ [:m [:km "open: Tower"]] [:b [:km "open: BetterTouchTool"]] [:r [:km "open: Fantastical"]] - [:e :!OSC1] ; Search Dash + [:e :!OSC1] ; Open Dash [:semicolon [:km "open: Xcode"]] [:period [:km "open: SnippetsLab"]] [:f [:km "open: 2do"]] @@ -231,6 +231,7 @@ [:r :!Squote] [:d :backslash] [:x :!Sbackslash] + [:b [:!St :!So :!Sd :!So :!Ssemicolon :spacebar]] [:caps_lock [:km "Match symbols"]] [:e :!S3] [:1 :!S1] @@ -258,7 +259,6 @@ [:5 :!C5] [:6 :!C6] [:w :!CObackslash] - [:v :!CT5] ; New Fantastical event [:spacebar [:alfred "search PDF files" "nikivi.search.files"]] [:g [ :alfred "search snippets" "com.renfei.SnippetsLab.AlfredWorkflow"]] [:grave_accent_and_tilde [:alfred "search processes" "com.vitorgalvao.alfred.processcontrol"]] @@ -363,7 +363,7 @@ [:l [:km "Select line and google"]] [:m [:km "Google clipboard"]] [:b {:pkey :button3}] - [:s {:pkey :button2}] + [:z {:pkey :button2}] [:v {:pkey :button1}] [:a :!TCO8] [:period :!CTO3]]} diff --git a/nix/darwin.nix b/nix/darwin.nix index f2f54087..e75b3087 100644 --- a/nix/darwin.nix +++ b/nix/darwin.nix @@ -14,6 +14,7 @@ pkgs.direnv pkgs.exa pkgs.fzf + pkgs.htop pkgs.httpie pkgs.gitAndTools.git-hub pkgs.git diff --git a/sublime/JsPrettier.sublime-settings b/sublime/JsPrettier.sublime-settings index 3ca70759..7b84c0ca 100644 --- a/sublime/JsPrettier.sublime-settings +++ b/sublime/JsPrettier.sublime-settings @@ -6,5 +6,5 @@ "*.css" ], "trailingComma": "es5", - "prettier_cli_path": "/Users/nikivi/.npm-global/bin/prettier", + "prettier_cli_path": "/Users/nikivi/.nvm/versions/node/v10.8.0/bin/prettier", } \ No newline at end of file diff --git a/vscode/keybindings.json b/vscode/keybindings.json index c8a5188a..09e8050d 100644 --- a/vscode/keybindings.json +++ b/vscode/keybindings.json @@ -66,7 +66,7 @@ "when": "editorTextFocus && inDebugMode" }, { - "key": "ctrl+k", + "key": "ctrl+;", "command": "editor.action.showHover", "when": "editorTextFocus" }, @@ -185,11 +185,11 @@ "command": "newFile.createNewFile" }, { - "key": "shift+cmd+j", + "key": "ctrl+j", "command": "workbench.action.previousEditor" }, { - "key": "shift+cmd+k", + "key": "ctrl+k", "command": "workbench.action.nextEditor" }, { @@ -197,7 +197,7 @@ "command": "extension.copyGitHubLinkToClipboard" }, { - "key": "ctrl+m", + "key": "ctrl+g", "command": "bookmarks.toggle" }, { @@ -274,7 +274,7 @@ "when": "editorTextFocus" }, { - "key": "ctrl+j", + "key": "ctrl+m", "command": "extension.dash.all", "when": "editorTextFocus" }, diff --git a/vscode/settings.json b/vscode/settings.json index ed82f7ff..af1250db 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -3,6 +3,9 @@ "workbench.colorCustomizations": { "editor.lineHighlightBackground": "#212121" }, + "[reason]": { + "editor.formatOnSave": true + }, // editor "editor.renderLineHighlight": "line", "editor.hideCursorInOverviewRuler": true, @@ -34,7 +37,7 @@ "workbench.settings.enableNaturalLanguageSearch": false, "workbench.colorTheme": "Monokai Night", // window - "window.zoomLevel": -1, + "window.zoomLevel": 0, "window.restoreWindows": "all", "window.title": "${activeEditorMedium}${separator}${rootName}", "window.newWindowDimensions": "maximized", diff --git a/zsh/env.zsh b/zsh/env.zsh index abfc1e08..1d8c40c7 100644 --- a/zsh/env.zsh +++ b/zsh/env.zsh @@ -9,7 +9,6 @@ export PATH=$PATH:~/.dotfiles/bin export PATH=$PATH:~/.cargo/bin # Rust export GOPATH="$(go env GOPATH)" # Go export PATH="$PATH:$GOPATH/bin" # Go -export PATH=$PATH:~/.npm-global/bin # npm globally installed # TODO: ? . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" @@ -18,4 +17,7 @@ export PATH=$PATH:~/.npm-global/bin # npm globally installed # look at the existing prompt and use below function as it returns needed info has_direnv() { if [[ -n $DIRENV_DIFF ]]; then echo in direnv; else echo not; fi } +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + typeset -U PATH # Remove duplicates in $PATH