diff --git a/config/framework13-system.org b/config/framework13-system.org index b0ad025..33c921d 100644 --- a/config/framework13-system.org +++ b/config/framework13-system.org @@ -339,18 +339,16 @@ details can be found (and mostly ignored) in [[https://guix.gnu.org/cookbook/en (endpoint "example.org:51820") (public-key "taeID3fNgci9OpE+1UYkS4DYZE6DIlhpLQL1BVN9sg8=") (allowed-ips '("10.0.0.13/32" "fded:dada::13/128")) + (keep-alive 25)) + (wireguard-peer + (name "vrt") + (public-key "4xA6sNrHyAebXZ2i8szdN0WMhH61CE786H+pGQwuLlA=") + (allowed-ips '("10.0.0.22/32" "fded:dada::22/128")) (keep-alive 25)))))) #+END_SRC *** display manager #+begin_src scheme - ;; (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") @@ -377,13 +375,13 @@ Trackpad config using [[https://www.mankier.com/4/libinput][libinput]] *** desktop environments Provide Gnome, KDE (plasma) and xfce as desktop environments. exwm is enabled automatically via module. #+begin_src scheme - (service plasma-desktop-service-type) + ;; (service plasma-desktop-service-type) ;; (service gnome-desktop-service-type) - (service xfce-desktop-service-type) + ;; (service xfce-desktop-service-type) + (service lxqt-desktop-service-type) #+end_src *** file sharing - #+begin_src scheme (service samba-service-type (samba-configuration @@ -460,7 +458,6 @@ initrd with AMD microcode blobs #:initrd base-initrd #:microcode-packages (list amd-microcode) rest))) - #+end_src ** bootloader diff --git a/config/framework13-system.scm b/config/framework13-system.scm index f194d80..1e388b0 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-03-06 08:32:36+01:00) +;; tangled from framework13-system.org on 2024-03-07 15:39:01+01:00) (use-modules (gnu) (gnu packages) @@ -213,15 +213,13 @@ COMMIT (endpoint "example.org:51820") (public-key "taeID3fNgci9OpE+1UYkS4DYZE6DIlhpLQL1BVN9sg8=") (allowed-ips '("10.0.0.13/32" "fded:dada::13/128")) + (keep-alive 25)) + (wireguard-peer + (name "vrt") + (public-key "4xA6sNrHyAebXZ2i8szdN0WMhH61CE786H+pGQwuLlA=") + (allowed-ips '("10.0.0.22/32" "fded:dada::22/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,9 +239,10 @@ COMMIT Option \"AccelProfile\" \"adaptive\" EndSection")))))) - (service plasma-desktop-service-type) + ;; (service plasma-desktop-service-type) ;; (service gnome-desktop-service-type) - (service xfce-desktop-service-type) + ;; (service xfce-desktop-service-type) + (service lxqt-desktop-service-type) (service samba-service-type (samba-configuration diff --git a/config/home-configuration.org b/config/home-configuration.org index d1d4377..6787b96 100644 --- a/config/home-configuration.org +++ b/config/home-configuration.org @@ -59,8 +59,6 @@ Packages that will show up in the home profile under =~/.guix-home/profile= "libreoffice" "rsync" ;; "nyxt" - "python" - "git" "git:send-email" "gnupg" "crda" "htop" @@ -98,11 +96,32 @@ kitty config is in =dotfiles/kitty/kitty.conf= "ardour" "audacity" "qpwgraph" + "patchage" #+END_SRC +*** programming, dev & ops +#+BEGIN_SRC scheme :session + "guile" + "sbcl" + "racket" + "python" + "gcc-toolchain" + "git" "git:send-email" +#+END_SRC + *** network & interconnect #+BEGIN_SRC scheme "nextcloud-client" #+END_SRC +*** fonts & typography + +#+BEGIN_SRC scheme :session + "font-monaspace" + "font-recursive" + "font-fira-sans" + "font-fira-mono" + "font-victor-mono" +#+END_SRC + *** Hardware #+BEGIN_SRC scheme "lm-sensors" @@ -159,7 +178,7 @@ Additional channels → nonguix (aka “The GUIX Channel That Shall Not Be Named `(("GUIX_LOCPATH" . "$HOME/.guix-profile/lib/locale") ("NOTMUCH_PROFILE" . "$XDG_CONFIG_HOME/notmuch/notmuch.conf") ("LD_LIBRARY_PATH" . "$HOME/.guix-profile/lib") - ("GPG_TTY" . "tty") + ("GPG_TTY" . "$TTY") ("SHELL" . ,(file-append zsh "/bin/zsh")))) #+END_SRC diff --git a/config/home-configuration.scm b/config/home-configuration.scm index e787e39..b254804 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-03-06 08:32:30+01:00) +;; tangled from home-configuration.org on 2024-03-07 15:41:27+01:00) (use-modules (gnu) (gnu services) @@ -29,8 +29,6 @@ "libreoffice" "rsync" ;; "nyxt" - "python" - "git" "git:send-email" "gnupg" "crda" "htop" @@ -57,9 +55,23 @@ "ardour" "audacity" "qpwgraph" + "patchage" + + "guile" + "sbcl" + "racket" + "python" + "gcc-toolchain" + "git" "git:send-email" "nextcloud-client" + "font-monaspace" + "font-recursive" + "font-fira-sans" + "font-fira-mono" + "font-victor-mono" + "lm-sensors" "dmidecode" "lshw" @@ -99,7 +111,7 @@ `(("GUIX_LOCPATH" . "$HOME/.guix-profile/lib/locale") ("NOTMUCH_PROFILE" . "$XDG_CONFIG_HOME/notmuch/notmuch.conf") ("LD_LIBRARY_PATH" . "$HOME/.guix-profile/lib") - ("GPG_TTY" . "tty") + ("GPG_TTY" . "$TTY") ("SHELL" . ,(file-append zsh "/bin/zsh")))) (service home-zsh-service-type