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

Put in earplugs

Browse source
This commit is contained in:
nik gaffney 2024-01-26 10:53:38 +01:00
parent 08336dab4b
commit bd14fef053
Signed by: nik
GPG key ID: 989F5E6EDB478160
2 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
config/framework13-system.org
View file

@ -66,7 +66,7 @@ Include non-free linux kernel, modules and firmware from the [[https://gitlab.c
* kernel corruption * kernel corruption
Some kernel corruption may be required to enable WIFI. Since the non-free kernel from nonguix doesn’t include the driver for RZ616/MT7922 adapter by default it needs to be added explicitly. Defined here and used in the =operating-system= declaration below. Some kernel corruption may be required to enable WIFI. Since the non-free kernel from nonguix doesn’t include the driver for RZ616/MT7922 adapter by default it needs to be added explicitly. Defined here and used in the =operating-system= declaration below. (see also commit [[https://gitlab.com/nonguix/nonguix/-/commit/3857d86267284000dc48660a5dfd56cb2a8cf004][3857d862]] for the addition of =nonguix-extra-linux-options=)
#+begin_src scheme #+begin_src scheme
(define-public linux-fw13 (define-public linux-fw13
@ -277,13 +277,12 @@ COMMIT
#+end_src #+end_src
SMB SMB
#+BEGIN_SRC scheme #+BEGIN_SRC scheme
-A INPUT -p udp -m udp -s fd24:609a:6c18::/64 --dport 137 -j ACCEPT -A INPUT -p udp -m udp -s fded:c2f7:43ef::/64 --dport 137 -j ACCEPT
-A INPUT -p udp -m udp -s fd24:609a:6c18::/64 --dport 138 -j ACCEPT -A INPUT -p udp -m udp -s fded:c2f7:43ef::/64 --dport 138 -j ACCEPT
-A INPUT -m state --state NEW -m tcp -p tcp -s fd24:609a:6c18::/64 --dport 139 -j ACCEPT -A INPUT -m state --state NEW -m tcp -p tcp -s fded:c2f7:43ef::/64 --dport 139 -j ACCEPT
-A INPUT -m state --state NEW -m tcp -p tcp -s fd24:609a:6c18::/64 --dport 445 -j ACCEPT -A INPUT -m state --state NEW -m tcp -p tcp -s fded:c2f7:43ef::/64 --dport 445 -j ACCEPT
#+end_src #+end_src
wireguard wireguard
#+BEGIN_SRC scheme #+BEGIN_SRC scheme
-A INPUT -p udp -m udp --dport 51820 -j ACCEPT -A INPUT -p udp -m udp --dport 51820 -j ACCEPT
-A INPUT -i wg0 -m state --state ESTABLISHED,RELATED -j ACCEPT -A INPUT -i wg0 -m state --state ESTABLISHED,RELATED -j ACCEPT
@ -304,7 +303,7 @@ details can be found (and mostly ignored) in [[https://guix.gnu.org/cookbook/en
#+BEGIN_SRC scheme :session #+BEGIN_SRC scheme :session
(service wireguard-service-type (service wireguard-service-type
(wireguard-configuration (wireguard-configuration
(addresses '("10.0.0.23/24" "fd24:609a:6c18::23/64")) (addresses '("10.0.0.23/32" "fded:dada::23/128"))
(private-key "/etc/wireguard/private.key") (private-key "/etc/wireguard/private.key")
(port 51820) (port 51820)
(peers (peers
@ -313,13 +312,13 @@ details can be found (and mostly ignored) in [[https://guix.gnu.org/cookbook/en
(name "lmn") (name "lmn")
(endpoint "example.org:51820") (endpoint "example.org:51820")
(public-key "WHmVhvgxkBxk8fqZU6pWEaH4iVzOcud9JQivwRsaIE8=") (public-key "WHmVhvgxkBxk8fqZU6pWEaH4iVzOcud9JQivwRsaIE8=")
(allowed-ips '("10.0.0.1/24" "fd24:609a:6c18::1/64")) (allowed-ips '("10.0.0.1/24" "fded:dada::1/64"))
(keep-alive 25)) (keep-alive 25))
(wireguard-peer (wireguard-peer
(name "beryllium") (name "beryllium")
(endpoint "example.org:51820") (endpoint "example.org:51820")
(public-key "taeID3fNgci9OpE+1UYkS4DYZE6DIlhpLQL1BVN9sg8=") (public-key "taeID3fNgci9OpE+1UYkS4DYZE6DIlhpLQL1BVN9sg8=")
(allowed-ips '("10.0.0.13/24" "fd24:609a:6c18::13/64")) (allowed-ips '("10.0.0.13/32" "fded:dada::13/128"))
(keep-alive 25)))))) (keep-alive 25))))))
#+END_SRC #+END_SRC

16
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-01-24 22:29:53+01:00) ;; tangled from framework13-system.org on 2024-01-26 10:45:43+01:00)
(use-modules (gnu) (use-modules (gnu)
(gnu packages) (gnu packages)
@ -172,10 +172,10 @@ COMMIT
-A INPUT -p tcp --dport 993 -j ACCEPT -A INPUT -p tcp --dport 993 -j ACCEPT
-A INPUT -p udp -m udp --dport 5353 -j ACCEPT -A INPUT -p udp -m udp --dport 5353 -j ACCEPT
-A INPUT -p udp -m udp -s fd24:609a:6c18::/64 --dport 137 -j ACCEPT -A INPUT -p udp -m udp -s fded:c2f7:43ef::/64 --dport 137 -j ACCEPT
-A INPUT -p udp -m udp -s fd24:609a:6c18::/64 --dport 138 -j ACCEPT -A INPUT -p udp -m udp -s fded:c2f7:43ef::/64 --dport 138 -j ACCEPT
-A INPUT -m state --state NEW -m tcp -p tcp -s fd24:609a:6c18::/64 --dport 139 -j ACCEPT -A INPUT -m state --state NEW -m tcp -p tcp -s fded:c2f7:43ef::/64 --dport 139 -j ACCEPT
-A INPUT -m state --state NEW -m tcp -p tcp -s fd24:609a:6c18::/64 --dport 445 -j ACCEPT -A INPUT -m state --state NEW -m tcp -p tcp -s fded:c2f7:43ef::/64 --dport 445 -j ACCEPT
-A INPUT -p udp -m udp --dport 51820 -j ACCEPT -A INPUT -p udp -m udp --dport 51820 -j ACCEPT
-A INPUT -i wg0 -m state --state ESTABLISHED,RELATED -j ACCEPT -A INPUT -i wg0 -m state --state ESTABLISHED,RELATED -j ACCEPT
@ -188,7 +188,7 @@ COMMIT
(service wireguard-service-type (service wireguard-service-type
(wireguard-configuration (wireguard-configuration
(addresses '("10.0.0.23/24" "fd24:609a:6c18::23/64")) (addresses '("10.0.0.23/32" "fded:dada::23/128"))
(private-key "/etc/wireguard/private.key") (private-key "/etc/wireguard/private.key")
(port 51820) (port 51820)
(peers (peers
@ -197,13 +197,13 @@ COMMIT
(name "lmn") (name "lmn")
(endpoint "example.org:51820") (endpoint "example.org:51820")
(public-key "WHmVhvgxkBxk8fqZU6pWEaH4iVzOcud9JQivwRsaIE8=") (public-key "WHmVhvgxkBxk8fqZU6pWEaH4iVzOcud9JQivwRsaIE8=")
(allowed-ips '("10.0.0.1/24" "fd24:609a:6c18::1/64")) (allowed-ips '("10.0.0.1/24" "fded:dada::1/64"))
(keep-alive 25)) (keep-alive 25))
(wireguard-peer (wireguard-peer
(name "beryllium") (name "beryllium")
(endpoint "example.org:51820") (endpoint "example.org:51820")
(public-key "taeID3fNgci9OpE+1UYkS4DYZE6DIlhpLQL1BVN9sg8=") (public-key "taeID3fNgci9OpE+1UYkS4DYZE6DIlhpLQL1BVN9sg8=")
(allowed-ips '("10.0.0.13/24" "fd24:609a:6c18::13/64")) (allowed-ips '("10.0.0.13/32" "fded:dada::13/128"))
(keep-alive 25)))))) (keep-alive 25))))))
;; (service sddm-service-type ;; (service sddm-service-type