2 files changed, 51 insertions, 20 deletions

diff --git a/guix/jd/desktops/base.scm b/guix/jd/desktops/base.scm
index 656c622..13bc5af 100644
--- a/guix/jd/desktops/base.scm
+++ b/guix/jd/desktops/base.scm
@@ -15,7 +15,8 @@
   #:use-module (nongnu packages linux)
   #:use-module (nongnu system linux-initrd))
 
-(use-package-modules wm gnome gnupg networking)
+(use-package-modules wm gnome gnupg networking virtualization
+                     lisp lisp-xyz)
 (use-service-modules cups desktop networking ssh xorg
                      docker virtualization pm sound dbus)
 
@@ -46,12 +47,13 @@
                       ("VISUAL" . "emacsclient")
                       ("EDITOR" . "emacsclient")
                       ("PATH" . "$HOME/.bin:$HOME/.npm-global/bin:$PATH")
-                      ("XDG_DATA_DIRS" . "$XDG_DATA_DIRS:$HOME/.local/share/flatpak/exports/share")))
+                      ("XDG_DATA_DIRS" . "$XDG_DATA_DIRS:$HOME/.local/share/flatpak/exports/share")
+                      ("SBCL_HOME" . "/run/current-system/profile/lib/sbcl/")))
 
     (service home-gpg-agent-service-type
              (home-gpg-agent-configuration
               (pinentry-program
-                (file-append pinentry "/bin/pinentry"))
+               (file-append pinentry "/bin/pinentry"))
               (ssh-support? #t)
               (default-cache-ttl 28800)
               (max-cache-ttl 28800)
@@ -83,6 +85,26 @@
                             )))
    %base-user-accounts))
 
+(define-public %stumpwm-packages
+  (list sbcl
+        sbcl-dbus
+        stumpwm+slynk
+
+        sbcl-stumpwm-screenshot
+        sbcl-stumpwm-pamixer
+        sbcl-stumpwm-pass
+
+        sbcl-stumpwm-cpu
+        sbcl-stumpwm-mem
+        sbcl-stumpwm-net
+        sbcl-stumpwm-battery-portable
+        sbcl-stumpwm-stumptray
+
+        sbcl-drakma
+        sbcl-yason
+
+        (list stumpwm "lib")))
+
 (define-public %jd-base-packages
   (append
    (specifications->packages '("emacs"
@@ -96,18 +118,25 @@
                                "intel-vaapi-driver"
                                "libva-utils" ;; vainfo
                                "nss-certs"))
+   %stumpwm-packages
    %base-packages))
 
+
 (define-public %jd-base-services
   (cons*
    (service openssh-service-type)
 
+   (set-xorg-configuration
+    (xorg-configuration                 ;for Xorg
+     (keyboard-layout (keyboard-layout "pl"))))
+
    (service network-manager-service-type
             (network-manager-configuration
              (vpn-plugins (list
                            network-manager-pptp))))
    
-   (simple-service 'blueman dbus-root-service-type (list blueman))
+   (simple-service 'dbus-packages dbus-root-service-type (list blueman
+                                                               virt-manager))
    (service bluetooth-service-type
             (bluetooth-configuration
              (auto-enable? #t)))
@@ -116,6 +145,7 @@
    (service libvirt-service-type
             (libvirt-configuration
              (unix-sock-group "libvirt")))
+   (service virtlog-service-type)
 
    (service cups-service-type
             (cups-configuration
@@ -129,7 +159,6 @@
    
    polkit-network-manager-service
    
-   (service lxqt-desktop-service-type) ;; Just in case, if Emacs doesn't want to work.
    (modify-services %desktop-services
                     (delete network-manager-service-type))))
 
diff --git a/guix/jd/desktops/berserker.scm b/guix/jd/desktops/berserker.scm
index 37135dc..ed673db 100755
--- a/guix/jd/desktops/berserker.scm
+++ b/guix/jd/desktops/berserker.scm
@@ -13,25 +13,27 @@
    (host-name "berserker")
 
    (bootloader (bootloader-configuration
-                (bootloader grub-efi-bootloader)
-                (targets (list "/boot/efi"))))
-   
-   (mapped-devices (list (mapped-device
-                          (source (uuid
-                                   "ef754148-6f23-4d7e-92b4-7abbfe0ae201"))
-                          (target "cryptroot")
-                          (type luks-device-mapping))))
+                (bootloader grub-efi-bootloader)
+                (targets (list "/boot/efi"))))
+
+   (swap-devices (list (swap-space
+                        (target (uuid
+                                 "70ee2477-66ff-4856-aebf-8a77053c4462")))))
 
    (file-systems (cons* (file-system
-                         (mount-point "/boot/efi")
-                         (device (uuid "695E-FE22"
+                         (mount-point "/boot/efi")
+                         (device (uuid "BE9B-69F0"
                                        'fat32))
-                         (type "vfat"))
+                         (type "vfat"))
+
                         (file-system
-                         (mount-point "/")
-                         (device "/dev/mapper/cryptroot")
-                         (type "ext4")
-                         (dependencies mapped-devices)) %base-file-systems))))
+                         (mount-point "/")
+                         (device (uuid
+                                  "d8783299-c180-4ca3-9c56-9826797f928d"
+                                  'ext4))
+                         (type "ext4"))
+
+                        %base-file-systems))))
 
 
 (if (getenv "JD_HOME") home system)