sako/nixos
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

attempt 2 at emacs overlay

Browse source
This commit is contained in:
Sakooooo 2023-12-25 14:36:00 +04:00
parent c6a5aea55e
commit 551f1e2c51
Signed by: sako
GPG key ID: FE52FD65B76E4751
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
config/emacs/emacs.org
View file

@ -403,7 +403,6 @@ Should make startup faster, taken from doom-emacs
** Better help menu ** Better help menu
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package helpful (use-package helpful
:ensure t
:custom :custom
(counsel-describe-function-function #'helpful-callable) (counsel-describe-function-function #'helpful-callable)
(counsel-describe-variable-function #'helpful-variable) (counsel-describe-variable-function #'helpful-variable)
@ -416,7 +415,6 @@ Should make startup faster, taken from doom-emacs
** Modern selection behavior ** Modern selection behavior
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package delsel (use-package delsel
:ensure nil
:config (delete-selection-mode +1)) :config (delete-selection-mode +1))
#+end_src #+end_src
** General Leader Key ** General Leader Key
@ -517,7 +515,6 @@ Should make startup faster, taken from doom-emacs
(setq evil-want-keybinding nil) (setq evil-want-keybinding nil)
(setq evil-want-C-u-scroll t) (setq evil-want-C-u-scroll t)
(setq evil-want-C-i-jump nil) (setq evil-want-C-i-jump nil)
:ensure t
:demand :demand
:config :config
(evil-mode 1) (evil-mode 1)
@ -712,7 +709,6 @@ Should make startup faster, taken from doom-emacs
** Org-Roam ** Org-Roam
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package org-roam (use-package org-roam
:ensure t
:custom :custom
(org-roam-directory "~/org/notes") (org-roam-directory "~/org/notes")
:bind (("C-c n l" . org-roam-buffer-toggle) :bind (("C-c n l" . org-roam-buffer-toggle)
@ -724,7 +720,6 @@ Should make startup faster, taken from doom-emacs
** Treemacs ** Treemacs
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package treemacs (use-package treemacs
:ensure t
:defer t :defer t
:init :init
(with-eval-after-load 'winum (with-eval-after-load 'winum
@ -814,16 +809,13 @@ Should make startup faster, taken from doom-emacs
("C-x t M-t" . treemacs-find-tag))) ("C-x t M-t" . treemacs-find-tag)))
(use-package treemacs-evil (use-package treemacs-evil
:after (treemacs evil) :after (treemacs evil))
:ensure t)
(use-package treemacs-projectile (use-package treemacs-projectile
:after (treemacs projectile) :after (treemacs projectile))
:ensure t)
(use-package treemacs-magit (use-package treemacs-magit
:after (treemacs magit) :after (treemacs magit))
:ensure t)
(use-package treemacs-nerd-icons (use-package treemacs-nerd-icons
:config :config
@ -970,7 +962,6 @@ make sure to setup authinfo
(elpy-enable)) (elpy-enable))
(use-package lsp-pyright (use-package lsp-pyright
:ensure t
:hook (python-mode . (lambda () :hook (python-mode . (lambda ()
(require 'lsp-pyright) (require 'lsp-pyright)
(lsp)))) ; or lsp-deferred (lsp)))) ; or lsp-deferred
@ -1120,7 +1111,6 @@ Dired is a built-in file manager for Emacs that does some pretty amazing things!
*** Configuration *** Configuration
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package dired (use-package dired
:ensure nil
:commands (dired dired-jump) :commands (dired dired-jump)
:bind (("C-x C-j" . dired-jump)) :bind (("C-x C-j" . dired-jump))
:custom ((dired-listing-switches "-agho --group-directories-first")) :custom ((dired-listing-switches "-agho --group-directories-first"))

12
modules/dev/editors/emacs/default.nix
View file

@ -15,12 +15,22 @@ in {
daemon = mkEnableOption true; daemon = mkEnableOption true;
}; };
nixpkgs.overlays = [
inputs.emacs-overlay.overlay
];
config = mkIf cfg.enable { config = mkIf cfg.enable {
# ues daemon # ues daemon
services.emacs = { services.emacs = {
enable = cfg.daemon; enable = cfg.daemon;
install = true; install = true;
package = pkgs.emacs29-pgtk; #package = pkgs.emacs29-pgtk;
package = (pkgs.emacsWithPackagesFromUsePackage {
config = ../../../../config/emacs/emacs.org;
defaultInitFile = true;
alwaysEnsure = true;
alwaysTangle = true;
});
}; };
users.users.sako.packages = with pkgs; [ users.users.sako.packages = with pkgs; [
# direnv # direnv