mirror of
https://codeberg.org/hako/Rosenthal.git
synced 2025-09-18 12:44:37 +00:00
services: Remove iwd-service-type.
* modules/rosenthal/services/networking.scm (<iwd-configuration>): Delete data type. (%iwd-config-general, %iwd-config-network, %iwd-config-blacklist) (%iwd-config-rank, %iwd-config-scan, %iwd-config-ipv4) (%iwd-config-driver-quirks, iwd-shepherd-service, iwd-service-type): Delete variables. (uglify-field-name, serialize-field, serialize-string, maybe-string) (serialize-boolean, maybe-boolean, cidr4?, serialize-cidr4, maybe-cidr4) (randomization-method?, serialize-randomization-method, randomization-method) (randomization-range?, serialize-randomization-range, randomization-range) (signal-strength?, serialize-signal-strength, signal-strength, seconds?) (serialize-seconds, maybe-seconds, protection-mode?, serialize-protection-mode) (maybe-protection-mode, resolution-method?, serialize-resolution-method) (serialize-integer, maybe-integer, serialize-number, maybe-number) (serialize-list-of-strings, list-of-strings, list-of-cidr4?) (serialize-list-of-cidr4, list-of-cidr4) (serialize-iwd-configuration, add-iwd-config-file, add-iwd-package) Delete procedures.
This commit is contained in:
Hilton Chain
parent
eb7e08c63e
commit
9e51ad4215
@ -16,372 +16,12 @@
|
|||||||
#:use-module (gnu services dbus)
|
#:use-module (gnu services dbus)
|
||||||
#:use-module (gnu services shepherd)
|
#:use-module (gnu services shepherd)
|
||||||
#:use-module (gnu system shadow)
|
#:use-module (gnu system shadow)
|
||||||
#:export (iwd-configuration
|
#:export (sing-box-service-type
|
||||||
iwd-service-type
|
|
||||||
|
|
||||||
sing-box-service-type
|
|
||||||
sing-box-configuration
|
sing-box-configuration
|
||||||
|
|
||||||
tailscale-configuration
|
tailscale-configuration
|
||||||
tailscale-service-type))
|
tailscale-service-type))
|
||||||
|
|
||||||
;;;
|
|
||||||
;;; iwd
|
|
||||||
;;;
|
|
||||||
|
|
||||||
|
|
||||||
(define %iwd-config-general
|
|
||||||
'(enable-network-configuration?
|
|
||||||
use-default-interface?
|
|
||||||
address-randomization
|
|
||||||
address-randomization-range
|
|
||||||
roam-threshold
|
|
||||||
roam-threshold-5g
|
|
||||||
roam-retry-interval
|
|
||||||
management-frame-protection
|
|
||||||
control-port-over-nl80211?
|
|
||||||
disable-anqp?
|
|
||||||
disable-ocv?
|
|
||||||
country))
|
|
||||||
|
|
||||||
(define %iwd-config-network
|
|
||||||
'(enable-ipv6?
|
|
||||||
name-resolving-service
|
|
||||||
route-priority-offset))
|
|
||||||
|
|
||||||
(define %iwd-config-blacklist
|
|
||||||
'(initial-timeout
|
|
||||||
multiplier
|
|
||||||
maximum-timeout))
|
|
||||||
|
|
||||||
(define %iwd-config-rank
|
|
||||||
'(band-modifier-5ghz
|
|
||||||
band-modifier-6ghz))
|
|
||||||
|
|
||||||
(define %iwd-config-scan
|
|
||||||
'(disable-periodic-scan?
|
|
||||||
initial-periodic-scan-interval
|
|
||||||
maximum-periodic-scan-interval
|
|
||||||
disable-roaming-scan?))
|
|
||||||
|
|
||||||
(define %iwd-config-ipv4
|
|
||||||
'(ap-address-pool))
|
|
||||||
|
|
||||||
(define %iwd-config-driver-quirks
|
|
||||||
'(default-interface
|
|
||||||
force-pae
|
|
||||||
power-save-disable))
|
|
||||||
|
|
||||||
(define (uglify-field-name field-name)
|
|
||||||
(case field-name
|
|
||||||
((control-port-over-nl80211?) "ControlPortOverNL80211")
|
|
||||||
((disable-anqp?) "DisableANQP")
|
|
||||||
((disable-ocv?) "DisableOCV")
|
|
||||||
((enable-ipv6?) "EnableIPv6")
|
|
||||||
((ap-address-pool) "APAddressPool")
|
|
||||||
(else (string-delete char-set:punctuation
|
|
||||||
(string-capitalize (symbol->string field-name))))))
|
|
||||||
|
|
||||||
(define (serialize-field field-name val)
|
|
||||||
(format #f "~a = ~a~%" (uglify-field-name field-name) val))
|
|
||||||
|
|
||||||
(define serialize-string serialize-field)
|
|
||||||
|
|
||||||
(define-maybe string)
|
|
||||||
|
|
||||||
(define (serialize-boolean field-name val)
|
|
||||||
(serialize-field field-name (if val "true" "false")))
|
|
||||||
|
|
||||||
(define-maybe boolean)
|
|
||||||
|
|
||||||
(define cidr4? (@@ (gnu services vpn) cidr4?))
|
|
||||||
|
|
||||||
(define serialize-cidr4 serialize-field)
|
|
||||||
|
|
||||||
(define-maybe cidr4)
|
|
||||||
|
|
||||||
(define (randomization-method? val)
|
|
||||||
(memv val '(#f once network)))
|
|
||||||
|
|
||||||
(define (serialize-randomization-method field-name val)
|
|
||||||
(serialize-field field-name (or val 'disabled)))
|
|
||||||
|
|
||||||
(define-maybe randomization-method)
|
|
||||||
|
|
||||||
(define (randomization-range? val)
|
|
||||||
(memv val '(full nic)))
|
|
||||||
|
|
||||||
(define serialize-randomization-range serialize-field)
|
|
||||||
|
|
||||||
(define-maybe randomization-range)
|
|
||||||
|
|
||||||
(define (signal-strength? val)
|
|
||||||
(and (number? val)
|
|
||||||
(>= val -100)
|
|
||||||
(<= val 1)))
|
|
||||||
|
|
||||||
(define serialize-signal-strength serialize-field)
|
|
||||||
|
|
||||||
(define-maybe signal-strength)
|
|
||||||
|
|
||||||
(define (seconds? val)
|
|
||||||
(and (integer? val)
|
|
||||||
(not (negative? val))))
|
|
||||||
|
|
||||||
(define serialize-seconds serialize-field)
|
|
||||||
|
|
||||||
(define-maybe seconds)
|
|
||||||
|
|
||||||
(define (protection-mode? val)
|
|
||||||
(memv val '(0 1 2)))
|
|
||||||
|
|
||||||
(define serialize-protection-mode serialize-field)
|
|
||||||
|
|
||||||
(define-maybe protection-mode)
|
|
||||||
|
|
||||||
(define (resolution-method? val)
|
|
||||||
(memv val '(#f resolvconf)))
|
|
||||||
|
|
||||||
(define (serialize-resolution-method field-name val)
|
|
||||||
(serialize-field field-name (or val 'none)))
|
|
||||||
|
|
||||||
(define serialize-integer serialize-field)
|
|
||||||
|
|
||||||
(define-maybe integer)
|
|
||||||
|
|
||||||
(define serialize-number serialize-field)
|
|
||||||
|
|
||||||
(define-maybe number)
|
|
||||||
|
|
||||||
(define (serialize-list-of-strings field-name val)
|
|
||||||
(serialize-field field-name (string-join val ",")))
|
|
||||||
|
|
||||||
(define-maybe list-of-strings)
|
|
||||||
|
|
||||||
(define list-of-cidr4? (list-of cidr4?))
|
|
||||||
|
|
||||||
(define serialize-list-of-cidr4 serialize-list-of-strings)
|
|
||||||
|
|
||||||
(define-maybe list-of-cidr4)
|
|
||||||
|
|
||||||
(define-configuration iwd-configuration
|
|
||||||
(iwd
|
|
||||||
(file-like iwd)
|
|
||||||
"The iwd package to use.")
|
|
||||||
|
|
||||||
(log-file
|
|
||||||
(string "/var/log/iwd.log")
|
|
||||||
"Log file location.")
|
|
||||||
|
|
||||||
;; General
|
|
||||||
(enable-network-configuration?
|
|
||||||
(boolean #f)
|
|
||||||
"Enable network configuration.")
|
|
||||||
|
|
||||||
(use-default-interface?
|
|
||||||
maybe-boolean
|
|
||||||
"Do not allow iwd to destroy / recreate wireless interfaces at startup,
|
|
||||||
including default interfaces.")
|
|
||||||
|
|
||||||
(address-randomization
|
|
||||||
maybe-randomization-method
|
|
||||||
"Available values are @code{#f}, @code{once} and @code{network}. @code{#f}
|
|
||||||
for default kernel behavior, @code{once} to randomize the MAC address when iwd
|
|
||||||
starts or the hardware is detected for the first time, @code{network} to
|
|
||||||
randomize the MAC address on each connection to a network (the MAC address is
|
|
||||||
generated based on the SSID and permanent address of the adapter).")
|
|
||||||
|
|
||||||
(address-randomization-range
|
|
||||||
maybe-randomization-range
|
|
||||||
"Available values are @code{nic} and @code{full}. @code{nic} to only
|
|
||||||
randomize the NIC specific octets (last 3 ones), @code{full} to randomize all
|
|
||||||
6 octets of the address.")
|
|
||||||
|
|
||||||
(roam-threshold
|
|
||||||
maybe-signal-strength
|
|
||||||
"Value in dBm, control how aggressively iwd roams when connected to a 2.4Ghz
|
|
||||||
access point.")
|
|
||||||
|
|
||||||
(roam-threshold-5g
|
|
||||||
maybe-signal-strength
|
|
||||||
"Value in dBm, control how aggressively iwd roams when connected to a 5Ghz
|
|
||||||
access point.")
|
|
||||||
|
|
||||||
(roam-retry-interval
|
|
||||||
maybe-seconds
|
|
||||||
"How long to wait before attempting to roam again if the last roam attempt
|
|
||||||
failed, or if the signal of the newly connected BSS is still considered weak.")
|
|
||||||
|
|
||||||
(management-frame-protection
|
|
||||||
maybe-protection-mode
|
|
||||||
"Available values are @code{0}, @code{1} and @code{2}. @code{0} to
|
|
||||||
completely turn off MFP (even if the hardware is capable), @code{1} to enable
|
|
||||||
MFP if the local hardware and remote AP both support it, @code{2} to always
|
|
||||||
require MFP.")
|
|
||||||
|
|
||||||
(control-port-over-nl80211?
|
|
||||||
maybe-boolean
|
|
||||||
"Enable sending EAPoL packets over NL80211.")
|
|
||||||
|
|
||||||
(disable-anqp?
|
|
||||||
maybe-boolean
|
|
||||||
"Disable ANQP queries.")
|
|
||||||
|
|
||||||
(disable-ocv?
|
|
||||||
maybe-boolean
|
|
||||||
"Disable Operating Channel Validation.")
|
|
||||||
|
|
||||||
(country
|
|
||||||
maybe-string
|
|
||||||
"ISO Alpha-2 Country Code. Request the country to be set for the system.")
|
|
||||||
|
|
||||||
;; Network
|
|
||||||
(enable-ipv6?
|
|
||||||
maybe-boolean
|
|
||||||
"Configure IPv6 addresses and routes.")
|
|
||||||
|
|
||||||
(name-resolving-service
|
|
||||||
(resolution-method 'resolvconf)
|
|
||||||
"Available values are @code{resolvconf} and @code{#f}. Configure a DNS
|
|
||||||
resolution method used by the system and must be used in conjunction with
|
|
||||||
@code{enable-network-configuration?}. @code{#f} to ignore DNS and domain name
|
|
||||||
information.")
|
|
||||||
|
|
||||||
(route-priority-offset
|
|
||||||
maybe-integer
|
|
||||||
"Configure a route priority offset used by the system to prioritize the
|
|
||||||
default routes. The route with lower priority offset is preferred.")
|
|
||||||
|
|
||||||
;; Blacklist
|
|
||||||
(initial-timeout
|
|
||||||
maybe-seconds
|
|
||||||
"The initial time that a BSS spends on the blacklist.")
|
|
||||||
|
|
||||||
(multiplier
|
|
||||||
maybe-integer
|
|
||||||
"If the BSS was blacklisted previously and another connection attempt has
|
|
||||||
failed after the initial timeout has expired, then the BSS blacklist time will
|
|
||||||
be extended by a multiple of @code{multiplier} for each unsuccessful attempt up
|
|
||||||
to @code{maximum-timeout} time.")
|
|
||||||
|
|
||||||
(maximum-timeout
|
|
||||||
maybe-seconds
|
|
||||||
"Maximum time that a BSS is blacklisted.")
|
|
||||||
|
|
||||||
;; Rank
|
|
||||||
(band-modifier-5ghz
|
|
||||||
maybe-number
|
|
||||||
"Increase or decrease the preference for 5GHz access points by increasing or
|
|
||||||
decreasing the value of this modifier.")
|
|
||||||
|
|
||||||
(band-modifier-6ghz
|
|
||||||
maybe-number
|
|
||||||
"Increase or decrease the preference for 6GHz access points by increasing or
|
|
||||||
decreasing the value of this modifier.")
|
|
||||||
|
|
||||||
;; Scan
|
|
||||||
(disable-periodic-scan?
|
|
||||||
maybe-boolean
|
|
||||||
"Disable periodic scan.")
|
|
||||||
|
|
||||||
(initial-periodic-scan-interval
|
|
||||||
maybe-seconds
|
|
||||||
"The initial periodic scan interval upon disconnect.")
|
|
||||||
|
|
||||||
(maximum-periodic-scan-interval
|
|
||||||
maybe-seconds
|
|
||||||
"The maximum periodic scan interval.")
|
|
||||||
|
|
||||||
(disable-roaming-scan?
|
|
||||||
maybe-boolean
|
|
||||||
"Disable roaming scan.")
|
|
||||||
|
|
||||||
;; IPv4
|
|
||||||
(ap-address-pool
|
|
||||||
maybe-list-of-cidr4
|
|
||||||
"Define the space of IPs used for the AP mode subnet addresses and the DHCP
|
|
||||||
server.")
|
|
||||||
|
|
||||||
;; DriverQuirks
|
|
||||||
(default-interface
|
|
||||||
maybe-list-of-strings
|
|
||||||
"List of drivers or glob matches. If a driver in use matches one in this
|
|
||||||
list, IWD will not attempt to remove and re-create the default interface.")
|
|
||||||
|
|
||||||
(force-pae
|
|
||||||
maybe-list-of-strings
|
|
||||||
"List of drivers or glob matches. If a driver in use matches one in this
|
|
||||||
list, @code{control-port-over-nl80211?} will not be used, and PAE will be used
|
|
||||||
instead.")
|
|
||||||
|
|
||||||
(power-save-disable
|
|
||||||
maybe-list-of-strings
|
|
||||||
"List of drivers or glob matches. If a driver in use matches one in this
|
|
||||||
list, power save will be disabled."))
|
|
||||||
|
|
||||||
(define (serialize-iwd-configuration config)
|
|
||||||
(apply mixed-text-file "main.conf"
|
|
||||||
(append-map
|
|
||||||
(match-lambda
|
|
||||||
((section . fields)
|
|
||||||
(list "[" section "]\n"
|
|
||||||
(serialize-configuration
|
|
||||||
config
|
|
||||||
(filter-configuration-fields
|
|
||||||
iwd-configuration-fields
|
|
||||||
fields)))))
|
|
||||||
`(("General" . ,%iwd-config-general)
|
|
||||||
("Network" . ,%iwd-config-network)
|
|
||||||
("Blacklist" . ,%iwd-config-blacklist)
|
|
||||||
("Rank" . ,%iwd-config-rank)
|
|
||||||
("Scan" . ,%iwd-config-scan)
|
|
||||||
("IPv4" . ,%iwd-config-ipv4)
|
|
||||||
("DriverQuirks" . ,%iwd-config-driver-quirks)))))
|
|
||||||
|
|
||||||
(define (add-iwd-config-file config)
|
|
||||||
`(("iwd/main.conf"
|
|
||||||
,(serialize-iwd-configuration config))))
|
|
||||||
|
|
||||||
(define add-iwd-package
|
|
||||||
(compose list iwd-configuration-iwd))
|
|
||||||
|
|
||||||
(define (iwd-shepherd-service config)
|
|
||||||
(match-record config <iwd-configuration>
|
|
||||||
(iwd log-file
|
|
||||||
enable-network-configuration? name-resolving-service)
|
|
||||||
(let ((conf (serialize-iwd-configuration config)))
|
|
||||||
(list (shepherd-service
|
|
||||||
(documentation "Run iwd")
|
|
||||||
(provision `(,@(if enable-network-configuration?
|
|
||||||
'(networking)
|
|
||||||
'())
|
|
||||||
iwd))
|
|
||||||
(requirement '(user-processes dbus-system))
|
|
||||||
(start #~(make-forkexec-constructor
|
|
||||||
(list (string-append #$iwd "/libexec/iwd"))
|
|
||||||
#:log-file #$log-file))
|
|
||||||
(stop #~(make-kill-destructor))
|
|
||||||
(actions
|
|
||||||
(list (shepherd-configuration-action "/etc/iwd/main.conf"))))))))
|
|
||||||
|
|
||||||
(define iwd-service-type
|
|
||||||
(service-type
|
|
||||||
(name 'iwd)
|
|
||||||
(extensions
|
|
||||||
(list (service-extension shepherd-root-service-type
|
|
||||||
iwd-shepherd-service)
|
|
||||||
(service-extension dbus-root-service-type
|
|
||||||
add-iwd-package)
|
|
||||||
(service-extension etc-service-type
|
|
||||||
add-iwd-config-file)
|
|
||||||
(service-extension profile-service-type
|
|
||||||
add-iwd-package)
|
|
||||||
(service-extension log-rotation-service-type
|
|
||||||
(compose list iwd-configuration-log-file))))
|
|
||||||
(default-value (iwd-configuration))
|
|
||||||
(description "Run iwd, the iNet wireless daemon.")))
|
|
||||||
|
|
||||||
|
|
||||||
;;;
|
;;;
|
||||||
;;; sing-box
|
;;; sing-box
|
||||||
;;;
|
;;;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user