Refactor.origin/wip-zabbixwip-zabbix

* gnu/services/autossh.scm: Delete file.
* gnu/services/wigust-monitoring.scm: Delete file.
* gnu/packages/wigust-admin.scm: Rename to 'wigust/packages/admin.scm'.
* gnu/packages/wigust-calamares.scm: Rename to 'wigust/packages/calamares.scm'.
* gnu/packages/wigust-compression.scm: Rename to 'wigust/packages/compression.scm'.
* gnu/packages/wigust-emacs.scm: Rename to 'wigust/packages/emacs.scm'.
* gnu/packages/wigust-game-development.scm: Rename to 'wigust/packages/game-development.scm'.
* gnu/packages/wigust-games.scm: Rename to 'wigust/packages/games.scm'.
* gnu/packages/wigust-gnuzilla.scm: Rename to 'wigust/packages/gnuzilla.scm'.
* gnu/packages/wigust-golang.scm: Rename to 'wigust/packages/golang.scm'.
* gnu/packages/wigust-gstreamer.scm: Rename to 'wigust/packages/gstreamer.scm'.
* gnu/packages/wigust-guile.scm: Rename to 'wigust/packages/guile.scm'.
* gnu/packages/wigust-guix.scm: Rename to 'wigust/packages/guix.scm'.
* gnu/packages/wigust-image-viewers.scm: Rename to 'wigust/packages/image-viewers.scm'.
* gnu/packages/wigust-lisp.scm: Rename to 'wigust/packages/lisp.scm'.
* gnu/packages/wigust-monitoring.scm: Rename to 'wigust/packages/monitoring.scm'.
* gnu/packages/wigust-pdf.scm: Rename to 'wigust/packages/pdf.scm'.
* gnu/packages/wigust-php.scm: Rename to 'wigust/packages/php.scm'.
* gnu/packages/wigust-pulseaudio.scm: Rename to 'wigust/packages/pulseaudio.scm'.
* gnu/packages/wigust-python.scm: Rename to 'wigust/packages/python.scm'.
* gnu/packages/wigust-raleigh.scm: Rename to 'wigust/packages/raleigh.scm'.
* gnu/packages/wigust-ruby.scm: Rename to 'wigust/packages/ruby.scm'.
* gnu/packages/wigust-spectre-meltdown-checker.scm: Rename to 'wigust/packages/spectre-meltdown-checker.scm'.
* gnu/packages/wigust-urho3d.scm: Rename to 'wigust/packages/urho3d.scm'.
* gnu/packages/wigust-version-control.scm: Rename to 'wigust/packages/version-control.scm'.
* gnu/packages/wigust-virtualization.scm: Rename to 'wigust/packages/virtualization.scm'.
* gnu/packages/wigust-vnc.scm: Rename to 'wigust/packages/vnc.scm'.
* gnu/packages/wigust-xdisorg.scm: Rename to 'wigust/packages/xdisorg.scm'.
* gnu/packages/wigust-xorg.scm: Rename to 'wigust/packages/xorg.scm'.

29 files changed, 28 insertions, 698 deletions

