diff options
| -rw-r--r-- | kolwynia/home/bdunahu.scm | 9 | ||||
| -rwxr-xr-x | kolwynia/home/bdunahu/files/.local/bin/xxinit | 6 | ||||
| -rw-r--r-- | kolwynia/os/hel.scm | 37 |
3 files changed, 39 insertions, 13 deletions
diff --git a/kolwynia/home/bdunahu.scm b/kolwynia/home/bdunahu.scm index 0a1f80a..1bf4572 100644 --- a/kolwynia/home/bdunahu.scm +++ b/kolwynia/home/bdunahu.scm @@ -52,9 +52,12 @@ (services (list (service home-shepherd-service-type) (service home-dicod-service-type) - ;; TODO: causes EXWM XELB: Authorization required, - ;; but no authorization protocol specified. - ;; ,(service home-startx-command-service-type) + (if hel? (service home-startx-command-service-type + (xorg-configuration + (modules (cons (specification->package "nvda") + %default-xorg-modules)) + (drivers '("nvidia")))) + (service home-startx-command-service-type)) (service home-channels-service-type (cons* channel:guix channel:tanelorn diff --git a/kolwynia/home/bdunahu/files/.local/bin/xxinit b/kolwynia/home/bdunahu/files/.local/bin/xxinit deleted file mode 100755 index 1ec9a82..0000000 --- a/kolwynia/home/bdunahu/files/.local/bin/xxinit +++ /dev/null @@ -1,6 +0,0 @@ - #!/bin/sh - -DIR=/home/bdunahu/.guix-home/profile/ -$DIR/bin/xinit -- $DIR/bin/Xorg :0 vt1 -keeptty \ - -configdir $DIR/share/X11/xorg.conf.d \ - -modulepath $DIR/lib/xorg/modules diff --git a/kolwynia/os/hel.scm b/kolwynia/os/hel.scm index e9b6289..0aadc0f 100644 --- a/kolwynia/os/hel.scm +++ b/kolwynia/os/hel.scm @@ -1,13 +1,18 @@ (define-module (kolwynia os hel) #:use-module (gnu) #:use-module (gnu packages) - #:use-module (gnu packages linux) #:use-module (gnu packages gnome) + #:use-module (gnu packages linux) #:use-module (gnu packages networking) #:use-module (gnu packages xorg) #:use-module (gnu services) + #:use-module (gnu services base) #:use-module (gnu services guix) #:use-module (guix gexp) + #:use-module (guix store) + #:use-module (nongnu packages linux) + #:use-module (nongnu services nvidia) + #:use-module (nongnu system linux-initrd) #:use-module (kolwynia os ymir) #:use-module ((kolwynia os hel file-systems) #:prefix fs:) @@ -19,7 +24,7 @@ ;;; Commentary: ;;; -;;; hel is a intel i5 with RTX 1050ti +;;; hel is a 6th gen intel i5 with RTX 1050ti ;;; ;;; Code: @@ -27,7 +32,11 @@ (inherit ymir) (host-name "hel") - (packages (cons* xf86-video-nouveau pkg:ymir-packages)) + (kernel linux) + (initrd microcode-initrd) + (firmware (list linux-firmware)) + + (kernel-arguments '("modprobe.blacklist=nouveau")) (services (cons* @@ -37,7 +46,27 @@ (service guix-home-service-type `((,users:bdunahu-str ,bdunahu))) - (operating-system-user-services ymir))) + (service nvidia-service-type) + + (modify-services (operating-system-user-services ymir) + (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))))))) (mapped-devices fs:%mapped-devices) (file-systems fs:%file-systems)) |