Merge home/system packages (temp?), use system home service

1 files changed, 59 insertions, 62 deletions

diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm
index 91d41a3..1b1c8df 100644
--- a/.config/guix/modules/base.scm
+++ b/.config/guix/modules/base.scm
@@ -1,71 +1,68 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Provides a set of my preferred ;;
+;; programs and services for any  ;;
+;; system                         ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
 (define-module (base)
   #:use-module (gnu packages)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu services)
-  #:use-module (guix gexp)
-  #:use-module (gnu home services)
-  #:use-module (gnu home services shepherd)
-  #:use-module (gnu home services dict)
-  #:use-module (gnu home services ssh)
-  #:use-module (gnu home services gnupg))
+  #:use-module (gnu services base)
+  #:use-module (gnu services file-sharing)
+  #:use-module (gnu services networking)
+  #:use-module (gnu services ssh)
+  #:use-module (gnu system)
+  #:export (bd-base-system-packages
+            bd-base-system-services))
 
 
-;; List of packages that will show up
-;; under ~/.guix-home/profile.
-(define-public desktop-packages
-  (map specification->package
-       (list
-        "aspell"
-        "aspell-dict-en"
-        "flameshot"
-        "font-google-noto-emoji"
-        "picom"
-        "rsync"
-        "stow"
-        "transmission"
-        "xdotool"
-        "xf86-input-libinput"
-        "xf86-video-fbdev"
-        "xinit"
-        "xmodmap"
-        "xorg-server"
-        "xrdb"
-        "xset"
-        )))
+(define dev
+  '(
+    "cryptsetup"
+    "curl"
+    "emacs"
+    "git"
+    "jq"
+    "netcat"
+    "recutils"
+    "rsync"
+    "sbcl"
+    "stow"
+    "texlive"
+    "vim"
+    ))
 
-(define-public program-packages
-  (map specification->package
-       (list
-        "feh"
-        "ffmpeg"
-        "gimp"
-        "gnupg"
-        "jq"
-        "librewolf"
-        "mpv"
-        "netcat"
-        "notmuch"
-        "offlineimap3"
-        "sbcl"
-        "texlive"
-        "xpdf" ; pdftotext
-        "xprop"
-        "yt-dlp"
-        "zathura"
-        "zathura-pdf-poppler")))
+(define comm
+  '(
+    "aspell"
+    "aspell-dict-en"
+    "gnupg"
+    "notmuch"
+    "offlineimap3"
+    "pass-otp"
+    "password-store"
+    "pinentry"
+    "transmission"
+    "xpdf" ; pdftotext
+    "yt-dlp"
+    ))
 
+(define bd-base-system-packages
+  `(,@(map specification->package
+           (append!
+            dev
+            comm
+            ))
+    ,@%base-packages))
 
-;; Below is a list of Home services.  To search for available
-;; services, run 'guix home search KEYWORD' in a terminal.
-(define-public base-services
-  (list
-   (service home-shepherd-service-type)
-   (service home-dicod-service-type)
-   (simple-service 'themes
-                   home-files-service-type
-                   `((".config/gtk-2.0/settings.ini"
-                      ,(plain-file "settings.ini" "[Settings]
-gtk-application-prefer-dark-theme=1\n"))
-                     (".config/gtk-3.0/settings.ini"
-                      ,(plain-file "settings.ini" "[Settings]
-gtk-application-prefer-dark-theme=1\n"))))))
+(define bd-base-system-services
+  `(,(service openssh-service-type
+              (openssh-configuration
+               (x11-forwarding? #t)
+               (permit-root-login 'prohibit-password)
+               (password-authentication? #f)))
+    ,(service tor-service-type)
+    ,(service transmission-daemon-service-type)
+    ,@%base-services))