3 files changed, 84 insertions, 90 deletions

diff --git a/guix/jd/desktops/base.scm b/guix/jd/desktops/base.scm
index 7618257..b9fc286 100644
--- a/guix/jd/desktops/base.scm
+++ b/guix/jd/desktops/base.scm
@@ -8,75 +8,86 @@
 (use-service-modules cups desktop networking ssh xorg
                      docker virtualization pm sound)
 
-;; Odin is a base operating system
-(define-public odin
-  (operating-system
-   (kernel linux)
-   (initrd microcode-initrd)
-   (firmware (list linux-firmware))
+(define-public %jd-base-user-accounts
+  (cons* (user-account
+          (name "jakub")
+          (comment "Jakub Dlugosz")
+          (group "users")
+          (home-directory "/home/jakub")
+          (supplementary-groups '("wheel"
+                                  "netdev"
+                                  "audio"
+                                  "docker"
+                                  "kvm"
+                                  "libvirt"
+                                  "video")))
+         %base-user-accounts))
 
-   (locale "en_US.utf8")
-   (timezone "Europe/Warsaw")
-   (keyboard-layout (keyboard-layout "pl"))
-   (host-name "odin")
-   
-   (users (cons* (user-account
-                  (name "jakub")
-                  (comment "Jakub Dlugosz")
-                  (group "users")
-                  (home-directory "/home/jakub")
-                  (supplementary-groups '("wheel" "netdev" "audio" "video")))
-                 %base-user-accounts))
+(define-public %jd-base-packages
+  (append
+   (specifications->packages '("emacs"
+                               "emacs-exwm"
+                               "stow"
+                               "bluez"
+                               "bluez-alsa"
+                               "exfat-utils"
+                               "git"
+                               "xf86-input-libinput"
+                               "intel-vaapi-driver"
+                               "libva-utils"
+                               "nss-certs"))
+   %base-packages))
 
-   (packages (append (specifications->packages '("emacs"
-                                                 "emacs-exwm"
-                                                 
-                                                 "brightnessctl"
+(define-public %jd-base-services
+  (append (list
+           (service openssh-service-type)
 
-                                                 "bluez"
-                                                 "bluez-alsa"
+           (service network-manager-service-type
+                    (network-manager-configuration
+                     (vpn-plugins (list
+                                   network-manager-pptp))))
+           
+           (service bluetooth-service-type
+                    (bluetooth-configuration
+                     (auto-enable? #t)))
 
-                                                 "xf86-input-libinput" 
-                                                 
-                                                 "nss-certs"))
+           (service docker-service-type)
+           (service libvirt-service-type
+                    (libvirt-configuration
+                     (unix-sock-group "libvirt")
+                     (tls-port "16555")))
 
-                     %base-packages))
-   
-   (services
-    (append (list
-             (service xfce-desktop-service-type)
-             (service openssh-service-type)
-             (set-xorg-configuration
-              (xorg-configuration (keyboard-layout keyboard-layout)))
+           (service sane-service-type)
+           (service cups-service-type
+                    (cups-configuration
+                     (web-interface? #t)))
 
-             (service network-manager-service-type
-                      (network-manager-configuration
-                       (vpn-plugins (list
-                                     network-manager-pptp))))
-             
-             (service bluetooth-service-type
-                      (bluetooth-configuration
-                       (auto-enable? #t)))
+           (service thermald-service-type)
+           (service tlp-service-type
+                    (tlp-configuration
+                     (cpu-boost-on-ac? #t)
+                     (wifi-pwr-on-bat? #t)))
 
-             (service docker-service-type)
-             (service libvirt-service-type
-                      (libvirt-configuration
-                       (unix-sock-group "libvirt")
-                       (tls-port "16555")))
+           (service slim-service-type (slim-configuration
+                                       (display ":0")
+                                       (vt "vt7"))))
 
-             (service sane-service-type)
-             (service cups-service-type
-                      (cups-configuration
-                       (web-interface? #t)))
+          (modify-services %desktop-services
+                           (delete network-manager-service-type)
+                           (delete gdm-service-type))))
 
-             (service thermald-service-type)
-             (service tlp-service-type
-                      (tlp-configuration
-                       (cpu-boost-on-ac? #t)
-                       (wifi-pwr-on-bat? #t))))
+;; Odin is a base operating system
+(define-public odin-free
+  (operating-system
+   (locale "en_US.utf8")
+   (timezone "Europe/Warsaw")
+   (keyboard-layout (keyboard-layout "pl"))
+   (host-name "odin")
+   
+   (users %jd-base-user-accounts)
+   (packages %jd-base-packages)
+   (services %jd-base-services)
 
-            (modify-services %desktop-services
-                             (delete network-manager-service-type))))
    (bootloader (bootloader-configuration
                 (bootloader grub-bootloader)
                 (targets (list "/boot/efi"))
@@ -88,3 +99,10 @@
                          (type "tmpfs")
                          (check? #f))
                         %base-file-systems))))
+
+(define-public odin-non-free
+  (operating-system
+   (inherit odin-free)
+   (kernel linux)
+   (initrd microcode-initrd)
+   (firmware (list linux-firmware))))
diff --git a/guix/jd/desktops/mimir.scm b/guix/jd/desktops/mimir.scm
index a635831..185df08 100644
--- a/guix/jd/desktops/mimir.scm
+++ b/guix/jd/desktops/mimir.scm
@@ -1,11 +1,16 @@
 (define-module (jd desktops mimir)
   #:use-module (jd desktops base)
-  #:use-module (gnu))
+  #:use-module (gnu)
+  #:use-module (gnu services desktop))
 
 
 (operating-system
- (inherit odin)
+ (inherit odin-non-free)
  (host-name "mimir")
+
+ (services (cons
+            (service xfce-desktop-service-type)
+            %jd-base-services))
  
  (bootloader (bootloader-configuration
               (bootloader grub-efi-bootloader)
diff --git a/guix/jd/desktops/viking.scm b/guix/jd/desktops/viking.scm
deleted file mode 100644
index 80ddb88..0000000
--- a/guix/jd/desktops/viking.scm
+++ /dev/null
@@ -1,29 +0,0 @@
-(define-module (jd desktops mimir)
-  #:use-module (jd desktops base)
-  #:use-module (gnu))
-
-(operating-system
- (inherit odin)
- (host-name "mimir")
- 
- (bootloader (bootloader-configuration
-              (bootloader grub-efi-bootloader)
-              (targets (list "/boot/efi"))))
-
- 
- (swap-devices (list (swap-space
-                      (target (uuid
-                               "658793cb-d374-426e-bcd5-00d032b003a0")))))
-
- (file-systems (cons* (file-system
-                       (mount-point "/boot/efi")
-                       (device (uuid "64D8-134F"
-                                     'fat32))
-                       (type "vfat"))
-                      (file-system
-                       (mount-point "/")
-                       (device (uuid
-                                "1f9304b0-5623-4248-ab66-534b5ac85876"
-                                'ext4))
-                       (type "ext4")) %base-file-systems)))
-