Rename some hostnames
This commit is contained in:
Jimbo
parent
bbf0696221
commit
17f2a16f48
51 changed files with 175 additions and 281 deletions
|
|
@ -18,7 +18,6 @@
|
|||
"${config.ws.w6}"
|
||||
"${config.ws.w4a}"
|
||||
"${config.ws.w5a}"
|
||||
"${config.ws.w6a}"
|
||||
];
|
||||
workspaces3 = [
|
||||
"${config.ws.w7}"
|
||||
|
|
@ -26,6 +25,9 @@
|
|||
"${config.ws.w9}"
|
||||
"${config.ws.w7a}"
|
||||
"${config.ws.w8a}"
|
||||
];
|
||||
workspaces4 = [
|
||||
"${config.ws.w6a}"
|
||||
"${config.ws.w9a}"
|
||||
];
|
||||
assign = output: workspaces:
|
||||
|
|
@ -37,7 +39,8 @@
|
|||
in
|
||||
(assign "${config.displays.d1}" workspaces1) ++
|
||||
(assign "${config.displays.d2}" workspaces2) ++
|
||||
(assign "${config.displays.d3}" workspaces3);
|
||||
(assign "${config.displays.d3}" workspaces3) ++
|
||||
(assign "${config.displays.d4}" workspaces4);
|
||||
|
||||
# Rules
|
||||
defaultWorkspace = config.ws.w1;
|
||||
|
|
|
|||
|
|
@ -6,16 +6,15 @@
|
|||
hashedPassword = config.secrets.jimboAccPass;
|
||||
isNormalUser = true;
|
||||
openssh.authorizedKeys.keys = [
|
||||
(builtins.readFile ../../../../../hosts/firefly/id_ed25519.pub)
|
||||
(builtins.readFile ../../../../../hosts/detritus/id_ed25519.pub)
|
||||
(builtins.readFile ../../../../../hosts/tower/id_ed25519.pub)
|
||||
|
||||
(builtins.readFile ../../../../../hosts/shuttle/id_ed25519.pub)
|
||||
(builtins.readFile ../../../../../hosts/lacros/id_ed25519.pub)
|
||||
(builtins.readFile ../../../../../hosts/redmond/id_ed25519.pub)
|
||||
(builtins.readFile ../../../../../hosts/treefruit/id_ed25519.pub)
|
||||
(builtins.readFile ../../../../../hosts/pomme/id_ed25519.pub)
|
||||
|
||||
(builtins.readFile ../../../../../hosts/cyberspark/id_ed25519.pub)
|
||||
(builtins.readFile ../../../../../hosts/bomberman/id_ed25519.pub)
|
||||
(builtins.readFile ../../../../../hosts/kitty/id_ed25519.pub)
|
||||
(builtins.readFile ../../../../../hosts/xenia/id_ed25519.pub)
|
||||
(builtins.readFile ../../../../../hosts/prophet/id_ed25519.pub)
|
||||
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./firewall
|
||||
./wireguard
|
||||
./wireless
|
||||
];
|
||||
imports = [ ./wireless ];
|
||||
|
||||
networking = {
|
||||
wireless.enable = false;
|
||||
|
|
|
|||
|
|
@ -1,66 +0,0 @@
|
|||
{ lib, config, ... }:
|
||||
{
|
||||
options.system.firewall = {
|
||||
server = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Enable server firewall settings";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
networking = {
|
||||
firewall = {
|
||||
allowPing = false;
|
||||
extraInputRules = ''
|
||||
${lib.optionalString (!config.system.firewall.server.enable) ''
|
||||
ip saddr { ${config.ips.server}, 10.100.0.1 } accept comment "Accept Server"
|
||||
''}
|
||||
${lib.optionalString config.system.firewall.server.enable ''
|
||||
ip saddr { ${config.ips.localSpan}.0/24, 10.100.0.0/24 } tcp dport 2049 accept comment "Accept NFS"
|
||||
ip saddr { ${config.ips.pc}, ${config.secrets.lunaIP}, ${config.secrets.cornIP} } tcp dport { 1935, 1945 } accept comment "Accept RTMP"
|
||||
''}
|
||||
'';
|
||||
};
|
||||
|
||||
# Nftables configuration only if server is enabled
|
||||
nftables = lib.mkIf config.system.firewall.server.enable {
|
||||
tables = {
|
||||
forwarding = {
|
||||
family = "ip";
|
||||
content = ''
|
||||
chain PREROUTING {
|
||||
type nat hook prerouting priority dstnat; policy accept;
|
||||
tcp dport 2211 dnat to ${config.ips.pc}:22 comment "SSH to PC"
|
||||
tcp dport 2222 dnat to 10.100.0.19:22 comment "SSH to Oracle VM"
|
||||
|
||||
udp dport { 27005, 27015, 7777 } dnat to ${config.ips.pc} comment "PC Hosted Games"
|
||||
|
||||
tcp dport { 58010, 57989, 57984 } dnat to ${config.ips.pc} comment "PC Sunshine TCP"
|
||||
udp dport { 57998, 57999, 58000 } dnat to ${config.ips.pc} comment "PC Sunshine UDP"
|
||||
|
||||
tcp dport { 38010, 37989, 37984 } dnat to ${config.ips.vm} comment "VM Sunshine TCP"
|
||||
udp dport { 37998, 37999, 38000 } dnat to ${config.ips.vm} comment "VM Sunshine UDP"
|
||||
|
||||
udp dport { 7790, 7791, 7792 } dnat to ${config.ips.hx} comment "Deus Ex"
|
||||
|
||||
ip saddr ${config.secrets.cornIP} tcp dport { 9943, 9944 } dnat to ${config.ips.vm} comment "VM ALVR TCP"
|
||||
ip saddr ${config.secrets.cornIP} udp dport { 9943, 9944 } dnat to ${config.ips.vm} comment "VM ALVR UDP"
|
||||
}
|
||||
|
||||
chain POSTROUTING {
|
||||
type nat hook postrouting priority 100; policy accept;
|
||||
oifname "${config.ips.netInt}" masquerade
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Enable IP forwarding for the server configuration
|
||||
boot.kernel.sysctl."net.ipv4.ip_forward" = lib.mkIf config.system.firewall.server.enable 1;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
{ lib, config, ... }:
|
||||
{
|
||||
options.system.wireguard = {
|
||||
client = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = "Enable WireGuard client";
|
||||
};
|
||||
};
|
||||
server = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Enable WireGuard server";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
networking = {
|
||||
firewall.allowedUDPPorts = [ 51820 ];
|
||||
|
||||
nat = {
|
||||
enable = config.system.wireguard.server.enable;
|
||||
externalInterface = "${config.ips.netInt}";
|
||||
internalInterfaces = [ "wgs" ];
|
||||
};
|
||||
|
||||
wireguard.interfaces = {
|
||||
wgc = lib.mkIf config.system.wireguard.client.enable {
|
||||
# Define IP of client in per device config
|
||||
listenPort = 51820;
|
||||
privateKey = config.secrets.wgClientPriv;
|
||||
peers = [
|
||||
{ # NixOS Server
|
||||
publicKey = "qnOT/lXOJMaQgDUdXpyfGZB2IEyUouRje2m/bCe9ux8=";
|
||||
allowedIPs = [ "10.100.0.0/24" ];
|
||||
endpoint = "sv.${config.domains.jim1}:51820";
|
||||
persistentKeepalive = 25;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
wgs = lib.mkIf config.system.wireguard.server.enable {
|
||||
ips = [ "10.100.0.1/24" ];
|
||||
listenPort = 51820;
|
||||
privateKey = config.secrets.wgServerPriv;
|
||||
peers = [
|
||||
{ # NixOS
|
||||
publicKey = "OKUH/h6YSURI4vgeTZKQD15QsqaygdbTn1mAWzQp9S0=";
|
||||
allowedIPs = [ "10.100.0.16/28" ];
|
||||
}
|
||||
{ # Pixel 9
|
||||
publicKey = "dPCtjm67adMZCnyL1O2L+uUOk0RbjA9T/tht1r+qcE4=";
|
||||
allowedIPs = [ "10.100.0.2/32" ];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -8,5 +8,6 @@
|
|||
./mpd
|
||||
./ssh
|
||||
./sunshine
|
||||
./tlp
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,17 +16,12 @@
|
|||
right = "noop";
|
||||
};
|
||||
|
||||
control = {
|
||||
ctrlmod = {
|
||||
backspace = "delete";
|
||||
h = "left";
|
||||
j = "down";
|
||||
k = "up";
|
||||
l = "right";
|
||||
g = "macro(C-h)";
|
||||
semicolon = "macro(C-l)";
|
||||
};
|
||||
|
||||
ctrlmod = {
|
||||
backspace = "delete";
|
||||
"1" = "f1";
|
||||
"2" = "f2";
|
||||
"3" = "f3";
|
||||
|
|
|
|||
|
|
@ -3,5 +3,6 @@
|
|||
services.sunshine = {
|
||||
enable = config.system.desktop.enable;
|
||||
autoStart = false;
|
||||
openFirewall = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
4
modules/system/services/general/tlp/default.nix
Normal file
4
modules/system/services/general/tlp/default.nix
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
services.tlp.enable = true;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue