new network setup

This commit is contained in:
Swarsel 2024-02-18 14:56:46 +01:00
parent fd2f0e3601
commit abfa84e9aa
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
4 changed files with 92 additions and 50 deletions

103
Nix.org
View file

@ -1291,50 +1291,61 @@ New setup for the SP3, this time using NixOS - another machine will take over th
#+begin_src nix :noweb yes :tangle profiles/fourside/nixos.nix #+begin_src nix :noweb yes :tangle profiles/fourside/nixos.nix
{ config, lib, pkgs, inputs, ... }: { config, lib, pkgs, inputs, ... }:
{ {
<<wrap>> <<wrap>>
services = { services = {
getty.autologinUser = "swarsel"; getty.autologinUser = "swarsel";
greetd.settings.initial_session.user="swarsel"; greetd.settings.initial_session.user="swarsel";
}; };
boot = { boot = {
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;
}; };
networking.hostName = "fourside"; # Define your hostname. networking.hostName = "fourside"; # Define your hostname.
stylix.image = ../../wallpaper/lenovowp.png; networking.firewall.enable = false;
<<theme>> stylix.image = ../../wallpaper/lenovowp.png;
<<theme>>
hardware = { hardware = {
bluetooth.enable = true; opengl = {
}; enable = true;
driSupport = true;
driSupport32Bit = true;
extraPackages = with pkgs; [
vulkan-loader
vulkan-validation-layers
vulkan-extension-layer
];
};
bluetooth.enable = true;
};
# Configure keymap in X11 (only used for login) # Configure keymap in X11 (only used for login)
services.xserver = { services.xserver = {
layout = "us"; layout = "us";
xkbVariant = "altgr-intl"; xkbVariant = "altgr-intl";
}; };
users.users.swarsel = { users.users.swarsel = {
isNormalUser = true; isNormalUser = true;
description = "Leon S"; description = "Leon S";
extraGroups = [ "networkmanager" "wheel" "lp" "audio" "video" ]; extraGroups = [ "networkmanager" "wheel" "lp" "audio" "video" ];
packages = with pkgs; []; packages = with pkgs; [];
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
]; ];
system.stateVersion = "23.05"; system.stateVersion = "23.05";
} }
#+end_src #+end_src
@ -1667,7 +1678,7 @@ In the long run, I am thinking about a transition to kubernetes or using just a
acmeRoot = null; acmeRoot = null;
locations = { locations = {
"/" = { "/" = {
proxyPass = "https://192.168.2.5"; proxyPass = "https://192.168.1.5";
extraConfig = '' extraConfig = ''
client_max_body_size 0; client_max_body_size 0;
''; '';
@ -1690,7 +1701,7 @@ In the long run, I am thinking about a transition to kubernetes or using just a
acmeRoot = null; acmeRoot = null;
locations = { locations = {
"~ ^(/_matrix|/_synapse/client)" = { "~ ^(/_matrix|/_synapse/client)" = {
proxyPass = "http://192.168.2.23:8008"; proxyPass = "http://192.168.1.23:8008";
extraConfig = '' extraConfig = ''
client_max_body_size 0; client_max_body_size 0;
''; '';
@ -1746,7 +1757,7 @@ In the long run, I am thinking about a transition to kubernetes or using just a
acmeRoot = null; acmeRoot = null;
locations = { locations = {
"/" = { "/" = {
proxyPass = "http://192.168.2.13:4040"; proxyPass = "http://192.168.1.13:4040";
proxyWebsockets = true; proxyWebsockets = true;
extraConfig = '' extraConfig = ''
proxy_redirect http:// https://; proxy_redirect http:// https://;
@ -1766,7 +1777,7 @@ In the long run, I am thinking about a transition to kubernetes or using just a
acmeRoot = null; acmeRoot = null;
locations = { locations = {
"/" = { "/" = {
proxyPass = "http://192.168.2.24:28981"; proxyPass = "http://192.168.1.24:28981";
extraConfig = '' extraConfig = ''
client_max_body_size 0; client_max_body_size 0;
''; '';
@ -1780,7 +1791,7 @@ In the long run, I am thinking about a transition to kubernetes or using just a
acmeRoot = null; acmeRoot = null;
locations = { locations = {
"/" = { "/" = {
proxyPass = "http://192.168.2.16:8096"; proxyPass = "http://192.168.1.16:8096";
extraConfig = '' extraConfig = ''
client_max_body_size 0; client_max_body_size 0;
''; '';
@ -1794,7 +1805,7 @@ In the long run, I am thinking about a transition to kubernetes or using just a
acmeRoot = null; acmeRoot = null;
locations = { locations = {
"~ ^(/_matrix|/_synapse/client)" = { "~ ^(/_matrix|/_synapse/client)" = {
proxyPass = "http://192.168.2.20:8008"; proxyPass = "http://192.168.1.20:8008";
extraConfig = '' extraConfig = ''
client_max_body_size 0; client_max_body_size 0;
''; '';
@ -1808,7 +1819,7 @@ In the long run, I am thinking about a transition to kubernetes or using just a
acmeRoot = null; acmeRoot = null;
locations = { locations = {
"/" = { "/" = {
proxyPass = "http://192.168.2.22:8080"; proxyPass = "http://192.168.1.22:8080";
extraConfig = '' extraConfig = ''
client_max_body_size 0; client_max_body_size 0;
''; '';
@ -1836,7 +1847,7 @@ In the long run, I am thinking about a transition to kubernetes or using just a
acmeRoot = null; acmeRoot = null;
locations = { locations = {
"/" = { "/" = {
proxyPass = "https://192.168.2.7"; proxyPass = "https://192.168.1.7";
extraConfig = '' extraConfig = ''
client_max_body_size 0; client_max_body_size 0;
''; '';
@ -3392,6 +3403,7 @@ Also, I define some useful shell scripts here.
# b2 backup @backblaze # b2 backup @backblaze
restic restic
# "big" programs # "big" programs
filebot filebot
gimp gimp
@ -3412,7 +3424,16 @@ Also, I define some useful shell scripts here.
# games # games
lutris lutris
#wine wine
libudev-zero
dwarfs
fuse-overlayfs
steam
steam-run
patchelf
gamescope
vulkan-tools
openssl
# firefox related # firefox related
tridactyl-native tridactyl-native

View file

@ -12,6 +12,7 @@
# b2 backup @backblaze # b2 backup @backblaze
restic restic
# "big" programs # "big" programs
filebot filebot
gimp gimp
@ -32,7 +33,16 @@
# games # games
lutris lutris
#wine wine
libudev-zero
dwarfs
fuse-overlayfs
steam
steam-run
patchelf
gamescope
vulkan-tools
openssl
# firefox related # firefox related
tridactyl-native tridactyl-native

View file

@ -21,6 +21,7 @@
networking.hostName = "fourside"; # Define your hostname. networking.hostName = "fourside"; # Define your hostname.
networking.firewall.enable = false;
stylix.image = ../../wallpaper/lenovowp.png; stylix.image = ../../wallpaper/lenovowp.png;
@ -73,6 +74,16 @@
hardware = { hardware = {
opengl = {
enable = true;
driSupport = true;
driSupport32Bit = true;
extraPackages = with pkgs; [
vulkan-loader
vulkan-validation-layers
vulkan-extension-layer
];
};
bluetooth.enable = true; bluetooth.enable = true;
}; };

View file

@ -70,7 +70,7 @@
acmeRoot = null; acmeRoot = null;
locations = { locations = {
"/" = { "/" = {
proxyPass = "https://192.168.2.5"; proxyPass = "https://192.168.1.5";
extraConfig = '' extraConfig = ''
client_max_body_size 0; client_max_body_size 0;
''; '';
@ -93,7 +93,7 @@
acmeRoot = null; acmeRoot = null;
locations = { locations = {
"~ ^(/_matrix|/_synapse/client)" = { "~ ^(/_matrix|/_synapse/client)" = {
proxyPass = "http://192.168.2.23:8008"; proxyPass = "http://192.168.1.23:8008";
extraConfig = '' extraConfig = ''
client_max_body_size 0; client_max_body_size 0;
''; '';
@ -149,7 +149,7 @@
acmeRoot = null; acmeRoot = null;
locations = { locations = {
"/" = { "/" = {
proxyPass = "http://192.168.2.13:4040"; proxyPass = "http://192.168.1.13:4040";
proxyWebsockets = true; proxyWebsockets = true;
extraConfig = '' extraConfig = ''
proxy_redirect http:// https://; proxy_redirect http:// https://;
@ -169,7 +169,7 @@
acmeRoot = null; acmeRoot = null;
locations = { locations = {
"/" = { "/" = {
proxyPass = "http://192.168.2.24:28981"; proxyPass = "http://192.168.1.24:28981";
extraConfig = '' extraConfig = ''
client_max_body_size 0; client_max_body_size 0;
''; '';
@ -183,7 +183,7 @@
acmeRoot = null; acmeRoot = null;
locations = { locations = {
"/" = { "/" = {
proxyPass = "http://192.168.2.16:8096"; proxyPass = "http://192.168.1.16:8096";
extraConfig = '' extraConfig = ''
client_max_body_size 0; client_max_body_size 0;
''; '';
@ -197,7 +197,7 @@
acmeRoot = null; acmeRoot = null;
locations = { locations = {
"~ ^(/_matrix|/_synapse/client)" = { "~ ^(/_matrix|/_synapse/client)" = {
proxyPass = "http://192.168.2.20:8008"; proxyPass = "http://192.168.1.20:8008";
extraConfig = '' extraConfig = ''
client_max_body_size 0; client_max_body_size 0;
''; '';
@ -211,7 +211,7 @@
acmeRoot = null; acmeRoot = null;
locations = { locations = {
"/" = { "/" = {
proxyPass = "http://192.168.2.22:8080"; proxyPass = "http://192.168.1.22:8080";
extraConfig = '' extraConfig = ''
client_max_body_size 0; client_max_body_size 0;
''; '';
@ -239,7 +239,7 @@
acmeRoot = null; acmeRoot = null;
locations = { locations = {
"/" = { "/" = {
proxyPass = "https://192.168.2.7"; proxyPass = "https://192.168.1.7";
extraConfig = '' extraConfig = ''
client_max_body_size 0; client_max_body_size 0;
''; '';