summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock12
-rw-r--r--pkgs/sorremacs/default.nix1
-rw-r--r--pkgs/sorremacs/emacs.el30
3 files changed, 37 insertions, 6 deletions
diff --git a/flake.lock b/flake.lock
index 4519a33..80233aa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1726132515,
- "narHash": "sha256-AmNvjJ5IzJzCHc+I8JYMGFO3dXXTTrIoTfg6tpUImSE=",
+ "lastModified": 1726161281,
+ "narHash": "sha256-eJOLqzu1Am7DY7OOQ/J5USvtZjbjkMlLiytdM3qlyoQ=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "5788c86646c42ebce3d8731fccd4f973b530240b",
+ "rev": "f587d92456e827b660a308a0dd632d3f6378f8cb",
"type": "github"
},
"original": {
@@ -60,11 +60,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1724819573,
- "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
+ "lastModified": 1725983898,
+ "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+ "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
"type": "github"
},
"original": {
diff --git a/pkgs/sorremacs/default.nix b/pkgs/sorremacs/default.nix
index eea70f5..05774f5 100644
--- a/pkgs/sorremacs/default.nix
+++ b/pkgs/sorremacs/default.nix
@@ -9,4 +9,5 @@ emacsWithPackagesFromUsePackage {
extraEmacsPackages = epkgs: [
epkgs.cask
];
+
}
diff --git a/pkgs/sorremacs/emacs.el b/pkgs/sorremacs/emacs.el
index e903b10..b24424a 100644
--- a/pkgs/sorremacs/emacs.el
+++ b/pkgs/sorremacs/emacs.el
@@ -132,6 +132,36 @@
helm-completion-in-region-fuzzy-match t)
(helm-mode 1))
+(use-package corfu
+ :custom
+ (corfu-cycle t)
+ (corfu-auto t) ;; Enable auto-completion
+
+ :init
+ (global-corfu-mode))
+
+(use-package emacs
+ :custom
+
+ ;; Enable indentation+completion using the TAB key.
+ ;; `completion-at-point' is often bound to M-TAB.
+ (tab-always-indent 'complete)
+
+ ;; Emacs 30 and newer: Disable Ispell completion function. As an alternative,
+ ;; try `cape-dict'.
+ (text-mode-ispell-word-completion nil)
+
+ ;; Emacs 28 and newer: Hide commands in M-x which do not apply to the current
+ ;; mode. Corfu commands are hidden, since they are not used via M-x. This
+ ;; setting is useful beyond Corfu.
+ (read-extended-command-predicate #'command-completion-default-include-p))
+
+(use-package paredit
+ :hook ((emacs-lisp-mode . enable-paredit-mode)
+ (lisp-mode . enable-paredit-mode)
+ (lisp-interaction-mode . enable-paredit-mode)
+ (ielm-mode . enable-paredit-mode)))
+
;;; --- Various major modes --- ;;;
(use-package nix-mode
:mode "\\.nix\\'")