From 7407ae3a47eccbc518664bfea234daa504600bf1 Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Thu, 16 Mar 2023 00:47:23 -0700
Subject: [PATCH] Install stumpwm+swank and get rid of some conflicting
 configuration

---
 oni/home/config/rincewind.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm
index 0ed4125..b54d081 100644
--- a/oni/home/config/rincewind.scm
+++ b/oni/home/config/rincewind.scm
@@ -18,8 +18,6 @@
   #:use-module ((gnu packages video)
                 #:select (mpv
                           mpv-mpris))
-  #:use-module ((gnu packages wm)
-                #:select (stumpwm))
   #:use-module ((gnu packages)
                 #:select (specification->package+output))
   #:use-module ((gnu services)
@@ -31,7 +29,7 @@
                           openpgp-fingerprint))
   #:use-module ((oni home config common)
                 #:select (home-redshift-service
-                          home-xbindkeys-service
+                          ;; home-xbindkeys-service
                           home-zsh-service
                           home-guile-service
                           home-xmodmap-service
@@ -87,6 +85,8 @@
                 #:select (pick-random-wallpaper))
   #:use-module ((oni packages shutdown-rofi)
                 #:select (shutdown-rofi))
+  #:use-module ((oni packages stumpwm)
+                #:select (stumpwm+swank))
   #:use-module ((oni packages emacs-outli)
                 #:select (emacs-outli))
   #:use-module ((oop goops)
@@ -158,7 +158,7 @@
                  emacs-inkplate
                  emacs-outli
                  emacs-oni-org-roam
-                 stumpwm))
+                 stumpwm+swank))
 
  (services
   (list
@@ -166,7 +166,7 @@
    home-rofi-default-service
    home-dunst-default-service
    home-redshift-service
-   home-xbindkeys-service
+   ;; home-xbindkeys-service
    home-zsh-service
    home-guile-service
    home-xmodmap-service
@@ -199,11 +199,11 @@
                        (openpgp-fingerprint
                         "50F3 3E2E 5B0C 3D90 0424  ABE8 9BDC F497 A4BB CC7F"))))))
 
-   (service home-polybar-service-type
-            (home-polybar-configuration
-             (bar "rincewind")))
+   ;; (service home-polybar-service-type
+   ;;          (home-polybar-configuration
+   ;;           (bar "rincewind")))
 
-   (service home-kdeconnect-service-type)
+   ;; (service home-kdeconnect-service-type)
    (service home-syncthing-service-type)
 
    (service home-emacs-service-type