zzkt/guix
1
0
Fork 0
Code Issues Pull requests Projects Activity Actions

Put in earplugs

Browse source
This commit is contained in:
nik gaffney 2024-04-14 13:48:11 +02:00
parent 6e65d33a8d
commit d22a11448e
Signed by: nik
GPG key ID: 989F5E6EDB478160
4 changed files with 47 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
config/framework13-system.org
View file

@ -72,7 +72,7 @@ Some kernel corruption may be required to enable WIFI. Since the non-free kernel
#+begin_src scheme #+begin_src scheme
(define-public linux-FWL13 (define-public linux-FWL13
(corrupt-linux linux-libre-6.7 (corrupt-linux linux-libre-6.8
#:name "linux-fwl13" #:name "linux-fwl13"
#:configs '("CONFIG_MT7921E=m"))) #:configs '("CONFIG_MT7921E=m")))
#+end_src #+end_src
@ -115,14 +115,15 @@ Kernel & driver details
Using =linux-6.7= from nonguix (which includes =CONFIG_MT7921E= by default as of 6.7.2) Using =linux-6.7= from nonguix (which includes =CONFIG_MT7921E= by default as of 6.7.2)
#+begin_src scheme #+begin_src scheme
(kernel linux-6.7) ;; previously (kernel linux-FWL13) (kernel linux-6.8)
;; (kernel linux-FWL13)
#+end_src #+end_src
testing [[https://community.frame.work/t/adaptive-backlight-management-abm/41055][Adaptive Backlight Management (ABM)]] testing [[https://community.frame.work/t/adaptive-backlight-management-abm/41055][Adaptive Backlight Management (ABM)]]
#+BEGIN_SRC scheme #+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 ;; (kernel-arguments '("modprobe.blacklist=hid_sensor_hub")) ;; required prior to 6.7
(kernel-arguments '("splash quiet")) (kernel-arguments '("splash" "quiet"))
#+END_SRC #+END_SRC
…and required firmware (should be possible to reduce to specifics) …and required firmware (should be possible to reduce to specifics)
@ -191,7 +192,6 @@ Packages installed system-wide. Users can also install packages under their own
"xfce4-session" "xfce4-session"
"xfce4-panel" "xfce4-panel"
;; gnome extras ;; gnome extras
"gnome-tweaks"
"gvfs" "gvfs"
; sddm ; sddm
"chili-sddm-theme" "chili-sddm-theme"
@ -202,7 +202,7 @@ Packages installed system-wide. Users can also install packages under their own
#+end_src #+end_src
** system services ** system services
Below is the list of enabled system services. To search for any available services, run 'guix system search KEYWORD' in a terminal. Below is the list of enabled system services. To search for any available services, run =guix system search KEYWORD= in a terminal.
#+begin_src scheme #+begin_src scheme
(services (services
@ -222,15 +222,14 @@ Below is the list of enabled system services. To search for any available servi
*** mail *** mail
use dovecot for local IMAP use dovecot for local IMAP
#+begin_src scheme
#+begin_src scheme
(service dovecot-service-type (service dovecot-service-type
(dovecot-configuration (dovecot-configuration
(mail-location "maildir:%h/Maildir:LAYOUT=fs"))) (mail-location "maildir:%h/Maildir:LAYOUT=fs")))
#+end_src #+end_src
*** iptables *** iptables
=iptables= configuration to allow SSH on port 22, IMAPS on 993, wireguard (wg0), mDNS and local smb for 192.168.0.0/16 =iptables= configuration to allow SSH on port 22, IMAPS on 993, wireguard (wg0), mDNS and local smb for 192.168.0.0/16
#+BEGIN_SRC scheme :session #+BEGIN_SRC scheme :session
@ -375,10 +374,10 @@ Trackpad config using [[https://www.mankier.com/4/libinput][libinput]]
*** desktop environments *** desktop environments
Provide Gnome, KDE (plasma) and xfce as desktop environments. exwm is enabled automatically via module. Provide Gnome, KDE (plasma) and xfce as desktop environments. exwm is enabled automatically via module.
#+begin_src scheme #+begin_src scheme
;; (service plasma-desktop-service-type) (service plasma-desktop-service-type)
;; (service gnome-desktop-service-type) ;; (service gnome-desktop-service-type)
;; (service xfce-desktop-service-type) ;; (service xfce-desktop-service-type)
(service lxqt-desktop-service-type) ;; (service lxqt-desktop-service-type)
#+end_src #+end_src
*** file sharing *** file sharing
@ -479,11 +478,11 @@ initrd with AMD microcode blobs
#+end_src #+end_src
** swap device ** swap device
% swapon --show
% swapon -L swap
#+begin_src scheme #+begin_src scheme
(swap-devices (list (swap-space (swap-devices (list (swap-space
(target (uuid (target (file-system-label "swap")))))
"e7cc2ca5-169a-4511-865f-d2d7ed72c05c")))))
#+end_src #+end_src
** file systems & mount points ** file systems & mount points

17
config/framework13-system.scm
View file

@ -1,6 +1,6 @@
;; -*- mode: scheme; coding: utf-8; -*- ;; -*- mode: scheme; coding: utf-8; -*-
;; ;;
;; tangled from framework13-system.org on 2024-03-07 16:38:09+01:00) ;; tangled from framework13-system.org on 2024-04-14 13:37:25+02:00)
(use-modules (gnu) (use-modules (gnu)
(gnu packages) (gnu packages)
@ -35,7 +35,7 @@
vpn) vpn)
(define-public linux-FWL13 (define-public linux-FWL13
(corrupt-linux linux-libre-6.7 (corrupt-linux linux-libre-6.8
#:name "linux-fwl13" #:name "linux-fwl13"
#:configs '("CONFIG_MT7921E=m"))) #:configs '("CONFIG_MT7921E=m")))
@ -51,11 +51,12 @@
#:options '("ctrl:nocaps" #:options '("ctrl:nocaps"
"altwin:swap_lalt_lwin"))) "altwin:swap_lalt_lwin")))
(kernel linux-6.7) ;; previously (kernel linux-FWL13) (kernel linux-6.8)
;; (kernel linux-FWL13)
;; (kernel-arguments '("amdgpu.abmlevel=3")) ;; (kernel-arguments '("amdgpu.abmlevel=3"))
;; (kernel-arguments '("modprobe.blacklist=hid_sensor_hub")) ;; required prior to 6.7 ;; (kernel-arguments '("modprobe.blacklist=hid_sensor_hub")) ;; required prior to 6.7
(kernel-arguments '("splash quiet")) (kernel-arguments '("splash" "quiet"))
(firmware (list linux-firmware)) (firmware (list linux-firmware))
;; (firmware (list amdgpu-firmware ;; (firmware (list amdgpu-firmware
@ -106,7 +107,6 @@
"xfce4-session" "xfce4-session"
"xfce4-panel" "xfce4-panel"
;; gnome extras ;; gnome extras
"gnome-tweaks"
"gvfs" "gvfs"
; sddm ; sddm
"chili-sddm-theme" "chili-sddm-theme"
@ -239,10 +239,10 @@ COMMIT
Option \"AccelProfile\" \"adaptive\" Option \"AccelProfile\" \"adaptive\"
EndSection")))))) EndSection"))))))
;; (service plasma-desktop-service-type) (service plasma-desktop-service-type)
;; (service gnome-desktop-service-type) ;; (service gnome-desktop-service-type)
;; (service xfce-desktop-service-type) ;; (service xfce-desktop-service-type)
(service lxqt-desktop-service-type) ;; (service lxqt-desktop-service-type)
(service samba-service-type (service samba-service-type
(samba-configuration (samba-configuration
@ -305,8 +305,7 @@ writable = yes
(keyboard-layout keyboard-layout))) (keyboard-layout keyboard-layout)))
(swap-devices (list (swap-space (swap-devices (list (swap-space
(target (uuid (target (file-system-label "swap")))))
"e7cc2ca5-169a-4511-865f-d2d7ed72c05c")))))
(file-systems (cons* (file-system (file-systems (cons* (file-system
(mount-point "/boot/efi") (mount-point "/boot/efi")

26
config/home-configuration.org
View file

@ -43,7 +43,7 @@ echo ";; -*- mode: scheme; coding: utf-8; -*-
* home environment * home environment
** packages ** packages
Packages that will show up in the home profile under =~/.guix-home/profile= Packages that will show up in the home profile under =~/.guix-home/profile= (this setup might make more sense split into several composible profiles or project based manifest files)
#+BEGIN_SRC scheme #+BEGIN_SRC scheme
(home-environment (home-environment
@ -57,11 +57,12 @@ Packages that will show up in the home profile under =~/.guix-home/profile=
"libreoffice" "libreoffice"
"rsync" "rsync"
"gnupg" "gnupg"
"rbw"
"crda" "crda"
"htop" "htop"
"tree" "tree"
"password-store" "password-store"
"tomb"
"rbw"
#+END_SRC #+END_SRC
*** KDE packages *** KDE packages
various features not installed as part of =plasma-desktop-service= various features not installed as part of =plasma-desktop-service=
@ -95,6 +96,8 @@ kitty config located in =dotfiles/.config/kitty/kitty.conf=
"audacity" "audacity"
"qpwgraph" "qpwgraph"
"patchage" "patchage"
"aubio"
"ffmpeg"
#+END_SRC #+END_SRC
*** programming, dev & ops *** programming, dev & ops
#+BEGIN_SRC scheme :session #+BEGIN_SRC scheme :session
@ -108,7 +111,7 @@ kitty config located in =dotfiles/.config/kitty/kitty.conf=
*** network & interconnect *** network & interconnect
#+BEGIN_SRC scheme #+BEGIN_SRC scheme
"firefox" "librewolf"
;; "nyxt" ;; "nyxt"
"nextcloud-client" "nextcloud-client"
"nmap" "nmap"
@ -194,16 +197,16 @@ zsh (and/or completions and/or [[https://lists.gnu.org/archive/html/help-guix/20
;; configs in $XDG_CONFIG_HOME/zsh ;; configs in $XDG_CONFIG_HOME/zsh
(xdg-flavor? #t) (xdg-flavor? #t)
(environment-variables (environment-variables
'(("HISTFILE" . "$XDG_CONFIG_HOME/zsh/.history") '(("HISTFILE" . "$HOME/.config/zsh/.history")
("HISTSIZE" . "800000") ("HISTSIZE" . "800000")
("SAVEHIST" . "800000"))))) ("SAVEHIST" . "800000")))))
#+END_SRC #+END_SRC
the zsh dotfiles are managed by =home-dotfiles-service= for now. the zsh dotfiles are added manually rather than using dotfiles-service (duplicate errors when managed by =home-dotfiles-service= )
#+BEGIN_SRC scheme #+BEGIN_SRC scheme
;; (zshenv (zshenv
;; (list (local-file ".zshenv" "zshenv"))) (list (local-file "dotfiles/.config/zsh/.zshenv" "zshenv")))
;; (zshrc (zshrc
;; (list (local-file ".zshrc" "zshrc"))))) (list (local-file "dotfiles/.config/zsh/.zshrc" "zshrc")))))
#+END_SRC #+END_SRC
*** gnupg *** gnupg
@ -217,7 +220,7 @@ the zsh dotfiles are managed by =home-dotfiles-service= for now.
#+END_SRC #+END_SRC
*** dotfiles *** dotfiles
(see [[https://guix.gnu.org/manual/devel/en/html_node/Essential-Home-Services.html][guix docs]]) (see [[https://guix.gnu.org/manual/devel/en/html_node/Essential-Home-Services.html][guix docs]] and note about zsh config)
#+BEGIN_SRC scheme #+BEGIN_SRC scheme
(service home-dotfiles-service-type (service home-dotfiles-service-type
@ -225,7 +228,8 @@ the zsh dotfiles are managed by =home-dotfiles-service= for now.
(layout 'plain) (layout 'plain)
(directories (list "dotfiles")) (directories (list "dotfiles"))
(excluded (excluded
'(".*~" ".*\\.swp" "\\.git" "\\.gitignore" ".zshenv")))) '(".*~" ".*\\.swp" "\\.git" "\\.gitignore"
".zshenv" ".zshrc"))))
#+END_SRC #+END_SRC
*** ssh & sundry *** ssh & sundry

22
config/home-configuration.scm
View file

@ -1,6 +1,6 @@
;; -*- mode: scheme; coding: utf-8; -*- ;; -*- mode: scheme; coding: utf-8; -*-
;; ;;
;; tangled from home-configuration.org on 2024-03-19 23:04:17+01:00) ;; tangled from home-configuration.org on 2024-04-14 13:47:30+02:00)
(use-modules (gnu) (use-modules (gnu)
(gnu home) (gnu home)
@ -27,11 +27,12 @@
"libreoffice" "libreoffice"
"rsync" "rsync"
"gnupg" "gnupg"
"rbw"
"crda" "crda"
"htop" "htop"
"tree" "tree"
"password-store" "password-store"
"tomb"
"rbw"
"dolphin-plugins" "dolphin-plugins"
"akonadi" "akonadi"
@ -53,6 +54,8 @@
"audacity" "audacity"
"qpwgraph" "qpwgraph"
"patchage" "patchage"
"aubio"
"ffmpeg"
"guile" "guile"
"sbcl" "sbcl"
@ -61,7 +64,7 @@
"gcc-toolchain" "gcc-toolchain"
"git" "git:send-email" "git" "git:send-email"
"firefox" "librewolf"
;; "nyxt" ;; "nyxt"
"nextcloud-client" "nextcloud-client"
"nmap" "nmap"
@ -120,14 +123,14 @@
;; configs in $XDG_CONFIG_HOME/zsh ;; configs in $XDG_CONFIG_HOME/zsh
(xdg-flavor? #t) (xdg-flavor? #t)
(environment-variables (environment-variables
'(("HISTFILE" . "$XDG_CONFIG_HOME/zsh/.history") '(("HISTFILE" . "$HOME/.config/zsh/.history")
("HISTSIZE" . "800000") ("HISTSIZE" . "800000")
("SAVEHIST" . "800000"))))) ("SAVEHIST" . "800000")))))
;; (zshenv (zshenv
;; (list (local-file ".zshenv" "zshenv"))) (list (local-file "dotfiles/.config/zsh/.zshenv" "zshenv")))
;; (zshrc (zshrc
;; (list (local-file ".zshrc" "zshrc"))))) (list (local-file "dotfiles/.config/zsh/.zshrc" "zshrc")))))
(service home-gpg-agent-service-type (service home-gpg-agent-service-type
(home-gpg-agent-configuration (home-gpg-agent-configuration
@ -140,7 +143,8 @@
(layout 'plain) (layout 'plain)
(directories (list "dotfiles")) (directories (list "dotfiles"))
(excluded (excluded
'(".*~" ".*\\.swp" "\\.git" "\\.gitignore" ".zshenv")))) '(".*~" ".*\\.swp" "\\.git" "\\.gitignore"
".zshenv" ".zshrc"))))
;; ssh config in 'dotfiles' ;; ssh config in 'dotfiles'