From ae6c242865a41cadc51f362f660d5c8784d352d9 Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Wed, 23 Mar 2022 18:42:48 +0100 Subject: [PATCH] Update flake inputs --- flake.lock | 18 +++++++++--------- nix/zig.nix | 15 +++------------ nixos/dustbowl.nix | 5 +++-- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index a71c050..14d6928 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs-overlay": { "locked": { - "lastModified": 1643193471, - "narHash": "sha256-LRp9AKw8AtEoWVXJj21n7hE7BDZE1lrW+2xTgs16aSM=", + "lastModified": 1647940792, + "narHash": "sha256-5pofvgMncMId9pWU2sGSNlByn/jwqvOAHcKoZcAiHFo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "588aced1ae8ad4107d9705649c69a35e7919f409", + "rev": "6d9fd817e8f2606df8a5afc138b840c9dc7184f3", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -32,11 +32,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1643080866, - "narHash": "sha256-iO3Z6jw0HEiie8UnXVpq1SxphprDYBXrVzubEa5D4eE=", + "lastModified": 1647800324, + "narHash": "sha256-rjwoxrk16zfrcO5Torh6CbAd5GHsHrXw+EwxOvh9AUI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c07b471b52be8fbc49a7dc194e9b37a6e19ee04d", + "rev": "9bc841fec1c0e8b9772afa29f934d2c7ce57da8e", "type": "github" }, "original": { diff --git a/nix/zig.nix b/nix/zig.nix index 3f448a1..f4fd935 100644 --- a/nix/zig.nix +++ b/nix/zig.nix @@ -1,21 +1,12 @@ { pkgs }: -let - nixpkgsWithLLVM13_0_1 = pkgs.fetchFromGitHub { - owner = "TerrorJack"; - repo = "nixpkgs"; - rev = "1a8754caf8eb8831b904daaf34b2ee737053b383"; - sha256 = "jmZIAMpm5wPw1QclgA6jsgMbN5MinakuXtUFHZWd5kY="; - }; - pkgsFork = import nixpkgsWithLLVM13_0_1 { system = pkgs.system; }; -in pkgs.mkShell { buildInputs = with pkgs; [ cmake ninja - pkgsFork.llvmPackages_13.clang-unwrapped - pkgsFork.llvmPackages_13.llvm - pkgsFork.llvmPackages_13.lld + llvmPackages_13.clang-unwrapped + llvmPackages_13.llvm + llvmPackages_13.lld libxml2 zlib ]; diff --git a/nixos/dustbowl.nix b/nixos/dustbowl.nix index f886faa..7cac238 100644 --- a/nixos/dustbowl.nix +++ b/nixos/dustbowl.nix @@ -73,6 +73,9 @@ networking.wireless.interfaces = [ "wlp2s0" ]; # networking.wireless.userControlled.enable = true; + networking.wireguard.enable = true; + networking.firewall.checkReversePath = "loose"; + # The global useDHCP flag is deprecated, therefore explicitly set to false here. # Per-interface useDHCP will be mandatory in the future, so this generated config # replicates the default behaviour. @@ -105,8 +108,6 @@ openrgb ]; - # services.logind.lidSwitch = "ignore"; - # Configure console console = { font = "Lat2-Terminus16";