Compare commits

..

4 Commits

30 changed files with 236 additions and 560 deletions

5
.gitignore vendored
View File

@ -1,5 +0,0 @@
### Nix template
# Ignore build outputs from performing a nix-build or `nix build` command
result
result-*

18
flake.lock generated
View File

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1752062782,
"narHash": "sha256-Dod77HcIByOyfGLEJOgRxg2Fmk2Y5lVgMEcN/xVEt/8=",
"lastModified": 1748529677,
"narHash": "sha256-MJEX3Skt5EAIs/aGHD8/aXXZPcceMMHheyIGSjvxZN0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "bec8ff39811568eb7c8c8d1e2a1a476326748f51",
"rev": "da282034f4d30e787b8a10722431e8b650a907ef",
"type": "github"
},
"original": {
@ -43,11 +43,11 @@
]
},
"locked": {
"lastModified": 1751903740,
"narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=",
"lastModified": 1747663185,
"narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "032decf9db65efed428afd2fa39d80f7089085eb",
"rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc",
"type": "github"
},
"original": {
@ -58,11 +58,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1751984180,
"narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
"lastModified": 1748370509,
"narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
"rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
"type": "github"
},
"original": {

View File

@ -27,8 +27,6 @@
outputs = { self, nixpkgs, home-manager, plasma-manager, nixos-generators, secrix }:
let
hmModule = file: {
imports = [ home-manager.nixosModules.home-manager ];
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
@ -37,19 +35,6 @@
# Optionally, use home-manager.extraSpecialArgs to pass
# arguments to home.nix
};
mkRouter = hostFile: nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
secrix.nixosModules.default
./modules
./modules/router
./hosts/common.nix
hostFile
./users/cazzzer
(hmModule ./home/common.nix)
];
};
in
{
apps.x86_64-linux.secrix = secrix.secrix self;
@ -64,6 +49,7 @@
./hosts/Yura-PC
./users/cazzzer
# https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-nixos-module
home-manager.nixosModules.home-manager
(hmModule ./home/cazzzer-pc.nix)
];
};
@ -76,6 +62,7 @@
./hosts/Yura-TPX13
./users/cazzzer
# https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-nixos-module
home-manager.nixosModules.home-manager
(hmModule ./home/cazzzer-laptop.nix)
];
};
@ -87,12 +74,18 @@
./hosts/hw-vm.nix
./hosts/vm
./users/cazzzer
(hmModule ./home/cazzzer-pc.nix)
];
};
router = mkRouter ./hosts/router;
router-1 = mkRouter ./hosts/router-1;
router-2 = mkRouter ./hosts/router-2;
router = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
secrix.nixosModules.default
./modules
./hosts/common.nix
./hosts/router
./users/cazzzer
];
};
};
# https://github.com/nix-community/nixos-generators?tab=readme-ov-file#using-in-a-flake
packages.x86_64-linux = {
@ -104,7 +97,6 @@
./hosts/hw-proxmox.nix
./hosts/vm
./users/cazzzer
(hmModule ./home/cazzzer-pc.nix)
];
format = "proxmox";
};
@ -117,7 +109,6 @@
./hosts/hw-proxmox.nix
./hosts/vm
./users/cazzzer
(hmModule ./home/cazzzer-pc.nix)
];
};
in

View File

