Fix up rincewind configuration

I've been messing arround with it for a while and I've changed a bunch of things
I don't even remember exactly why, but here we are and everything works.

- There were some imports that needed to be changed because packages had moved
  around.

- I've added some packages that I'm trying out for various things.

- I removed Blackthorne from my configuration because I have a dedicated device
  to play this on now.

- I split off some packages in separate variables to try and make more clear why
  I'm using them and also make them easier to reuse in other configurations.

2 files changed, 24 insertions, 20 deletions

diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm
index dd12eae..f791739 100644
--- a/oni/packages/emacs-config.scm
+++ b/oni/packages/emacs-config.scm
@@ -21,7 +21,7 @@
 
 (define-public emacs-oni-config
   (let
-      ((commit "a78aef63b76469444cea136e05230b842306c208")
+      ((commit "ab553a83bbe434d61400d7765117dfc1aab93118")
        (revision "0"))
     (package (name "emacs-oni-config")
              (version (git-version "0.0.1" revision commit))
@@ -30,15 +30,15 @@
                       (uri
                        (git-reference
                         (url
-                         "https://code.ryuslash.org/ryuslash/emacs-config.git")
+                         "git://code.ryuslash.org/emacs-config.git")
                         (commit commit)))
                       (file-name (git-file-name name version))
                       (sha256
                        (base32
-                        "1qqawaxfhadar5pgxb6496xyynihzghl5gaw6bz0pm5wk6cm63br"))))
+                        "11m5wb163801s4qjf6warbp22y6dm5fmk4wfpl476n3qivhfgzjc"))))
              (build-system emacs-build-system)
              (home-page
-              "https://code.ryuslash.org/ryuslash/emacs-config/")
+              "https://code.ryuslash.org/emacs-config/")
              (synopsis "My Emacs configuration")
              (description
               "This package provides my configuration for emacs")
diff --git a/oni/packages/emacs.scm b/oni/packages/emacs.scm
index cc0898b..1f6e175 100644
--- a/oni/packages/emacs.scm
+++ b/oni/packages/emacs.scm
@@ -923,27 +923,31 @@ README.md from the same repository for extended documentation.")
         (sha256
          (base32 "0jbj48glh0r6fkb0lk1xb9067x2myp3krkw2byycijwdq1nlqzv2")))))))
 
-(define-public emacs-sawfish
-  (let ((commit "ba51040997cbdb6c138bf4180e69e794f094f630")
+(define-public emacs-eshell-atuin
+  (let ((commit "1ac4895529546839985c7f57c9858644f7be1e6a")
         (revision "0"))
     (package
-      (name "emacs-sawfish")
-      (version "1.13.0")
+      (name "emacs-eshell-atuin")
+      (version (git-version "0.0.0" revision commit))
       (source
        (origin
-         (method git-fetch)
-         (url (git-reference
-               (url "https://github.com/SawfishWM/sawfish")
+         (uri (git-reference
+               (url "https://github.com/SqrtMinusOne/eshell-atuin.git")
                (commit commit)))
+         (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0jbj48glh0r6fkb0lk1xb9067x2myp3krkw2byycijwdq1nlqzv2"))))
+          (base32 "0zf62qdmqw7y7s1dg3d35abr9jaymyqfbrv4bplkrry2wwk0m4gx"))))
+      (propagated-inputs
+       (list emacs-compat))
       (build-system emacs-build-system)
-      (arguments
-       '(#:include '("sawfish.el")))
-      (home-page "https://sawfish.tuxfamily.org")
-      (synopsis "Sawfish mode.")
-      (description
-       "\"sawfish.el\" provides
-* A major mode for writing Sawfish code. This include symbol / var / func completion and help access, both from doc-string and info file.
-* sawfish-client wrapper, i.e. an interface to interact with running Sawfish window manager."))))
+      (home-page "https://github.com/SqrtMinusOne/eshell-atuin")
+      (synopsis "eshell ❤️ atuin")
+      (description "Integrate eshell with atuin.
+
+atuin stores shell history in a database, which allows for having the same
+history across multiple shells, sessions, and optionally across different
+machines. See the project page for the complete list of features.
+
+This package provides functionality to store and browse eshell history in atuin.")
+      (license license:gpl3+))))