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.

5 files changed, 148 insertions, 134 deletions

diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm
index 4806191..0a56bd4 100644
--- a/oni/home/config/rincewind.scm
+++ b/oni/home/config/rincewind.scm
@@ -11,7 +11,7 @@
                           home-gpg-agent-configuration))
   #:use-module ((gnu home services ssh)
                 #:select (home-ssh-agent-service-type))
-  #:use-module ((gnu packages certs)
+  #:use-module ((gnu packages nss)
                 #:select (nss-certs))
   #:use-module ((gnu packages cdrom)
                 #:select (abcde))
@@ -38,6 +38,8 @@
   #:use-module ((gnu packages mail)
                 #:select (notmuch
                           emacs-notmuch))
+  #:use-module ((gnu packages man)
+                #:select (man-db))
   #:use-module ((gnu packages music)
                 #:select (easytag))
   #:use-module ((gnu packages tree-sitter)
@@ -102,11 +104,13 @@
                           home-emacs-org-modern-service-type
                           home-emacs-org-modern-configuration
                           home-wakatime-service-type
-                          home-wakatime-configuration))
+                          home-wakatime-configuration
+                          home-emacs-org-journal-service-type))
   #:use-module ((oni home services environment)
                 #:select (home-environment-service))
   #:use-module ((oni home services flameshot)
                 #:select (home-flameshot-service-type))
+  #:use-module (oni home services freedesktop)
   #:use-module ((oni home services git)
                 #:select (home-git-service-type
                           home-git-configuration))
@@ -228,9 +232,6 @@
                 #:select (pick-random-wallpaper))
   #:use-module ((oni packages shutdown-rofi)
                 #:select (shutdown-rofi))
-  #:use-module ((oni packages snes-games)
-                #:select (snes-blackthorne
-                          snes-blackthorne-icons))
   #:use-module ((oni packages stumpwm)
                 #:select (stumpwm+swank))
   #:use-module ((oni packages terminals)
@@ -277,120 +278,121 @@
 
 (define my-emacs emacs-next)
 
