summaryrefslogtreecommitdiff
path: root/hosts/sif
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2021-10-17 20:50:47 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2021-10-17 20:50:47 +0200
commit3a2161ef205c432db0053e9a82893069b54e55ed (patch)
tree4557c7c6c97fba7de6585729210a0ab8c1eec3cf /hosts/sif
parent65d0b738ab8e25042f1568ed313b001101c3f628 (diff)
downloadnixos-3a2161ef205c432db0053e9a82893069b54e55ed.tar
nixos-3a2161ef205c432db0053e9a82893069b54e55ed.tar.gz
nixos-3a2161ef205c432db0053e9a82893069b54e55ed.tar.bz2
nixos-3a2161ef205c432db0053e9a82893069b54e55ed.tar.xz
nixos-3a2161ef205c432db0053e9a82893069b54e55ed.zip
yggdrasil-wg: ...
Diffstat (limited to 'hosts/sif')
-rw-r--r--hosts/sif/default.nix58
1 files changed, 29 insertions, 29 deletions
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 1658865a..43bd4485 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -70,32 +70,32 @@
70 ''; 70 '';
71 }; 71 };
72 72
73 wlanInterfaces = { 73 # wlanInterfaces = {
74 wlan0 = { 74 # wlan0 = {
75 device = "wlp82s0"; 75 # device = "wlp82s0";
76 }; 76 # };
77 }; 77 # };
78 78
79 bonds = { 79 # bonds = {
80 "lan" = { 80 # "lan" = {
81 interfaces = [ "wlan0" "enp0s31f6" "dock0" ]; 81 # interfaces = [ "wlan0" "enp0s31f6" "dock0" ];
82 driverOptions = { 82 # driverOptions = {
83 miimon = "1000"; 83 # miimon = "1000";
84 mode = "active-backup"; 84 # mode = "active-backup";
85 primary_reselect = "always"; 85 # primary_reselect = "always";
86 }; 86 # };
87 }; 87 # };
88 }; 88 # };
89 89
90 dhcpcd.enable = false; 90 dhcpcd.enable = false;
91 useDHCP = false; 91 useDHCP = false;
92 useNetworkd = true; 92 useNetworkd = true;
93 93
94 interfaces."tinc.yggdrasil" = { 94 # interfaces."tinc.yggdrasil" = {
95 virtual = true; 95 # virtual = true;
96 virtualType = config.services.tinc.networks.yggdrasil.interfaceType; 96 # virtualType = config.services.tinc.networks.yggdrasil.interfaceType;
97 macAddress = "5c:93:21:c3:61:39"; 97 # macAddress = "5c:93:21:c3:61:39";
98 }; 98 # };
99 }; 99 };
100 100
101 systemd.services."NetworkManager-wait-online".enable = false; 101 systemd.services."NetworkManager-wait-online".enable = false;
@@ -122,7 +122,7 @@
122 services = { 122 services = {
123 udev.packages = with pkgs; [ uhk-agent ]; 123 udev.packages = with pkgs; [ uhk-agent ];
124 124
125 tinc.yggdrasil.enable = true; 125 # tinc.yggdrasil.enable = true;
126 126
127 uucp = { 127 uucp = {
128 enable = true; 128 enable = true;
@@ -274,13 +274,13 @@
274 daemonNiceLevel = 10; 274 daemonNiceLevel = 10;
275 daemonIONiceLevel = 3; 275 daemonIONiceLevel = 3;
276 276
277 buildServers.vidhar = { 277 # buildServers.vidhar = {
278 address = "vidhar.yggdrasil"; 278 # address = "vidhar.yggdrasil";
279 systems = ["x86_64-linux" "i686-linux"]; 279 # systems = ["x86_64-linux" "i686-linux"];
280 maxJobs = 12; 280 # maxJobs = 12;
281 speedFactor = 4; 281 # speedFactor = 4;
282 supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"]; 282 # supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
283 }; 283 # };
284 }; 284 };
285 285
286 environment.etc."X11/xorg.conf.d/50-wacom.conf".source = lib.mkForce ./wacom.conf; 286 environment.etc."X11/xorg.conf.d/50-wacom.conf".source = lib.mkForce ./wacom.conf;