From 3de35322f62f544c36089251bf0ed4255be79cc2 Mon Sep 17 00:00:00 2001
From: Janne Peltola <git@jannepeltola.net>
Date: Tue, 3 Feb 2026 17:59:53 +0200
Subject: [PATCH] Add emacs

---
 home-manager/emacs.el    | 57 ++++++++++++++++++++++++++++++++++++++++
 home-manager/home.nix    |  4 ---
 home-manager/wayland.nix |  2 +-
 3 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 home-manager/emacs.el

diff --git a/home-manager/emacs.el b/home-manager/emacs.el
new file mode 100644
index 0000000..9b2fa01
--- /dev/null
+++ b/home-manager/emacs.el
@@ -0,0 +1,57 @@
+; Aesthetics
+(use-package material-theme)
+(load-theme 'material t)
+
+(menu-bar-mode -1)
+(tool-bar-mode -1)
+
+;; Window navigation 
+(windmove-default-keybindings)
+
+;; Autocompletion with vertico
+(use-package vertico
+  :custom
+  (vertico-count 20)  ;; limit to a fixed size
+  :bind (:map vertico-map
+    ;; Use page-up/down to scroll vertico buffer, like ivy does by default.
+    ("<prior>" . 'vertico-scroll-down)
+    ("<next>"  . 'vertico-scroll-up))
+  :init
+  ;; Activate vertico
+  (vertico-mode))
+
+;; Convenient path selection
+(use-package vertico-directory
+  :after vertico
+  :ensure nil  ;; no need to install, it comes with vertico
+  :bind (:map vertico-map
+    ("DEL" . vertico-directory-delete-char)))
+
+(use-package orderless
+  :custom
+  ;; Activate orderless completion
+  (completion-styles '(orderless basic))
+  ;; Enable partial completion for file wildcard support
+  (completion-category-overrides '((file (styles partial-completion)))))
+
+(use-package consult
+  :custom
+  ;; Disable preview
+  (consult-preview-key nil)
+  :bind
+  (("C-x b" . 'consult-buffer)    ;; Switch buffer, including recentf and bookmarks
+   ("M-l"   . 'consult-git-grep)  ;; Search inside a project
+   ("M-y"   . 'consult-yank-pop)  ;; Paste by selecting the kill-ring
+   ("M-s"   . 'consult-line)      ;; Search current buffer, like swiper
+   ))
+
+(use-package embark
+  :bind
+  (("C-."   . embark-act)         ;; Begin the embark process
+   ("C-;"   . embark-dwim)        ;; good alternative: M-.
+   ("C-h B" . embark-bindings)) ;; alternative for `describe-bindings'
+  :config
+  (use-package embark-consult))
+
+;; ORG-MODE
+(setq org-replace-disputed-keys t)
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 43ddd7a..e49c360 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -30,7 +30,6 @@
     pkgs.ktailctl
     pkgs.kitty
     pkgs.hyprpaper
-    pkgs.kdeconnect
   ];
 
    programs.emacs = {
@@ -52,9 +51,6 @@
     extraConfig = builtins.readFile ./emacs.el;
    };
 
-   
-  programs.kdeconnect.enable = true;
-
   programs.zsh.enable = true;
 
   # Enable home-manager and git
diff --git a/home-manager/wayland.nix b/home-manager/wayland.nix
index 8519cfa..935e41b 100644
--- a/home-manager/wayland.nix
+++ b/home-manager/wayland.nix
@@ -110,7 +110,7 @@
 
         "$mod, f, exec, ${pkgs.firefox}/bin/firefox"
         "$mod, e, exec, ${pkgs.emacs}/bin/emacs"
-        "$mod, s, exec, ${pkgs.stean}/bin/steam"
+        "$mod, s, exec, ${pkgs.steam}/bin/steam"
       ];