vpn package specification addition, moved emacs-manifest.scm

5 files changed, 33 insertions, 29 deletions

diff --git a/.config/guix/emacs-manifest.scm b/.config/guix/emacs-manifest.scm
new file mode 100644
index 0000000..71b66d9
--- /dev/null
+++ b/.config/guix/emacs-manifest.scm
@@ -0,0 +1,22 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Below defines the emacs packages required for ;;
+;; associated init.el                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(specifications->manifest
+ '(
+   "emacs-all-the-icons"
+   "emacs-auctex"
+   "emacs-company"
+   "emacs-ednc"
+   "emacs-emms"
+   "emacs-exwm"
+   "emacs-guix"
+   "emacs-magit"
+   "emacs-marginalia"
+   "emacs-orderless"
+   "emacs-org-roam"
+   "emacs-password-store"
+   "emacs-pinentry"
+   "emacs-slime"
+   "emacs-vertico"))
diff --git a/.config/guix/hati.scm b/.config/guix/hati.scm
index 70b9a6b..3684100 100644
--- a/.config/guix/hati.scm
+++ b/.config/guix/hati.scm
@@ -11,7 +11,6 @@
   #:use-module (gnu home services)
   #:use-module (gnu services)
   #:use-module (guix gexp)
-  #:use-module (emacs)
   #:use-module (xdg)
   #:use-module (shell)
   #:use-module (ssh)
@@ -52,8 +51,7 @@
   (home-environment
    (packages
     `(,@desktop-packages
-      ,@program-packages
-      ,@emacs-packages))
+      ,@program-packages))
 
    (services
     `(,@xdg-service
diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm
index 74ef5e4..566cfcc 100644
--- a/.config/guix/modules/base.scm
+++ b/.config/guix/modules/base.scm
@@ -44,6 +44,15 @@
         "zathura"
         "zathura-pdf-poppler")))
 
+(define-public vpn-packages
+  (map specification->package
+       (list
+        "glib-networking"
+        "gp-saml-gui"
+        "gsettings-desktop-schemas"
+        "openconnect"
+        "webkitgtk-with-libsoup2")))
+
 
 ;; Below is a list of Home services.  To search for available
 ;; services, run 'guix home search KEYWORD' in a terminal.
diff --git a/.config/guix/modules/emacs.scm b/.config/guix/modules/emacs.scm
deleted file mode 100644
index bb08e7e..0000000
--- a/.config/guix/modules/emacs.scm
+++ /dev/null
@@ -1,24 +0,0 @@
-(define-module (emacs)
-  #:use-module (gnu packages))
-
-
-;; List of packages that will show up
-;; under ~/.guix-home/profile.
-(define-public emacs-packages
-  (map specification->package
-       (list
-        "emacs-all-the-icons"
-        "emacs-auctex"
-        "emacs-company"
-        "emacs-ednc"
-        "emacs-emms"
-        "emacs-exwm"
-        "emacs-guix"
-        "emacs-magit"
-        "emacs-marginalia"
-        "emacs-orderless"
-        "emacs-org-roam"
-        "emacs-password-store"
-        "emacs-pinentry"
-        "emacs-slime"
-        "emacs-vertico")))
diff --git a/.config/guix/vali.scm b/.config/guix/vali.scm
index edcb62f..7df3745 100644
--- a/.config/guix/vali.scm
+++ b/.config/guix/vali.scm
@@ -11,7 +11,6 @@
   #:use-module (gnu home services)
   #:use-module (gnu services)
   #:use-module (guix gexp)
-  #:use-module (emacs)
   #:use-module (xdg)
   #:use-module (shell)
   #:use-module (ssh)
@@ -55,7 +54,7 @@
    (packages
     `(,@desktop-packages
       ,@program-packages
-      ,@emacs-packages))
+      ,@vpn-packages))
 
    (services
     `(,@xdg-service