From 7d442a62a151fcd2dc57e6f7c58eda184ce78664 Mon Sep 17 00:00:00 2001 From: nik gaffney Date: Sat, 10 Feb 2024 16:59:21 +0100 Subject: [PATCH] Put in earplugs --- config/framework13-system.org | 24 ++++++++++++++---------- config/framework13-system.scm | 24 +++++++----------------- config/home-configuration.org | 3 ++- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/config/framework13-system.org b/config/framework13-system.org index 3f3cedf..f4eefa1 100644 --- a/config/framework13-system.org +++ b/config/framework13-system.org @@ -118,7 +118,7 @@ Using =linux-6.7= from nonguix which includes =CONFIG_MT7921E= by default as of testing [[https://community.frame.work/t/adaptive-backlight-management-abm/41055][Adaptive Backlight Management (ABM)]] #+BEGIN_SRC scheme - (kernel-arguments '("amdgpu.abmlevel=3")) + ;; (kernel-arguments '("amdgpu.abmlevel=3")) ;; (kernel-arguments '("modprobe.blacklist=hid_sensor_hub")) ;; required prior to 6.7 #+END_SRC @@ -339,16 +339,20 @@ details can be found (and mostly ignored) in [[https://guix.gnu.org/cookbook/en *** display manager #+begin_src scheme - ;; (service sddm-service-type - ;; (sddm-configuration - ;; (display-server "wayland") - ;; (remember-last-user? #t))) + ;; (service gdm-service-type + ;; (gdm-configuration + ;; (auto-suspend? #f) + ;; (xorg-configuration + ;; (xorg-configuration + ;; (keyboard-layout keyboard-layout) - (service gdm-service-type - (gdm-configuration - (auto-suspend? #f) + (service sddm-service-type + (sddm-configuration + (display-server "x11") + (remember-last-user? #t) + (theme "maya") + (xorg-configuration (xorg-configuration - (xorg-configuration (keyboard-layout keyboard-layout) #+end_src @@ -369,7 +373,7 @@ Trackpad config using [[https://www.mankier.com/4/libinput][libinput]] Provide Gnome, KDE (plasma) and xfce as desktop environments. exwm is enabled automatically via module. #+begin_src scheme (service plasma-desktop-service-type) - (service gnome-desktop-service-type) + ;; (service gnome-desktop-service-type) (service xfce-desktop-service-type) #+end_src diff --git a/config/framework13-system.scm b/config/framework13-system.scm index b398e0c..6cb74a6 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-09 14:00:47+01:00) +;; tangled from framework13-system.org on 2024-02-10 16:57:56+01:00) (use-modules (gnu) (gnu packages) @@ -51,13 +51,7 @@ (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 - (firmware (list linux-firmware)) - ;; (firmware (list amdgpu-firmware - ;; amd-microcode - ;; realtek-firmware)) (users (cons* (user-account (name "zzk") @@ -210,16 +204,13 @@ COMMIT (allowed-ips '("10.0.0.13/32" "fded:dada::13/128")) (keep-alive 25)))))) - ;; (service sddm-service-type - ;; (sddm-configuration - ;; (display-server "wayland") - ;; (remember-last-user? #t))) - - (service gdm-service-type - (gdm-configuration - (auto-suspend? #f) + (service sddm-service-type + (sddm-configuration + (display-server "x11") + (remember-last-user? #t) + (theme "maya") + (xorg-configuration (xorg-configuration - (xorg-configuration (keyboard-layout keyboard-layout) (extra-config '("Section \"InputClass\" @@ -233,7 +224,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 c2640af..c848897 100644 --- a/config/home-configuration.org +++ b/config/home-configuration.org @@ -75,7 +75,8 @@ Packages that will show up in the home profile under =~/.guix-home/profile= *** terminal kitty config is in =dotfiles/kitty/kitty.conf= #+BEGIN_SRC scheme - "kitty" + "kitty-next" + ;; "kitty" #+END_SRC *** Mail #+BEGIN_SRC scheme