From 39bbac4c6d4375df839e23172156236e9b2317d4 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Thu, 9 Jun 2022 18:25:15 -0700 Subject: feat(nix): update nix to version 22.05 NixOS 22.05 was released last month. Bump the versions for both nixos and home-manager. I also need to make a few changes for this update work (packages were renamed, options were addded to tailscale, ...) Change-Id: I84ed9f21915b769c9f7b8e21988b2b021715c982 Reviewed-on: https://cl.fcuny.net/c/world/+/365 Tested-by: CI Reviewed-by: Franck Cuny --- flake.lock | 59 +++++++++++++++++----------------- flake.nix | 4 +-- home/direnv/default.nix | 5 +-- modules/services/gnome/default.nix | 2 +- modules/services/tailscale/default.nix | 1 + modules/system/packages/default.nix | 4 +-- 6 files changed, 36 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 4e7c152..1f176d9 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1652700427, - "narHash": "sha256-Tzuqx7w3CIN/kZRE1hjMMsB3oC+39OoCUpgbw4it3RI=", + "lastModified": 1654803545, + "narHash": "sha256-XV0gxr2looaXOKbzGn+BZsCh1NsCq7rti1ooYql6Y9g=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e9f4792aa79bccedb34b3fc04d1a36f1848b7b57", + "rev": "cf5a17b22ffd987e24770d33b5b59ea496eeac49", "type": "github" }, "original": { @@ -41,11 +41,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1652557277, - "narHash": "sha256-jSes9DaIVMdmwBB78KkFUVrlDzawmD62vrUg0GS2500=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "12806d31a381e7cd169a6bac35590e7b36dc5fe5", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -56,11 +56,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1652557277, - "narHash": "sha256-jSes9DaIVMdmwBB78KkFUVrlDzawmD62vrUg0GS2500=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "12806d31a381e7cd169a6bac35590e7b36dc5fe5", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -76,26 +76,25 @@ ] }, "locked": { - "lastModified": 1651519540, - "narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=", + "lastModified": 1654113405, + "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0", + "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-21.11", + "ref": "release-22.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1652364845, - "narHash": "sha256-1pG2GR+z7IrUVGcMoTsH6nJ+ACMvBplo/Pyw4SXJDIE=", - "path": "/nix/store/6kajy5640i5vv6hp2y0ll14bhx4mvpmy-source", - "rev": "ee80943d4d1160f460e3d719222212dbfbc6a193", + "lastModified": 0, + "narHash": "sha256-EFkgVkHuPFuzd8L5W81fZR5YEbfHirh3uDMk3xhQmhc=", + "path": "/nix/store/s7w8mfm95yylaxp5vp0dh1f9w59grfk8-source", "type": "path" }, "original": { @@ -105,11 +104,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1652692103, - "narHash": "sha256-ygRLh8g0F/WkVCSfQcxMoVaaD45i6Ky+f+b4wCOazag=", + "lastModified": 1654694478, + "narHash": "sha256-nFAMETXEhIrqnBe28u6vqy4ixSRr0BRrlZLlS0e7eoM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "556ce9a40abde33738e6c9eac65f965a8be3b623", + "rev": "18de53ca965bd0678aaf09e5ce0daae05c58355a", "type": "github" }, "original": { @@ -121,27 +120,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1652710895, - "narHash": "sha256-wDEZUMu3mDuy1Cea5RyToqI3E8mhXINGl4agJ961M0U=", + "lastModified": 1654812539, + "narHash": "sha256-yWRSyOPL6WYHWQo/hMz5MP4DzUtfPmWh4/UMJ/enIuc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbbe8ed7e093b13ca02bad5cfae0bb7252ef94cc", + "rev": "f961520b1f163beb178ad2af448832985c7f8417", "type": "github" }, "original": { "owner": "nixos", - "ref": "release-21.11", + "ref": "release-22.05", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1652699429, - "narHash": "sha256-sWy8ftFgOb86aDFlJU8or+pE72DGeHFRNpvKxGJU0ug=", + "lastModified": 1654815884, + "narHash": "sha256-mmYhB+fl2dabl8Osm4d0vHKLxISH+lL4tAG9bsrnuIQ=", "owner": "nix-community", "repo": "NUR", - "rev": "8eba199b772313bd471b1d4ce7190f8e282ba4f2", + "rev": "d52f3d30fa7d0672844941450ba07159f4b30f8b", "type": "github" }, "original": { @@ -164,11 +163,11 @@ }, "utils": { "locked": { - "lastModified": 1652557277, - "narHash": "sha256-jSes9DaIVMdmwBB78KkFUVrlDzawmD62vrUg0GS2500=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "12806d31a381e7cd169a6bac35590e7b36dc5fe5", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3f8a401..9627d28 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Nixpkgs, NixOS's official repo - nixpkgs.url = "github:nixos/nixpkgs/release-21.11"; + nixpkgs.url = "github:nixos/nixpkgs/release-22.05"; utils.url = "github:numtide/flake-utils"; @@ -22,7 +22,7 @@ flake-utils.url = "github:numtide/flake-utils"; home-manager = { - url = "github:nix-community/home-manager/release-21.11"; + url = "github:nix-community/home-manager/release-22.05"; # We want home-manager to use the same set of nixpkgs as our system. inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/direnv/default.nix b/home/direnv/default.nix index 89d0535..26e99f2 100644 --- a/home/direnv/default.nix +++ b/home/direnv/default.nix @@ -10,10 +10,7 @@ in { config = lib.mkIf cfg.enable { programs.direnv = { enable = true; - nix-direnv = { - enable = true; - enableFlakes = true; - }; + nix-direnv = { enable = true; }; }; programs.fish.interactiveShellInit = lib.mkIf fishEnabled ( diff --git a/modules/services/gnome/default.nix b/modules/services/gnome/default.nix index 448934f..0fc91e5 100644 --- a/modules/services/gnome/default.nix +++ b/modules/services/gnome/default.nix @@ -7,7 +7,7 @@ in { services = { dbus = { enable = true; - packages = with pkgs; [ gcr gnome3.dconf gnome3.gnome-keyring ]; + packages = with pkgs; [ gcr dconf gnome3.gnome-keyring ]; }; udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ]; diff --git a/modules/services/tailscale/default.nix b/modules/services/tailscale/default.nix index cad1cad..73cf06b 100644 --- a/modules/services/tailscale/default.nix +++ b/modules/services/tailscale/default.nix @@ -9,5 +9,6 @@ in { config = lib.mkIf cfg.enable { services.tailscale.enable = true; networking.firewall.trustedInterfaces = [ "tailscale0" ]; + networking.firewall.checkReversePath = "loose"; }; } diff --git a/modules/system/packages/default.nix b/modules/system/packages/default.nix index 3747f6e..d260f20 100644 --- a/modules/system/packages/default.nix +++ b/modules/system/packages/default.nix @@ -13,7 +13,7 @@ in { curl dmidecode ethtool - flameGraph + flamegraph git htop hwdata @@ -44,7 +44,7 @@ in { usbutils vim wget - wireguard + wireguard-tools ]; programs.bcc.enable = true; -- cgit 1.4.1