@ -2,8 +2,7 @@
{
imports = [
./common.nix
./common-desktop.nix
./modules
];
programs.plasma = {

View File

@ -2,8 +2,7 @@
{
imports = [
./common.nix
./common-desktop.nix
./modules
];
programs.plasma.kwin.virtualDesktops.number = 2;

View File

@ -1,21 +0,0 @@
{ config, lib, pkgs, ... }:
{
imports = [
./modules/starship.nix
./modules/plasma.nix
];
services.darkman = {
enable = true;
settings = {
lat = 37.3387;
lng = -121.8853;
};
lightModeScripts = {
plasma-color = "plasma-apply-colorscheme BreezeLight";
};
darkModeScripts = {
plasma-color = "plasma-apply-colorscheme BreezeDark";
};
};
}

View File

@ -1,32 +0,0 @@
{ config, lib, pkgs, ... }:
let
username = "cazzzer";
in
{
imports = [
./modules/fish.nix
./modules/git.nix
];
# Home Manager needs a bit of information about you and the paths it should
# manage.
home.username = username;
home.homeDirectory = "/home/${username}";
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
home.sessionVariables = {
EDITOR = "micro";
SHELL = "fish";
};
# This value determines the Home Manager release that your configuration is
# compatible with. This helps avoid breakage when a new Home Manager release
# introduces backwards incompatible changes.
#
# You should not change this value, even if you update Home Manager. If you do
# want to update the value, then make sure to first check the Home Manager
# release notes.
home.stateVersion = "24.11"; # Please read the comment before changing.
}

83
home/modules/default.nix Normal file
View File

@ -0,0 +1,83 @@
{ config, lib, pkgs, ... }:
let
username = "cazzzer";
in
{
imports = [
./fish.nix
./starship.nix
./plasma.nix
];
# Home Manager needs a bit of information about you and the paths it should
# manage.
home.username = username;
home.homeDirectory = "/home/${username}";
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
home.sessionVariables = {
EDITOR = "micro";
SHELL = "fish";
};
services.darkman = {
enable = true;
settings = {
lat = 37.3387;
lng = -121.8853;
};
lightModeScripts = {
plasma-color = "plasma-apply-colorscheme BreezeLight";
};
darkModeScripts = {
plasma-color = "plasma-apply-colorscheme BreezeDark";
};
};
# This value determines the Home Manager release that your configuration is
# compatible with. This helps avoid breakage when a new Home Manager release
# introduces backwards incompatible changes.
#
# You should not change this value, even if you update Home Manager. If you do
# want to update the value, then make sure to first check the Home Manager
# release notes.
home.stateVersion = "24.11"; # Please read the comment before changing.
# The home.packages option allows you to install Nix packages into your
# environment.
# home.packages = [
# # Adds the 'hello' command to your environment. It prints a friendly
# # "Hello, world!" when run.
# pkgs.hello
# # It is sometimes useful to fine-tune packages, for example, by applying
# # overrides. You can do that directly here, just don't forget the
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
# # fonts?
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
# # You can also create simple shell scripts directly inside your
# # configuration. For example, this adds a command 'my-hello' to your
# # environment:
# (pkgs.writeShellScriptBin "my-hello" ''
# echo "Hello, ${config.home.username}!"
# '')
# ];
# Home Manager is pretty good at managing dotfiles. The primary way to manage
# plain files is through 'home.file'.
# home.file = {
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
# # symlink to the Nix store copy.
# ".screenrc".source = dotfiles/screenrc;
# # You can also set the file content immediately.
# ".gradle/gradle.properties".text = ''
# org.gradle.console=verbose
# org.gradle.daemon.idletimeout=3600000
# '';
# };
}

View File

@ -1,64 +0,0 @@
{ config, lib, pkgs, ... }:
let
name = "Yuri Tatishchev";
email = "itatishch@gmail.com";
signingKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE02AhJIZtrtZ+5sZhna39LUUCEojQzmz2BDWguT9ZHG";
in
{
programs.git = {
enable = true;
userName = name;
userEmail = email;
signing = {
key = signingKey;
signByDefault = true;
format = "ssh";
};
aliases = {
co = "checkout";
s = "switch";
};
extraConfig = {
url = {
"https://gitea.cazzzer.com/" = {
insteadOf = "caztea:";
};
"https://github.com/" = {
insteadOf = "github:";
};
};
core = {
autocrlf = "input";
editor = "micro";
};
color = {
ui = true;
};
pull = {
ff = "only";
};
filter.lfs = {
clean = "git-lfs clean -- %f";
smudge = "git-lfs smudge -- %f";
process = "git-lfs filter-process";
required = true;
};
credential = {
helper = "libsecret";
};
merge = {
conflictStyle = "zdiff3";
};
};
};
}

View File

@ -18,11 +18,6 @@
fsType = "zfs";
};
fileSystems."/nix" =
{ device = "zroot/data/nix";
fsType = "zfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/970C-6A15";
fsType = "vfat";

View File

@ -7,7 +7,7 @@
"sysrq_always_enabled=1"
];
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_15;
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_14;
boot.loader = {
efi.canTouchEfiVariables = true;
timeout = 3;
@ -24,9 +24,6 @@
# Enable networking
networking.networkmanager.enable = true;
networking.networkmanager.plugins = [
pkgs.networkmanager-openvpn
];
# Enable the X11 windowing system.
# You can disable this if you're only using the Wayland session.
@ -110,7 +107,6 @@
jq
ldns
mediainfo
powertop
rbw
restic
resticprofile
@ -118,7 +114,6 @@
ripgrep-all
rustscan
whois
wireguard-tools
yt-dlp
] ++ [
bitwarden-desktop

View File

@ -1,24 +0,0 @@
{
imports = [
../hw-vm.nix
];
router = {
enableDesktop = false;
enableDhcpClient = false;
wanMAC = "bc:24:11:af:bd:84";
lanMAC = "bc:24:11:38:b1:91";
wanLL = "fe80::be24:11ff:feaf:bd84";
lanLL = "fe80::be24:11ff:fe38:b191";
defaultToken = 251;
pdFromWan = "fd46:fbbe:ca55:100";
wanAddr4 = "192.168.1.63";
wanGw4 = "192.168.1.254";
};
networking.hostName = "grouty";
# override hw-vm.nix default
networking.useDHCP = false;
}

View File

@ -1,24 +0,0 @@
{
imports = [
../hw-vm.nix
];
router = {
enableDesktop = false;
enableDhcpClient = false;
wanMAC = "bc:24:11:bc:db:c1";
lanMAC = "bc:24:11:19:2a:96";
wanLL = "fe80::be24:11ff:febc:dbc1";
lanLL = "fe80::be24:11ff:fe19:2a96";
defaultToken = 252;
pdFromWan = "fd46:fbbe:ca55:100";
wanAddr4 = "192.168.1.64";
wanGw4 = "192.168.1.254";
};
networking.hostName = "grouta";
# override hw-vm.nix default
networking.useDHCP = false;
}

View File

@ -1,18 +1,89 @@
{ config, lib, pkgs, ... }:
let
vars = import ./vars.nix;
enableDesktop = false;
in
{
imports = [
./hardware-configuration.nix
./private.nix
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
./ifconfig.nix
./firewall.nix
./dns.nix
./kea.nix
./glance.nix
./services.nix
];
# Secrix for secrets management
secrix.hostPubKey = vars.pubkey;
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = false;
boot.kernelParams = [
"sysrq_always_enabled=1"
];
router = {
enableDesktop = false;
enableDhcpClient = true;
wanMAC = "bc:24:11:4f:c9:c4";
lanMAC = "bc:24:11:83:d8:de";
wanLL = "fe80::be24:11ff:fe4f:c9c4";
lanLL = "fe80::be24:11ff:fe83:d8de";
defaultToken = 1;
};
boot.loader.timeout = 2;
boot.loader.systemd-boot.configurationLimit = 5;
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
boot.growPartition = true;
networking.hostName = "grouter";
# Enable the X11 windowing system.
# You can disable this if you're only using the Wayland session.
services.xserver.enable = false;
# Enable the KDE Plasma Desktop Environment.
# Useful for debugging with wireshark.
hardware.graphics.enable = true;
services.displayManager.sddm.enable = enableDesktop;
services.displayManager.sddm.wayland.enable = enableDesktop;
services.desktopManager.plasma6.enable = enableDesktop;
# No need for audio in VM
services.pipewire.enable = false;
# VM services
services.qemuGuest.enable = true;
services.spice-vdagentd.enable = true;
security.sudo.wheelNeedsPassword = false;
programs.firefox.enable = true;
programs.fish.enable = true;
programs.git.enable = true;
programs.neovim.enable = true;
programs.bat.enable = true;
programs.htop.enable = true;
programs.wireshark.enable = true;
programs.wireshark.package = pkgs.wireshark; # wireshark-cli by default
environment.systemPackages = with pkgs; [
dust
eza
fastfetch
fd
kdePackages.kate
ldns
lsof
micro
mpv
openssl
ripgrep
rustscan
starship
tealdeer
transcrypt
waypipe
whois
];
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "24.11"; # Did you read the comment?
}

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
vars = import ./vars.nix config;
vars = import ./vars.nix;
domain = vars.domain;
ldomain = vars.ldomain;
sysdomain = vars.sysdomain;
@ -44,12 +44,10 @@ in
services.adguardhome.mutableSettings = false;
# https://github.com/AdguardTeam/Adguardhome/wiki/Configuration
services.adguardhome.settings = {
querylog.interval = "168h"; # 7 days
dns = {
# Disable rate limit, default of 20 is too low
# https://github.com/AdguardTeam/AdGuardHome/issues/6726
ratelimit = 0;
enable_dnssec = true;
bootstrap_dns = [ "1.1.1.1" "9.9.9.9" ];
upstream_dns = [
# Default upstreams
@ -80,14 +78,11 @@ in
"|etappi.${sysdomain}^$dnsrewrite=${ifs.lan.p4}.12"
"|etappi.${sysdomain}^$dnsrewrite=${ifs.lan.ulaPrefix}::12:1"
"|hass.${domain}^$dnsrewrite=${ifs.lan.ulaAddr}"
# Lab DNS rewrites
"||lab.${domain}^$dnsrewrite=etappi.${sysdomain}"
# Allowed exceptions
"@@||googleads.g.doubleclick.net"
"@@||stats.grafana.org"
]
# Alpina DNS rewrites
++ map (host: "${host}${domain}^$dnsrewrite=debbi.${sysdomain}") alpinaDomains;

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
vars = import ./vars.nix config;
vars = import ./vars.nix;
links = vars.links;
ifs = vars.ifs;
pdFromWan = vars.pdFromWan;
@ -13,7 +13,6 @@ let
${ifs.lan30.name},
${ifs.lan40.name},
${ifs.lan50.name},
${ifs.wg0.name},
}
define OPNSENSE_NET6 = ${vars.extra.opnsense.net6}
define ZONE_LAN_EXTRA_NET6 = {
@ -47,15 +46,7 @@ in
map port_forward {
type inet_proto . inet_service : ipv4_addr . inet_service
elements = {
tcp . 8006 : ${ifs.lan50.p4}.10 . 8006,
# opnsense vpn endpoints
# the plan is to maybe eventually move these to nixos
udp . 18596 : ${vars.extra.opnsense.addr4} . 18596,
udp . 48512 : ${vars.extra.opnsense.addr4} . 48512,
udp . 40993 : ${vars.extra.opnsense.addr4} . 40993,
udp . 45608 : ${vars.extra.opnsense.addr4} . 45608,
udp . 35848 : ${vars.extra.opnsense.addr4} . 35848,
udp . 48425 : ${vars.extra.opnsense.addr4} . 48425,
tcp . 8006 : ${ifs.lan50.p4}.10 . 8006
}
}
@ -94,10 +85,8 @@ in
family = "inet";
content = ''
${nftIdentifiers}
define ALLOWED_TCP_PORTS = { ssh }
define ALLOWED_UDP_PORTS = { ${toString vars.ifs.wg0.listenPort} }
define ALLOWED_TCP_LAN_PORTS = { ssh, https }
define ALLOWED_UDP_LAN_PORTS = { bootps, dhcpv6-server, domain, https }
define ALLOWED_TCP_PORTS = { ssh, https }
define ALLOWED_UDP_PORTS = { bootps, dhcpv6-server, domain, https }
set port_forward_v6 {
type inet_proto . ipv6_addr . inet_service
elements = {
@ -144,10 +133,6 @@ in
# but apparently not.
ip6 daddr { fe80::/10, ff02::/16 } th dport { dhcpv6-client, dhcpv6-server } accept
# Global input rules
tcp dport $ALLOWED_TCP_PORTS accept
udp dport $ALLOWED_UDP_PORTS accept
# WAN zone input rules
iifname $ZONE_WAN_IFS jump zone_wan_input
# LAN zone input rules
@ -172,7 +157,8 @@ in
}
chain zone_wan_input {
# Allow specific stuff from WAN
# Allow SSH from WAN (if needed)
tcp dport ssh accept
}
chain zone_wan_forward {
@ -194,8 +180,8 @@ in
ip protocol icmp accept
# Allow specific services from LAN
tcp dport $ALLOWED_TCP_LAN_PORTS accept
udp dport $ALLOWED_UDP_LAN_PORTS accept
tcp dport $ALLOWED_TCP_PORTS accept
udp dport $ALLOWED_UDP_PORTS accept
}
chain zone_lan_forward {

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
vars = import ./vars.nix config;
vars = import ./vars.nix;
domain = vars.domain;
in
{

View File

@ -1,7 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.router;
vars = import ./vars.nix config;
vars = import ./vars.nix;
links = vars.links;
ifs = vars.ifs;
pdFromWan = vars.pdFromWan;
@ -58,7 +57,7 @@ in
# https://github.com/systemd/systemd/issues/22571
# https://github.com/systemd/systemd/issues/22571#issuecomment-2094905496
# https://gist.github.com/csamsel/0f8cca3b2e64d7e4cc47819ec5ba9396
networking.dhcpcd.enable = cfg.enableDhcpClient;
networking.dhcpcd.enable = true;
networking.dhcpcd.allowInterfaces = [ ifs.wan.name ];
networking.dhcpcd.extraConfig = ''
debug
@ -84,7 +83,7 @@ in
ia_pd 30/${ifs.lan30.net6} -
ia_pd 40/${ifs.lan40.net6} -
ia_pd 50/${ifs.lan50.net6} -
ia_pd 100/${pdFromWan}9::/64 - # for vpn stuff
# ia_pd 7 -
# ia_pd 8 -
# the leases can be assigned to the interfaces,

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
vars = import ./vars.nix config;
vars = import ./vars.nix;
ldomain = vars.ldomain;
ifs = vars.ifs;

View File

@ -1,3 +1,2 @@
U2FsdGVkX1+eMFkQxarJDGLkX0zXyMRPukeRNvzd/BJ0XDAUZ2EeZvQnZw8U53Xz
W97X4rvT+K/NQ7FVCYfOg1XpQhzlSiC9z1M4WLmPRutUgsDY5n5RFJu2R8K5DAfi
sAPcxiQUGVKrmDUva16yNqoR2Dkx2XE9iW1hpkfGFYVUK+QKIBkUEowQQlJJ1Wg1
U2FsdGVkX1/98w32OE1ppwT0I5A3UOTKCLJfvk+TQdrbf0TLfYNZ9TC9n8cH2hC9
ObKVuFlOLwHlzeBy7MXaLg==

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
vars = import ./vars.nix config;
vars = import ./vars.nix;
domain = vars.domain;
in
{
@ -52,42 +52,33 @@ in
};
};
secrix.system.secrets.cf-api-key.encrypted.file = ./secrets/cf-api-key.age;
secrix.system.secrets.cf-api-key.encrypted.file = ../../secrets/cf_api_key.age;
systemd.services.caddy.serviceConfig.EnvironmentFile = config.secrix.system.secrets.cf-api-key.decrypted.path;
services.caddy = {
enable = true;
package = pkgs.caddy.withPlugins {
plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
hash = "sha256-2D7dnG50CwtCho+U+iHmSj2w14zllQXPjmTHr6lJZ/A=";
hash = "sha256-Gsuo+ripJSgKSYOM9/yl6Kt/6BFCA6BuTDvPdteinAI=";
};
virtualHosts."*.${domain}".extraConfig = ''
virtualHosts."grouter.${domain}".extraConfig = ''
encode
tls {
dns cloudflare {env.CF_API_KEY}
resolvers 1.1.1.1
}
@grouter host grouter.${domain}
handle @grouter {
@grafana path /grafana /grafana/*
handle @grafana {
reverse_proxy localhost:${toString config.services.grafana.settings.server.http_port}
}
redir /adghome /adghome/
handle_path /adghome/* {
reverse_proxy localhost:${toString config.services.adguardhome.port}
basic_auth {
Bob $2a$14$HsWmmzQTN68K3vwiRAfiUuqIjKoXEXaj9TOLUtG2mO1vFpdovmyBy
}
}
handle /* {
reverse_proxy localhost:${toString config.services.glance.settings.server.port}
@grafana path /grafana /grafana/*
handle @grafana {
reverse_proxy localhost:${toString config.services.grafana.settings.server.http_port}
}
redir /adghome /adghome/
handle_path /adghome/* {
reverse_proxy localhost:${toString config.services.adguardhome.port}
basic_auth {
Bob $2a$14$HsWmmzQTN68K3vwiRAfiUuqIjKoXEXaj9TOLUtG2mO1vFpdovmyBy
}
}
@hass host hass.${domain}
handle @hass {
reverse_proxy homeassistant.4.lab.l.cazzzer.com:8123
handle /* {
reverse_proxy localhost:${toString config.services.glance.settings.server.port}
}
'';
};

View File

@ -1,34 +1,31 @@
config:
let
cfg = config.router;
private = import ./private.nix;
mkIfConfig = {
name_,
domain_,
p4_, # /24
p4Size_ ? 24,
p6_, # /64
p6Size_ ? 64,
ulaPrefix_, # /64
ulaSize_ ? 64,
token? cfg.defaultToken,
token? 1,
ip6Token_? "::${toString token}",
ulaToken_? "::${toString token}",
}: rec {
name = name_;
domain = domain_;
p4 = p4_;
p4Size = p4Size_;
p4Size = 24;
net4 = "${p4}.0/${toString p4Size}";
addr4 = "${p4}.${toString token}";
addr4Sized = "${addr4}/${toString p4Size}";
p6 = p6_;
p6Size = p6Size_;
p6Size = 64;
net6 = "${p6}::/${toString p6Size}";
ip6Token = ip6Token_;
addr6 = "${p6}${ip6Token}";
addr6Sized = "${addr6}/${toString p6Size}";
ulaPrefix = ulaPrefix_;
ulaSize = ulaSize_;
ulaSize = 64;
ulaNet = "${ulaPrefix}::/${toString ulaSize}";
ulaToken = ulaToken_;
ulaAddr = "${ulaPrefix}${ulaToken}";
@ -41,21 +38,21 @@ rec {
ldomain = "l.${domain}";
sysdomain = "sys.${domain}";
links = {
wanMAC = cfg.wanMAC;
lanMAC = cfg.lanMAC;
wanLL = cfg.wanLL;
lanLL = cfg.lanLL;
wanMAC = "bc:24:11:4f:c9:c4";
lanMAC = "bc:24:11:83:d8:de";
wanLL = "fe80::be24:11ff:fe4f:c9c4";
lanLL = "fe80::be24:11ff:fe83:d8de";
};
p4 = "10.17"; # .0.0/16
pdFromWan = cfg.pdFromWan; # ::/60
pdFromWan = private.pdFromWan; # ::/60
ulaPrefix = "fdab:07d3:581d"; # ::/48
ifs = rec {
wan = rec {
name = "wan";
addr4 = cfg.wanAddr4;
addr4 = "192.168.1.61";
addr4Sized = "${addr4}/24";
gw4 = cfg.wanGw4;
gw4 = "192.168.1.254";
};
lan = mkIfConfig {
name_ = "lan";
@ -77,7 +74,7 @@ rec {
p4_ = "${p4}.20"; # .0/24
p6_ = "${pdFromWan}0"; # ::/64 managed by Att box
ulaPrefix_ = "${ulaPrefix}:0020"; # ::/64
ip6Token_ = "::1:${toString cfg.defaultToken}"; # override ipv6 for lan20, since the Att box uses ::1 here
ip6Token_ = "::1:1"; # override ipv6 for lan20, since the Att box uses ::1 here
};
lan30 = mkIfConfig {
name_ = "${lan.name}.30";
@ -100,17 +97,6 @@ rec {
p6_ = "${pdFromWan}a"; # ::/64
ulaPrefix_ = "${ulaPrefix}:0050"; # ::/64
};
wg0 = mkIfConfig {
name_ = "wg0";
domain_ = "wg0.${ldomain}";
p4_ = "10.18.16"; # .0/24
p6_ = "${pdFromWan}9:0:6"; # ::/96
p6Size_ = 96;
ulaPrefix_ = "${ulaPrefix}:0100:0:6"; # ::/96
ulaSize_ = 96;
} // {
listenPort = 51944;
};
};
extra = {

View File

@ -1,92 +0,0 @@
{ config, lib, pkgs, ... }:
let
vars = import ./vars.nix config;
enableDesktop = config.router.enableDesktop;
in
{
imports =
[ # Include the results of the hardware scan.
./opts.nix
./ifconfig.nix
./wireguard.nix
./firewall.nix
./dns.nix
./kea.nix
./glance.nix
./services.nix
];
# Secrix for secrets management
secrix.hostPubKey = vars.pubkey;
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = false;
boot.kernelParams = [
"sysrq_always_enabled=1"
];
boot.loader.timeout = 2;
boot.loader.systemd-boot.configurationLimit = 5;
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
boot.growPartition = true;
# Enable the X11 windowing system.
# You can disable this if you're only using the Wayland session.
services.xserver.enable = false;
# Enable the KDE Plasma Desktop Environment.
# Useful for debugging with wireshark.
hardware.graphics.enable = true;
services.xserver.desktopManager.xfce.enable = enableDesktop;
services.xserver.desktopManager.xfce.enableWaylandSession = enableDesktop;
# services.displayManager.sddm.enable = enableDesktop;
# services.displayManager.sddm.wayland.enable = enableDesktop;
# services.desktopManager.plasma6.enable = enableDesktop;
# No need for audio in VM
services.pipewire.enable = false;
# VM services
services.qemuGuest.enable = true;
services.spice-vdagentd.enable = true;
security.sudo.wheelNeedsPassword = false;
programs.firefox.enable = true;
programs.fish.enable = true;
programs.git.enable = true;
programs.neovim.enable = true;
programs.bat.enable = true;
programs.htop.enable = true;
programs.wireshark.enable = true;
programs.wireshark.package = pkgs.wireshark; # wireshark-cli by default
environment.systemPackages = with pkgs; [
dust
eza
fastfetch
fd
kdePackages.kate
ldns
lsof
micro
mpv
openssl
ripgrep
rustscan
starship
tealdeer
transcrypt
wakeonlan
waypipe
whois
wireguard-tools
];
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "24.11"; # Did you read the comment?
}

View File

@ -1,69 +0,0 @@
{ lib, config, ... }:
with lib;
{
options = {
router = {
enableDesktop = mkOption {
type = types.bool;
default = false;
description = "Enable desktop environment for debugging";
};
enableDhcpClient = mkOption {
type = types.bool;
default = false;
description = "Enable DHCP client (should only be set on the main router)";
};
wanMAC = mkOption {
type = types.str;
example = "bc:24:11:4f:c9:c4";
description = "WAN interface MAC address";
};
lanMAC = mkOption {
type = types.str;
example = "bc:24:11:83:d8:de";
description = "LAN interface MAC address";
};
wanLL = mkOption {
type = types.str;
example = "fe80::be24:11ff:fe4f:c9c4";
description = "WAN IPv6 link-local address";
};
lanLL = mkOption {
type = types.str;
example = "fe80::be24:11ff:fe83:d8de";
description = "LAN IPv6 link-local address";
};
defaultToken = mkOption {
type = types.int;
default = 1;
description = "Default token for interface addressing";
};
wanAddr4 = mkOption {
type = types.str;
example = "192.168.1.61";
description = "WAN IPv4 address";
};
wanGw4 = mkOption {
type = types.str;
example = "192.168.1.254";
description = "WAN IPv4 gateway";
};
pdFromWan = mkOption {
type = types.str;
example = "2001:db8:0:000";
description = "IPv6 prefix delegation from ISP (/60)";
};
};
};
}

View File

@ -1,5 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 D2MY/A cRVo1AetNYKsb28kGpe6mVpoCyfNcRibeBYhJuXbbEY
k8XL4XEv4FM6sfU/TOFTg4vlKm61409No/TpCEjTnSk
--- mT9w1vnx2FrzWw+Zt1wV6UJ+mjHTizrUPVeaTisYQ74
=—q-SoÁÚpn„”§ÆöIÿ•þZÖ i˜'ƒÖÓ"%M©®¯C& ñÿá«K-<2D>E>¹ˆ»ûgBæfXßñ×I¶?@÷D@<40>q®ñ

View File

@ -1,5 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 D2MY/A Xg7XTl/qJqVqvXsHNKcoICq74DeOlquN1CEn1PwxlVY
FqmPdDgmuUrwZPLW56RhW8o1VXr5l2Xms6IVebpi7bA
--- nLT/bC55EvoXK6f7DYbMhD3I8Z122bxeGVw1PCds2IM
!×ûãDlµêôñ°Ý;ÉûKXq8ï4”œ©‰+b·p_q4Bý³'8cI„„D± <0C> ƒV~;v*ÆúW·-¹,[´ì

View File

@ -1,72 +0,0 @@
{ config, lib, pkgs, ... }:
let
vars = import ./vars.nix config;
wg0 = vars.ifs.wg0;
peerIps = ifObj: token: [
"${ifObj.p4}.${toString token}/32"
"${ifObj.p6}:${toString token}:0/112"
"${ifObj.ulaPrefix}:${toString token}:0/112"
];
mkWg0Peer = token: publicKey: {
allowedIPs = peerIps wg0 token;
inherit publicKey;
pskEnabled = true;
};
wg0Peers = {
"Yura-TPX13" = mkWg0Peer 100 "iFdsPYrpw7vsFYYJB4SOTa+wxxGVcmYp9CPxe0P9ewA=";
"Yura-Pixel7Pro" = mkWg0Peer 101 "GPdXxjvnhsyufd2QX/qsR02dinUtPnnxrE66oGt/KyA=";
};
peerSecretName = name: "wg0-peer-${name}-psk";
secrets = config.secrix.services.systemd-networkd.secrets;
in
{
secrix.services.systemd-networkd.secrets = let
pskPeers = lib.attrsets.filterAttrs (name: peer: peer.pskEnabled) wg0Peers;
mapPeer = name: peer: {
name = peerSecretName name;
value.encrypted.file = ./secrets/wireguard/${peerSecretName name}.age;
};
peerSecrets = lib.attrsets.mapAttrs' mapPeer pskPeers;
allSecrets = {
wg0-private-key.encrypted.file = ./secrets/wireguard/wg0-private-key.age;
} // peerSecrets;
setSecretOwnership = name: value: value // {
decrypted.user = "systemd-network";
decrypted.group = "systemd-network";
};
in lib.attrsets.mapAttrs setSecretOwnership allSecrets;
systemd.network.netdevs = {
"10-wg0" = {
netdevConfig = {
Kind = "wireguard";
Name = wg0.name;
};
wireguardConfig = {
PrivateKeyFile = secrets.wg0-private-key.decrypted.path;
ListenPort = wg0.listenPort;
};
wireguardPeers = map (peer: {
AllowedIPs = lib.strings.concatStringsSep "," peer.value.allowedIPs;
PublicKey = peer.value.publicKey;
PresharedKeyFile = if peer.value.pskEnabled then secrets."${peerSecretName peer.name}".decrypted.path else null;
}) (lib.attrsToList wg0Peers);
};
};
systemd.network.networks = {
"10-wg0" = {
matchConfig.Name = "wg0";
networkConfig = {
IPv4Forwarding = true;
IPv6SendRA = false;
Address = [ wg0.addr4Sized wg0.addr6Sized wg0.ulaAddrSized ];
};
};
};
}

View File

@ -5,7 +5,7 @@
isNormalUser = true;
description = "Yura";
group = "cazzzer";
extraGroups = [ "wheel" "dialout" ]
extraGroups = [ "wheel" ]
++ lib.optionals config.networking.networkmanager.enable [ "networkmanager" ]
++ lib.optionals config.virtualisation.docker.enable [ "docker" ]
++ lib.optionals config.programs.wireshark.enable [ "wireshark" ]