diff --git a/emacs/init.el b/emacs/init.el index a40a0f9..c3d88df 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -23,7 +23,7 @@ ;; If there is more than one, they won't work right. '(package-selected-packages (quote - (elpy importmagic py-autopep8 flycheck excorporate ivy nginx-mode helm-projectile projectile json-mode jinja2-mode company-terraform terraform-mode yaml-mode company racer rust-mode magit theme-looper myterminal-controls meta-presenter which-key dired-launch material-theme neotree undo-tree ztree buffer-move powerline ace-window ace-jump-mode multiple-cursors helm)))) + (vue-mode jedi-direx multi-web-mode web-mode quack elpy importmagic py-autopep8 flycheck excorporate ivy nginx-mode helm-projectile projectile json-mode jinja2-mode company-terraform terraform-mode yaml-mode company racer rust-mode magit theme-looper myterminal-controls meta-presenter which-key dired-launch material-theme neotree undo-tree ztree buffer-move powerline ace-window ace-jump-mode multiple-cursors helm)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/emacs/super-emacs/file-modes.el b/emacs/super-emacs/file-modes.el index a01c6e2..7dad277 100644 --- a/emacs/super-emacs/file-modes.el +++ b/emacs/super-emacs/file-modes.el @@ -1,2 +1,13 @@ (setq auto-mode-alist (append '(("\\.sls$" . yaml-mode)) auto-mode-alist)) + + + + +(defvar dwlisp-mode-hook nil) +(add-to-list 'auto-mode-alist '("\\.lisp\\'" . dwlisp-mode)) + +(define-derived-mode dwlisp-mode + lisp-mode "dwlisp" + "major mode for dwlisp" + (setq lisp-body-indent 2)) diff --git a/emacs/super-emacs/key-bindings.el b/emacs/super-emacs/key-bindings.el index edb6263..73ff2c5 100644 --- a/emacs/super-emacs/key-bindings.el +++ b/emacs/super-emacs/key-bindings.el @@ -28,7 +28,9 @@ ("s-=" . text-scale-increase) ("C-c m" . magit-status) ("C-c g" . helm-projectile-grep) + ("C-S-s" . helm-occur) ("C-c b" . helm-semantic-or-imenu) + ("C-c j" . helm-all-mark-rings) )) (defun super-emacs-apply-keyboard-bindings (pair) @@ -38,3 +40,7 @@ (mapc 'super-emacs-apply-keyboard-bindings super-emacs--my-keyboard-bindings) + +(add-hook 'python-mode-hook (lambda () + (local-set-key (kbd "C-c i") (lambda () (interactive) ( + insert "import pdb; pdb.set_trace()"))))) diff --git a/emacs/super-emacs/misc.el b/emacs/super-emacs/misc.el index 6647ca6..111f4b5 100644 --- a/emacs/super-emacs/misc.el +++ b/emacs/super-emacs/misc.el @@ -6,8 +6,8 @@ (t (message "You're not editing a file!")))) ;Disable splash message, start *scratch* buffer by default -(setq initial-buffer-choice - t) +(setq inhibit-startup-screen t + initial-buffer-choice nil) (setq initial-scratch-message "") @@ -20,7 +20,7 @@ ;Enable whitespace mode (global-whitespace-mode) - (setq whitespace-line-column 125) + (setq whitespace-line-column 500) ;Enable winner-mode (winner-mode t) @@ -31,6 +31,8 @@ ;;keep search highlight (setq lazy-highlight-cleanup nil) +;turn off bell + (setq ring-bell-function 'ignore) ;;cleanup buffers diff --git a/emacs/super-emacs/packages.el b/emacs/super-emacs/packages.el index d4cabd0..c0129c2 100644 --- a/emacs/super-emacs/packages.el +++ b/emacs/super-emacs/packages.el @@ -122,12 +122,16 @@ "*.tar.gz" "*.tgz" "*.zip" + "*.o" ) projectile-globally-ignored-files)) (setq projectile-globally-ignored-directories (append '( ".git" ".svn" + ".idea" + ".vscode" + "node_modules" ) projectile-globally-ignored-directories)) ))) @@ -139,4 +143,4 @@ ;; (add-to-list 'elpy-default-minor-modes 'flycheck-mode)) ;;flycheck -(setq flycheck-flake8-maximum-line-length 125) +(setq flycheck-flake8-maximum-line-length 500) diff --git a/slate.js b/slate.js index 7f72605..2be04a1 100644 --- a/slate.js +++ b/slate.js @@ -57,6 +57,11 @@ var topLeft = S.op("corner", { "width": "screenSizeX/2", "height": "screenSizeY/2" }); +var topLeftShort = S.op("corner", { + "direction": "top-left", + "width": "screenSizeX/2", + "height": "screenSizeY/4" +}); var topRight = S.op("corner", { "direction": "top-right", @@ -68,6 +73,12 @@ var bottomLeft = S.op("corner", { "width": "screenSizeX/2", "height": "screenSizeY/2" }); +var bottomLeftTall = S.op("corner", { + "direction": "bottom-left", + "width": "screenSizeX/2", + "height": "screenSizeY*0.63" +}); + var bottomRight = S.op("corner", { "direction": "bottom-right", "width": "screenSizeX/2", @@ -147,7 +158,7 @@ var threeMonitorLayout = slate.layout("threeMonitor", { "Slack": { "operations": [function(wo) { wo.doOperation(moveScreen0); - wo.doOperation(topLeft); + wo.doOperation(topLeftShort); }], "main-first": true, "ignore-fail": true, @@ -156,7 +167,7 @@ var threeMonitorLayout = slate.layout("threeMonitor", { "Microsoft Outlook": { "operations": [function(wo) { wo.doOperation(moveScreen0); - wo.doOperation(bottomLeft); + wo.doOperation(bottomLeftTall); }], "main-first": true, "ignore-fail": false, @@ -202,6 +213,24 @@ var threeMonitorLayout = slate.layout("threeMonitor", { "main-first": true, "ignore-fail": true, "repeat": true + }, + "Emacs": { + "operations": [function(wo) { + wo.doOperation(moveScreen2); + wo.doOperation(topHalf); + }], + "main-first": true, + "ignore-fail": true, + "repeat": true + }, + "iTerm2": { + "operations": [function(wo) { + wo.doOperation(moveScreen2); + wo.doOperation(bottomHalf); + }], + "main-first": true, + "ignore-fail": true, + "repeat": true } });