-(home-environment
- (packages (list easytag
-                 (specification->package+output "glibc-locales")
-                 (specification->package+output "font-fantasque-sans")
-                 (specification->package+output "font-comic-neue")
-                 (specification->package+output "font-dosis")
-                 (specification->package "zathura")
-                 (specification->package "zathura-ps")
-                 (specification->package "zathura-pdf-mupdf")
-                 (specification->package "zathura-cb")
-                 pick-random-wallpaper
-                 notmuch-collect-tasks
-                 notmuch-tag-mailinglists
-                 (inbox-size my-emacs)
-                 count-emails
-                 shutdown-rofi
-                 my-emacs-org-roam
-                 emacs-org-roam-ui
-                 emacs-org-contacts
-                 fakeroot               ; Needed for build arch packages
-                 tmsu
-                 mpd-random-albums
-                 notmuch
-                 emacs-inkplate
-                 emacs-syncthing-status
-                 emacs-outli
-                 emacs-guix
-                 emacs-fennel-mode
+(define foreign-distro-compatibility-packages
+  (list (specification->package+output "glibc-locales")
+        hicolor-icon-theme              ; Might be needed for certain icons?
+        nss-certs                       ; Might be needed for cetrificates
+        man-db                          ; Needed to see man pages from packages
+        ))
+
+(define archlinux-compatibility-packages
+  (list fakeroot                        ; Needed to build arch packages
+        ))
 
-                 (emacs-oni-org-roam my-emacs)
-                 emacs-oni-elisp
-                 emacs-oni-core
-                 emacs-oni-elfeed
-                 emacs-oni-eshell
-                 emacs-oni-compilation
-                 emacs-oni-common-lisp
-                 emacs-oni-gui
-                 emacs-oni-magit
-                 emacs-oni-notmuch
-                 emacs-oni-hy
-                 emacs-oni-project
-                 emacs-oni-bookmark
-                 emacs-oni-dired
-                 emacs-oni-browse-url
-                 emacs-oni-c
-                 emacs-oni-circe
-                 emacs-oni-clojure
-                 emacs-oni-cmake
-                 emacs-oni-conf
-                 emacs-oni-cpp
-                 emacs-oni-csharp
-                 emacs-oni-css
-                 emacs-oni-diff-hl
-                 emacs-oni-ediff
-                 emacs-oni-elm
-                 emacs-oni-embrace
-                 emacs-oni-emms
-                 emacs-oni-epub
-                 emacs-oni-eww
-                 emacs-oni-grep
-                 emacs-oni-haskell
-                 emacs-oni-highlight-indent-guides
-                 emacs-oni-html
-                 emacs-oni-java
-                 emacs-oni-json
-                 emacs-oni-log-edit
-                 emacs-oni-lua
-                 emacs-oni-makefile
-                 emacs-oni-nxml
-                 emacs-oni-package
-                 emacs-oni-projectile
-                 emacs-oni-scheme
-                 emacs-oni-sh
-                 emacs-oni-shr
-                 emacs-oni-tramp
-                 emacs-oni-yaml
-                 emacs-oni-python
-                 emacs-nginx-mode
-                 emacs-oni-git-commit
-                 emacs-oni-php
-                 emacs-oni-web-mode
-                 emacs-oni-js
+(home-environment
+ (packages (append
+            foreign-distro-compatibility-packages
+            archlinux-compatibility-packages
+            (list easytag
+                  (specification->package+output "font-fantasque-sans")
+                  (specification->package+output "font-comic-neue")
+                  (specification->package+output "font-dosis")
+                  (specification->package "zathura")
+                  (specification->package "zathura-ps")
+                  (specification->package "zathura-pdf-mupdf")
+                  (specification->package "zathura-cb")
+                  pick-random-wallpaper
+                  notmuch-collect-tasks
+                  notmuch-tag-mailinglists
+                  (inbox-size my-emacs)
+                  count-emails
+                  shutdown-rofi
+                  my-emacs-org-roam
+                  emacs-org-roam-ui
+                  emacs-org-contacts
+                  tmsu
+                  mpd-random-albums
+                  notmuch
+                  emacs-inkplate
+                  emacs-syncthing-status
+                  emacs-outli
+                  emacs-guix
+                  emacs-fennel-mode
 
-                 tree-sitter-bash
-                 tree-sitter-scheme
-                 tree-sitter-python
-                 tree-sitter-org
-                 tree-sitter-json
-                 tree-sitter-css
-                 gforth
-                 recutils
-                 emacs-rec-mode
-                 ;; Might be needed for certain icons?
-                 hicolor-icon-theme
-                 ;; Might be needed for cetrificates
-                 nss-certs
+                  (emacs-oni-org-roam my-emacs)
+                  emacs-oni-elisp
+                  emacs-oni-core
+                  emacs-oni-elfeed
+                  emacs-oni-eshell
+                  emacs-oni-compilation
+                  emacs-oni-common-lisp
+                  emacs-oni-gui
+                  emacs-oni-magit
+                  emacs-oni-notmuch
+                  emacs-oni-hy
+                  emacs-oni-project
+                  emacs-oni-bookmark
+                  emacs-oni-dired
+                  emacs-oni-browse-url
+                  emacs-oni-c
+                  emacs-oni-circe
+                  emacs-oni-clojure
+                  emacs-oni-cmake
+                  emacs-oni-conf
+                  emacs-oni-cpp
+                  emacs-oni-csharp
+                  emacs-oni-css
+                  emacs-oni-diff-hl
+                  emacs-oni-ediff
+                  emacs-oni-elm
+                  emacs-oni-embrace
+                  emacs-oni-emms
+                  emacs-oni-epub
+                  emacs-oni-eww
+                  emacs-oni-grep
+                  emacs-oni-haskell
+                  emacs-oni-highlight-indent-guides
+                  emacs-oni-html
+                  emacs-oni-java
+                  emacs-oni-json
+                  emacs-oni-log-edit
+                  emacs-oni-lua
+                  emacs-oni-makefile
+                  emacs-oni-nxml
+                  emacs-oni-package
+                  emacs-oni-projectile
+                  emacs-oni-scheme
+                  emacs-oni-sh
+                  emacs-oni-shr
+                  emacs-oni-tramp
+                  emacs-oni-yaml
+                  emacs-oni-python
+                  emacs-nginx-mode
+                  emacs-oni-git-commit
+                  emacs-oni-php
+                  emacs-oni-web-mode
+                  emacs-oni-js
 
-                 tym
+                  tree-sitter-bash
+                  tree-sitter-scheme
+                  tree-sitter-python
+                  tree-sitter-org
+                  tree-sitter-json
+                  tree-sitter-css
+                  gforth
+                  recutils
+                  emacs-rec-mode
 
-                 (with-source snes-blackthorne-icons
-                              (format #f "~a/pictures/icons/Blackthorne/blackthorne_icons.tar.gz" (getenv "HOME")))
-                 (with-source snes-blackthorne
-                              (format #f "~a/downloads/Blackthorne.7z" (getenv "HOME")))
+                  tym
 
-                 emacs-indexed
-                 emacs-gnuplot))
+                  emacs-indexed
+                  emacs-gnuplot)))
 
  (services
   (list
    home-environment-service
-   home-rofi-default-service
    home-dunst-default-service
    home-redshift-service
-   ;; home-xbindkeys-service
    home-zsh-service
    home-guile-service
    home-xmodmap-service
@@ -466,6 +468,7 @@
    (service home-emacs-org-modern-service-type
             (home-emacs-org-modern-configuration
              (package emacs-next-org-modern)))
+   (service home-emacs-org-journal-service-type)
    (service home-wakatime-service-type
             (home-wakatime-configuration
              (api-url "https://waka.ryuslash.org/api")
@@ -512,7 +515,7 @@
    ;; [2024-01-05 Fri] mpv-mpris fails to compile:
    ;;    mpris.c:1:10: fatal error: gio/gio.h: No such file or directory
    ;; Since I don't actually use it right now I really don't need it.
-   ; (service home-mpv-mpris-service-type)
+                                        ; (service home-mpv-mpris-service-type)
 
    (service home-stumpwm-service-type
             (home-stumpwm-configuration
@@ -612,4 +615,6 @@
                 ("sidebar.verticalTabs" #t)
                 ("sidebar.revamp" #t)
                 ("sidebar.visibility" "hide-sidebar")
-                ("ui.key.menuAccessKeyFocuses" #f))))))))
+                ("ui.key.menuAccessKeyFocuses" #f)))))
+
+   (service home-udiskie-service-type))))
diff --git a/oni/home/services/kdeconnect.scm b/oni/home/services/kdeconnect.scm
index 4d648d2..2bbf22c 100644
--- a/oni/home/services/kdeconnect.scm
+++ b/oni/home/services/kdeconnect.scm
@@ -1,6 +1,6 @@
 (define-module (oni home services kdeconnect)
   #:use-module (gnu services configuration)
-  #:use-module (gnu packages kde)
+  #:use-module (gnu packages kde-internet)
   #:use-module (gnu home services)
   #:use-module (gnu home services shepherd)
   #:use-module (gnu home services utils)
diff --git a/oni/home/services/stumpwm/stumpwm.lisp b/oni/home/services/stumpwm/stumpwm.lisp
index 1d0ec08..991abc7 100644
--- a/oni/home/services/stumpwm/stumpwm.lisp
+++ b/oni/home/services/stumpwm/stumpwm.lisp
@@ -44,8 +44,14 @@ after it has been unlocked."
 (define-key *top-map* (kbd "s-b") "raise-browser")
 (define-key *top-map* (kbd "s-e") "raise-emacs")
 (define-key *top-map* (kbd "s-t") "raise-terminal")
-(define-key *top-map* (kbd "s-!") "exec rofi -show drun")
-(define-key *top-map* (kbd "s-w") "exec rofi -show window")
+(define-key *top-map* (kbd "s-!") "exec rofi -show drun");
+;; (define-key *top-map* (kbd "s-w") "exec rofi -show window")
+(define-key *top-map* (kbd "s-w") "windowlist")
+(define-key *top-map* (kbd "s-r") "exec")
+(define-key *top-map* (kbd "s-B") "move-window left")
+(define-key *top-map* (kbd "s-F") "move-window right")
+(define-key *top-map* (kbd "s-N") "move-window down")
+(define-key *top-map* (kbd "s-P") "move-window up")
 
 (define-remapped-keys
     `(("teams-for-linux"
@@ -172,5 +178,4 @@ after it has been unlocked."
 (swank:create-server :dont-close t)
 
 (add-hook *restart-hook* 'stop-swank)
-
 (which-key-mode)
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+))))