Changeset 8f6be2b in dotfiles

Timestamp:

Nov 25, 2023, 2:21:29 PM (12 months ago)

Author:

Mikhail Kirillov <w96k@…>

Branches:

master

Children:

6782e9b

Parents:

8676811

Message:

Update guix setup with nonguix

File:

• guix/desktop.scm (modified) (4 diffs)

guix/desktop.scm

@@ -10 +10 @@
 ;; Indicate which modules to import to access the variables
 ;; used in this configuration.
-(use-modules (gnu))
+(use-modules (gnu)
+             (nongnu packages linux)
+             (nongnu system linux-initrd))
 (use-service-modules cups desktop networking ssh xorg)
 
@@ -16 +18 @@
   (locale "en_US.utf8")
   (timezone "Asia/Tbilisi")
+
+  (kernel linux)
+  (initrd microcode-initrd)
+  (firmware (list linux-firmware))
+
   (keyboard-layout (keyboard-layout "us,ru"
                                     #:options '("grp:shifts_toggle" "ctrl:nocaps")))
-  (host-name "wkz-desktop")
+  (host-name "wkz-guix")
 
   ;; The list of user accounts ('root' is implicit).
@@ -32 +39 @@
   ;; under their own account: use 'guix search KEYWORD' to search
   ;; for packages and 'guix install PACKAGE' to install a package.
-  (packages (append (list (specification->package "xterm")
+  (packages (append (list (specification->package "ratpoison")
+                          (specification->package "xterm")
                           (specification->package "emacs")
                           (specification->package "emacs-exwm")
-                          (specification->package "emacs-guix")
-                          (specification->package "git")
-                          (specification->package "os-prober")
                           (specification->package
                            "emacs-desktop-environment")
@@ -46 +51 @@
   ;; services, run 'guix system search KEYWORD' in a terminal.
   (services
-   (append (list
-            (service openssh-service-type)
-            (service tor-service-type)
-
-           
-
-           ;; (remove (lambda (service)
-           ;;        (eq? (service-kind service) gdm-service-type))
-           ;;      %desktop-services)
-
-           (service slim-service-type
+   (append (list (service tor-service-type)
+                 (service openssh-service-type)
+                 (service slim-service-type
                     (slim-configuration
                      (xorg-configuration
                       (xorg-configuration
-                       (drivers '("modesetting"))
-                       (keyboard-layout keyboard-layout))))))
-           
-           
+                       (keyboard-layout keyboard-layout)))))
+                 
+                 ;; (set-xorg-configuration
+                 ;;  (xorg-configuration (keyboard-layout keyboard-layout)))
+
+                 )
+
            (modify-services %desktop-services
-                            (delete gdm-service-type))))
+                            (guix-service-type config => (guix-configuration
+                                               (inherit config)
+                                               (substitute-urls
+                                                (append (list "https://substitutes.nonguix.org")
+                                                        %default-substitute-urls))
+                                               (authorized-keys
+                                                (append (list (plain-file "non-guix.pub"
+"
+(public-key 
+ (ecc 
+  (curve Ed25519)
+  (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)
+  )
+ )
+"))
+                                                        %default-authorized-guix-keys))))
+                            
+                            (delete gdm-service-type))
 
+           ))
   (bootloader (bootloader-configuration
                 (bootloader grub-efi-bootloader)
                 (targets (list "/boot/efi"))
-                (keyboard-layout keyboard-layout)
-                (menu-entries
-                 (list
-                  (menu-entry
-                   (label "Proprietary work system")
-                   (linux "/boot/vmlinuz-6.2.0-32-generic")
-                   (linux-arguments '("root=UUID=908bea86-3c60-4f30-a3b0-c224912bf4a9"))
-                   ;; (linux-arguments '("root=(hd2,gpt2)"))
-                   (device (uuid "908bea86-3c60-4f30-a3b0-c224912bf4a9" 'ext4))
-                   (initrd "/boot/initrd.img-6.2.0-32-generic"))
-                  ))))
-  
+                (keyboard-layout keyboard-layout)))
   (mapped-devices (list (mapped-device
                           (source (uuid
-                                   "fd9bdf14-371d-4767-90f4-5d51111a2329"))
+                                   "6cfe9eed-8cdd-43da-9b9f-cec6f8ec538b"))
                           (target "cryptroot")
                           (type luks-device-mapping))))