base, demiurge: move desktop-specific into demiurge for now

will later put into separate desktop.scm for laptop

4 files changed, 16 insertions, 7 deletions

diff --git a/demiurge.pub b/demiurge.pub
new file mode 100644
index 0000000..d380698
--- /dev/null
+++ b/demiurge.pub
@@ -0,0 +1,6 @@
+(public-key
+ (ecc
+  (curve Ed25519)
+  (q #D421783A5EE3354CA5AD80389D6257BD35926E5248FF9087E4EC9679AF815B7B#)
+  )
+ )
diff --git a/epistemia/deploy.scm b/epistemia/deploy.scm
index 6f19eb0..5a46bae 100644
--- a/epistemia/deploy.scm
+++ b/epistemia/deploy.scm
@@ -5,7 +5,6 @@
                          ;; (host-name "saklas")
                          (host-name "162.55.242.220")
                          (system "x86_64-linux")
-                         (user "vin")
                          (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILisyUFXdEQHKE42FavKbHHJQJpQAuzbfkmjHrBqZtW2")
                          (identity "/data/ssh/id_ed25519")
                          (safety-checks? #f)))))
diff --git a/epistemia/systems/base-system.scm b/epistemia/systems/base-system.scm
index 5993c0d..86abafd 100644
--- a/epistemia/systems/base-system.scm
+++ b/epistemia/systems/base-system.scm
@@ -24,9 +24,10 @@
 
     (packages %base-packages)
 
-    (services (append (list (service openssh-service-type)
-                            (service alsa-service-type
-                                     (alsa-configuration (pulseaudio? #f)))
-                            (service ladspa-service-type
-                                     (ladspa-configuration (plugins (list lsp-plugins)))))
-                      %base-services))))
+    (services (modify-services %base-services
+                (guix-service-type config =>
+                                   (guix-configuration
+                                     (inherit config)
+                                     (authorized-keys
+                                      (append (list (local-file "../../demiurge.pub"))
+                                              %default-authorized-guix-keys))))))))
diff --git a/epistemia/systems/demiurge.scm b/epistemia/systems/demiurge.scm
index 33fc828..95e4f7e 100644
--- a/epistemia/systems/demiurge.scm
+++ b/epistemia/systems/demiurge.scm
@@ -5,6 +5,7 @@
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages machine-learning)
+  #:use-module (gnu packages music)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages vpn)
   #:use-module (gnu services dbus) ; temp
@@ -146,6 +147,8 @@
                                                      `(("vin" ,(local-file "/data/ssh/id_ed25519.pub"))
                                                        ("root" ,(local-file "/data/ssh/id_ed25519.pub"))))
                                                     (extra-content "\
+                                           (service ladspa-service-type
+                                                    (ladspa-configuration (plugins (list lsp-plugins))))
                                        ListenAddress 127.0.0.1:22
                                        ListenAddress 192.168.1.2:22
                                        ListenAddress 10.0.13.2:22")))