diff --git a/gnu/services/autossh.scm b/gnu/services/autossh.scm
deleted file mode 100644
index ccafa23..0000000
--- a/gnu/services/autossh.scm
+++ /dev/null
@@ -1,165 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
-;;;
-;;; This file is 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 (gnu services autossh)
-  #:use-module (gnu packages admin)
-  #:use-module (gnu packages ssh)
-  #:use-module (gnu services base)
-  #:use-module (gnu services configuration)
-  #:use-module (gnu services shepherd)
-  #:use-module (gnu services web)
-  #:use-module (gnu services)
-  #:use-module (gnu system shadow)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix records)
-  #:use-module (guix store)
-  #:use-module (ice-9 match)
-  #:use-module (srfi srfi-26)
-  #:export (autossh-configuration
-            autossh-service-type
-            openssh-client-configuration
-            openssh-client-host-configuration
-
-            openssh-client-configuration-fields
-            openssh-client-host-configuration-fields
-            serialize-openssh-client-host-configuration-list))
-
-;;; Commentary:
-;;;
-;;; This module provides a service definition for the SERVICE_NAME
-;;; SERVICE_DESCRTIPTION
-;;;
-;;; Code:
-
-(define (uglify-field-name field-name)
-  (apply string-append
-         (map string-capitalize
-              (string-split (string-delete #\?
-                                           (symbol->string field-name))
-                            #\-))))
-
-(define (serialize-field field-name val)
-  #~(format #f "~a=~a~%" #$(uglify-field-name field-name) #$val))
-
-(define (serialize-number field-name val)
-  (serialize-field field-name (number->string val)))
-
-(define (serialize-list field-name val)
-  (if (null? val) "" (serialize-field field-name (string-join val))))
-
-(define (serialize-string field-name val)
-  (if (and (string? val) (string=? val ""))
-      ""
-      (serialize-field field-name val)))
-
-(define (serialize-boolean field-name val)
-  (serialize-string field-name (if val "yes" "no")))
-
-(define-configuration openssh-client-host-configuration
-  (host
-   (string "")
-   "")
-  (host-name
-   (string "")
-   "")
-  (port
-   (number 22)
-   "")
-  (user
-   (string "")
-   "")
-  (strict-host-key-checking?
-   (boolean #t)
-   "")
-  (identity-file
-   (string "")
-   "")
-  (password-authentication?
-   (boolean #t)
-   ""))
-
-(define (serialize-openssh-client-host-configuration-list field-name val)
-  #~(string-append
-     #$@(map (cut serialize-configuration <>
-                  openssh-client-host-configuration-fields)
-             val)))
-
-(define (openssh-client-host-configuration-list? val)
-  (list? val))
-
-(define-configuration openssh-client-configuration
-  (hosts
-   (openssh-client-host-configuration-list '())
-   "List of hosts."))
-
-(define-record-type* <autossh-configuration>
-  autossh-configuration make-autossh-configuration
-  autossh-configuration?
-  (user autossh-configuration-user ;string
-        (default "autossh"))
-  (group autossh-configuration-group ;string
-         (default "autossh"))
-  (openssh-client-config autossh-configuration-openssh-client-config
-                         (default #f))
-  (host autossh-configuration-host ;string
-        (default "")))
-
-(define autossh-account
-  ;; Return the user accounts and user groups for CONFIG.
-  (match-lambda
-    (($ <autossh-configuration> autossh-user autossh-group _)
-     (list (user-group (name autossh-group) (system? #t))
-           (user-account
-            (name autossh-user)
-            (system? #t)
-            (group autossh-group)
-            (comment "autossh privilege separation user")
-            (home-directory (string-append "/var/run/" autossh-user))
-            (shell #~(string-append #$shadow "/sbin/nologin")))))))
-
-(define autossh-shepherd-service
-  (match-lambda
-    (($ <autossh-configuration> autossh-user autossh-group
-                                openssh-client-config host)
-     (list (shepherd-service
-            (provision '(autossh))
-            (documentation "Run autossh daemon.")
-            (start #~(make-forkexec-constructor
-                      (list (string-append #$autossh "/bin/autossh")
-                            "-F" #$(mixed-text-file "ssh-client.conf"
-                                                    (serialize-configuration openssh-client-config
-                                                                             openssh-client-configuration-fields))
-                            #$host)
-                      #:user #$autossh-user
-                      #:group #$autossh-group))
-            (stop #~(make-kill-destructor)))))))
-
-(define autossh-service-type
-  (service-type
-   (name 'autossh)
-   (extensions
-    (list (service-extension shepherd-root-service-type
-                             autossh-shepherd-service)
-          (service-extension account-service-type
-                             autossh-account)))
-   (default-value (autossh-configuration))
-   (description
-    "Run the autossh.")))
-
-;;; autossh.scm ends here
diff --git a/gnu/services/wigust-monitoring.scm b/gnu/services/wigust-monitoring.scm
deleted file mode 100644
index 5d0e487..0000000
--- a/gnu/services/wigust-monitoring.scm
+++ /dev/null
@@ -1,505 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
-;;;
-;;; This file is 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 (gnu services wigust-monitoring)
-  #:use-module (gnu services)
-  #:use-module (gnu services configuration)
-  #:use-module (gnu services shepherd)
-  #:use-module (gnu packages admin)
-  #:use-module (gnu packages monitoring)
-  #:use-module (gnu system shadow)
-  #:use-module (guix gexp)
-  #:use-module (guix records)
-  #:use-module (ice-9 match)
-  #:export (zabbix-server-service-type
-            zabbix-agentd-service-type))
-
-(define (uglify-field-name field-name)
-  (apply string-append
-         (map string-capitalize
-              (string-split (string-delete #\?
-                                           (symbol->string field-name))
-                            #\-))))
-
-(define (serialize-field field-name val)
-  (format #t "~a=~a~%" (uglify-field-name field-name) val))
-
-(define (serialize-number field-name val)
-  (serialize-field field-name (number->string val)))
-
-(define (serialize-list field-name val)
-  (if (null? val) "" (serialize-field field-name (string-join val))))
-
-(define (serialize-string field-name val)
-  (if (and (string? val) (string=? val ""))
-      ""
-      (serialize-field field-name val)))
-
-(define (serialize-boolean field-name val)
-  (serialize-string field-name (if val "yes" "no")))
- 
-(define-configuration zabbix-server-configuration
-  (debug-level
-   (number 5)
-   "")
-  (alert-scripts-path
-   (string "${datadir}/zabbix/alertscripts")
-   "")
-  (allow-root?
-   (boolean #f)
-   "")
-  (cache-size
-   (string "8M")
-   "")
-  (cache-update-frequency
-   (number 60)
-   "")
-  (db-host
-   (string "127.0.0.1")
-   "")
-  (db-name
-   (string "zabbix")
-   "")
-  (db-password
-   (string "")
-   "")
-  (db-port
-   (number 5432)
-   "")
-  (db-schema
-   (string "")
-   "")
-  (db-socket
-   (string "")
-   "")
-  (external-scripts
-   (string "${datadir}/zabbix/externalscripts")
-   "")
-  (fping-location
-   (string "/run/setuid-programs/fping")
-   "")
-  (fping6-location
-   (string "/run/setuid-programs/fping")
-   "")
-  (history-cache-size
-   (string "16M")
-   "")
-  (history-index-cache-size
-   (string "4M")
-   "")
-  (history-storage-types
-   (list '("uint" "dbl" "str" "log" "text"))
-   "")
-  (history-storage-url
-   (string "")
-   "")
-  (housekeeping-frequency
-   (number 1)
-   "")
-  (include-file
-   (list '())
-   "")
-  (java-gateway
-   (string "")
-   "")
-  (java-gateway-port
-   (number 10052)
-   "")
-  (listen-ip-addresses
-   (list '("0.0.0.0" "127.0.0.1"))
-   "")
-  (listen-port
-   (number 10051)
-   "")
-  (load-module
-   (string "")
-   "")
-  (load-module-path
-   (string "${libdir}/modules")
-   "")
-  (log-file
-   (string "")
-   "")
-  (log-file-size
-   (number 1)
-   "")
-  (log-slow-queries
-   (number 3000)
-   "")
-  (log-type
-   (string "file")
-   "")
-  (max-housekeeper-delete
-   (string "5000")
-   "")
-  (pid-file
-   (string "/var/run/zabbix/zabbix-server.pid")
-   "")
-  (proxy-config-frequency
-   (number 3600)
-   "")
-  (proxy-data-frequency
-   (number 1)
-   "")
-  (snmp-trapper-file
-   (string "/tmp/zabbix_traps.tmp")
-   "")
-  (socket-dir
-   (string "/tmp")
-   "")
-  (source-ip
-   (string "")
-   "")
-  (ssh-key-location
-   (string "")
-   "")
-  (ssl-ca-location
-   (string "/etc/ssl/certs/ca-certificates.crt")
-   "")
-  (ssl-cert-location
-   (string "/etc/ssl/certs")
-   "")
-  (start-alerters
-   (number 3)
-   "")
-  (start-db-syncers
-   (number 4)
-   "")
-  (start-discoverers
-   (number 1)
-   "")
-  (start-escalators
-   (number 1)
-   "")
-  (start-http-pollers
-   (number 1)
-   "")
-  (start-ipmi-pollers
-   (number 0)
-   "")
-  (start-java-pollers
-   (number 0)
-   "")
-  (start-pingers
-   (number 1)
-   "")
-  (start-pollers
-   (number 5)
-   "")
-  (start-pollers-unreachable
-   (number 1)
-   "")
-  (start-preprocessors
-   (number 3)
-   "")
-  (start-proxy-pollers
-   (number 1)
-   "")
-  (start-snmp-trapper
-   (string "0")
-   "")
-  (start-timers
-   (number 1)
-   "")
-  (start-trappers
-   (number 5)
-   "")
-  (start-vmware-collectors
-   (number 0)
-   "")
-  (timeout
-   (number 3)
-   "")
-  (tls-ca-file
-   (string "")
-   "")
-  (tls-cert-file
-   (string "")
-   "")
-  (tls-crl-file
-   (string "")
-   "")
-  (tls-key-file
-   (string "")
-   "")
-  (tmp-dir
-   (string "/tmp")
-   "")
-  (trapper-timeout
-   (number 300)
-   "")
-  (trend-cache-size
-   (string "4M")
-   "")
-  (unavailable-delay
-   (number 60)
-   "")
-  (unreachable-delay
-   (number 15)
-   "")
-  (unreachable-period
-   (number 45)
-   "")
-  (user
-   (string "zabbix")
-   "")
-  (value-cache-size
-   (string "8M")
-   "")
-  (vmware-cache-size
-   (string "8M")
-   "")
-  (vmware-frequency
-   (number 60)
-   "")
-  (vmware-perf-frequency
-   (number 60)
-   "")
-  (vmware-timeout
-   (number 10)
-   ""))
-
-(define-configuration zabbix-agentd-configuration
-  (alias
-   (string "")
-   "")
-  (allow-root?
-   (boolean #f)
-   "")
-  (buffer-send
-   (number 5)
-   "")
-  (buffer-size
-   (number 100)
-   "")
-  (debug-level
-   (number 3)
-   "")
-  (enable-remote-commands?
-   (boolean #f)
-   "")
-  (host-metadata
-   (string "")
-   "")
-  (host-metadata-item
-   (string "")
-   "")
-  (hostname
-   (string "Zabbix server")
-   "")
-  (hostname-item
-   (string "system.hostname")
-   "")
-  (include-files
-   (string '())
-   "")
-  (listen-ip
-   (string "0.0.0.0")
-   "")
-  (listen-port
-   (string "10050")
-   "")
-  (load-module
-   (string "")
-   "")
-  (load-module-path
-   (string "${libdir}/modules")
-   "")
-  (log-file
-   (string "/tmp/zabbix-agentd.log")
-   "")
-  (log-file-size
-   (number 1)
-   "")
-  (log-remote-commands
-   (boolean #f)
-   "")
-  (log-type
-   (string "file")
-   "")
-  (max-lines-per-second
-   (number 20)
-   "")
-  (pid-file
-   (string "/var/run/zabbix/zabbix-agentd.pid")
-   "")
-  (refresh-active-checks
-   (number 120)
-   "")
-  (server
-   (string '("127.0.0.1" "192.168.1.0/24" "::1" "2001:db8::/32"))
-   "")
-  (server-active
-   (string "127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1]")
-   "")
-  (source-ip
-   (string "")
-   "")
-  (start-agents
-   (number 3)
-   "")
-  (timeout
-   (number 3)
-   "")
-  (tls-accept
-   (string "unencrypted")
-   "")
-  (tls-ca-file
-   (string "")
-   "")
-  (tls-cert-file
-   (string "")
-   "")
-  (tls-connect
-   (string "unencrypted")
-   "")
-  (tls-crl-file
-   (string "")
-   "")
-  (tls-key-file
-   (string "")
-   "")
-  (tls-psk-file
-   (string "")
-   "")
-  (tls-psk-identity
-   (string "")
-   "")
-  (tls-server-cert-issuer
-   (string "")
-   "")
-  (tls-server-cert-subject
-   (string "")
-   "")
-  (unsafe-user-parameters
-   (string "0")
-   "")
-  (user
-   (string "zabbix")
-   "")
-  (user-parameter
-   (string '())
-   ""))
-
-(define (zabbix-server-account config)
-  "Return the user accounts and user groups for CONFIG."
-  (let ((zabbix-user "zabbix")
-        (zabbix-group "zabbix"))
-      (list (user-group (name zabbix-group) (system? #t))
-        (user-account
-         (name zabbix-user)
-         (system? #t)
-         (group zabbix-group)
-         (comment "zabbix privilege separation user")
-         (home-directory (string-append "/var/run/" zabbix-user))
-         (shell #~(string-append #$shadow "/sbin/nologin"))))))
-
-(define (zabbix-server-activation config)
-  "Return the activation GEXP for CONFIG."
-  #~(begin
-      (use-modules (guix build utils))
-      (let ((user (getpw "zabbix"))
-            (group (getpw "zabbix")))
-        (let ((dir "/var/run/zabbix"))
-          (mkdir-p dir)
-          (chmod dir #o700)
-          (chown dir (passwd:uid user) (group:gid group))))))
-
-(define (zabbix-agentd-account config)
-  "Return the user accounts and user groups for CONFIG."
-  (let ((zabbix-user "zabbix")
-        (zabbix-group "zabbix"))
-      (list (user-group (name zabbix-group) (system? #t))
-        (user-account
-         (name zabbix-user)
-         (system? #t)
-         (group zabbix-group)
-         (comment "zabbix privilege separation user")
-         (home-directory (string-append "/var/run/" zabbix-user))
-         (shell #~(string-append #$shadow "/sbin/nologin"))))))
-
-(define (zabbix-agentd-activation config)
-  "Return the activation GEXP for CONFIG."
-  #~(begin
-      (use-modules (guix build utils))
-      (let ((user (getpw "zabbix"))
-            (group (getpw "zabbix")))
-        (let ((dir "/var/run/zabbix"))
-          (mkdir-p dir)
-          (chmod dir #o700)
-          (chown dir (passwd:uid user) (group:gid group))))))
-
-(define (zabbix-server-shepherd-service config)
-  "Return a <shepherd-service> for Zabbix server with CONFIG."
-  (list (shepherd-service
-         (provision '(zabbix-server))
-         (documentation "Run zabbix daemon.")
-         (start #~(make-forkexec-constructor
-                   (list #$(file-append zabbix-server "/sbin/zabbix_server")
-                         "--config" "/etc/zabbix/zabbix_server.conf")
-                   #:user "zabbix"
-                   #:group "zabbix"
-                   #:pid-file "/var/run/zabbix/zabbix_server.pid"
-                   #:environment-variables
-                   (list "SSL_CERT_DIR=/run/current-system/profile\
-/etc/ssl/certs"
-                         "SSL_CERT_FILE=/run/current-system/profile\
-/etc/ssl/certs/ca-certificates.crt")))
-         (stop #~(make-kill-destructor)))))
-
-(define (zabbix-agentd-shepherd-service config)
-  "Return a <shepherd-service> for Zabbix agent with CONFIG."
-  (list (shepherd-service
-         (provision '(zabbix-agentd))
-         (documentation "Run zabbix daemon.")
-         (start #~(make-forkexec-constructor
-                   (list #$(file-append zabbix-server "/sbin/zabbix_agentd")
-                         "--config" "/etc/zabbix/zabbix_agentd.conf")
-                   #:user "zabbix"
-                   #:group "zabbix"
-                   #:pid-file "/var/run/zabbix/zabbix_agentd.pid"
-                   #:environment-variables
-                   (list "SSL_CERT_DIR=/run/current-system/profile\
-/etc/ssl/certs"
-                         "SSL_CERT_FILE=/run/current-system/profile\
-/etc/ssl/certs/ca-certificates.crt")))
-         (stop #~(make-kill-destructor)))))
-
-(define zabbix-server-service-type
-  (service-type
-   (name 'zabbix-server)
-   (extensions
-    (list (service-extension shepherd-root-service-type
-                             zabbix-server-shepherd-service)
-          (service-extension account-service-type
-                             zabbix-server-account)
-          (service-extension activation-service-type
-                             zabbix-server-activation)))
-   (default-value '())))
-
-(define zabbix-agentd-service-type
-  (service-type
-   (name 'zabbix-agentd)
-   (extensions
-    (list (service-extension shepherd-root-service-type
-                             zabbix-agentd-shepherd-service)
-          (service-extension account-service-type
-                             zabbix-agentd-account)
-          (service-extension activation-service-type
-                             zabbix-agentd-activation)))
-   (default-value '())))
diff --git a/gnu/packages/wigust-admin.scm b/wigust/packages/admin.scm
index 624313f..b036b07 100644
--- a/gnu/packages/wigust-admin.scm
+++ b/wigust/packages/admin.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-admin)
+(define-module (wigust packages admin)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
diff --git a/gnu/packages/wigust-calamares.scm b/wigust/packages/calamares.scm
index d868111..3db5cb0 100644
--- a/gnu/packages/wigust-calamares.scm
+++ b/wigust/packages/calamares.scm
@@ -1,4 +1,4 @@
-(define-module (gnu packages wigust-calamares)
+(define-module (wigust packages calamares)
   #:use-module (ice-9 match)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix utils)
diff --git a/gnu/packages/wigust-compression.scm b/wigust/packages/compression.scm
index 05a06b5..4a662f8 100644
--- a/gnu/packages/wigust-compression.scm
+++ b/wigust/packages/compression.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-compression)
+(define-module (wigust packages compression)
   #:use-module (gnu packages compression)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix utils)
diff --git a/gnu/packages/wigust-emacs.scm b/wigust/packages/emacs.scm
index ccbe8a5..089924e 100644
--- a/gnu/packages/wigust-emacs.scm
+++ b/wigust/packages/emacs.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-emacs)
+(define-module (wigust packages emacs)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/gnu/packages/wigust-game-development.scm b/wigust/packages/game-development.scm
index c804015..7b26b59 100644
--- a/gnu/packages/wigust-game-development.scm
+++ b/wigust/packages/game-development.scm
@@ -1,5 +1,5 @@
 
-(define-module (gnu packages wigust-game-development)
+(define-module (wigust packages game-development)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/gnu/packages/wigust-games.scm b/wigust/packages/games.scm
index 89a41d8..30f919d 100644
--- a/gnu/packages/wigust-games.scm
+++ b/wigust/packages/games.scm
@@ -1,4 +1,4 @@
-(define-module (gnu packages wigust-games)
+(define-module (wigust packages games)
   #:use-module (ice-9 match)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix utils)
diff --git a/gnu/packages/wigust-gnuzilla.scm b/wigust/packages/gnuzilla.scm
index 8d5587c..1c52ba6 100644
--- a/gnu/packages/wigust-gnuzilla.scm
+++ b/wigust/packages/gnuzilla.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-gnuzilla)
+(define-module (wigust packages gnuzilla)
   #:use-module ((srfi srfi-1) #:hide (zip))
   #:use-module (ice-9 match)
   #:use-module (gnu packages)
diff --git a/gnu/packages/wigust-golang.scm b/wigust/packages/golang.scm
index c7835a6..d78aca8 100644
--- a/gnu/packages/wigust-golang.scm
+++ b/wigust/packages/golang.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-golang)
+(define-module (wigust packages golang)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix utils)
   #:use-module (guix download)
diff --git a/gnu/packages/wigust-gstreamer.scm b/wigust/packages/gstreamer.scm
index a50a987..3806360 100644
--- a/gnu/packages/wigust-gstreamer.scm
+++ b/wigust/packages/gstreamer.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-gstreamer)
+(define-module (wigust packages gstreamer)
   #:use-module (gnu packages gstreamer)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
diff --git a/gnu/packages/wigust-guile.scm b/wigust/packages/guile.scm
index 4b6a6bc..c461240 100644
--- a/gnu/packages/wigust-guile.scm
+++ b/wigust/packages/guile.scm
@@ -1,4 +1,4 @@
-(define-module (gnu packages wigust-guile)
+(define-module (wigust packages guile)
   #:use-module (guix utils)
   #:use-module (guix packages)
   #:use-module (gnu packages)
diff --git a/gnu/packages/wigust-guix.scm b/wigust/packages/guix.scm
index d9e7953..2a3dd34 100644
--- a/gnu/packages/wigust-guix.scm
+++ b/wigust/packages/guix.scm
@@ -1,4 +1,4 @@
-(define-module (gnu packages wigust-guix)
+(define-module (wigust packages guix)
   #:use-module (ice-9 popen)
   #:use-module (ice-9 rdelim)
   #:use-module (guix gexp)
@@ -15,7 +15,7 @@
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages autotools)
-  #:use-module (gnu packages wigust-emacs)
+  #:use-module (wigust packages emacs)
   #:use-module (guix build-system emacs)
   #:use-module (guix build-system trivial)
   #:use-module ((guix licenses) #:prefix license:))
diff --git a/gnu/packages/wigust-image-viewers.scm b/wigust/packages/image-viewers.scm
index 69da964..7d1defb 100644
--- a/gnu/packages/wigust-image-viewers.scm
+++ b/wigust/packages/image-viewers.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-image-viewers)
+(define-module (wigust packages image-viewers)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix download)
   #:use-module (guix packages)
diff --git a/gnu/packages/wigust-lisp.scm b/wigust/packages/lisp.scm
index 9d37f70..d1a652b 100644
--- a/gnu/packages/wigust-lisp.scm
+++ b/wigust/packages/lisp.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-lisp)
+(define-module (wigust packages lisp)
   #:use-module (gnu packages lisp)
   #:use-module (gnu packages)
   #:use-module ((guix licenses) #:prefix license:)
diff --git a/gnu/packages/wigust-monitoring.scm b/wigust/packages/monitoring.scm
index cc5e05b..3113ae7 100644
--- a/gnu/packages/wigust-monitoring.scm
+++ b/wigust/packages/monitoring.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-monitoring)
+(define-module (wigust packages monitoring)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
diff --git a/gnu/packages/wigust-pdf.scm b/wigust/packages/pdf.scm
index 61a7c3b..f233a2a 100644
--- a/gnu/packages/wigust-pdf.scm
+++ b/wigust/packages/pdf.scm
@@ -1,4 +1,4 @@
-(define-module (gnu packages wigust-pdf)
+(define-module (wigust packages pdf)
   #:use-module (guix utils)
   #:use-module (guix packages)
   #:use-module (gnu packages)
diff --git a/gnu/packages/wigust-php.scm b/wigust/packages/php.scm
index be807dd..564886c 100644
--- a/gnu/packages/wigust-php.scm
+++ b/wigust/packages/php.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-php)
+(define-module (wigust packages php)
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages aspell)
diff --git a/gnu/packages/wigust-pulseaudio.scm b/wigust/packages/pulseaudio.scm
index 0b3b970..8747c0a 100644
--- a/gnu/packages/wigust-pulseaudio.scm
+++ b/wigust/packages/pulseaudio.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-pulseaudio)
+(define-module (wigust packages pulseaudio)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix license:)
diff --git a/gnu/packages/wigust-python.scm b/wigust/packages/python.scm
index bc77b53..656cb07 100644
--- a/gnu/packages/wigust-python.scm
+++ b/wigust/packages/python.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-python)
+(define-module (wigust packages python)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
diff --git a/gnu/packages/wigust-raleigh.scm b/wigust/packages/raleigh.scm
index e427b08..b368901 100644
--- a/gnu/packages/wigust-raleigh.scm
+++ b/wigust/packages/raleigh.scm
@@ -1,4 +1,4 @@
-(define-module (gnu packages wigust-raleigh)
+(define-module (wigust packages raleigh)
   #:use-module (ice-9 match)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix utils)
diff --git a/gnu/packages/wigust-ruby.scm b/wigust/packages/ruby.scm
index edeed08..6c64eab 100644
--- a/gnu/packages/wigust-ruby.scm
+++ b/wigust/packages/ruby.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-ruby)
+(define-module (wigust packages ruby)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
diff --git a/gnu/packages/wigust-spectre-meltdown-checker.scm b/wigust/packages/spectre-meltdown-checker.scm
index 3e83ed7..12f4674 100644
--- a/gnu/packages/wigust-spectre-meltdown-checker.scm
+++ b/wigust/packages/spectre-meltdown-checker.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-spectre-meltdown-checker)
+(define-module (wigust packages spectre-meltdown-checker)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages compression)
diff --git a/gnu/packages/wigust-urho3d.scm b/wigust/packages/urho3d.scm
index 59519a1..954c141 100644
--- a/gnu/packages/wigust-urho3d.scm
+++ b/wigust/packages/urho3d.scm
@@ -1,4 +1,4 @@
-(define-module (gnu packages wigust-urho3d)
+(define-module (wigust packages urho3d)
   #:use-module (ice-9 match)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix utils)
diff --git a/gnu/packages/wigust-version-control.scm b/wigust/packages/version-control.scm
index b3b77a4..2989392 100644
--- a/gnu/packages/wigust-version-control.scm
+++ b/wigust/packages/version-control.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-version-control)
+(define-module (wigust packages version-control)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix utils)
   #:use-module (guix packages)
diff --git a/gnu/packages/wigust-virtualization.scm b/wigust/packages/virtualization.scm
index dfaa632..070f958 100644
--- a/gnu/packages/wigust-virtualization.scm
+++ b/wigust/packages/virtualization.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-virtualization)
+(define-module (wigust packages virtualization)
   #:use-module (gnu packages)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages attr)
diff --git a/gnu/packages/wigust-vnc.scm b/wigust/packages/vnc.scm
index 28a4f91..5ec425f 100644
--- a/gnu/packages/wigust-vnc.scm
+++ b/wigust/packages/vnc.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-vnc)
+(define-module (wigust packages vnc)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
diff --git a/gnu/packages/wigust-xdisorg.scm b/wigust/packages/xdisorg.scm
index ef64632..ff42d0f 100644
--- a/gnu/packages/wigust-xdisorg.scm
+++ b/wigust/packages/xdisorg.scm
@@ -1,4 +1,4 @@
-(define-module (gnu packages wigust-xdisorg)
+(define-module (wigust packages xdisorg)
   #:use-module (ice-9 popen)
   #:use-module (ice-9 rdelim)
   #:use-module (guix build utils)
diff --git a/gnu/packages/wigust-xorg.scm b/wigust/packages/xorg.scm
index 2fa9815..6ab2c2c 100644
--- a/gnu/packages/wigust-xorg.scm
+++ b/wigust/packages/xorg.scm
@@ -16,7 +16,7 @@
 ;;; 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 (gnu packages wigust-xorg)
+(define-module (wigust packages xorg)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)