@@ -1,12 +1,6 @@

 (require 'cl-generic)

 (cl-defgeneric (setf seq-elt) (store sequence n))

-(setq package-user-dir

-      (locate-user-emacs-file

-        (concat

-          (file-name-as-directory "elpa")

-          emacs-version)))

-

 (modify-all-frames-parameters

  '(

    (top . 701)

@@ -21,6 +15,12 @@

    (ns-transparent-titlebar . t)

    ))

+(setq package-user-dir

+      (locate-user-emacs-file

+       (concat

+        (file-name-as-directory "elpa")

+        emacs-version)))

+

 (when (fboundp 'tool-bar-mode)

   (tool-bar-mode 0))

@@ -167,6 +167,8 @@

         (directory-files (format "%s/%s" *dotfiles-repo* "emacs.d/packages/")

                          t ".*[.]el$")))

+(use-package json-mode

+  :ensure t)

 (unless (package-installed-p 'fwoar-functional-utils)

   (fwoar/load-local-packages))

@@ -169,3 +169,5 @@

 		               (find-package-json default-directory))))

   (def-js-like-find-system js-mode)

   (def-js-like-find-system typescript-mode))

+(cl-defmethod fwoar/find-system (&context ((projectile-project-type) (eql 'npm)))

+	(find-package-json default-directory))

@@ -170,12 +170,38 @@ from the selected region."

       (global-display-line-numbers-mode)

     (setq linum-format "%5d\u2502")

     (global-linum-mode))

-  (set-exec-path-from-shell-PATH)

+  (fwoar/source "~/.zshrc")

   ;; NOTE: this must be here...

   (global-company-mode 1))

 (defvar fwoar.is-ordinary)

+(defun fwoar/source (filename)

+  "Update environment variables from a shell source file."

+  (interactive "fSource file: ")

+

+  (message "Sourcing environment from `%s'..." filename)

+  (with-temp-buffer

+    (shell-command (format "diff -u <(true; export) <(source %s; export)" filename) '(4))

+

+    (let ((envvar-re "\\([^=[:space:]]+\\)=\\(.*\\)$"))

+      ;; Remove environment variables

+      (while (search-forward-regexp (concat "^-" envvar-re) nil t)

+        (let ((var (match-string 1)))

+          (message "%s" (prin1-to-string `(setenv ,var nil)))

+          (setenv var nil)

+          ))

+

+      ;; Update environment variables

+      (goto-char (point-min))

+      (while (search-forward-regexp (concat "^+" envvar-re) nil t)

+        (let ((var (match-string 1))

+              (value (string-trim (match-string 2) "'" "'")))

+          (message "%s" (prin1-to-string `(setenv ,var ,value)))

+          (setenv var value)

+          ))))

+  (message "Sourcing environment from `%s'... done." filename))

+

 (defun cold-boot ()

   ""

   (run-with-idle-timer 5 t 'garbage-collect)

@@ -6,6 +6,7 @@

 ;; Version: 0.0.1

 ;; Keywords: json,navigator

 ;; URL: https://fwoar.co

+;; Package-Requires: (json-mode fwoar-functional-utils)

 ;; This program is free software; you can redistribute it and/or modify

 ;; it under the terms of the GNU General Public License as published by

@@ -25,12 +26,13 @@

 ;; simple attempts to navigate json

 ;;; Code:

+(require 'fwoar-functional-utils)

+(require 'json-mode)

 (defvar-local fwoar/json-nav--data nil)

 (defvar-local fwoar/json-nav--path nil)

 (defvar-local fwoar/json-nav--prev-buffer nil)

 (defvar-local fwoar/json-nav--start-buffer nil)

-(require 'fwoar-functional-utils)

 (defun fwoar/browse-json-response (url)

   (interactive "Murl? ")

@@ -53,10 +55,9 @@

     (switch-to-buffer json)))

 (defun fwoar/json--ensure-data ()

-  (unless fwoar/json-nav--data

-    (save-excursion

-      (goto-char (point-min))

-      (setq-local fwoar/json-nav--data (json-parse-buffer :null-object nil))))

+  (save-excursion

+    (goto-char (point-min))

+    (setq-local fwoar/json-nav--data (json-parse-buffer :null-object nil)))

   (values))

 (defun fwoar/json-nav--pierce-vectors (fun it)

@@ -4676,6 +4676,8 @@

 			<string>Default</string>

 			<key>Disable Window Resizing</key>

 			<true/>

+			<key>Enable Triggers in Interactive Apps</key>

+			<false/>

 			<key>Flashing Bell</key>

 			<false/>

 			<key>Foreground Color</key>

@@ -6356,7 +6358,7 @@

 	<key>findIgnoreCase_iTerm</key>

 	<true/>

 	<key>findMode_iTerm</key>

-	<integer>4</integer>

+	<integer>0</integer>

 	<key>findRegex_iTerm</key>

 	<false/>

 	<key>kCPKSelectionViewPreferredModeKey</key>

new file mode 100644

@@ -0,0 +1,152 @@

+# emacs files

+*~

+*\#

+.tramp_history

+

+# vim cache files

+*.swp

+

+# auto generated files

+*.logrt

+

+/build

+/build_*

+/build-*

+/tests/venv

+

+# logs

+*.log

+*.stderr

+*.stdout

+

+/docs/build

+/docs/publish

+/docs/edit

+/docs/website

+/docs/venv

+/docs/tools/venv

+/docs/tools/translate/venv

+/docs/tools/translate/output.md

+/docs/en/single.md

+/docs/ru/single.md

+/docs/zh/single.md

+/docs/ja/single.md

+/docs/fa/single.md

+/docs/en/development/cmake-in-clickhouse.md

+

+# callgrind files

+callgrind.out.*

+

+# ignore kdevelop files

+*.kdev4

+*.kdev_include_paths

+

+# ignore sublime project files

+*.sublime-*

+

+# Qt Creator files

+*.user

+

+# ignore perf output

+*/perf.data

+

+# ignore build files

+CMakeCache.txt

+CMakeFiles

+Makefile

+cmake_install.cmake

+CTestTestfile.cmake

+*.a

+*.o

+cmake-build-*

+

+# Python cache

+*.pyc

+__pycache__

+*.pytest_cache

+

+test.cpp

+CPackConfig.cmake

+CPackSourceConfig.cmake

+

+*-preprocessed.xml

+

+core

+!core/

+vgcore*

+

+*.deb

+*.build

+*.upload

+*.changes

+build-stamp

+configure-stamp

+

+*.bin

+*.mrk

+*.mrk2

+*.mrk3

+

+.dupload.conf

+

+# Netbeans project files

+nbproject/*

+

+# JetBrains project files

+.idea

+

+# Microsoft Visual Studio Code

+.vscode

+

+config-preprocessed.xml

+

+# Protobuf

+*.pb.cpp

+*.pb.h

+

+# Ignore symlink to private repository

+/private

+

+# Gulp dependencies used to minify website

+node_modules

+public

+website/docs

+website/presentations

+website/package-lock.json

+.DS_Store

+*/.DS_Store

+

+# cquery cache

+/.cquery-cache

+

+# ccls cache

+/.ccls-cache

+

+# clangd cache

+/.clangd

+/.cache

+

+/compile_commands.json

+

+# Toolchains

+/cmake/toolchain/*

+

+# ANTLR extension cache

+.antlr

+

+# ANTLR generated files

+/src/Parsers/New/*.interp

+/src/Parsers/New/*.tokens

+/src/Parsers/New/ClickHouseParserBaseVisitor.*

+

+# pytest-profiling

+/prof

+

+*.iml

+

+# data store

+/programs/server/data

+/programs/server/metadata

+/programs/server/store

+

+*

@@ -185,3 +185,7 @@ if [[ ! -z "$GIT_CMD" ]]; then

     fi

   }

 fi

+

+cr() {

+  cd "$(fzf --preview='git --git-dir={1}/.git --work-tree={1} status' < "$HOME"/.git_repos)"

+}

@@ -38,3 +38,6 @@ fi

 gtdo() { cd ~downloads/"${(j</>)*}" }

+hcd () {

+  fc -e true "${${(z)$(fc -l -m '\~[a-z]*' 1 | fzf)}[1]}"

+}