diff --git a/config/framework13-system.org b/config/framework13-system.org index 618155a..45865a4 100644 --- a/config/framework13-system.org +++ b/config/framework13-system.org @@ -122,6 +122,7 @@ testing [[https://community.frame.work/t/adaptive-backlight-management-abm/41055 #+BEGIN_SRC scheme ;; (kernel-arguments '("amdgpu.abmlevel=3")) ;; (kernel-arguments '("modprobe.blacklist=hid_sensor_hub")) ;; required prior to 6.7 + (kernel-arguments '("splash" "quiet")) #+END_SRC …and required firmware (should be possible to reduce to specifics) diff --git a/config/framework13-system.scm b/config/framework13-system.scm index 5e1b4db..c021665 100644 --- a/config/framework13-system.scm +++ b/config/framework13-system.scm @@ -1,6 +1,6 @@ ;; -*- mode: scheme; coding: utf-8; -*- ;; -;; tangled from framework13-system.org on 2024-02-17 23:10:06+01:00) +;; tangled from framework13-system.org on 2024-02-23 13:06:55+01:00) (use-modules (gnu) (gnu packages) @@ -53,13 +53,9 @@ (kernel linux-6.7) ;; previously (kernel linux-FWL13) - ;; (kernel-arguments '("amdgpu.abmlevel=3")) - ;; (kernel-arguments '("modprobe.blacklist=hid_sensor_hub")) ;; required prior to 6.7 + (kernel-arguments '("splash" "quiet")) (firmware (list linux-firmware)) - ;; (firmware (list amdgpu-firmware - ;; amd-microcode - ;; realtek-firmware)) (users (cons* (user-account (name "zzk") @@ -214,13 +210,6 @@ COMMIT (allowed-ips '("10.0.0.13/32" "fded:dada::13/128")) (keep-alive 25)))))) - ;; (service gdm-service-type - ;; (gdm-configuration - ;; (auto-suspend? #f) - ;; (xorg-configuration - ;; (xorg-configuration - ;; (keyboard-layout keyboard-layout) - (service sddm-service-type (sddm-configuration (display-server "x11") @@ -241,7 +230,6 @@ COMMIT EndSection")))))) (service plasma-desktop-service-type) - ;; (service gnome-desktop-service-type) (service xfce-desktop-service-type) (service samba-service-type diff --git a/config/home-configuration.org b/config/home-configuration.org index c848897..cac1f57 100644 --- a/config/home-configuration.org +++ b/config/home-configuration.org @@ -148,6 +148,7 @@ Additional channels → nonguix (aka “The GUIX Channel That Shall Not Be Named home-environment-variables-service-type `(("NOTMUCH_PROFILE" . "$XDG_CONFIG_HOME/notmuch/notmuch.conf") ("LD_LIBRARY_PATH" . "$HOME/.guix-profile/lib") + ("GPG_TTY" . "tty") ("SHELL" . ,(file-append zsh "/bin/zsh")))) #+END_SRC @@ -176,7 +177,7 @@ zsh (and/or completions and/or [[https://lists.gnu.org/archive/html/help-guix/20 (service home-gpg-agent-service-type (home-gpg-agent-configuration (pinentry-program - (file-append pinentry-emacs "/bin/pinentry-emacs")) + (file-append pinentry-qt "/bin/pinentry-qt")) (ssh-support? #t))) #+END_SRC diff --git a/config/home-configuration.scm b/config/home-configuration.scm index cea3206..0280269 100644 --- a/config/home-configuration.scm +++ b/config/home-configuration.scm @@ -1,6 +1,6 @@ ;; -*- mode: scheme; coding: utf-8; -*- ;; -;; tangled from home-configuration.org on 2024-02-09 14:00:59+01:00) +;; tangled from home-configuration.org on 2024-02-23 13:06:42+01:00) (use-modules (gnu) (gnu services) @@ -21,7 +21,6 @@ (home-environment (packages (specifications->packages (list - "nordic-theme" "firefox" "emacs-guix" @@ -31,7 +30,7 @@ "nyxt" "python" "git" - "gnupg" + "gnupg" "pinentry-emacs" "pinentry-qt" "crda" "htop" "password-store" @@ -89,6 +88,7 @@ home-environment-variables-service-type `(("NOTMUCH_PROFILE" . "$XDG_CONFIG_HOME/notmuch/notmuch.conf") ("LD_LIBRARY_PATH" . "$HOME/.guix-profile/lib") + ("GPG_TTY" . "tty") ("SHELL" . ,(file-append zsh "/bin/zsh")))) (service home-zsh-service-type @@ -107,15 +107,13 @@ (service home-gpg-agent-service-type (home-gpg-agent-configuration (pinentry-program - (file-append pinentry-emacs "/bin/pinentry-emacs")) + (file-append pinentry-qt "/bin/pinentry-qt")) (ssh-support? #t))) (service home-dotfiles-service-type (home-dotfiles-configuration (directories (list "dotfiles")))) - ;; ssh config in 'dotfiles' - (service home-dbus-service-type) (service home-pipewire-service-type