diff --git a/channels.scm b/channels.scm index 24d49e0..f5efc77 100644 --- a/channels.scm +++ b/channels.scm @@ -7,14 +7,14 @@ "897c1a470da759236cc11798f4e0a5f7d4d59fbc" (openpgp-fingerprint "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) - (channel - (name 'emacs-melpa) - (url "https://github.com/babariviere/guix-emacs") - (introduction - (make-channel-introduction - "72ca4ef5b572fea10a4589c37264fa35d4564783" - (openpgp-fingerprint - "261C A284 3452 FB01 F6DF 6CF4 F9B7 864F 2AB4 6F18")))) + (channel + (name 'emacs-melpa) + (url "https://github.com/babariviere/guix-emacs") + (introduction + (make-channel-introduction + "72ca4ef5b572fea10a4589c37264fa35d4564783" + (openpgp-fingerprint + "261C A284 3452 FB01 F6DF 6CF4 F9B7 864F 2AB4 6F18")))) (channel (name 'ziltis-channel) (url "https://gitea.lyrion.ch/zilti/guixchannel")) diff --git a/config.org b/config.org index a28e37c..6198d09 100644 --- a/config.org +++ b/config.org @@ -197,9 +197,11 @@ This adds the Nonguix channel. <>) (list <>) + (list + <>) (list <>) - )) + )) #+end_src *** Simple Services @@ -207,18 +209,18 @@ This adds the Nonguix channel. These services are unmodified, or have just few settings. #+NAME: root-simple-services -| Service | Options | -|--------------------+------------------------------------------------------| -| tlp | () | -| thermald | ((adaptive? #t)) | -| bluetooth | () | -| docker | () | -| earlyoom | ((minimum-available-memory 5) (minimum-free-swap 5)) | -| inputattach | () | -| libvirt | ((unix-sock-group "libvirt")) | -| fstrim | () | -| fprintd | () | -| seatd | () | +| Service | Options | +|-------------+------------------------------------------------------| +| tlp | () | +| thermald | ((adaptive? #t)) | +| bluetooth | () | +| docker | () | +| earlyoom | ((minimum-available-memory 5) (minimum-free-swap 5)) | +| inputattach | () | +| libvirt | ((unix-sock-group "libvirt")) | +| fstrim | () | +| fprintd | () | +| seatd | () | #+NAME: root-simple-service-block #+begin_src scheme :noweb yes :exports none :results output @@ -236,6 +238,16 @@ These services are unmodified, or have just few settings. <>))) #+end_src +*** Hosts File + +#+NAME: hosts-file-service +#+begin_src scheme :noweb no-export + (simple-service 'add-extra-hosts + hosts-service-type + (list (host "127.0.0.1" "l.redsky.io" '("ld.redsky.io")) + (host "::1" "l.redsky.io" '("ld.redsky.io")))) +#+end_src + *** Modified Desktop Services #+NAME: nonguix-pubkey diff --git a/config.scm b/config.scm index 3f7ee5a..114bfaa 100644 --- a/config.scm +++ b/config.scm @@ -15,9 +15,9 @@ (gnu services virtualization) (gnu services xorg) (gnu system nss) + (zilti packages hyprland) (nongnu packages linux) - (nongnu system linux-initrd) - (zilti packages hyprland)) + (nongnu system linux-initrd)) (use-service-modules desktop xorg) @@ -180,6 +180,11 @@ (program (file-append swaylock-effects "/bin/swaylock")) (using-setuid? #f)))) + (list + (simple-service 'add-extra-hosts + hosts-service-type + (list (host "127.0.0.1" "l.redsky.io" '("ld.redsky.io")) + (host "::1" "l.redsky.io" '("ld.redsky.io"))))) (list (service unattended-upgrade-service-type (unattended-upgrade-configuration @@ -194,17 +199,17 @@ "897c1a470da759236cc11798f4e0a5f7d4d59fbc" (openpgp-fingerprint "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) - (channel - (name 'emacs-melpa) - (url "https://github.com/babariviere/guix-emacs") - (introduction - (make-channel-introduction - "72ca4ef5b572fea10a4589c37264fa35d4564783" - (openpgp-fingerprint - "261C A284 3452 FB01 F6DF 6CF4 F9B7 864F 2AB4 6F18")))) + (channel + (name 'emacs-melpa) + (url "https://github.com/babariviere/guix-emacs") + (introduction + (make-channel-introduction + "72ca4ef5b572fea10a4589c37264fa35d4564783" + (openpgp-fingerprint + "261C A284 3452 FB01 F6DF 6CF4 F9B7 864F 2AB4 6F18")))) (channel (name 'ziltis-channel) (url "https://gitea.lyrion.ch/zilti/guixchannel")) %default-channels))))) - )) + )) (name-service-switch %mdns-host-lookup-nss)) diff --git a/home/emacs/init.el b/home/emacs/init.el index e6495a3..e382996 100644 --- a/home/emacs/init.el +++ b/home/emacs/init.el @@ -670,7 +670,9 @@ Point must be at the beginning of balanced expression (sexp)." "clojure-lsp" :initializationOptions (:preferences - (:includeInlayParameterNameHints + (:inlayHintProvider + t + :includeInlayParameterNameHints "all" :includeInlayParameterNameHintsWhenArgumentMatchesName t