~
This commit is contained in:
parent
796c11b823
commit
90eb0c61af
5 changed files with 50 additions and 32 deletions
|
@ -18,7 +18,7 @@
|
||||||
boot.supportedFilesystems = [ "bcachefs" ];
|
boot.supportedFilesystems = [ "bcachefs" ];
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
|
||||||
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
# networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||||
time.timeZone = "Europe/Paris";
|
time.timeZone = "Europe/Paris";
|
||||||
|
|
||||||
# Configure network proxy if necessary
|
# Configure network proxy if necessary
|
||||||
|
@ -116,9 +116,12 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
streamConfig = ''
|
streamConfig = ''
|
||||||
|
upstream kat-virt {
|
||||||
|
server 192.168.122.2:22;
|
||||||
|
}
|
||||||
server {
|
server {
|
||||||
listen 22000;
|
listen 22000;
|
||||||
proxy_pass 192.168.122.2:22;
|
proxy_pass kat-virt;
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
@ -7,36 +7,36 @@
|
||||||
{
|
{
|
||||||
boot.kernel.sysctl."net.ipv4.ip_forward" = true;
|
boot.kernel.sysctl."net.ipv4.ip_forward" = true;
|
||||||
|
|
||||||
# networking.nat = {
|
# networking.nat = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
# internalInterfaces = [ "enp2s0" ];
|
# internalInterfaces = [ "vlan-thurne" ];
|
||||||
# externalInterface = "enp1s0";
|
# externalInterface = "enp1s0";
|
||||||
# };
|
# };
|
||||||
networking.interfaces.enp2s0 = {
|
# networking.interfaces.enp2s0 = {
|
||||||
useDHCP = false;
|
# useDHCP = false;
|
||||||
ipv4.addresses = [
|
# ipv4.addresses = [
|
||||||
{
|
# {
|
||||||
address = "192.168.42.1";
|
# address = "192.168.42.1";
|
||||||
prefixLength = 24;
|
# prefixLength = 24;
|
||||||
}
|
# }
|
||||||
];
|
# ];
|
||||||
};
|
# };
|
||||||
|
|
||||||
# networking.interfaces.enp3s0 = {
|
# networking.useDHCP = false;
|
||||||
# useDHCP = false;
|
networking.interfaces.enp3s0.useDHCP = lib.mkForce false;
|
||||||
# ipv4.addresses = [{ address = "192.168.222.1"; prefixLength = 24; }];
|
networking.interfaces.enp2s0.useDHCP = lib.mkForce false;
|
||||||
# ipv6.addresses = [{ address = "fd26:baf9:d250:8000::ffff"; prefixLength = 64; }];
|
networking.interfaces.enp1s0.useDHCP = lib.mkForce true;
|
||||||
# };
|
networking.useNetworkd = true;
|
||||||
|
|
||||||
services.dnsmasq = {
|
# services.dnsmasq = {
|
||||||
enable = true;
|
# enable = true;
|
||||||
settings = {
|
# settings = {
|
||||||
interface = [ "vlan-admin" ];
|
# interface = [ "vlan-admin" ];
|
||||||
bind-dynamic = true;
|
# bind-dynamic = true;
|
||||||
dhcp-option = "3,0.0.0.0";
|
# dhcp-option = "3,0.0.0.0";
|
||||||
dhcp-range = "192.168.222.100,192.168.222.254,255.255.255.0,infinite";
|
# dhcp-range = "192.168.222.100,192.168.222.254,255.255.255.0,infinite";
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
|
|
||||||
systemd.network = {
|
systemd.network = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -127,6 +127,9 @@ autocmd InsertLeave * set relativenumber!
|
||||||
map <F2> :set number!<CR>
|
map <F2> :set number!<CR>
|
||||||
map <F3> :set relativenumber!<CR>
|
map <F3> :set relativenumber!<CR>
|
||||||
|
|
||||||
|
colorscheme vim
|
||||||
|
set notermguicolors
|
||||||
|
|
||||||
hi Normal guifg=cyan guibg=black
|
hi Normal guifg=cyan guibg=black
|
||||||
hi NonText guifg=yellow guibg=#303030
|
hi NonText guifg=yellow guibg=#303030
|
||||||
hi comment guifg=green
|
hi comment guifg=green
|
||||||
|
|
|
@ -48,9 +48,15 @@
|
||||||
proxyJump = "sas.ens";
|
proxyJump = "sas.ens";
|
||||||
};
|
};
|
||||||
|
|
||||||
"jourdan01.dgn" = {
|
"netcore02.dgn" = {
|
||||||
user = "root";
|
user = "root";
|
||||||
hostname = "192.168.42.6";
|
hostname = "fd26:baf9:d250:8000::1001";
|
||||||
|
proxyJump = "r86s.kat";
|
||||||
|
identityFile = "~/.ssh/juniper";
|
||||||
|
};
|
||||||
|
"netaccess01.dgn" = {
|
||||||
|
user = "root";
|
||||||
|
hostname = "fd26:baf9:d250:8000::2001";
|
||||||
proxyJump = "r86s.kat";
|
proxyJump = "r86s.kat";
|
||||||
identityFile = "~/.ssh/juniper";
|
identityFile = "~/.ssh/juniper";
|
||||||
};
|
};
|
||||||
|
|
|
@ -51,5 +51,11 @@
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
settings.battery.disabled = true;
|
settings.battery.disabled = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
direnv = {
|
||||||
|
enable = true;
|
||||||
|
enableZshIntegration = true;
|
||||||
|
nix-direnv.enable = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue