summaryrefslogtreecommitdiffstats
path: root/jeschli/2configs
diff options
context:
space:
mode:
Diffstat (limited to 'jeschli/2configs')
-rw-r--r--jeschli/2configs/emacs-org-agenda.nix16
-rw-r--r--jeschli/2configs/emacs.nix20
2 files changed, 25 insertions, 11 deletions
diff --git a/jeschli/2configs/emacs-org-agenda.nix b/jeschli/2configs/emacs-org-agenda.nix
index ded90ea1a..79540977c 100644
--- a/jeschli/2configs/emacs-org-agenda.nix
+++ b/jeschli/2configs/emacs-org-agenda.nix
@@ -162,14 +162,14 @@ let
(setq org-refile-allow-creating-parent-nodes (quote confirm))
; Use IDO for both buffer and file completion and ido-everywhere to t
-(setq org-completion-use-ido t)
-(setq ido-everywhere t)
-(setq ido-max-directory-size 100000)
-(ido-mode (quote both))
-; Use the current window when visiting files and buffers with ido
-(setq ido-default-file-method 'selected-window)
-(setq ido-default-buffer-method 'selected-window)
-; Use the current window for indirect buffer display
+; (setq org-completion-use-ido t)
+; (setq ido-everywhere t)
+; (setq ido-max-directory-size 100000)
+; (ido-mode (quote both))
+; ; Use the current window when visiting files and buffers with ido
+; (setq ido-default-file-method 'selected-window)
+; (setq ido-default-buffer-method 'selected-window)
+; ; Use the current window for indirect buffer display
(setq org-indirect-buffer-display 'current-window)
;;;; Refile settings
diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index d243017f1..46354bd62 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -53,6 +53,13 @@ let
(ido-mode t)
'';
+ helm = ''
+ (helm-mode 1)
+ (global-set-key (kbd "M-x") #'helm-M-x)
+ (global-set-key (kbd "C-x r b") #'helm-filtered-bookmarks)
+ (global-set-key (kbd "C-x C-f") #'helm-find-files)
+ '';
+
magit = ''
(global-set-key (kbd "C-x g") 'magit-status) ; "Most Magit commands are commonly invoked from the status buffer"
@@ -161,10 +168,9 @@ let
${evilMode}
${goMode}
- ${ido}
+ ${helm}
${magit}
${orgMode}
- ${recentFiles}
${rustDevelopment}
${theme}
${windowCosmetics}
@@ -175,9 +181,17 @@ let
#emacsWithCustomPackages
emacsPkgs= epkgs: [
-#testing
+ #testing
+ epkgs.melpaPackages.web-mode
+ epkgs.melpaPackages.js2-mode
+ epkgs.melpaPackages.xref-js2
+
+ epkgs.melpaPackages.academic-phrases
+
epkgs.melpaPackages.gitlab
epkgs.melpaPackages.forge
+ epkgs.melpaPackages.helm
+ epkgs.melpaPackages.weechat
# emacs convenience
epkgs.melpaPackages.ag