MetzNet
/
metznet-channel
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added ci.scm and updated other systme files with better naming

master
Noah Metz 2022-09-28 15:40:15 -06:00
parent 72b93105e6
commit bd818dd219
3 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
system/base-system.scm
Unescape Escape View File

@ -72,9 +72,9 @@
(define-public %my-base-packages (append (list metznet-system openldap git neovim zsh nss-certs mit-krb5 openvpn openresolv) %base-packages)) (define-public %my-base-packages (append (list metznet-system openldap git neovim zsh nss-certs mit-krb5 openvpn openresolv) %base-packages))
(define-public %my-desktop-packages (append (list i3-wm i3status dmenu alacritty icecat) %my-base-packages)) (define-public %metznet-desktop-packages (append (list i3-wm i3status dmenu alacritty icecat) %my-base-packages))
(define-public %my-server-packages (append (list isc-dhcp) %my-base-packages)) (define-public %metznet-server-packages (append (list isc-dhcp) %my-base-packages))
(define-public %desktop-setuid-programs (append (define-public %desktop-setuid-programs (append
(list (setuid-program (list (setuid-program
@ -119,7 +119,7 @@
"55-backlight.rules" "55-backlight.rules"
"RUN+=\"/bin/chgrp video /sys/class/backlight/intel_backlight/brightness\"")) "RUN+=\"/bin/chgrp video /sys/class/backlight/intel_backlight/brightness\""))
(define-public %my-desktop-services (define-public %metznet-desktop-services
(append (list (service openssh-service-type) (append (list (service openssh-service-type)
(service krb5-service-type (krb5-config %domain-kdc %domain-kadmin)) (service krb5-service-type (krb5-config %domain-kdc %domain-kadmin))
(service pam-krb5-service-type pam-krb5-config) (service pam-krb5-service-type pam-krb5-config)
@ -158,7 +158,7 @@
(service pam-krb5-service-type pam-krb5-config)) (service pam-krb5-service-type pam-krb5-config))
%base-services)) %base-services))
(define-public %my-server-services (append (list (define-public %metznet-server-services (append (list
(service dhcp-client-service-type) (service dhcp-client-service-type)
(openvpn-client-service (openvpn-client-service
#:config (openvpn-client-configuration #:config (openvpn-client-configuration
@ -207,13 +207,13 @@
(operating-system (operating-system
(inherit base-operating-system) (inherit base-operating-system)
(host-name "base-server") (host-name "base-server")
(packages %my-server-packages) (packages %metznet-server-packages)
(services %my-server-services))) (services %metznet-server-services)))
(define-public base-desktop-system (define-public base-desktop-system
(operating-system (operating-system
(inherit base-operating-system) (inherit base-operating-system)
(host-name "base-desktop") (host-name "base-desktop")
(setuid-programs %desktop-setuid-programs) (setuid-programs %desktop-setuid-programs)
(packages %my-desktop-packages) (packages %metznet-desktop-packages)
(services %my-desktop-services))) (services %metznet-desktop-services)))

22
system/clients/otto.scm
Unescape Escape View File

@ -34,24 +34,6 @@
#:use-module (gnu services base) #:use-module (gnu services base)
#:export (otto-operating-system)) #:export (otto-operating-system))
; (define (nvidia-insmod-shepherd-service config)
; (list (shepherd-service
; (provision '(nvidia-insmod))
; (requirement '())
; (start #~(lambda _ (and
; (zero? (system* (string-append #$nvidia-driver "/bin/nvidia-insmod"))))))
; (one-shot? #t)
; (auto-start? #t)
; (respawn? #f))))
;
;(define nvidia-insmod-service-type
; (service-type
; (name 'nvidia-insmod-name)
; (extensions
; (list (service-extension shepherd-root-service-type nvidia-insmod-shepherd-service)))
; (default-value '())))
(define otto-operating-system (define otto-operating-system
(operating-system (operating-system
(inherit base-desktop-system) (inherit base-desktop-system)
@ -61,7 +43,7 @@
qemu texlive firefox pavucontrol mupdf gcc-toolchain gnu-make qemu texlive firefox pavucontrol mupdf gcc-toolchain gnu-make
gcc-arm-none-eabi-7-2018-q2-update sane-backends-minimal xsane gcc-arm-none-eabi-7-2018-q2-update sane-backends-minimal xsane
cups xf86-video-nv xf86-input-libinput vulkan-loader vulkan-tools cups xf86-video-nv xf86-input-libinput vulkan-loader vulkan-tools
(list isc-bind "utils")) %my-desktop-packages)) (list isc-bind "utils")) %metznet-desktop-packages))
(services (append (list (services (append (list
(simple-service 'blueman dbus-root-service-type (list blueman)) (simple-service 'blueman dbus-root-service-type (list blueman))
(bluetooth-service #:auto-enable? #t) (bluetooth-service #:auto-enable? #t)
@ -74,7 +56,7 @@
(service cups-service-type (service cups-service-type
(cups-configuration (cups-configuration
(web-interface? #t)))) (web-interface? #t))))
(modify-services %my-desktop-services (modify-services %metznet-desktop-services
(udev-service-type config => (udev-service-type config =>
(udev-configuration (inherit config) (udev-configuration (inherit config)
(rules (append (list (rules (append (list

37
system/servers/ci.scm
Unescape Escape View File

@ -0,0 +1,37 @@
(define-module (system clients otto)
#:use-module (gnu)
#:use-module (gnu packages ci)
#:use-module (gnu services cuirass)
#:use-module (system base-system)
#:export (ci-operating-system))
(define ci-operating-system
(operating-system
(inherit base-server-system)
(host-name "ci")
(packages (append (list cuirass) %metznet-server-packages))
(services (append (list
(service cuirass-service-type
(cuirass-configuration
(specifications #~(list (specification
(name "metznet-channel")
(build '(channels metznet-channel))
(channels
(cons (channel
(name 'metznet-channel)
(url "git://git.metznet.ca:metznet-channel.git"))
%default-channels)))))))) %metznet-server-services))
(file-systems
(cons* (file-system
(mount-point "/boot/efi")
(device (uuid "6E88-FE62" 'fat32))
(type "vfat"))
(file-system
(mount-point "/")
(device
(uuid "ba93a043-9e58-466f-b90f-bf2a6bbf91fe"
'ext4))
(type "ext4"))
%base-file-systems))))
ci-operating-system