rewrite: apply guix-reference formatting; cleanup some module imports

1 files changed, 176 insertions, 177 deletions

diff --git a/px/packages/themes.scm b/px/packages/themes.scm
index fd3c757..f3c889d 100644
--- a/px/packages/themes.scm
+++ b/px/packages/themes.scm
@@ -1,9 +1,10 @@
 ;;; Theme Packages Module for PantherX
-;;; Author: Hamzeh Nasajpour (h.nasajpour@pantherx.org)
+;;; Hamzeh Nasajpour (h.nasajpour@pantherx.org)
 ;;;
 
 (define-module (px packages themes)
-  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module ((guix licenses)
+                #:prefix license:)
   #:use-module (guix download)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
@@ -31,55 +32,58 @@
     (version "5.19.5-1")
     (source
      (origin
-      (method url-fetch)
-      (uri (string-append "https://source.pantherx.org/" name "_v" version
-                          ".tgz"))
-      (sha256
-       (base32 "0ihx39li1r266ankc1q4lvv2vfh9hbxjlyjddyy30rir8rbdfilp"))))
-    (properties `((tags . '("Desktop" "KDE" "Plasma"))))
+       (method url-fetch)
+       (uri (string-append "https://source.pantherx.org/" name "_v" version
+                           ".tgz"))
+       (sha256
+        (base32 "0ihx39li1r266ankc1q4lvv2vfh9hbxjlyjddyy30rir8rbdfilp"))))
+    (properties `((tags quote
+                        ("Desktop" "KDE" "Plasma"))))
     (build-system cmake-build-system)
-    (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("pkg-config" ,pkg-config)))
+    (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)
+                     ("pkg-config" ,pkg-config)))
     ;; TODO: Warning at /gnu/store/…-kpackage-5.34.0/…/KF5PackageMacros.cmake:
-    ;;   warnings during generation of metainfo for org.kde.breezedark.desktop:
-    ;;   Package type "Plasma/LookAndFeel" not found
+    ;; warnings during generation of metainfo for org.kde.breezedark.desktop:
+    ;; Package type "Plasma/LookAndFeel" not found
     ;; TODO: Unknown property type for key "X-KDE-ParentApp",
