From 3bd412ef0e0c0f5147d6ab930a34789c7b3d7bf2 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sun, 8 May 2022 12:48:06 -0400 Subject: [PATCH] Update work configuration to support podman --- flake.lock | 24 ++++++++++++------------ flake.nix | 5 +++++ machines/work/configuration.nix | 9 ++++++++- overlays/iptables/default.nix | 5 +++++ 4 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 overlays/iptables/default.nix diff --git a/flake.lock b/flake.lock index 9a7be9d..f16e576 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1639871969, - "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=", + "lastModified": 1651519540, + "narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=", "owner": "rycee", "repo": "home-manager", - "rev": "697cc8c68ed6a606296efbbe9614c32537078756", + "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1642190797, - "narHash": "sha256-cxeEEAtfIACnm8sV1oz0xlNp9IVk10Fxcc09ggoEZuo=", + "lastModified": 1651848520, + "narHash": "sha256-KkJ28fShdd78+zal5HlHsXUICOCtO7Bdvylc5zlp5Mk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3ddd960a3b575bf3230d0e59f42614b71f9e0db9", + "rev": "5656d7f92aa8264eb06ba68ad94c87ac5b5312e8", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nur": { "locked": { - "lastModified": 1642392502, - "narHash": "sha256-ZRgwagDhwT5eQgTSqhupXz3ugQmFat0836d5Hh8ZK4Q=", + "lastModified": 1651887110, + "narHash": "sha256-AMQ0A5Osq647zEHWb+GZEIYZeNrZm55kY24uVOqSTzg=", "owner": "nix-community", "repo": "NUR", - "rev": "8993a1cfc2d6ed69725788a2ccafbe8cde0510e3", + "rev": "c7a43bc69e52a636e76ba3d378695c1bd4f0bbbd", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "unstable": { "locked": { - "lastModified": 1642104392, - "narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=", + "lastModified": 1651726670, + "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5", + "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d1b8b77..b3191ad 100644 --- a/flake.nix +++ b/flake.nix @@ -55,6 +55,11 @@ system = "x86_64-linux"; modules = [ self.overlaysModule + { + nixpkgs.overlays = [ + (import ./overlays/iptables) + ]; + } ./modules/containers.nix ./modules/nix.nix ./modules/vscode-server.nix diff --git a/machines/work/configuration.nix b/machines/work/configuration.nix index dae2962..da2f6d6 100644 --- a/machines/work/configuration.nix +++ b/machines/work/configuration.nix @@ -16,11 +16,18 @@ in environment.etc.hosts.enable = false; environment.etc."resolv.conf".enable = false; - time.timeZone = "America/New_York"; + time.timeZone = "America/New_York"; programs.adb.enable = true; networking.dhcpcd.enable = false; + # Required because for some reason WSL kernel doesn't play well with nftables + networking.firewall.package = pkgs.iptables-legacy; + + environment.systemPackages = with pkgs; [ + wget + ]; + # Proxychains programs.proxychains = { enable = true; diff --git a/overlays/iptables/default.nix b/overlays/iptables/default.nix new file mode 100644 index 0000000..3163bd0 --- /dev/null +++ b/overlays/iptables/default.nix @@ -0,0 +1,5 @@ +self: super: { + iptables = super.iptables.override { + nftablesCompat = false; + }; +}