Jimbo/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Final touchups

Browse source
This commit is contained in:
jimjam4real 2024-09-23 14:16:30 -04:00
parent 040d7392dc
commit b896a064f4
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
system/pinebook.nix
View file

@ -1,4 +1,6 @@
{ lib, ...}: { { lib, ...}: let
ips = import ./modules/ips.nix;
in {
imports = [ imports = [
# Base configs # Base configs
./base.nix ./base.nix
@ -7,7 +9,7 @@
./users/jimbo.nix ./users/jimbo.nix
./users/groups.nix ./users/groups.nix
# Desktop only # Desktop
./desktop/misc.nix ./desktop/misc.nix
./desktop/sway.nix ./desktop/sway.nix
./desktop/greetd-sway.nix ./desktop/greetd-sway.nix
@ -17,8 +19,9 @@
./desktop/firewall.nix ./desktop/firewall.nix
./desktop/fonts.nix ./desktop/fonts.nix
./desktop/qt.nix ./desktop/qt.nix
./desktop/wireguard.nix
# Laptop/Portable only # Laptop/Portable
./hardware/wireless.nix ./hardware/wireless.nix
# Modules # Modules

2
system/server/firewall.nix
View file

@ -12,7 +12,7 @@
# Add extra input rules using nftables # Add extra input rules using nftables
extraInputRules = '' extraInputRules = ''
ip saddr ${ips.localSpan}.0/24 tcp dport 2049 accept comment "Accept NFS" ip saddr { ${ips.localSpan}.0/24, ${ips.wgSpan}.0/24 } tcp dport 2049 accept comment "Accept NFS"
ip saddr { ${ips.pc}, ${outputs.secrets.lunaIP}, ${outputs.secrets.cornIP}, ${outputs.secrets.vertIP} } tcp dport { 1935, 1945 } accept comment "Accept RTMP" ip saddr { ${ips.pc}, ${outputs.secrets.lunaIP}, ${outputs.secrets.cornIP}, ${outputs.secrets.vertIP} } tcp dport { 1935, 1945 } accept comment "Accept RTMP"
ip saddr ${ips.wgSpan}.3 tcp dport ${mailPorts} accept comment "Accept mail" ip saddr ${ips.wgSpan}.3 tcp dport ${mailPorts} accept comment "Accept mail"
''; '';