-    ;;    "X-Plasma-MainScript"
-    (inputs
-     `(("kcmutils" ,kcmutils)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcoreaddons" ,kcoreaddons)
-       ("kde-frameworkintegration" ,kde-frameworkintegration)
-       ("kdecoration" ,kdecoration)
-       ("kguiaddons" ,kguiaddons)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kpackage" ,kpackage)
-       ("kwayland" ,kwayland)
-       ("kwindowsystem" ,kwindowsystem)
-       ("plasma-framework" ,plasma-framework) ; missing in CMakeList.txt
-       ;;("qtbase" ,qtbase)
-       ("qtdeclarative" ,qtdeclarative-5)
-       ("qtx11extras" ,qtx11extras)))
-    (propagated-inputs
-     `(("qtbase" ,qtbase-5)))
+    ;; "X-Plasma-MainScript"
+    (inputs `(("kcmutils" ,kcmutils)
+              ("kconfigwidgets" ,kconfigwidgets)
+              ("kcoreaddons" ,kcoreaddons)
+              ("kde-frameworkintegration" ,kde-frameworkintegration)
+              ("kdecoration" ,kdecoration)
+              ("kguiaddons" ,kguiaddons)
+              ("ki18n" ,ki18n)
+              ("kiconthemes" ,kiconthemes)
+              ("kpackage" ,kpackage)
+              ("kwayland" ,kwayland)
+              ("kwindowsystem" ,kwindowsystem)
+              ("plasma-framework" ,plasma-framework) ;missing in CMakeList.txt
+              ;; ("qtbase" ,qtbase)
+              ("qtdeclarative" ,qtdeclarative-5)
+              ("qtx11extras" ,qtx11extras)))
+    (propagated-inputs `(("qtbase" ,qtbase-5)))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'fix-source
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (substitute* "CMakeLists.txt" (("include\\(KDEClangFormat\\)") "#include(KDEClangFormat)"))
-               (substitute* "CMakeLists.txt" (("kde_clang_format") "#kde_clang_format"))
-               ;; Fixing the path of kde4breeze to pointing to the store of breeze theme
-               (substitute* "colors-px/breeze-default-colorscheme.desktop" 
-                            (("kde4breeze") (string-append out "/lib/kconf_update_bin/kde4breeze")))
-               #t)))
-         )))
+     `(#:phases (modify-phases %standard-phases
+                  (add-before 'configure 'fix-source
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let ((out (assoc-ref outputs "out")))
+                        (substitute* "CMakeLists.txt"
+                          (("include\\(KDEClangFormat\\)")
+                           "#include(KDEClangFormat)"))
+                        (substitute* "CMakeLists.txt"
+                          (("kde_clang_format")
+                           "#kde_clang_format"))
+                        ;; Fixing the path of kde4breeze to pointing to the store of breeze theme
+                        (substitute* "colors-px/breeze-default-colorscheme.desktop"
+                          (("kde4breeze")
+                           (string-append out
+                                          "/lib/kconf_update_bin/kde4breeze")))
+                        #t))))))
     (home-page "https://kde.org/plasma-desktop")
     (synopsis "Default Plasma theme (meta-package)")
-    (description "Forked version of breeze style theme with additional color-schemes for PantherX.")
+    (description
+     "Forked version of breeze style theme with additional color-schemes for PantherX.")
     (license license:gpl2+)))
 
 (define-public lxqt-arc-dark-theme
@@ -90,23 +94,23 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-			 (url "https://git.pantherx.org/franz/lxqt-arc-dark-theme")
+             (url "https://git.pantherx.org/franz/lxqt-arc-dark-theme")
              (commit "928cddad613a4b28f5453e1c2414b6ce0438d9c8")))
        (sha256
         (base32 "0qi5vy2hjkkyydycmpilbig6rwf870n8yjy2knz9jm0y6a2bx07w"))
-		(file-name (git-file-name name version))))
+       (file-name (git-file-name name version))))
     (build-system trivial-build-system)
     (arguments
-      `(#:modules ((guix build utils))
-        #:builder  (begin
-          (use-modules (guix build utils) 
-                       (srfi srfi-26))
-		        (let* ((source     (assoc-ref %build-inputs "source"))
-			           (theme-dir  (string-append %output "/share/lxqt/themes/"))
-                       )
-		        (mkdir-p (string-append theme-dir "arc-dark"))
-		        (copy-recursively (string-append source "/arc-dark") (string-append theme-dir "arc-dark"))
-                ))))
+     `(#:modules ((guix build utils))
+       #:builder (begin
+                   (use-modules (guix build utils)
+                                (srfi srfi-26))
+                   (let* ((source (assoc-ref %build-inputs "source"))
+                          (theme-dir (string-append %output
+                                                    "/share/lxqt/themes/")))
+                     (mkdir-p (string-append theme-dir "arc-dark"))
+                     (copy-recursively (string-append source "/arc-dark")
+                                       (string-append theme-dir "arc-dark"))))))
     (synopsis "LXQt Arc Dark Theme")
     (home-page "https://git.pantherx.org/franz/lxqt-arc-dark-theme")
     (description "LXQt Theme based on Arc by horst3180 and LXQt dark theme")
@@ -118,96 +122,97 @@
     (version "0.0.5")
     (source
      (origin
-      (method url-fetch)
-      (uri (string-append "https://source.pantherx.org/" name "_v" version
-                          ".tgz"))
-      (sha256
-       (base32 "19ir80lknf0lxb3qfy3s0zxl1ly1dxw83d33304zj2zpghd77i37"))))
+       (method url-fetch)
+       (uri (string-append "https://source.pantherx.org/" name "_v" version
+                           ".tgz"))
+       (sha256
+        (base32 "19ir80lknf0lxb3qfy3s0zxl1ly1dxw83d33304zj2zpghd77i37"))))
     (build-system cmake-build-system)
     (arguments
-      `(#:tests? #f))
+     `(#:tests? #f))
     (synopsis "Arc Openbox theme")
     (home-page "https://github.com/dglava/arc-openbox")
-    (description "Openbox theme created to fit in nicely with the Arc GTK theme.")
+    (description
+     "Openbox theme created to fit in nicely with the Arc GTK theme.")
     (license license:gpl3+)))
 
-
 (define-public sddm-darkine-theme
   (package
     (name "sddm-darkine-theme")
     (version "0.0.1")
-    (source (origin
-	      (method git-fetch)
-	      (uri (git-reference
-		     (url "https://github.com/Rokin05/darkine-kde.git")
-		     (commit "cd37f809b3f3ca7fd8865e6e91887a26b591c8d3")))
-	      (sha256
-		(base32 "0wfq5ydlmf92y7xj8qad2rjvvicy1f97cd7n3j5i3pmq9pl74zys"))
-	      (file-name (git-file-name name version))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Rokin05/darkine-kde.git")
+             (commit "cd37f809b3f3ca7fd8865e6e91887a26b591c8d3")))
+       (sha256
+        (base32 "0wfq5ydlmf92y7xj8qad2rjvvicy1f97cd7n3j5i3pmq9pl74zys"))
+       (file-name (git-file-name name version))))
     (build-system trivial-build-system)
     (arguments
-      `(#:modules ((guix build utils))
-        #:builder  (begin
-          (use-modules (guix build utils) 
-				               (srfi srfi-26))
-		      (let* ((source     (assoc-ref %build-inputs "source"))
-			           (theme-dir  (string-append %output "/share/sddm/themes/darkine")))
-		        (mkdir-p theme-dir)
-		        (copy-recursively (string-append source "/sddm/themes/darkine") theme-dir)))))
+     `(#:modules ((guix build utils))
+       #:builder (begin
+                   (use-modules (guix build utils)
+                                (srfi srfi-26))
+                   (let* ((source (assoc-ref %build-inputs "source"))
+                          (theme-dir (string-append %output
+                                      "/share/sddm/themes/darkine")))
+                     (mkdir-p theme-dir)
+                     (copy-recursively (string-append source
+                                                      "/sddm/themes/darkine")
+                                       theme-dir)))))
     (home-page "https://github.com/Rokin05/darkine-kde")
     (synopsis "SDDM theme from Darkine KDE collection")
-    (description "SDDM theme from Darkine KDE collection, a pure QtQuick2 based SDDM login theme") 
+    (description
+     "SDDM theme from Darkine KDE collection, a pure QtQuick2 based SDDM login theme")
     (license license:expat)))
 
-
 (define-public px-sddm-theme
   (package
-   (name "px-sddm-theme")
-   (version "0.0.1")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "https://source.pantherx.org/" name
-                                "_v" version ".tgz"))
-            (sha256
-             (base32 "1hjyi7mw8rkpkziq8wip2xsy8cwdjcwmyd7wjaq8892yir3rr66q"))))
-   (build-system trivial-build-system)
-   (arguments
-    `(#:modules ((guix build utils))
-      #:builder
-      (begin
-        (use-modules (guix build utils)
-                     (srfi srfi-26))
-        (let ((tar  (assoc-ref %build-inputs "tar"))
-              (gzip (assoc-ref %build-inputs "gzip"))
-              (src  (assoc-ref %build-inputs "source"))
-              (theme-dir (string-append %output "/share/sddm/themes")))
-          (mkdir-p theme-dir)
-          (setenv "PATH" (string-append gzip "/bin"))
-          (invoke (string-append tar "/bin/tar")
-                  "xvf" src "-C" theme-dir)
-          #t))))
-   (native-inputs
-    `(("tar" ,tar)
-      ("gzip" ,gzip)))
-   (home-page "https://pantherx.org")
-   (synopsis "PantherX login theme")
-   (description "SDDM login theme for PantherX")
-   (license license:expat)))
-
+    (name "px-sddm-theme")
+    (version "0.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://source.pantherx.org/" name "_v" version
+                           ".tgz"))
+       (sha256
+        (base32 "1hjyi7mw8rkpkziq8wip2xsy8cwdjcwmyd7wjaq8892yir3rr66q"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder (begin
+                   (use-modules (guix build utils)
+                                (srfi srfi-26))
+                   (let ((tar (assoc-ref %build-inputs "tar"))
+                         (gzip (assoc-ref %build-inputs "gzip"))
+                         (src (assoc-ref %build-inputs "source"))
+                         (theme-dir (string-append %output
+                                                   "/share/sddm/themes")))
+                     (mkdir-p theme-dir)
+                     (setenv "PATH"
+                             (string-append gzip "/bin"))
+                     (invoke (string-append tar "/bin/tar") "xvf" src "-C"
+                             theme-dir) #t))))
+    (native-inputs `(("tar" ,tar)
+                     ("gzip" ,gzip)))
+    (home-page "https://pantherx.org")
+    (synopsis "PantherX login theme")
+    (description "SDDM login theme for PantherX")
+    (license license:expat)))
 
 (define-public chilie-login-theme
   (package
     (name "chilie-login-theme")
     (version "0.1.5")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append
-                   "https://github.com/MarianArlt/sddm-chili/archive/"
-				   version
-				   ".tar.gz"))
-             (sha256
-              (base32
-               "03wswhqp9980blsrhk60jj49gbqmpkij85i71bzqyi0gyxxn1h53"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/MarianArlt/sddm-chili/archive/"
+             version ".tar.gz"))
+       (sha256
+        (base32 "03wswhqp9980blsrhk60jj49gbqmpkij85i71bzqyi0gyxxn1h53"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
@@ -215,50 +220,47 @@
                    (use-modules (guix build utils)
                                 (srfi srfi-26))
                    (let* ((source (assoc-ref %build-inputs "source"))
-                          (tar    (assoc-ref %build-inputs "tar"))
-                          (gzip     (assoc-ref %build-inputs "gzip"))
-						  (theme-dir  (string-append %output "/share/sddm/themes"))
-						  )
+                          (tar (assoc-ref %build-inputs "tar"))
+                          (gzip (assoc-ref %build-inputs "gzip"))
+                          (theme-dir (string-append %output
+                                                    "/share/sddm/themes")))
                      (mkdir-p theme-dir)
-					 (setenv "PATH" (string-append gzip "/bin"))
-                     (invoke (string-append tar "/bin/tar") "xvf" source "-C" theme-dir)
-					 ))))
+                     (setenv "PATH"
+                             (string-append gzip "/bin"))
+                     (invoke (string-append tar "/bin/tar") "xvf" source "-C"
+                             theme-dir)))))
     (native-inputs `(("tar" ,tar)
-                     ("gzip" ,gzip)
-					 ))
-	(home-page "https://github.com/MarianArlt/sddm-chili")
+                     ("gzip" ,gzip)))
+    (home-page "https://github.com/MarianArlt/sddm-chili")
     (synopsis "Chili login theme for SDDM")
     (description "Chili login theme for SDDM.")
     (license license:gpl3)))
-	
+
 (define-public paper-icon-theme
   (package
     (name "paper-icon-theme")
     (version "1.5.0")
     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-          "https://github.com/snwh/paper-icon-theme/archive/v." 
-          version 
-          ".tar.gz"))
-        (sha256
-          (base32
-            "1klf545hk6g7dx9g0bkblrzd46kz6hr0yj1mqvjq3r7cjpz1vwk2"))))
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/snwh/paper-icon-theme/archive/v." version
+             ".tar.gz"))
+       (sha256
+        (base32 "1klf545hk6g7dx9g0bkblrzd46kz6hr0yj1mqvjq3r7cjpz1vwk2"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'disable-post-install
-           (lambda _
-             (substitute* "meson.build"
-               (("meson.add_install_script.*") "")))))))
+     `(#:phases (modify-phases %standard-phases
+                  (add-before 'configure 'disable-post-install
+                    (lambda _
+                      (substitute* "meson.build"
+                        (("meson.add_install_script.*")
+                         "")))))))
     (synopsis "Paper icon theme")
     (home-page "https://snwh.org")
     (description "Paper is an open source FreeDesktop icon project")
     (license license:expat)))
 
