diff --git a/channels.scm b/channels.scm index d8f67bf..9198ef5 100644 --- a/channels.scm +++ b/channels.scm @@ -28,10 +28,4 @@ "13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7")))) (channel (name 'ziltis-channel) - (url "https://gitea.lyrion.ch/zilti/guixchannel") - #;(introduction - (make-channel-introduction - "2aa768893d7da14d9831d45e6f1b1625240ff222" - (openpgp-fingerprint - "37F6 55BA F43B C0FF 300A 91A1 B389 76E8 2C9D AE42"))))) - ) + (url "https://gitea.lyrion.ch/zilti/guixchannel")))) diff --git a/config.org b/config.org index 8f73cc1..1a02b03 100644 --- a/config.org +++ b/config.org @@ -91,6 +91,7 @@ There are many community modules at [[https://whereis.みんな/][Whereis]]. - fonts - gl - gnome +- kde-frameworks - linux - pciutils - qt @@ -166,13 +167,7 @@ This adds the Nonguix channel. "13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7")))) (channel (name 'ziltis-channel) - (url "https://gitea.lyrion.ch/zilti/guixchannel") - #;(introduction - (make-channel-introduction - "2aa768893d7da14d9831d45e6f1b1625240ff222" - (openpgp-fingerprint - "37F6 55BA F43B C0FF 300A 91A1 B389 76E8 2C9D AE42"))))) - ) + (url "https://gitea.lyrion.ch/zilti/guixchannel")))) #+end_src #+RESULTS: root-channels @@ -194,6 +189,7 @@ This adds the Nonguix channel. - mesa - nss-certs - network-manager +- kwayland - qtwayland - readline - tuxedo-keyboard @@ -202,6 +198,7 @@ This adds the Nonguix channel. - xf86-video-amdgpu - xf86-video-intel - xorg-server-xwayland +- wayland - amdgpu-firmware - amd-microcode - intel-microcode @@ -225,8 +222,6 @@ This adds the Nonguix channel. <> <> (list polkit-wheel-service) - #;(list - <>) (list <>) (list @@ -266,7 +261,7 @@ These services are unmodified, or have just few settings. (service unattended-upgrade-service-type (unattended-upgrade-configuration (schedule "5 12 * * 1") - (channels #~ + #;(channels #~ <>))) #+end_src @@ -330,37 +325,6 @@ These services are unmodified, or have just few settings. %default-authorized-guix-keys))))) #+end_src -*** Greeter Service - -=greetd= is a broken mess, yet here we are. - -#+NAME: greeter-service -#+begin_src scheme - (service greetd-service-type - (greetd-configuration - (greeter-supplementary-groups - (list "video" "input")) - (terminals - (list - (greetd-terminal-configuration - (terminal-vt "1")) - (greetd-terminal-configuration - (terminal-vt "2")) - (greetd-terminal-configuration - (terminal-vt "3")) - (greetd-terminal-configuration - (terminal-vt "4")) - #;(greetd-terminal-configuration - (terminal-vt "7") - (terminal-switch #t) - (default-session-command - (greetd-wlgreet-session - (command - (file-append swayfx "/bin/sway"))))) - (greetd-terminal-configuration - (terminal-vt "8")))))) -#+end_src - *** Screen Locker Service For some reason, this service runs on root level for Guix. diff --git a/config.scm b/config.scm index 7a4108b..bcc1b1b 100644 --- a/config.scm +++ b/config.scm @@ -34,6 +34,7 @@ fonts gl gnome + kde-frameworks linux pciutils qt @@ -98,6 +99,7 @@ mesa nss-certs network-manager + kwayland qtwayland readline tuxedo-keyboard @@ -106,6 +108,7 @@ xf86-video-amdgpu xf86-video-intel xorg-server-xwayland + wayland amdgpu-firmware amd-microcode intel-microcode) @@ -199,7 +202,7 @@ (service unattended-upgrade-service-type (unattended-upgrade-configuration (schedule "5 12 * * 1") - (channels #~ + #;(channels #~ (append %default-channels (list (channel @@ -230,11 +233,5 @@ "13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7")))) (channel (name 'ziltis-channel) - (url "https://gitea.lyrion.ch/zilti/guixchannel") - #;(introduction - (make-channel-introduction - "2aa768893d7da14d9831d45e6f1b1625240ff222" - (openpgp-fingerprint - "37F6 55BA F43B C0FF 300A 91A1 B389 76E8 2C9D AE42"))))) - ))))))) + (url "https://gitea.lyrion.ch/zilti/guixchannel")))))))))) (name-service-switch %mdns-host-lookup-nss)) diff --git a/home/home-configuration.scm b/home/home-configuration.scm index 69375f6..11bfad9 100644 --- a/home/home-configuration.scm +++ b/home/home-configuration.scm @@ -192,8 +192,10 @@ "pavucontrol" "perl-mozilla-ca" "pinentry-qt" + "plasma-wayland-protocols" "process-compose" - "qtwayland" + "qt5ct" + "qtwayland@5.15.10" "pv" "rsync" "rust" @@ -269,6 +271,7 @@ "emacs-paredit" "emacs-paren-face" "emacs-pass" + "emacs-pinentry" "emacs-seq" "emacs-tempel" "emacs-transient"