From 61a0974286739962223ed5db3968c8d48a9c346a Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sat, 29 Nov 2025 12:11:19 -0800
Subject: 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.
---
 oni/home/services/kdeconnect.scm       |  2 +-
 oni/home/services/stumpwm/stumpwm.lisp | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'oni/home/services')

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)
-- 
cgit v1.3-2-g0d8e