refactor: Added devel/perl instead of code distributed to several files

4 files changed, 94 insertions, 19 deletions

diff --git a/johnlepikhin/devel/files/perlcriticrc b/johnlepikhin/devel/files/perlcriticrc
new file mode 100644
index 0000000..2e16701
--- /dev/null
+++ b/johnlepikhin/devel/files/perlcriticrc
@@ -0,0 +1,30 @@
+severity = 1
+theme = bugs + maintenance + security + complexity + pbp + cosmetic + core
+
+#This one must be disabled, since flymake will create temp files which
+#by definition never match the specified package name
+[-Modules::RequireFilenameMatchesPackage]
+
+[-Subroutines::ProhibitSubroutinePrototypes]
+[-Subroutines::ProhibitExplicitReturnUndef]
+[-Subroutines::RequireArgUnpacking]
+[-InputOutput::RequireCheckedSyscalls]
+[-ValuesAndExpressions::ProhibitInterpolationOfLiterals]
+[-ValuesAndExpressions::ProhibitMagicNumbers]
+[-RegularExpressions::RequireDotMatchAnything]
+[-RegularExpressions::RequireExtendedFormatting]
+[-RegularExpressions::RequireLineBoundaryMatching]
+[-Modules::RequireVersionVar]
+[-Modules::ProhibitMultiplePackages]
+[-RegularExpressions::ProhibitComplexRegexes]
+[-ValuesAndExpressions::ProhibitLongChainsOfMethodCalls]
+[-InputOutput::RequireCheckedClose]
+[-Variables::ProhibitPunctuationVars]
+[-ControlStructures::ProhibitDeepNests]
+
+[-Documentation::RequirePodAtEnd]
+[-Documentation::RequirePodSections]
+[-Documentation::PodSpelling]
+
+[InputOutput::RequireBriefOpen]
+lines = 20
diff --git a/johnlepikhin/devel/perl.scm b/johnlepikhin/devel/perl.scm
new file mode 100644
index 0000000..d3d58d3
--- /dev/null
+++ b/johnlepikhin/devel/perl.scm
@@ -0,0 +1,64 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023 Evgenii Lepikhin <johnlepikhin@gmail.com>
+;;;
+;;; This file is not part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (johnlepikhin devel perl)
+  #:use-module (gnu home services)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages perl-web)
+  #:use-module (gnu services configuration)
+  #:use-module (gnu services)
+  #:use-module (guix gexp)
+  #:use-module (guix records)
+  #:use-module (srfi srfi-1)
+  #:export (home-devel-perl-configuration
+            home-devel-perl-service-type))
+
+(define-record-type* <home-devel-perl-configuration>
+  home-devel-perl-configuration make-home-devel-perl-configuration
+  home-devel-perl-configuration?
+  (packages home-devel-perl-configuration-packages
+            (default '(perl-file-slurp
+                       perl-http-tiny
+                       perl-json
+                       perl-perlcritic
+                       perl-uri-escape
+                       perl-yaml-tiny
+                       perltidy
+                       perl-io-socket-ssl))))
+
+(define (add-devel-perl-packages config)
+  (append (home-devel-perl-configuration-packages config)
+          (list perl
+                perl-critic)))
+
+(define (add-env-variables config)
+  `(("PERL5LIB" . ,(string-append (getenv "HOME") "/perl5/lib/perl5:$PERL5LIB"))))
+
+(define (add-files config)
+  `((".perlcriticrc" ,(local-file "files/perlcriticrc"))))
+
+(define home-devel-perl-service-type
+  (service-type
+   (name 'home-devel-perl)
+   (extensions
+    (list
+     (service-extension home-profile-service-type add-devel-perl-packages)
+     (service-extension home-environment-variables-service-type add-env-variables)
+     (service-extension home-files-service-type add-files)))
+   (compose concatenate)
+   (description "Install packages required for Perl development")))
diff --git a/johnlepikhin/home/bash.scm b/johnlepikhin/home/bash.scm
index 13f3a93..f2ab8f8 100644
--- a/johnlepikhin/home/bash.scm
+++ b/johnlepikhin/home/bash.scm
@@ -88,8 +88,6 @@ function whereis_guix {
 
 export PATH=\"$HOME/.cargo/bin:$HOME/go/bin:$HOME/.local/bin:$PATH\"
 
-export PERL5LIB=\"$HOME/perl5/lib/perl5:$PERL5LIB\"
-
 # temporary fix for https://issues.guix.gnu.org/63238
 export LIBRARY_PATH=\"$HOME/lib:$LIBRARY_PATH\"
 
diff --git a/johnlepikhin/home/packages.scm b/johnlepikhin/home/packages.scm
index f7ffe91..7f1d031 100644
--- a/johnlepikhin/home/packages.scm
+++ b/johnlepikhin/home/packages.scm
@@ -74,9 +74,6 @@
   #:use-module (gnu packages package-management)
   #:use-module (gnu packages package-management)
   #:use-module (gnu packages password-utils)
-  #:use-module (gnu packages perl)
-  #:use-module (gnu packages perl)
-  #:use-module (gnu packages perl-web)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages pv)
   #:use-module (gnu packages python-xyz)
@@ -103,7 +100,6 @@
   #:use-module (johnlepikhin packages dbeaver)
   #:use-module (johnlepikhin packages git-sync)
   #:use-module (johnlepikhin packages oping)
-  #:use-module (johnlepikhin packages perl)
   #:use-module (johnlepikhin packages puppet-lint)
   #:use-module (johnlepikhin packages rust-nightly)
   #:use-module (johnlepikhin packages shadowplay)
@@ -113,7 +109,6 @@
             %xmonad-packages
             %xdesktop-packages
             %tools-packages
-            %perl-packages
             %devel-other-packages
             %golang-packages
             %editors-packages
@@ -251,18 +246,6 @@
    tlp
    diffoscope))
 
-(define %perl-packages
-  (list
-   perl
-   perl-file-slurp
-   perl-http-tiny
-   perl-json
-   perl-perlcritic
-   perl-uri-escape
-   perl-yaml-tiny
-   perltidy
-   perl-io-socket-ssl))
-
 (define %golang-packages
   (list
    go-1.20