export all modules under sjson and swayipc

examples/stumpwm-inspired/behavior.scm

@@ -1,4 +1,4 @@
-(use-modules (swayipc dispatcher))
+(use-modules (swayipc))
 
 (sway-output "HDMI-A-2" "pos 0 0 res 1920x1080")
 (sway-output "DP-1" "pos 1920 0 res 1920x1080")

examples/stumpwm-inspired/init.scm

@@ -24,11 +24,7 @@
              (modules workspace-grid)
              (modules auto-reload)
              (modules which-key)
-             (swayipc connection)
+             (swayipc))
-             (swayipc records)
-             (swayipc info)
-             (swayipc events)
-             (swayipc dispatcher))
 
 ;; load look and feel
 (load "behavior.scm")

examples/stumpwm-inspired/keybindings.scm

@@ -1,7 +1,6 @@
 (use-modules (modules kbd)
              (modules general)
-             (swayipc info)
+             (swayipc)
-             (swayipc records)
              (ice-9 popen)
              (srfi srfi-18)
              (ice-9 textual-ports))

modules/auto-reload.scm

@@ -12,7 +12,7 @@
 ;; (auto-reload-init)
 
 (define-module (modules auto-reload)
-  #:use-module (swayipc dispatcher)
+  #:use-module (swayipc)
   #:use-module (system foreign)
   #:use-module (system foreign-library)
   #:use-module (srfi srfi-1)

modules/general.scm

@@ -1,8 +1,6 @@
 (define-module (modules general)
-  #:use-module (sjson parser)
+  #:use-module (sjson)
-  #:use-module (swayipc dispatcher)
+  #:use-module (swayipc)
-  #:use-module (swayipc events)
-  #:use-module (swayipc records)
   #:use-module (srfi srfi-18)
   #:use-module (ice-9 hash-table)
   #:use-module (ice-9 string-fun)

modules/which-key.scm

@@ -1,9 +1,5 @@
 (define-module (modules which-key)
-  #:use-module (swayipc records)
+  #:use-module (swayipc)
-  #:use-module (swayipc info)
-  #:use-module (swayipc dispatcher)
-  #:use-module (swayipc events)
-  #:use-module (modules general)
   #:use-module (ice-9 hash-table)
   #:use-module (srfi srfi-18)
   #:export (which-key-init

modules/workspace-grid.scm

@@ -7,10 +7,7 @@
 ;; (workspace-grid-init)
 
 (define-module (modules workspace-grid)
-  #:use-module (swayipc records)
+  #:use-module (swayipc)
-  #:use-module (swayipc info)
-  #:use-module (swayipc dispatcher)
-  #:use-module (swayipc events)
 
   #:export (workspace-grid-workspaces
             workspace-grid-columns

modules/workspace-groups.scm

@@ -7,10 +7,7 @@
 ;; (workspace-groups-init)
 
 (define-module (modules workspace-groups)
-  #:use-module (swayipc records)
+  #:use-module (swayipc)
-  #:use-module (swayipc info)
-  #:use-module (swayipc dispatcher)
-  #:use-module (swayipc events)
 
   #:export (workspace-groups-init
             workspace-groups-configure

swayipc/dispatcher.scm

@@ -3,7 +3,7 @@
   #:use-module (swayipc records)
   #:use-module (srfi srfi-9)
   #:use-module (srfi srfi-1)
-  #:use-module (sjson parser)
+  #:use-module (sjson)
 
   #:export (SWAY-ORIENTATION-HORIZONTAL
             SWAY-ORIENTATION-VERTICAL

swayipc/info.scm

@@ -2,7 +2,7 @@
   #:use-module (swayipc connection)
   #:use-module (swayipc records)
   #:use-module (oop goops)
-  #:use-module (sjson parser)
+  #:use-module (sjson)
   #:use-module (srfi srfi-9)
   #:use-module (srfi srfi-1)
 

swayipc/records.scm

@@ -1,8 +1,6 @@
 (define-module (swayipc records)
   #:use-module (oop goops)
-  #:use-module (sjson record)
+  #:use-module (sjson)
-  #:use-module (sjson parser)
-  #:use-module (sjson builder)
 
   #:export (<sway-rect>
             scm->sway-rect