libkookie: update emacs config

main
Katharina Fey 3 years ago
parent 83edc69622
commit 6978515738
  1. 3
      infra/libkookie/overlays/kookie/emacs/base/default.el
  2. 8
      infra/libkookie/overlays/kookie/emacs/base/default.nix
  3. 14
      infra/libkookie/overlays/kookie/emacs/builder.nix
  4. 3
      infra/libkookie/overlays/kookie/emacs/default.nix
  5. 7
      infra/libkookie/overlays/kookie/emacs/org/default.el
  6. 2
      infra/libkookie/overlays/kookie/emacs/org/default.nix

@ -77,6 +77,9 @@
;;; Capn Proto mode ;;; Capn Proto mode
(add-to-list 'auto-mode-alist '("\\.capnp$" . protobuf-mode)) (add-to-list 'auto-mode-alist '("\\.capnp$" . protobuf-mode))
;;; Load centaur tabl and treemacs on new init
(require 'centaur-tabs)
(require 'treemacs)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Function definitions ;;; Function definitions

@ -1,3 +1,9 @@
{ buildModule, pkgs, epkgs }: { buildModule, pkgs, epkgs }:
with epkgs; with epkgs;
(buildModule "base" ./. [ direnv smex sublimity scad-mode protobuf-mode ]) (buildModule "base" ./. [
centaur-tabs
direnv
smex
sublimity
])

@ -12,15 +12,19 @@ rec {
/** /**
* Create a new elisp module with a set of package dependencies. * Create a new elisp module with a set of package dependencies.
* *
* When calling this function three arguments are required. It
* returns a "module", which is an attribute set.
*
* { * {
* name = "base"; * name = "base";
* lisp = ./default.el; * path = ./.;
* deps = [ pkgs.hello ]; * pkgs = [ hello ];
* } * }
* *
* The lisp path is the main file contained in the nix store, and deps * The path must point to the root of the module, which is then used
* contains a set of emacsPackages, and base packages that the module * as an offset. The pkgs set may contain both emacs and non-emacs
* depends on to function. * packages that the module depends on to function. depends on to
* function.
*/ */
buildModule = with pkgs; (name: path: pkgs: { buildModule = with pkgs; (name: path: pkgs: {
inherit name pkgs; inherit name pkgs;

@ -30,7 +30,9 @@ pkgs.emacsWithPackages (epkgs:
markdown-mode markdown-mode
nim-mode nim-mode
nix-mode nix-mode
protobuf-mode
raku-mode raku-mode
scad-mode
# Utility moduse # Utility moduse
fzf fzf
@ -38,6 +40,7 @@ pkgs.emacsWithPackages (epkgs:
treemacs treemacs
undo-tree undo-tree
visual-fill-column visual-fill-column
vterm
which-key which-key
]) ])

@ -9,6 +9,9 @@
(provide 'kookie-org) (provide 'kookie-org)
(require 'org) (require 'org)
(require 'ox-reveal)
(load-library "ox-reveal")
;;; Set .org as my file ending of choice ;;; Set .org as my file ending of choice
(add-to-list 'auto-mode-alist '("\\.org$" . org-mode)) (add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
@ -25,6 +28,10 @@
)) ))
(org-open-at-point))) (org-open-at-point)))
(defun org-insert-block ()
"Insert a matching set of blocks statements"
(interactive))
;;; Org mode key bindings replicated here to make it easier for me ;;; Org mode key bindings replicated here to make it easier for me
(define-key org-mode-map "\C-c\C-o" 'org-open-at-point-in-current-window) (define-key org-mode-map "\C-c\C-o" 'org-open-at-point-in-current-window)
(define-key org-mode-map "\C-S-<up>" nil) (define-key org-mode-map "\C-S-<up>" nil)

@ -1,4 +1,4 @@
{ buildModule, epkgs, pkgs }: { buildModule, epkgs, pkgs }:
with epkgs; with pkgs; with epkgs; with pkgs;
(buildModule "kookie-org" ./. [ org ]) (buildModule "kookie-org" ./. [ org ox-reveal ])

Loading…
Cancel
Save