From 044a018160cf541835f6d20ce7a4bfdf502cac06 Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Thu, 4 Apr 2024 02:08:03 +0200 Subject: [PATCH] . --- config.org | 39 +++++++++++++++++-------------------- config.scm | 14 ++++++------- home/emacs/init.el | 8 ++++---- home/home-configuration.scm | 8 +++++--- 4 files changed, 33 insertions(+), 36 deletions(-) diff --git a/config.org b/config.org index ef5c15b..977d5db 100644 --- a/config.org +++ b/config.org @@ -41,7 +41,6 @@ This is to be run after setting up the partitions. There are many community modules at [[https://whereis.みんな/][Whereis]]. - #+NAME: module-list - gnu - gnu image @@ -62,6 +61,7 @@ There are many community modules at [[https://whereis.みんな/][Whereis]]. - gnu system nss - rosenthal packages wm - zilti packages sway +- zilti packages hyprland - nongnu packages firmware - nongnu packages linux - nongnu system linux-initrd @@ -88,13 +88,13 @@ There are many community modules at [[https://whereis.みんな/][Whereis]]. - bootloaders - certs - containers -- emacs -- emacs-xyz +- freedesktop - fonts - gl - gnome - linux - pciutils +- qt - readline - terminals - version-control @@ -184,28 +184,25 @@ This adds the Nonguix channel. - bluez-firmware - egl-wayland - eglexternalplatform -- emacs -- emacs-desktop-environment - font-terminus - fwupd-nonfree - git - glu - hwdata -- hyprcursor - hyprland - i915-firmware - libdrm - mesa - nss-certs - network-manager +- qtwayland - readline -- swayfx-0.3.2 - tuxedo-keyboard +- xdg-desktop-portal - xdg-desktop-portal-hyprland - xf86-video-amdgpu - xf86-video-intel - xorg-server-xwayland -- xorg-server - amdgpu-firmware - amd-microcode - intel-microcode @@ -245,18 +242,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 | () | -| earlyoom | ((minimum-available-memory 5) (minimum-free-swap 5)) | -| inputattach | () | -| libvirt | ((unix-sock-group "libvirt")) | -| virtlog | () | -| fstrim | () | -| fprintd | () | -| sddm | () | +| Service | Options | +|-----------+--------------------------------------------------| +| tlp | () | +| thermald | ((adaptive? #t)) | +| bluetooth | () | +| earlyoom | ((minimum-available-memory 5) (minimum-free-swap 5)) | +| inputattach | () | +| libvirt | ((unix-sock-group "libvirt")) | +| virtlog | () | +| fstrim | () | +| fprintd | () | +| sddm | () | #+NAME: root-simple-service-block #+begin_src scheme :noweb yes :exports none :results output @@ -270,7 +267,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 diff --git a/config.scm b/config.scm index d6dc149..8b0c4f0 100644 --- a/config.scm +++ b/config.scm @@ -18,6 +18,7 @@ (gnu system nss) (rosenthal packages wm) (zilti packages sway) + (zilti packages hyprland) (nongnu packages firmware) (nongnu packages linux) (nongnu system linux-initrd)) @@ -28,13 +29,13 @@ bootloaders certs containers - emacs - emacs-xyz + freedesktop fonts gl gnome linux pciutils + qt readline terminals version-control @@ -85,28 +86,25 @@ (list bluez-firmware egl-wayland eglexternalplatform - emacs - emacs-desktop-environment font-terminus fwupd-nonfree git glu hwdata - hyprcursor hyprland i915-firmware libdrm mesa nss-certs network-manager + qtwayland readline - swayfx-0.3.2 tuxedo-keyboard + xdg-desktop-portal xdg-desktop-portal-hyprland xf86-video-amdgpu xf86-video-intel xorg-server-xwayland - xorg-server amdgpu-firmware amd-microcode intel-microcode) @@ -199,7 +197,7 @@ (service unattended-upgrade-service-type (unattended-upgrade-configuration (schedule "5 12 * * 1") - #;(channels + (channels #~ (append %default-channels (list (channel diff --git a/home/emacs/init.el b/home/emacs/init.el index 14d9b0e..67f1f0a 100644 --- a/home/emacs/init.el +++ b/home/emacs/init.el @@ -778,10 +778,10 @@ Point must be at the beginning of balanced expression (sexp)." ;; Magit requires 'transient' >= 0.5.0, but due to bad defaults, Emacs' package manager refuses to ;; upgrade this and other built-in packages to higher releases from GNU Elpa. -;; (use-package transient -;; :init -;; (progn (unload-feature 'transient t) -;; (require 'transient))) +(use-package transient + :init + (progn (unload-feature 'transient t) + (require 'transient))) ;; To fix this, you have to add this to your init file: ;; (setq package-install-upgrade-built-in t) ;; You must also make sure the updated version is loaded, by evaluating the `progn` form below. diff --git a/home/home-configuration.scm b/home/home-configuration.scm index 3925468..820d81e 100644 --- a/home/home-configuration.scm +++ b/home/home-configuration.scm @@ -146,6 +146,7 @@ "deluge" "direnv" "emacs-pgtk-xwidgets" + "emacs-desktop-environment" "entr" "eternalterminal" "diff-so-fancy" @@ -153,6 +154,7 @@ "flatpak" "font-libertinus" "font-nerdfont-monaspice" + "font-nerdfont-iosevka-term-slab" "fuzzel" "fzf" "gammastep" @@ -170,6 +172,7 @@ "kitty" "ksshaskpass" "kwayland-integration" + "le-certs" "ledger" "libaacs" "libbdplus" @@ -186,6 +189,7 @@ "password-store" "pass-otp" "pavucontrol" + "perl-mozilla-ca" "pinentry-qt" "process-compose" "pv" @@ -215,8 +219,6 @@ "waybar" "wlogout" "xdg-dbus-proxy" - "xdg-desktop-portal" - "xdg-desktop-portal-wlr" "xdg-utils" "emacs-adaptive-wrap" @@ -321,7 +323,7 @@ (ssh-support? #t) (default-cache-ttl 7200) (default-cache-ttl-ssh 7200) - (extra-content "grab\nallow-emacs-pinentry\nallow-loopback-pinentry"))) + (extra-content "grab\nallow-emacs-pinentry\nallow-loopback-pinentry\n"))) (service home-dbus-service-type) (service home-pipewire-service-type (home-pipewire-configuration