-
 (define-public px-lxqt-themes
   (package
     (name "px-lxqt-themes")
@@ -266,35 +268,32 @@
     (source
      (origin
        (method url-fetch)
-       (uri (string-append 
-         "https://source.pantherx.org/" name "_" version ".tgz"))        
+       (uri (string-append "https://source.pantherx.org/" name "_" version
+                           ".tgz"))
        (sha256
         (base32 "06zzwym5id6a2nwwvxki7c4c1c7xf2lq03rm6924gylj047hyj5q"))))
     (build-system cmake-build-system)
-    (native-inputs
-        `(("lxqt-build-tools" ,lxqt-build-tools)
-          ("perl" ,perl)))
-      (arguments
-        `(#:tests? #f                      ; no tests
-          #:phases
-            (modify-phases %standard-phases
-            ;; !!! TODO I guess these Variables come from lxqt-build-tools, so maybe it would be better to update this package 
-            ;;     instead of these patches. 
-              (add-after 'unpack 'patch-source
-                (lambda _
-                  (substitute* '("CMakeLists.txt")
-                    (("DESTINATION \"\\$\\{LXQT_GRAPHICS_DIR\\}")
-                     "DESTINATION \"share/lxqt/graphics"))
-                  (substitute* '("themes/CMakeLists.txt")
-                    (("DESTINATION \"\\$\\{LXQT_SHARE_DIR\\}")
-                     "DESTINATION \"share/lxqt"))
-                  (substitute* '("wallpapers/CMakeLists.txt")
-                    (("DESTINATION \"\\$\\{LXQT_SHARE_DIR\\}")
-                     "DESTINATION \"share/lxqt"))
-                  (substitute* '("palettes/CMakeLists.txt")
-                    (("DESTINATION \"\\$\\{LXQT_SHARE_DIR\\}")
-                     "DESTINATION \"share/lxqt"))
-                  #t)))))
+    (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools)
+                     ("perl" ,perl)))
+    (arguments
+     `(#:tests? #f ;no tests
+       #:phases (modify-phases %standard-phases
+                  ;; !!! TODO I guess these Variables come from lxqt-build-tools, so maybe it would be better to update this package
+                  ;; instead of these patches.
+                  (add-after 'unpack 'patch-source
+                    (lambda _
+                      (substitute* '("CMakeLists.txt")
+                        (("DESTINATION \"\\$\\{LXQT_GRAPHICS_DIR\\}")
+                         "DESTINATION \"share/lxqt/graphics"))
+                      (substitute* '("themes/CMakeLists.txt")
+                        (("DESTINATION \"\\$\\{LXQT_SHARE_DIR\\}")
+                         "DESTINATION \"share/lxqt"))
+                      (substitute* '("wallpapers/CMakeLists.txt")
+                        (("DESTINATION \"\\$\\{LXQT_SHARE_DIR\\}")
+                         "DESTINATION \"share/lxqt"))
+                      (substitute* '("palettes/CMakeLists.txt")
+                        (("DESTINATION \"\\$\\{LXQT_SHARE_DIR\\}")
+                         "DESTINATION \"share/lxqt")) #t)))))
     (home-page "https://lxqt-project.org/")
     (synopsis "Themes, graphics and icons for LXQt")
     (description "This package comprises a number of graphic files and themes