oni/home/config/common.scm

@@ -92,7 +92,6 @@
                "alias sbcl=\"rlwrap sbcl\"\n"
                "alias hc=herbstclient\n"
                "alias reco=\"pushd ~/projects/new-dotfiles/ && guix home reconfigure config.scm; popd\"\n"
-               "alias abcde=\"guix shell abcde -- abcde\"\n"
                "setopt SHARE_HISTORY\n"
                "setopt HIST_IGNORE_ALL_DUPS\n"
                "setopt HIST_IGNORE_SPACE\n"
@@ -106,8 +105,8 @@
                "autoload -Uz compinit\n"
                "compinit\n"
                "function horizontal-rule() {\n"
-               "  local width=$(tput cols)\n"
-               "  echo -e \"\\033[0;32m${(pl:$width::━:)}\\033[0m\"\n"
+               "local width=$(tput cols)\n"
+               "echo -e \"\\033[0;32m${(pl:$width::━:)}\\033[0m\"\n"
                "}\n"
                "preexec_functions+=(horizontal-rule)\n"
                "precmd_functions+=(horizontal-rule)\n"

oni/home/config/rincewind.scm

@@ -238,8 +238,6 @@
             (fade-in-step 3)
             (fade-out-step 3))))
 
-(define my-emacs emacs-next-tree-sitter)
-
 (home-environment
  (packages (list mpv mpv-mpris easytag
                  (specification->package+output "glibc-locales")
@@ -249,7 +247,7 @@
                  pick-random-wallpaper
                  notmuch-collect-tasks
                  notmuch-tag-mailinglists
-                 (inbox-size my-emacs)
+                 (inbox-size emacs-next-tree-sitter)
                  count-emails
                  shutdown-rofi
                  emacs-org-roam
@@ -265,7 +263,7 @@
                  emacs-outli
                  emacs-guix
 
-                 (emacs-oni-org-roam my-emacs)
+                 emacs-oni-org-roam
                  emacs-oni-vterm
                  emacs-oni-elisp
                  emacs-oni-core
@@ -322,6 +320,7 @@
                  gforth
                  recutils
                  emacs-rec-mode
+                 abcde
                  ;; Might be needed for certain icons?
                  hicolor-icon-theme
                  ;; Might be needed for cetrificates
@@ -394,7 +393,7 @@
 
    (service home-emacs-service-type
             (home-emacs-configuration
-             (package my-emacs)
+             (package emacs-next-tree-sitter)
              (configurations
               (list
                (local-file "../services/emacs/init.el")

oni/packages/emacs-config.scm

@@ -13,7 +13,7 @@
   #:use-module (oni packages go))
 
 (define-public emacs-oni-config
-  (let ((commit "e6a7b37ce47422db495d647b30643b9e26c58e67")
+  (let ((commit "655ce45b2f4f8ebcc0e1937e1a362228022dd95d")
         (revision "0"))
     (package
       (name "emacs-oni-config")
@@ -26,7 +26,7 @@
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "1qi64x699fg3nazzwch4y3ypdddppm7nsnvsjvr92ivv13p33sab"))))
+          (base32 "00l4g6n3rk3fwnz6sfmfyagdqik5w21cm8mg3biz48qjnhhm1n5w"))))
       (build-system emacs-build-system)
       (home-page "https://code.ryuslash.org/ryuslash/emacs-config")
       (synopsis "My Emacs configuration")
@@ -303,7 +303,7 @@ Emacs")))
     (synopsis "My Emacs Bats coding configuration")
     (description "This package provides my configuration for coding in Bats")))
 
-(define-public (emacs-oni-org emacs)
+(define-public emacs-oni-org
   (package
    (inherit emacs-oni-config)
    (name "emacs-oni-org")
@@ -315,10 +315,7 @@ Emacs")))
       #:include '("\\.el$"
                   "^snippets\\/org-mode\\/"
                   "^capture-templates\\/"
-                  "^icons\\/")
-      ;; The default #:emacs (emacs-minimal) doesn't include `range.el' and
-      ;; throws an error while trying to byte-compile oni-org.
-      #:emacs ,emacs))
+                  "^icons\\/")))
    (propagated-inputs
     `(("emacs-oni-yasnippet" ,emacs-oni-yasnippet)
       ("emacs-oni-alert" ,emacs-oni-alert)
@@ -337,14 +334,14 @@ Emacs")))
    (synopsis "My Emacs Org configuration")
    (description "This package provides my configuration for org")))
 
-(define-public (emacs-oni-org-roam emacs)
+(define-public emacs-oni-org-roam
   (package
    (inherit emacs-oni-config)
    (name "emacs-oni-org-roam")
    (arguments
     '(#:include '("oni-org-roam.el")))
    (propagated-inputs
-    `(("emacs-oni-org" ,(emacs-oni-org emacs))
+    `(("emacs-oni-org" ,emacs-oni-org)
       ("emacs-org-roam" ,emacs-org-roam)))
    (synopsis "My Emacs Org Roam configuration")
    (description "This package provides my configuration for Org Roam")))