From 42ec7345d3a893235ce13b19a5cfb8ac90b9b727 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Fri, 2 Jun 2023 12:04:53 -0400 Subject: [PATCH] updates to bindings and stuff --- bindings.el | 48 +++++++++++++++++++++++------------------------- config.el | 25 +++++++++++++++++++++---- init.el | 4 ++-- packages.el | 4 ++-- 4 files changed, 48 insertions(+), 33 deletions(-) diff --git a/bindings.el b/bindings.el index a5f8b2c..3e0536e 100644 --- a/bindings.el +++ b/bindings.el @@ -34,8 +34,8 @@ (:prefix-map ("w" . "window") :desc "ace-window" "w" #'ace-window - :desc "split horizontally" "h" #'split-window-horizontally - :desc "split vertically" "v" #'split-window-vertically + :desc "split vertical" "v" #'split-window-horizontally + :desc "split horizontal" "h" #'split-window-vertically :desc "make taller" "+" #'enlarge-window :desc "make taller" "-" #'shrink-window :desc "make wider" ">" #'enlarge-window-horizontally @@ -234,35 +234,21 @@ (:when (modulep! :ui treemacs) :desc "Project sidebar" "p" #'+treemacs/toggle :desc "Find file in project sidebar" "P" #'treemacs-find-file) - (:when (modulep! :term shell) - :desc "Toggle shell popup" "t" #'+shell/toggle - :desc "Open shell here" "T" #'+shell/here) - (:when (modulep! :term term) - :desc "Toggle terminal popup" "t" #'+term/toggle - :desc "Open terminal here" "T" #'+term/here) (:when (modulep! :term vterm) - :desc "Toggle vterm popup" "t" #'+vterm/toggle - :desc "Open vterm here" "T" #'+vterm/here) + :desc "Toggle vterm popup" "v" #'+vterm/toggle + :desc "Open vterm here" "V" #'+vterm/here) (:when (modulep! :term eshell) :desc "Toggle eshell popup" "e" #'+eshell/toggle :desc "Open eshell here" "E" #'+eshell/here) (:when (modulep! :os macos) :desc "Reveal in Finder" "o" #'+macos/reveal-in-finder :desc "Reveal project in Finder" "O" #'+macos/reveal-project-in-finder - :desc "Send to Transmit" "u" #'+macos/send-to-transmit - :desc "Send project to Transmit" "U" #'+macos/send-project-to-transmit - :desc "Send to Launchbar" "l" #'+macos/send-to-launchbar - :desc "Send project to Launchbar" "L" #'+macos/send-project-to-launchbar - :desc "Open in iTerm" "i" #'+macos/open-in-iterm - :desc "Open in new iTerm window" "I" #'+macos/open-in-iterm-new-window) + :desc "Open in Kitty" "k" #'terminal-here + :desc "Open project root in Kitty" "K" #'terminal-here-project-launch) (:when (modulep! :tools docker) :desc "Docker" "D" #'docker) (:when (modulep! :email mu4e) - :desc "mu4e" "m" #'=mu4e) - (:when (modulep! :email notmuch) - :desc "notmuch" "m" #'=notmuch) - (:when (modulep! :email wanderlust) - :desc "wanderlust" "m" #'=wanderlust)) + :desc "mu4e" "m" #'=mu4e)) (:prefix-map ("n" . "notes") :desc "Search notes for symbol" "*" #'+default/search-notes-for-symbol-at-point @@ -391,10 +377,8 @@ "s-z" #'undo "s-w" #'kill-buffer "s-f" #'+default/search-buffer - "M-s-]" #'next-window-any-frame - "C-M-s-" #'next-window-any-frame - "M-s-[" #'previous-window-any-frame - "C-M-s-" #'previous-window-any-frame + "M-s-" #'next-window-any-frame + "M-s-" #'previous-window-any-frame "s-" #'beginning-of-buffer "s-" #'end-of-buffer "M-s-v" #'consult-yank-from-kill-ring @@ -423,6 +407,20 @@ "[" #'sp-wrap-square "{" #'sp-wrap-curly) +;; (map! +;; :map lisp-mode-map +;; "f" #'sp-forward-sexp +;; "b" #'sp-backward-sexp +;; "u" #'sp-unwrap-sexp +;; "k" #'sp-kill-sexp +;; "s" #'sp-split-sexp +;; "(" #'sp-wrap-round +;; "[" #'sp-wrap-square +;; "{" #'sp-wrap-curly) + +(setq ns-alternate-modifier 'meta) +(setq ns-right-alternate-modifier 'none) + (after! which-key (let ((prefix-re (regexp-opt (list doom-leader-key doom-leader-alt-key)))) (cl-pushnew `((,(format "\\`\\(?:C-w\\|%s w\\) m\\'" prefix-re)) diff --git a/config.el b/config.el index 79140f9..0d6f7fb 100644 --- a/config.el +++ b/config.el @@ -35,8 +35,18 @@ ;; set default frame size on launch (setq default-frame-alist '( (left . 0) (top . 0) (height . 48) (width . 160) )) -;; fixing compat issue for corfu in emacs28 -;; (defalias 'compat-string-width 'string-width) +(defun mnl/frame-center () + "Center the current frame." + (interactive) + (let* ((dw (display-pixel-width)) + (dh (display-pixel-height)) + (f (selected-frame)) + (fw (frame-pixel-width f)) + (fh (frame-pixel-height f)) + (x (- (/ dw 2) (/ fw 2))) + (y (- (/ dh 2) (/ fh 2)))) + (message (format "dw %d dh %d fw %d fh %d x %d y %d" dw dh fw fh x y)) + (set-frame-position f x y))) ;; some global settings (setq tab-always-indent t) ; don't autocomplete with tab @@ -69,8 +79,9 @@ ;; import all my customized keybindings based on doom evil mode, but without evil. (load! "bindings.el") -(setq treemacs-follow-mode t) -(setq treemacs-project-follow-mode t) +(after! treemacs + (setq treemacs-follow-mode t) + (setq treemacs-project-follow-mode t)) ;; smart tabs set modes (after! smart-tabs-mode @@ -163,4 +174,10 @@ ;; tidal cycles! (setq tidal-boot-script-path "~/.cabal/share/aarch64-osx-ghc-9.4.2/tidal-1.9.3/BootTidal.hs") +(defvar company-backends '()) + (load! "obsidian-config.el") + +(add-hook 'window-setup-hook #'mnl/frame-center) + +(server-start) diff --git a/init.el b/init.el index 4699a31..dd6fba8 100644 --- a/init.el +++ b/init.el @@ -45,7 +45,7 @@ ophints ; highlight the region an operation acts on (popup +all +defaults) ; tame sudden yet inevitable temporary windows tabs ; a tab bar for Emacs - treemacs ; a project drawer, like neotree but cooler + (treemacs +lsp) ; a project drawer, like neotree but cooler ;;unicode ; extended unicode support for various languages (vc-gutter +pretty) ; vcs diff in the fringe vi-tilde-fringe ; fringe tildes to mark beyond EOB @@ -63,7 +63,7 @@ ;; lispy ; vim for lisp, for people who don't like vim ;; multiple-cursors ; editing in many places at once ;; objed ; text object editing for the innocent - ;; parinfer ; turn lisp into python, sort of + parinfer ; turn lisp into python, sort of ;;rotate-text ; cycle region at point between text candidates snippets ; my elves. They type so I don't have to word-wrap ; soft wrapping with language-aware indent diff --git a/packages.el b/packages.el index ce1e722..0a515df 100644 --- a/packages.el +++ b/packages.el @@ -18,7 +18,7 @@ ;; (unpin! orderless) (package! obsidian) - +(package! w3m) (package! terminal-here) (package! processing-mode) (package! ob-p5js) @@ -27,7 +27,7 @@ (package! smart-tabs-mode) (package! arduino-mode) (package! arduino-cli-mode) -(package! supercollider +(package! sclang :recipe (:local-repo "/Users/emenel/Library/Application Support/SuperCollider/downloaded-quarks/scel/el")) (package! ijanet :recipe (:type git