.
This commit is contained in:
parent
753dc7452d
commit
8e7938a87e
3 changed files with 9 additions and 76 deletions
74
config.org
74
config.org
|
@ -94,6 +94,7 @@ This is to be run after setting up the partitions.
|
||||||
- readline
|
- readline
|
||||||
- terminals
|
- terminals
|
||||||
- version-control
|
- version-control
|
||||||
|
- virtualization
|
||||||
- wm
|
- wm
|
||||||
- xdisorg
|
- xdisorg
|
||||||
- xorg
|
- xorg
|
||||||
|
@ -176,7 +177,6 @@ This adds the Nonguix channel.
|
||||||
- mesa
|
- mesa
|
||||||
- nss-certs
|
- nss-certs
|
||||||
- network-manager
|
- network-manager
|
||||||
- podman
|
|
||||||
- readline
|
- readline
|
||||||
- swayfx-0.3.2
|
- swayfx-0.3.2
|
||||||
- tuxedo-keyboard
|
- tuxedo-keyboard
|
||||||
|
@ -228,10 +228,10 @@ These services are unmodified, or have just few settings.
|
||||||
| tlp | () |
|
| tlp | () |
|
||||||
| thermald | ((adaptive? #t)) |
|
| thermald | ((adaptive? #t)) |
|
||||||
| bluetooth | () |
|
| bluetooth | () |
|
||||||
| docker | () |
|
|
||||||
| earlyoom | ((minimum-available-memory 5) (minimum-free-swap 5)) |
|
| earlyoom | ((minimum-available-memory 5) (minimum-free-swap 5)) |
|
||||||
| inputattach | () |
|
| inputattach | () |
|
||||||
| libvirt | ((unix-sock-group "libvirt")) |
|
| libvirt | ((unix-sock-group "libvirt")) |
|
||||||
|
| virtlog | () |
|
||||||
| fstrim | () |
|
| fstrim | () |
|
||||||
| fprintd | () |
|
| fprintd | () |
|
||||||
| plasma-desktop | () |
|
| plasma-desktop | () |
|
||||||
|
@ -390,77 +390,9 @@ This is the full operating system specification.
|
||||||
(name "zilti")
|
(name "zilti")
|
||||||
(group "users")
|
(group "users")
|
||||||
(supplementary-groups
|
(supplementary-groups
|
||||||
'("avahi" "docker" "users" "wheel" "netdev" "audio" "cdrom" "video" "libvirt" "lp")))
|
'("avahi" "users" "wheel" "netdev" "audio" "cdrom" "video" "libvirt" "lp")))
|
||||||
%base-user-accounts))
|
%base-user-accounts))
|
||||||
<<root-package-block>>
|
<<root-package-block>>
|
||||||
<<root-services-block>>
|
<<root-services-block>>
|
||||||
(name-service-switch %mdns-host-lookup-nss))
|
(name-service-switch %mdns-host-lookup-nss))
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
* Other Components
|
|
||||||
|
|
||||||
** Podman
|
|
||||||
|
|
||||||
Podman needs the files =/etc/subuid= and =/etc/subgid=.
|
|
||||||
|
|
||||||
#+begin_src fundamental :tangle etc/subuid :mkdirp yes
|
|
||||||
zilti:1001:65536
|
|
||||||
#+end_src
|
|
||||||
|
|
||||||
#+begin_src fundamental :tangle etc/subgid :mkdirp yes
|
|
||||||
zilti:1000:1000
|
|
||||||
#+end_src
|
|
||||||
|
|
||||||
Then, there is the =policy.json=:
|
|
||||||
|
|
||||||
#+begin_src json :tangle podman/policy.json :mkdirp yes
|
|
||||||
{
|
|
||||||
"default": [
|
|
||||||
{
|
|
||||||
"type": "reject"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"transports": {
|
|
||||||
"docker": {
|
|
||||||
"docker.io": [
|
|
||||||
{
|
|
||||||
"type": "insecureAcceptAnything"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"docker.io/library": [
|
|
||||||
{
|
|
||||||
"type": "insecureAcceptAnything"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"registry.access.redhat.com": [
|
|
||||||
{
|
|
||||||
"type": "signedBy",
|
|
||||||
"keyType": "GPGKeys",
|
|
||||||
"keyPath": "/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"registry.redhat.io": [
|
|
||||||
{
|
|
||||||
"type": "signedBy",
|
|
||||||
"keyType": "GPGKeys",
|
|
||||||
"keyPath": "/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"docker-daemon": {
|
|
||||||
"": [
|
|
||||||
{
|
|
||||||
"type": "insecureAcceptAnything"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#+end_src
|
|
||||||
|
|
||||||
And finally the registries.
|
|
||||||
|
|
||||||
#+begin_src conf :tangle podman/registries.conf :mkdirp yes
|
|
||||||
[registries.search]
|
|
||||||
registries = ["docker.io", "registry.access.redhat.com", "quay.io"]
|
|
||||||
#+end_src
|
|
||||||
|
|
10
config.scm
10
config.scm
|
@ -37,6 +37,7 @@
|
||||||
readline
|
readline
|
||||||
terminals
|
terminals
|
||||||
version-control
|
version-control
|
||||||
|
virtualization
|
||||||
wm
|
wm
|
||||||
xdisorg
|
xdisorg
|
||||||
xorg)
|
xorg)
|
||||||
|
@ -76,7 +77,7 @@
|
||||||
(name "zilti")
|
(name "zilti")
|
||||||
(group "users")
|
(group "users")
|
||||||
(supplementary-groups
|
(supplementary-groups
|
||||||
'("avahi" "docker" "users" "wheel" "netdev" "audio" "cdrom" "video" "libvirt" "lp")))
|
'("avahi" "users" "wheel" "netdev" "audio" "cdrom" "video" "libvirt" "lp")))
|
||||||
%base-user-accounts))
|
%base-user-accounts))
|
||||||
(packages
|
(packages
|
||||||
(append
|
(append
|
||||||
|
@ -96,7 +97,6 @@
|
||||||
mesa
|
mesa
|
||||||
nss-certs
|
nss-certs
|
||||||
network-manager
|
network-manager
|
||||||
podman
|
|
||||||
readline
|
readline
|
||||||
swayfx-0.3.2
|
swayfx-0.3.2
|
||||||
tuxedo-keyboard
|
tuxedo-keyboard
|
||||||
|
@ -134,9 +134,6 @@
|
||||||
(service
|
(service
|
||||||
bluetooth-service-type
|
bluetooth-service-type
|
||||||
(bluetooth-configuration))
|
(bluetooth-configuration))
|
||||||
(service
|
|
||||||
docker-service-type
|
|
||||||
(docker-configuration))
|
|
||||||
(service
|
(service
|
||||||
earlyoom-service-type
|
earlyoom-service-type
|
||||||
(earlyoom-configuration
|
(earlyoom-configuration
|
||||||
|
@ -149,6 +146,9 @@
|
||||||
libvirt-service-type
|
libvirt-service-type
|
||||||
(libvirt-configuration
|
(libvirt-configuration
|
||||||
(unix-sock-group "libvirt")))
|
(unix-sock-group "libvirt")))
|
||||||
|
(service
|
||||||
|
virtlog-service-type
|
||||||
|
(virtlog-configuration))
|
||||||
(service
|
(service
|
||||||
fstrim-service-type
|
fstrim-service-type
|
||||||
(fstrim-configuration))
|
(fstrim-configuration))
|
||||||
|
|
|
@ -208,6 +208,7 @@
|
||||||
"tree-sitter"
|
"tree-sitter"
|
||||||
"ungoogled-chromium-wayland"
|
"ungoogled-chromium-wayland"
|
||||||
"unzip"
|
"unzip"
|
||||||
|
"virt-manager"
|
||||||
"visidata"
|
"visidata"
|
||||||
"waybar"
|
"waybar"
|
||||||
"wlogout"
|
"wlogout"
|
||||||
|
|
Loading…
Reference in a new issue