update lock file remove tabs
This commit is contained in:
+24
-24
@@ -7,16 +7,16 @@
|
||||
|
||||
users.users.lilac = {
|
||||
isNormalUser = true;
|
||||
group = "lilac";
|
||||
extraGroups = [ "wheel" ];
|
||||
group = "lilac";
|
||||
extraGroups = [ "wheel" ];
|
||||
};
|
||||
users.groups.lilac = {};
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
useUserPackages = true;
|
||||
|
||||
users.lilac = import ../../home/lilac.nix;
|
||||
};
|
||||
users.lilac = import ../../home/lilac.nix;
|
||||
};
|
||||
programs.zsh.enable = true;
|
||||
users.users.lilac.shell = pkgs.zsh;
|
||||
security.sudo.wheelNeedsPassword = false;
|
||||
@@ -62,8 +62,8 @@
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
whipper
|
||||
flac
|
||||
tor-browser
|
||||
flac
|
||||
tor-browser
|
||||
];
|
||||
|
||||
networking.wireless.enable = true;
|
||||
@@ -73,22 +73,22 @@
|
||||
|
||||
networking = {
|
||||
firewall = {
|
||||
enable = true;
|
||||
allowedUDPPorts = [ 51820 ];
|
||||
trustedInterfaces = [ "wg0" ];
|
||||
};
|
||||
enable = true;
|
||||
allowedUDPPorts = [ 51820 ];
|
||||
trustedInterfaces = [ "wg0" ];
|
||||
};
|
||||
|
||||
wireguard.interfaces."wg0" = {
|
||||
wireguard.interfaces."wg0" = {
|
||||
ips = [ "10.0.0.4/24" ];
|
||||
generatePrivateKeyFile = true;
|
||||
privateKeyFile = "/var/lib/wireguard/wg0.key";
|
||||
peers = [{
|
||||
generatePrivateKeyFile = true;
|
||||
privateKeyFile = "/var/lib/wireguard/wg0.key";
|
||||
peers = [{
|
||||
publicKey = "Tst6SiqoGLSoOAF9l5vT2vvR2RGJ/mFcoBL3BL5n90k=";
|
||||
allowedIPs = [ "10.0.0.0/24" ];
|
||||
endpoint = "216.128.177.13:51820";
|
||||
persistentKeepalive = 25;
|
||||
}];
|
||||
};
|
||||
allowedIPs = [ "10.0.0.0/24" ];
|
||||
endpoint = "216.128.177.13:51820";
|
||||
persistentKeepalive = 25;
|
||||
}];
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
@@ -99,10 +99,10 @@ networking = {
|
||||
|
||||
services.restic.server = {
|
||||
enable = true;
|
||||
listenAddress = "10.0.0.4:8000";
|
||||
dataDir = "/var/lib/restic";
|
||||
appendOnly = true;
|
||||
extraFlags = [ "--no-auth" ];
|
||||
listenAddress = "10.0.0.4:8000";
|
||||
dataDir = "/var/lib/restic";
|
||||
appendOnly = true;
|
||||
extraFlags = [ "--no-auth" ];
|
||||
};
|
||||
|
||||
networking.firewall.interfaces.wg0.allowedTCPPorts = [ 8000 ];
|
||||
|
||||
+25
-25
@@ -9,17 +9,17 @@
|
||||
../../modules/site/mail.nix
|
||||
../../modules/site/music.nix
|
||||
../../modules/site/photo.nix
|
||||
../../modules/site/vault.nix
|
||||
../../modules/site/vault.nix
|
||||
|
||||
../../modules/ssh.nix
|
||||
../../modules/ssh.nix
|
||||
];
|
||||
|
||||
networking.hostName = "desktop";
|
||||
|
||||
users.users.lilac = {
|
||||
isNormalUser = true;
|
||||
group = "lilac";
|
||||
extraGroups = [ "wheel" "render" "video" "input" "uinput" ];
|
||||
group = "lilac";
|
||||
extraGroups = [ "wheel" "render" "video" "input" "uinput" ];
|
||||
};
|
||||
users.groups.lilac = {};
|
||||
home-manager = {
|
||||
@@ -102,31 +102,31 @@
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
whipper
|
||||
flac
|
||||
tor-browser
|
||||
restic
|
||||
flac
|
||||
tor-browser
|
||||
restic
|
||||
];
|
||||
|
||||
programs.steam.enable = true;
|
||||
|
||||
networking = {
|
||||
firewall = {
|
||||
enable = true;
|
||||
allowedUDPPorts = [ 51820 ];
|
||||
trustedInterfaces = [ "wg0" ];
|
||||
};
|
||||
enable = true;
|
||||
allowedUDPPorts = [ 51820 ];
|
||||
trustedInterfaces = [ "wg0" ];
|
||||
};
|
||||
|
||||
wireguard.interfaces."wg0" = {
|
||||
wireguard.interfaces."wg0" = {
|
||||
ips = [ "10.0.0.2/24" ];
|
||||
generatePrivateKeyFile = true;
|
||||
privateKeyFile = "/var/lib/wireguard/wg0.key";
|
||||
peers = [{
|
||||
generatePrivateKeyFile = true;
|
||||
privateKeyFile = "/var/lib/wireguard/wg0.key";
|
||||
peers = [{
|
||||
publicKey = "Tst6SiqoGLSoOAF9l5vT2vvR2RGJ/mFcoBL3BL5n90k=";
|
||||
allowedIPs = [ "10.0.0.0/24" ];
|
||||
endpoint = "216.128.177.13:51820";
|
||||
persistentKeepalive = 25;
|
||||
}];
|
||||
};
|
||||
allowedIPs = [ "10.0.0.0/24" ];
|
||||
endpoint = "216.128.177.13:51820";
|
||||
persistentKeepalive = 25;
|
||||
}];
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
@@ -135,10 +135,10 @@
|
||||
|
||||
services.restic.backups.backup = {
|
||||
repository = "rest:http://10.0.0.4:8000/backup";
|
||||
initialize = true;
|
||||
passwordFile = "/home/lilac/test-password";
|
||||
paths = [ "/var/lib/immich" "/var/lib/music" "/var/lib/gitea" "/var/lib/vault-backup" ];
|
||||
timerConfig.OnCalendar = "03:30";
|
||||
pruneOpts = [ "--keep-daily 7" "--keep-weekly 4" "--keep-monthly 12" ];
|
||||
initialize = true;
|
||||
passwordFile = "/home/lilac/test-password";
|
||||
paths = [ "/var/lib/immich" "/var/lib/music" "/var/lib/gitea" "/var/lib/vault-backup" ];
|
||||
timerConfig.OnCalendar = "03:30";
|
||||
pruneOpts = [ "--keep-daily 7" "--keep-weekly 4" "--keep-monthly 12" ];
|
||||
};
|
||||
}
|
||||
|
||||
+30
-30
@@ -11,8 +11,8 @@
|
||||
|
||||
users.users.lilac = {
|
||||
isNormalUser = true;
|
||||
group = "lilac";
|
||||
extraGroups = [ "wheel" ];
|
||||
group = "lilac";
|
||||
extraGroups = [ "wheel" ];
|
||||
};
|
||||
users.groups.lilac = {};
|
||||
home-manager = {
|
||||
@@ -27,47 +27,47 @@
|
||||
# forwarding inbound network traffic over wireguard
|
||||
networking = {
|
||||
firewall = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [ 80 443 ];
|
||||
allowedUDPPorts = [ 51820 ];
|
||||
trustedInterfaces = [ "wg0" ];
|
||||
};
|
||||
wireguard.interfaces."wg0" = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [ 80 443 ];
|
||||
allowedUDPPorts = [ 51820 ];
|
||||
trustedInterfaces = [ "wg0" ];
|
||||
};
|
||||
wireguard.interfaces."wg0" = {
|
||||
ips = [ "10.0.0.3/24" ];
|
||||
listenPort = 51820;
|
||||
generatePrivateKeyFile = true;
|
||||
privateKeyFile = "/var/lib/wireguard/wg0.key";
|
||||
peers = [
|
||||
{
|
||||
allowedIPs = [ "10.0.0.1/32" ];
|
||||
listenPort = 51820;
|
||||
generatePrivateKeyFile = true;
|
||||
privateKeyFile = "/var/lib/wireguard/wg0.key";
|
||||
peers = [
|
||||
{
|
||||
allowedIPs = [ "10.0.0.1/32" ];
|
||||
publicKey = "guKFJGQW946HXWjca/biMYH1nJKw0fguLjzGXKZ7Bxw=";
|
||||
}
|
||||
{
|
||||
}
|
||||
{
|
||||
allowedIPs = [ "10.0.0.2/32" ];
|
||||
publicKey = "7BcwtszpzS4ABDwKwMaiJ7F35sJRa89fBbuh80Sk8Uk=";
|
||||
}
|
||||
{
|
||||
allowedIPs = [ "10.0.0.4/32" ];
|
||||
publicKey = "XjuV3wzkP03UUjYSJfY3OG3WWLRtoQBN7GokDEWhdhQ=";
|
||||
}
|
||||
publicKey = "7BcwtszpzS4ABDwKwMaiJ7F35sJRa89fBbuh80Sk8Uk=";
|
||||
}
|
||||
{
|
||||
allowedIPs = [ "10.0.0.4/32" ];
|
||||
publicKey = "XjuV3wzkP03UUjYSJfY3OG3WWLRtoQBN7GokDEWhdhQ=";
|
||||
}
|
||||
];
|
||||
};
|
||||
nftables = {
|
||||
enable = true;
|
||||
tables.nat = {
|
||||
family = "ip";
|
||||
content = ''
|
||||
};
|
||||
nftables = {
|
||||
enable = true;
|
||||
tables.nat = {
|
||||
family = "ip";
|
||||
content = ''
|
||||
chain prerouting {
|
||||
type nat hook prerouting priority dstnat; policy accept;
|
||||
iifname "enp1s0" tcp dport { 80, 443 } dnat to 10.0.0.2
|
||||
}
|
||||
chain postrouting {
|
||||
chain postrouting {
|
||||
type nat hook postrouting priority srcnat; policy accept;
|
||||
oifname "wg0" masquerade
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
boot.kernel.sysctl = {
|
||||
"net.ipv4.ip_forward" = 1;
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
{
|
||||
boot = {
|
||||
initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
|
||||
kernelModules = [ ];
|
||||
extraModulePackages = [ ];
|
||||
loader.systemd-boot.enable = true;
|
||||
loader.efi.canTouchEfiVariables = true;
|
||||
loader.efi.efiSysMountPoint = "/boot/efi";
|
||||
kernelModules = [ ];
|
||||
extraModulePackages = [ ];
|
||||
loader.systemd-boot.enable = true;
|
||||
loader.efi.canTouchEfiVariables = true;
|
||||
loader.efi.efiSysMountPoint = "/boot/efi";
|
||||
};
|
||||
|
||||
fileSystems."/" = { device = "/dev/vda2"; fsType = "ext4"; };
|
||||
|
||||
Reference in New Issue
Block a user