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-02-08 11:13:13 +01:00
parent ef9a4cdeb9
commit bb38c513d5
Signed by: nik
GPG key ID: 989F5E6EDB478160
4 changed files with 59 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
config/framework13-system.org
View file

@ -34,7 +34,7 @@ echo ";; -*- mode: scheme; coding: utf-8; -*-
(gnu packages emacs-xyz)) (gnu packages emacs-xyz))
#+end_src #+end_src
Include non-free linux kernel, modules and firmware from the [[https://gitlab.com/nonguix/nonguix/][nonguix channel]] (aka “the guix channel that shall not be named”) Include non-free linux kernel, modules and firmware from the [[https://gitlab.com/nonguix/nonguix/][nonguix channel]] (aka “The GUIX Channel That Shall Not Be Named”)
#+begin_src scheme #+begin_src scheme
(use-modules (nongnu packages linux) (use-modules (nongnu packages linux)
(nongnu system linux-initrd)) (nongnu system linux-initrd))
@ -85,7 +85,7 @@ The =operating-system= declaration
(timezone "Europe/Amsterdam") (timezone "Europe/Amsterdam")
#+end_src #+end_src
hosts file for local & LAN name resolving and persistent =/etc/hosts= (Note: convert to =hosts-service-type=) hosts file for local & LAN name resolving and persistent =/etc/hosts= (maybe convert to =hosts-service-type=)
#+BEGIN_SRC scheme :session #+BEGIN_SRC scheme :session
(hosts-file (local-file "hosts.conf")) (hosts-file (local-file "hosts.conf"))
@ -168,7 +168,7 @@ Using =linux-6.7= from nonguix which includes =CONFIG_MT7921E= by default as of
#+end_src #+end_src
** system-wide packages ** system-wide packages
Packages installed system-wide. Users can also install packages under their own account: use 'guix search KEYWORD' to search for packages and 'guix install PACKAGE' to install a package. Packages installed system-wide. Users can also install packages under their own account: use =guix search KEYWORD= to search for packages and =guix install PACKAGE= to install a package.
#+begin_src scheme #+begin_src scheme
(packages (packages
@ -180,7 +180,6 @@ Packages installed system-wide. Users can also install packages under their own
"nss-certs" "nss-certs"
;; xfce ;; xfce
"xfce4-power-manager" "xfce4-power-manager"
"xfce4-screensaver"
"xfce4-settings" "xfce4-settings"
"xfce4-session" "xfce4-session"
"xfce4-panel" "xfce4-panel"

5
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-02-07 18:15:15+01:00) ;; tangled from framework13-system.org on 2024-02-08 11:11:49+01:00)
(use-modules (gnu) (use-modules (gnu)
(gnu packages) (gnu packages)
@ -69,7 +69,7 @@
"audio" "audio"
"video" "video"
"www-data" "www-data"
"realtime" "realtime"
"lp"))) "lp")))
(user-account (user-account
(name "www-data") (name "www-data")
@ -98,7 +98,6 @@
"nss-certs" "nss-certs"
;; xfce ;; xfce
"xfce4-power-manager" "xfce4-power-manager"
"xfce4-screensaver"
"xfce4-settings" "xfce4-settings"
"xfce4-session" "xfce4-session"
"xfce4-panel" "xfce4-panel"

28
config/home-configuration.org
View file

@ -24,25 +24,23 @@ echo ";; -*- mode: scheme; coding: utf-8; -*-
#+BEGIN_SRC scheme #+BEGIN_SRC scheme
(use-modules (gnu) (use-modules (gnu)
(gnu home)
(gnu packages)
(gnu services) (gnu services)
(gnu packages)
(gnu packages gnupg) (gnu packages gnupg)
(gnu packages shells) (gnu packages shells)
(guix channels) (gnu home)
(guix gexp)
(gnu home services) (gnu home services)
(gnu home services guix) (gnu home services guix)
(gnu home services shells) (gnu home services shells)
(gnu home services dotfiles) (gnu home services dotfiles)
(gnu home services desktop) (gnu home services desktop)
(gnu home services sound) (gnu home services sound)
(gnu home services gnupg)) (gnu home services gnupg)
(guix channels)
(guix gexp))
#+END_SRC #+END_SRC
getmail? → (use-service-modules mail) Packages that will show up in the home profile under =~/.guix-home/profile=
Packages that will show up in your Home profile under =~/.guix-home/profile=
#+BEGIN_SRC scheme #+BEGIN_SRC scheme
(home-environment (home-environment
@ -84,14 +82,14 @@ Packages that will show up in your Home profile under =~/.guix-home/profile=
))) )))
#+END_SRC #+END_SRC
The list of Home services. To search for available services, run 'guix home search KEYWORD' in a terminal. The list of home services. To search for available services run =guix home search KEYWORD= in a terminal.
#+BEGIN_SRC scheme #+BEGIN_SRC scheme
(services (services
(list (list
#+END_SRC #+END_SRC
additional channels → nonguix & zzkt Additional channels → nonguix (aka “The GUIX Channel That Shall Not Be Named”) & zzkt (local particulars)
#+BEGIN_SRC scheme #+BEGIN_SRC scheme
(simple-service 'variant-packages-service (simple-service 'variant-packages-service
@ -101,8 +99,6 @@ additional channels → nonguix & zzkt
(name 'nonguix) (name 'nonguix)
(url "https://gitlab.com/nonguix/nonguix") (url "https://gitlab.com/nonguix/nonguix")
(branch "master") (branch "master")
(commit
"fe2fcf125cfc5f7284b24cfac50f37feaf74f7b5")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"897c1a470da759236cc11798f4e0a5f7d4d59fbc" "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
@ -121,12 +117,14 @@ additional channels → nonguix & zzkt
"24A7 4604 91E6 A60F 5BB4 A00F 989F 5E6E DB47 8160")))))) "24A7 4604 91E6 A60F 5BB4 A00F 989F 5E6E DB47 8160"))))))
#+END_SRC #+END_SRC
#+RESULTS:
environment / variables environment / variables
#+BEGIN_SRC scheme #+BEGIN_SRC scheme
(simple-service 'variant-env-vars-service (simple-service 'variant-env-vars-service
home-environment-variables-service-type home-environment-variables-service-type
`(("NOTMUCH_PROFILE" . "$HOME/.config/notmuch/notmuch.conf") `(("NOTMUCH_PROFILE" . "$XDG_CONFIG_HOME/notmuch/notmuch.conf")
("LD_LIBRARY_PATH" . "$HOME/.guix-profile/lib") ("LD_LIBRARY_PATH" . "$HOME/.guix-profile/lib")
("SHELL" . ,(file-append zsh "/bin/zsh")))) ("SHELL" . ,(file-append zsh "/bin/zsh"))))
#+END_SRC #+END_SRC
@ -140,7 +138,7 @@ 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" . "$HOME/.config/zsh/.history") '(("HISTFILE" . "$XDG_CONFIG_HOME/zsh/.history")
("HISTSIZE" . "800000") ("HISTSIZE" . "800000")
("SAVEHIST" . "800000"))) ("SAVEHIST" . "800000")))
(zshenv (zshenv
@ -170,7 +168,7 @@ dotfiles (see [[https://guix.gnu.org/manual/devel/en/html_node/Essential-Home-Se
ssh & sundry (see also [[https://guix.gnu.org/manual/devel/en/html_node/Secure-Shell.html][guix manual]]) ssh & sundry (see also [[https://guix.gnu.org/manual/devel/en/html_node/Secure-Shell.html][guix manual]])
#+BEGIN_SRC scheme #+BEGIN_SRC scheme
;; ssh config in 'dotfiles'
#+END_SRC #+END_SRC
sound via pipewire which requires dbus (see also [[https://guix.gnu.org/manual/devel/en/html_node/Sound-Home-Services.html][guix manual]]) sound via pipewire which requires dbus (see also [[https://guix.gnu.org/manual/devel/en/html_node/Sound-Home-Services.html][guix manual]])

80
config/home-configuration.scm
View file

@ -1,22 +1,22 @@
;; -*- mode: scheme; coding: utf-8; -*- ;; -*- mode: scheme; coding: utf-8; -*-
;; ;;
;; tangled from home-configuration.org on 2024-02-07 18:41:00+01:00) ;; tangled from home-configuration.org on 2024-02-08 11:12:05+01:00)
(use-modules (gnu) (use-modules (gnu)
(gnu home)
(gnu packages)
(gnu services) (gnu services)
(gnu packages)
(gnu packages gnupg) (gnu packages gnupg)
(gnu packages shells) (gnu packages shells)
(guix channels) (gnu home)
(guix gexp)
(gnu home services) (gnu home services)
(gnu home services guix) (gnu home services guix)
(gnu home services shells) (gnu home services shells)
(gnu home services dotfiles) (gnu home services dotfiles)
(gnu home services desktop) (gnu home services desktop)
(gnu home services sound) (gnu home services sound)
(gnu home services gnupg)) (gnu home services gnupg)
(guix channels)
(guix gexp))
(home-environment (home-environment
(packages (specifications->packages (packages (specifications->packages
@ -57,46 +57,44 @@
))) )))
(services (services
(list (list
(simple-service 'variant-packages-service (simple-service 'variant-packages-service
home-channels-service-type home-channels-service-type
(list (list
(channel (channel
(name 'nonguix) (name 'nonguix)
(url "https://gitlab.com/nonguix/nonguix") (url "https://gitlab.com/nonguix/nonguix")
(branch "master") (branch "master")
(commit (introduction
"fe2fcf125cfc5f7284b24cfac50f37feaf74f7b5") (make-channel-introduction
(introduction "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
(make-channel-introduction (openpgp-fingerprint
"897c1a470da759236cc11798f4e0a5f7d4d59fbc" "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
(openpgp-fingerprint (channel
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) (name 'zzkt)
(channel (url "https://gitlab.com/zzkt/guix")
(name 'zzkt) (branch "endless")
(url "https://gitlab.com/zzkt/guix") (commit
(branch "endless") "ef1868ed9bdcf1a49771442e405bd88207b3ab0c")
(commit (introduction
"ef1868ed9bdcf1a49771442e405bd88207b3ab0c") (make-channel-introduction
(introduction "fc0ada85de1980e1fc9ee50672d827c0c17c3e7d"
(make-channel-introduction (openpgp-fingerprint
"fc0ada85de1980e1fc9ee50672d827c0c17c3e7d" "24A7 4604 91E6 A60F 5BB4 A00F 989F 5E6E DB47 8160"))))))
(openpgp-fingerprint
"24A7 4604 91E6 A60F 5BB4 A00F 989F 5E6E DB47 8160"))))))
(simple-service 'variant-env-vars-service (simple-service 'variant-env-vars-service
home-environment-variables-service-type home-environment-variables-service-type
`(("NOTMUCH_PROFILE" . "$HOME/.config/notmuch/notmuch.conf") `(("NOTMUCH_PROFILE" . "$XDG_CONFIG_HOME/notmuch/notmuch.conf")
("LD_LIBRARY_PATH" . "$HOME/.guix-profile/lib") ("LD_LIBRARY_PATH" . "$HOME/.guix-profile/lib")
("SHELL" . ,(file-append zsh "/bin/zsh")))) ("SHELL" . ,(file-append zsh "/bin/zsh"))))
(service home-zsh-service-type (service home-zsh-service-type
(home-zsh-configuration (home-zsh-configuration
;; configs in $XDG_CONFIG_HOME/zsh ;; configs in $XDG_CONFIG_HOME/zsh
(xdg-flavor? #t) (xdg-flavor? #t)
(environment-variables (environment-variables
'(("HISTFILE" . "$HOME/.config/zsh/.history") '(("HISTFILE" . "$XDG_CONFIG_HOME/zsh/.history")
("HISTSIZE" . "800000") ("HISTSIZE" . "800000")
("SAVEHIST" . "800000"))) ("SAVEHIST" . "800000")))
(zshenv (zshenv
@ -114,10 +112,14 @@
(home-dotfiles-configuration (home-dotfiles-configuration
(directories (list "dotfiles")))) (directories (list "dotfiles"))))
;; ssh config in 'dotfiles'
(service home-dbus-service-type) (service home-dbus-service-type)
(service home-pipewire-service-type (service home-pipewire-service-type
(home-pipewire-configuration (home-pipewire-configuration
(enable-pulseaudio? #t))) (enable-pulseaudio? #t)))
))) ;; end home-environment
))) ;; end home-environment