diff options
| author | Kjetil Orbekk <kj@orbekk.com> | 2020-10-24 18:16:18 -0400 |
|---|---|---|
| committer | Kjetil Orbekk <kj@orbekk.com> | 2020-10-24 18:16:18 -0400 |
| commit | 3d9d5c8eb85d3f2063af633deec7fb876f11868e (patch) | |
| tree | 9ca080c10f50a6699a6c40e412ad15427d66ccef /config | |
| parent | 739033c5211ea4611e86f45790f3ae859d303a77 (diff) | |
mostly networking changes
Diffstat (limited to 'config')
| -rw-r--r-- | config/ap.nix | 25 | ||||
| -rw-r--r-- | config/desktop.nix | 3 | ||||
| -rw-r--r-- | config/users.nix | 10 |
3 files changed, 29 insertions, 9 deletions
diff --git a/config/ap.nix b/config/ap.nix index 18c0c6e..4f3c634 100644 --- a/config/ap.nix +++ b/config/ap.nix @@ -6,6 +6,15 @@ in { networking.networkmanager.enable = lib.mkForce false; + # networking.vlans.lan = { + # id = 110; + # interface = wan-dev; + # }; + # networking.vlans.wan = { + # id = 100; + # interface = wan-dev; + # }; + networking.firewall = { enable = lib.mkForce false; allowedTCPPorts = lib.mkForce [ ]; @@ -97,6 +106,8 @@ in }; boot.kernel.sysctl = { + # Something wrong with Spectrum ipv6 :( + "net.ipv6.conf.all.disable_ipv6" = true; "net.ipv4.conf.all.forwarding" = true; "net.ipv4.conf.default.forwarding" = true; "net.ipv6.conf.all.forwarding" = true; @@ -154,9 +165,17 @@ in # internalIPs = [ "10.0.0.0/24" ]; }; - networking.interfaces.${wan-dev} = { - macAddress = "3c:97:0e:19:7e:5c"; - }; + # Error matching on link that was already renamed. + # systemd.network.links."40-enp37s0".matchConfig = { + # # OriginalName = lib.mkForce null; + # # MACAddress = "00:d8:61:c2:c6:6c"; + # }; + # systemd.services.dhcpcd.preStart = lib.mkAfter '' + # ${pkgs.iproute}/bin/ip link set dev ${wan-dev} address ${config.networking.interfaces.${wan-dev}.macAddress}; + # ''; + # networking.interfaces.${wan-dev} = { + # macAddress = "3c:97:0e:19:7e:5c"; + # }; networking.interfaces."${lan-dev}" = { ipv4.addresses = [ { diff --git a/config/desktop.nix b/config/desktop.nix index 58fbbdd..283b1dd 100644 --- a/config/desktop.nix +++ b/config/desktop.nix @@ -34,7 +34,7 @@ environment.systemPackages = with pkgs; [ chromium dmenu - emacs25 + emacs firefox haskellPackages.xmobar pavucontrol @@ -47,6 +47,7 @@ xscreensaver xsel # used by urxvt clipboard xss-lock + imagemagick ]; i18n.inputMethod = { diff --git a/config/users.nix b/config/users.nix index 4261ea2..b595754 100644 --- a/config/users.nix +++ b/config/users.nix @@ -16,11 +16,11 @@ in { ]; }; guest = { - isNormalUser = true; - home = "/home/guest"; - uid = 1500; - description = "Guest"; - extraGroups = ["networkmanager" "audio" "input"]; + isNormalUser = true; + home = "/home/guest"; + uid = 1500; + description = "Guest"; + extraGroups = ["networkmanager" "audio" "input"]; }; fcgi = { group = "fcgi"; |