diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 7cc6f68..97ce353 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -1,4 +1,11 @@ -;; -*- lexical-binding: t; -*- +;;;; init.el --- Personal Init file -*- lexical-binding: t; -*- + +;;;; Commentary: + +;; Personal Emacs input file + +;;;; Code: + ;; Personal modules (add-to-list 'load-path '"~/.dotfiles/emacs/.emacs.d/modules") @@ -12,6 +19,7 @@ (require 'jg-keys) (require 'jg-dev) (require 'jg-org) +(require 'jg-media) (use-package ivy :diminish @@ -51,5 +59,9 @@ (use-package auctex :config (setq TeX-auto-save t) - (setq TeX-parse-self t) - ) + (setq TeX-parse-self t)) + +(provide 'init) +;;; init.el ends here + + diff --git a/emacs/.emacs.d/modules/jg-core.el b/emacs/.emacs.d/modules/jg-core.el index 950caaa..2c4ca20 100644 --- a/emacs/.emacs.d/modules/jg-core.el +++ b/emacs/.emacs.d/modules/jg-core.el @@ -1,5 +1,10 @@ ; -*- lexical-binding: t; -*- +;; Make it easer to do 'alt-x' + +(global-set-key "\C-x\C-m" 'execute-extended-command) +(global-set-key "\C-c\C-m" 'execute-extended-command) + (setq inhibit-startup-message t) (setq initial-scratch-message nil) diff --git a/emacs/.emacs.d/modules/jg-dev.el b/emacs/.emacs.d/modules/jg-dev.el index 90177c3..7023773 100644 --- a/emacs/.emacs.d/modules/jg-dev.el +++ b/emacs/.emacs.d/modules/jg-dev.el @@ -1,5 +1,9 @@ ; -*- lexical-binding: t; -*- +(use-package flycheck + :config + (add-hook 'after-init-hook #'global-flycheck-mode)) + (use-package magit :commands (magit-status magit-get-current-branch) :custom @@ -8,7 +12,6 @@ (use-package rainbow-delimiters :hook (prog-mode . rainbow-delimiters-mode)) - (use-package lsp-mode :commands (lsp lsp-deferred) :init @@ -17,6 +20,17 @@ (lsp-enable-which-key-integration t) ) +(use-package company + :after lsp-mode + :hook (lsp-mode . company-mode) + :bind (:map company-active-map + ("" . company-complete-selection)) + (:map lsp-mode-map + ("" . company-indent-or-complete-common)) + :custom + (company-minimum-prefix-length 1) + (company-idle-delay 0.0)) + (use-package lsp-ui :hook (lsp-mode . lsp-ui-mode) :custom @@ -39,12 +53,7 @@ ;; Set up Node debugging (require 'dap-python) ;; (dap-python-setup) ;; Automatically installs Node debug adapter if needed - - ;; Bind `C-c l d` to `dap-hydra` for easy access - (general-define-key - :keymaps 'lsp-mode-map - :prefix lsp-keymap-prefix - "d" '(dap-hydra t :wk "debugger"))) + ) (use-package python-mode :ensure nil diff --git a/emacs/.emacs.d/modules/jg-media.el b/emacs/.emacs.d/modules/jg-media.el index 7a8f736..7b542ab 100644 --- a/emacs/.emacs.d/modules/jg-media.el +++ b/emacs/.emacs.d/modules/jg-media.el @@ -10,6 +10,7 @@ :config (setq emms-source-file-default-directory "~/Music/") (setq emms-player-mplayer-parameters '("-novideo")) + (setq emms-player-list '(emms-player-mplayer)) ) (provide 'jg-media)