nix/nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add plato back to rus.selby.ca, move git to common

Browse Source
This commit is contained in:
Niten 2021-03-02 17:07:31 +00:00
parent ce77837769
commit 25e3cd0783
5 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/hardware/clunk.nix
View File

@ -48,11 +48,6 @@
interface = "enp2s0"; interface = "enp2s0";
mode = "bridge"; mode = "bridge";
}; };
extif0 = {
interface = "enp1s0";
mode = "bridge";
};
}; };
interfaces = { interfaces = {
@ -60,11 +55,6 @@
# output of: echo clunk-intif0|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/' # output of: echo clunk-intif0|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/'
macAddress = "02:44:d1:eb:c3:6b"; macAddress = "02:44:d1:eb:c3:6b";
}; };
extif0 = {
# output of: echo clunk-extif0|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/'
macAddress = "02:5e:ff:e4:83:e4";
};
}; };
}; };
} }

11
config/hosts/clunk.nix
View File

@ -1,5 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib;
let let
primary-ip = "10.0.0.1"; primary-ip = "10.0.0.1";
dns-proxy-ip = "10.0.0.2"; dns-proxy-ip = "10.0.0.2";
@ -8,6 +9,9 @@ let
site = config.fudo.site.${site-name}; site = config.fudo.site.${site-name};
in { in {
# Don't do unsupervised upgrades...
system.autoUpgrade.enable = mkForce false;
fudo.local-network = let fudo.local-network = let
host-config = config.fudo.hosts.${config.instance.hostname}; host-config = config.fudo.hosts.${config.instance.hostname};
site-name = host-config.site; site-name = host-config.site;
@ -42,7 +46,8 @@ in {
}; };
interfaces = { interfaces = {
# enp1s0.useDHCP = false; enp1s0.useDHCP = true;
enp2s0.useDHCP = false; enp2s0.useDHCP = false;
enp3s0.useDHCP = false; enp3s0.useDHCP = false;
enp4s0.useDHCP = false; enp4s0.useDHCP = false;
@ -60,13 +65,11 @@ in {
} }
]; ];
}; };
extif0 = { useDHCP = true; };
}; };
nat = { nat = {
enable = true; enable = true;
externalInterface = "extif0"; externalInterface = "enp1s0";
internalInterfaces = [ "intif0" ]; internalInterfaces = [ "intif0" ];
}; };
}; };

5
config/networks/rus.selby.ca.nix
View File

@ -25,6 +25,11 @@ in {
mac-address = "70:3a:cb:c0:3b:09"; mac-address = "70:3a:cb:c0:3b:09";
}; };
plato = {
ipv4-address = "10.0.0.102";
mac-address = "00:e3:5c:68:79:a2";
};
pselby-work = { pselby-work = {
ipv4-address = "10.0.0.151"; ipv4-address = "10.0.0.151";
mac-address = "00:50:b6:aa:bd:b3"; mac-address = "00:50:b6:aa:bd:b3";

2
config/profiles/common.nix
View File

@ -3,7 +3,7 @@
with lib; with lib;
let let
# Available to all users on the system. Keep it minimal. # Available to all users on the system. Keep it minimal.
global-packages = with pkgs; [ openssh_gssapi vim wget ]; global-packages = with pkgs; [ bind git openssh_gssapi vim wget ];
in { in {
environment = { environment = {

7
home-manager/niten.nix
View File

@ -18,7 +18,6 @@ let
enca enca
file file
fortune fortune
git
gnupg gnupg
guile guile
imagemagick imagemagick
@ -63,11 +62,7 @@ in {
userName = name; userName = name;
userEmail = email; userEmail = email;
ignores = [ "*~" ]; ignores = [ "*~" ];
extraConfig = { extraConfig = { pull = { rebase = false; }; };
pull = {
rebase = false;
};
};
}; };
}; };