Cleaning up before the RDE 0.6 release

Kirill Yermak (11):
  rde: features: emacs-xyz: Remove deprecated APIs
  rde: features: video: Remove deprecated APIs
  rde: packages: emacs: Remove deprecated APIs
  gnu: Remove ‘services’ directory
  gnu: home-services: Remove ‘shellutils’ module
  gnu: home-services: Remove ‘keyboard’ module
  gnu: home-services: Remove ‘video’ module
  gnu: home-services: shells: Remove deprecated APIs
  gnu: home-services: Remove ‘base’ module
  gnu: home-services: wm: Remove deprecated APIs
  gnu: home-services-utils: Remove unused module import

 src/gnu/home-services-utils.scm      |  1 -
 src/gnu/home-services/base.scm       | 44 ----------------------------
 src/gnu/home-services/keyboard.scm   | 33 ---------------------
 src/gnu/home-services/shells.scm     | 33 +--------------------
 src/gnu/home-services/shellutils.scm | 25 ----------------
 src/gnu/home-services/video.scm      | 31 --------------------
 src/gnu/home-services/wm.scm         | 17 +----------
 src/gnu/services/home.scm            | 12 --------
 src/rde/features/emacs-xyz.scm       |  7 -----
 src/rde/features/video.scm           |  6 +---
 src/rde/packages/emacs.scm           |  7 +----
 11 files changed, 4 insertions(+), 212 deletions(-)
 delete mode 100644 src/gnu/home-services/base.scm
 delete mode 100644 src/gnu/home-services/keyboard.scm
 delete mode 100644 src/gnu/home-services/shellutils.scm
 delete mode 100644 src/gnu/home-services/video.scm
 delete mode 100644 src/gnu/services/home.scm


base-commit: 026f48cf631fd69b46281e839b2d0b443ec86ace
-- 
2.47.0

---
 src/rde/features/emacs-xyz.scm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/rde/features/emacs-xyz.scm b/src/rde/features/emacs-xyz.scm
index 1229ae2c..af66902f 100644
--- a/src/rde/features/emacs-xyz.scm
+++ b/src/rde/features/emacs-xyz.scm
@@ -42,7 +42,6 @@
   #:use-module (guix gexp)
   #:use-module (rde gexp)
   #:use-module (guix packages)
-  #:use-module (guix deprecation)
   #:use-module (guix diagnostics)
   #:use-module (guix i18n)
 
@@ -114,7 +113,6 @@
             feature-emacs-citation
             feature-emacs-zotra
             feature-emacs-org-dailies
-            feature-emacs-org-protocol  ; Deprecated.
             feature-emacs-org-ql
             feature-emacs-spelling
             feature-emacs-org-recur
@@ -4986,11 +4984,6 @@ This currently is not a self-contained solution."
    (values `((,f-name . #t)))
    (home-services-getter get-home-services)))
 
-(define-deprecated/alias feature-emacs-org-protocol
-  (feature
-   (name 'org-protocol)
-   (values '((org-protocol . #t)))))
-
 (define* (feature-emacs-spelling
           #:key
           (spelling-program (@ (gnu packages aspell) aspell))
-- 
2.47.0

---
 src/rde/features/video.scm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/rde/features/video.scm b/src/rde/features/video.scm
index e35f7a0a..b6a0a888 100644
--- a/src/rde/features/video.scm
+++ b/src/rde/features/video.scm
@@ -32,11 +32,9 @@
   #:use-module (gnu home services xdg)
   #:use-module (rde home services video)
   #:use-module (guix gexp)
-  #:use-module (guix deprecation)
   #:use-module (srfi srfi-1)
   #:export (feature-mpv
-            feature-yt-dlp
-            feature-youtube-dl))
+            feature-yt-dlp))
 
 ;; https://github.com/po5/mpv_sponsorblock
 ;; Nice mpv configs
@@ -343,5 +341,3 @@ and various other sites."
    (values `((,f-name . ,yt-dlp)
              (emacs-ytdl . ,emacs-ytdl)))
    (home-services-getter get-home-services)))
-
-(define-deprecated/alias feature-youtube-dl feature-yt-dlp)
-- 
2.47.0

---
 src/rde/packages/emacs.scm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/rde/packages/emacs.scm b/src/rde/packages/emacs.scm
index 364ac4c7..2b887b15 100644
--- a/src/rde/packages/emacs.scm
+++ b/src/rde/packages/emacs.scm
@@ -25,13 +25,8 @@
   #:use-module (guix utils)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
-  #:use-module (guix deprecation)
   #:use-module (guix build-system trivial)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:export (emacs-next-pgtk-stable emacs-next-pgtk-latest))
-
-(define-deprecated/alias emacs-next-pgtk-stable emacs-pgtk)
-(define-deprecated/alias emacs-next-pgtk-latest emacs-pgtk)
+  #:use-module ((guix licenses) #:prefix license:))
 
 (define-public emacs-consumer
   (package
-- 
2.47.0

There is only one module left in this directory
that contains only deprecated APIs.
---
 src/gnu/services/home.scm | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 src/gnu/services/home.scm

diff --git a/src/gnu/services/home.scm b/src/gnu/services/home.scm
deleted file mode 100644
index cb514d64..00000000
--- a/src/gnu/services/home.scm
@@ -1,12 +0,0 @@
-(define-module (gnu services home)
-  #:use-module (gnu services guix)
-
-  #:use-module (guix deprecation)
-
-  #:export (guix-home-service-type))
-
-;; Use upstreamed version of the service:
-;; https://yhetil.org/guix-patches/05fd930c91838ce9640720ce68e3379f10154590.1710355300.git.richard@freakingpenguin.com/
-(define-deprecated/alias
-  guix-home-service-type
-  (@ (gnu services guix) guix-home-service-type))
-- 
2.47.0

The module contains only deprecated APIs.
---
 src/gnu/home-services/shellutils.scm | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 src/gnu/home-services/shellutils.scm

diff --git a/src/gnu/home-services/shellutils.scm b/src/gnu/home-services/shellutils.scm
deleted file mode 100644
index 27bfcfd1..00000000
--- a/src/gnu/home-services/shellutils.scm
@@ -1,25 +0,0 @@
-(define-module (gnu home-services shellutils)
-  #:use-module (gnu services configuration)
-  #:use-module (gnu home-services-utils)
-  #:use-module (gnu home services)
-  #:use-module (gnu home-services base)
-  #:use-module (gnu home-services shells)
-  #:use-module (gnu packages shellutils)
-  #:use-module (guix deprecation)
-  #:use-module (guix packages)
-  #:use-module (guix gexp)
-  #:use-module (srfi srfi-1)
-  #:use-module (srfi srfi-26)
-
-  #:export (home-zsh-plugin-manager-service-type
-	    home-zsh-autosuggestions-service-type
-	    home-zsh-direnv-service-type
-            home-bash-direnv-service-type))
-
-(define-deprecated/alias home-zsh-plugin-manager-service-type
-  (@ (rde home services shellutils) home-zsh-plugin-manager-service-type))
-(define-deprecated/alias home-zsh-autosuggestions-service-type
-  (@ (rde home services shellutils) home-zsh-autosuggestions-service-type))
-
-(define-deprecated/alias home-zsh-direnv-service-type #f)
-(define-deprecated/alias home-bash-direnv-service-type #f)
-- 
2.47.0

The module contains only deprecated APIs.
---
 src/gnu/home-services/keyboard.scm | 33 ------------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 src/gnu/home-services/keyboard.scm

diff --git a/src/gnu/home-services/keyboard.scm b/src/gnu/home-services/keyboard.scm
deleted file mode 100644
index d76bad03..00000000
--- a/src/gnu/home-services/keyboard.scm
@@ -1,33 +0,0 @@
-(define-module (gnu home-services keyboard)
-  #:use-module (gnu system keyboard)
-  #:use-module (gnu services configuration)
-  #:use-module (gnu home services)
-  #:use-module (gnu home-services-utils)
-  #:use-module (guix deprecation)
-
-  #:export (home-keyboard-service-type))
-
-;; We don't place it to xorg.scm, because it works for wayland
-
-(define (set-xkb-variables layout)
-  (if layout
-      `(("XKB_DEFAULT_LAYOUT" . ,(keyboard-layout-name layout))
-	("XKB_DEFAULT_VARIANT" . ,(keyboard-layout-variant layout))
-	("XKB_DEFAULT_OPTIONS" . ,(string-join
-				   (keyboard-layout-options layout) ","))
-	("XKB_DEFAULT_MODEL" . ,(keyboard-layout-model layout)))
-      '()))
-
-(define home-keyboard-service-type
-  (service-type (name 'home-keyboard)
-                (extensions
-                 (list (service-extension
-			home-environment-variables-service-type
-			set-xkb-variables)))
-                (default-value #f)
-                (description "Set layouts by configuring XKB_*
-environment variables.  Service accepts an instance of
-@code{keyboard-layout} from @code{(gnu system keyboard)}.")))
-
-(define-deprecated/alias home-keyboard-service-type
-  (@ (rde home services keyboard) home-keyboard-service-type))
-- 
2.47.0

The module contains only deprecated APIs.
---
 src/gnu/home-services/video.scm | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 src/gnu/home-services/video.scm

diff --git a/src/gnu/home-services/video.scm b/src/gnu/home-services/video.scm
deleted file mode 100644
index 51b4364e..00000000
--- a/src/gnu/home-services/video.scm
@@ -1,31 +0,0 @@
-(define-module (gnu home-services video)
-  #:use-module (gnu home services)
-  #:use-module (gnu home-services-utils)
-  #:use-module (gnu packages video)
-  #:use-module (gnu services configuration)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix deprecation)
-  #:use-module (ice-9 match)
-  #:export (mpv-profile
-            home-mpv-configuration
-            home-mpv-service-type)
-  #:re-export (alist?))
-
-;;; Commentary:
-;;;
-;;; This module contains services related to video playback and
-;;; editing.
-;;;
-;;; Code:
-
-
-;;;
-;;; mpv.
-;;;
-
-(define-deprecated/alias mpv-profile #f)
-(define-deprecated/alias home-mpv-configuration
-  (@ (rde home services video) home-mpv-configuration))
-(define-deprecated/alias home-mpv-service-type
-  (@ (rde home services video) home-mpv-service-type))
-- 
2.47.0

---
 src/gnu/home-services/shells.scm | 33 +-------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/src/gnu/home-services/shells.scm b/src/gnu/home-services/shells.scm
index 73724ad4..3995d478 100644
--- a/src/gnu/home-services/shells.scm
+++ b/src/gnu/home-services/shells.scm
@@ -26,23 +26,11 @@
   #:use-module (gnu packages bash)
   #:use-module (guix gexp)
   #:use-module (guix packages)
-  #:use-module (guix deprecation)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:use-module (ice-9 match)
 
-  #:export (home-shell-profile-service-type
-            home-shell-profile-configuration
-
-            home-bash-service-type
-            home-bash-configuration
-            home-bash-extension
-
-            home-zsh-service-type
-            home-zsh-configuration
-            home-zsh-extension
-
-            home-fish-service-type
+  #:export (home-fish-service-type
             home-fish-configuration
             home-fish-extension))
 
@@ -52,25 +40,6 @@
 ;;;
 ;;; Code:
 
-(define-deprecated/alias home-shell-profile-service-type
-  (@ (rde home services shells) home-shell-profile-service-type))
-(define-deprecated/alias home-shell-profile-configuration
-  (@ (rde home services shells) home-shell-profile-configuration))
-
-(define-deprecated/alias home-bash-service-type
-  (@ (rde home services shells) home-bash-service-type))
-(define-deprecated/alias home-bash-configuration
-  (@ (rde home services shells) home-bash-configuration))
-(define-deprecated/alias home-bash-extension
-  (@ (rde home services shells) home-bash-extension))
-
-(define-deprecated/alias home-zsh-service-type
-  (@ (rde home services shells) home-zsh-service-type))
-(define-deprecated/alias home-zsh-configuration
-  (@ (rde home services shells) home-zsh-configuration))
-(define-deprecated/alias home-zsh-extension
-  (@ (rde home services shells) home-zsh-extension))
-
 
 ;;;
 ;;; Fish.
-- 
2.47.0

The module contains only deprecated APIs.
---
 src/gnu/home-services/base.scm | 44 ----------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 src/gnu/home-services/base.scm

diff --git a/src/gnu/home-services/base.scm b/src/gnu/home-services/base.scm
deleted file mode 100644
index bcd41d0c..00000000
--- a/src/gnu/home-services/base.scm
@@ -1,44 +0,0 @@
-(define-module (gnu home-services base)
-  #:use-module (gnu home services)
-  #:use-module (gnu services)
-  #:use-module (guix deprecation)
-  #:use-module (ice-9 match)
-
-  #:export (home-generic-service)
-  #:re-export (simple-service))
-
-
-(define* (home-generic-service
-	  name
-	  #:key
-          (description "An auxiliary service.")
-	  (files '())
-	  (packages '())
-	  (extensions '()))
-  "Creates a service which extends home-profile with PACKAGES and
-home-files with FILES.  EXTENSIONS is an alist of pairs @code{(target
-. function)}."
-  (let* ((profile-extension (service-extension
-			     home-profile-service-type
-			     (const packages)))
-	 (files-extension   (service-extension
-			     home-files-service-type
-			     (const files)))
-	 (more-extensions   (map
-			     (match-lambda
-			       ((target . value)
-				(service-extension
-				 target
-				 (const value))))
-			     extensions))
-	 (type              (service-type
-			     (name name)
-                             (description description)
-			     (extensions
-			      (append
-			       more-extensions
-			       (list profile-extension
-				     files-extension))))))
-    (service type #f)))
-
-(define-deprecated/alias home-generic-service #f)
-- 
2.47.0

---
 src/gnu/home-services/wm.scm | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/gnu/home-services/wm.scm b/src/gnu/home-services/wm.scm
index 6fe8c4a6..05dc2603 100644
--- a/src/gnu/home-services/wm.scm
+++ b/src/gnu/home-services/wm.scm
@@ -8,19 +8,13 @@
   #:use-module (guix packages)
   #:use-module (guix gexp)
   #:use-module (guix diagnostics)
-  #:use-module (guix deprecation)
   #:use-module (guix ui)
 
   #:use-module (srfi srfi-1)
   #:use-module (ice-9 match)
 
 
-  #:export (home-sway-service-type
-            home-sway-configuration
-
-            sway-config?
-
-            home-xmonad-service-type
+  #:export (home-xmonad-service-type
             home-xmonad-configuration))
 
 ;;; Commentary:
@@ -29,15 +23,6 @@
 ;;;
 ;;; Code:
 
-
-(define-deprecated/alias home-sway-service-type
-  (@ (rde home services wm) home-sway-service-type))
-(define-deprecated/alias home-sway-configuration
-  (@ (rde home services wm) home-sway-configuration))
-
-(define-deprecated/alias sway-config?
-  (@ (rde home services wm) sway-config?))
-
 
 ;;;
 ;;; XMonad.
-- 
2.47.0

---
 src/gnu/home-services-utils.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gnu/home-services-utils.scm b/src/gnu/home-services-utils.scm
index 70652e82..251ec3e7 100644
--- a/src/gnu/home-services-utils.scm
+++ b/src/gnu/home-services-utils.scm
@@ -28,7 +28,6 @@
   #:use-module (guix profiles)
   #:use-module (guix packages)
   #:use-module (guix build-system trivial)
-  #:use-module (guix deprecation)
 
   #:use-module (ice-9 curried-definitions)
   #:use-module (ice-9 match)
-- 
2.47.0

On 2024-11-02 16:46, Kirill Yermak wrote:

> Cleaning up before the RDE 0.6 release
>
> Kirill Yermak (11):
>   rde: features: emacs-xyz: Remove deprecated APIs
>   rde: features: video: Remove deprecated APIs
>   rde: packages: emacs: Remove deprecated APIs
>   gnu: Remove ‘services’ directory
>   gnu: home-services: Remove ‘shellutils’ module
>   gnu: home-services: Remove ‘keyboard’ module
>   gnu: home-services: Remove ‘video’ module
>   gnu: home-services: shells: Remove deprecated APIs
>   gnu: home-services: Remove ‘base’ module
>   gnu: home-services: wm: Remove deprecated APIs
>   gnu: home-services-utils: Remove unused module import
>
>  src/gnu/home-services-utils.scm      |  1 -
>  src/gnu/home-services/base.scm       | 44 ----------------------------
>  src/gnu/home-services/keyboard.scm   | 33 ---------------------
>  src/gnu/home-services/shells.scm     | 33 +--------------------
>  src/gnu/home-services/shellutils.scm | 25 ----------------
>  src/gnu/home-services/video.scm      | 31 --------------------
>  src/gnu/home-services/wm.scm         | 17 +----------
>  src/gnu/services/home.scm            | 12 --------
>  src/rde/features/emacs-xyz.scm       |  7 -----
>  src/rde/features/video.scm           |  6 +---
>  src/rde/packages/emacs.scm           |  7 +----
>  11 files changed, 4 insertions(+), 212 deletions(-)
>  delete mode 100644 src/gnu/home-services/base.scm
>  delete mode 100644 src/gnu/home-services/keyboard.scm
>  delete mode 100644 src/gnu/home-services/shellutils.scm
>  delete mode 100644 src/gnu/home-services/video.scm
>  delete mode 100644 src/gnu/services/home.scm
>
>
> base-commit: 026f48cf631fd69b46281e839b2d0b443ec86ace

Well done!  Applied, pushed.  Thank you!

-- 
Best regards,
Andrew Tropin