diff --git a/flake.lock b/flake.lock index 3c57ea3..e9a399a 100644 --- a/flake.lock +++ b/flake.lock @@ -275,16 +275,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716991068, - "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25cf937a30bf0801447f6bf544fc7486c6309234", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index e53b9e7..8b972ef 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ url = "github:edolstra/flake-compat"; flake = false; }; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; inputs.nixos-hardware.url = "github:NixOS/nixos-hardware"; inputs.cachix-deploy.url = "github:cachix/cachix-deploy-flake"; inputs.nixos-generators.url = "github:nix-community/nixos-generators"; diff --git a/modules/common.nix b/modules/common.nix index e3b9ec6..487692f 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -9,7 +9,6 @@ documentation.enable = false; nix = { - package = pkgs.nixUnstable; extraOptions = '' builders-use-substitutes = true experimental-features = nix-command flakes diff --git a/modules/consul/base.nix b/modules/consul/base.nix index 0cfc931..32b373e 100644 --- a/modules/consul/base.nix +++ b/modules/consul/base.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, lib, ... }: { services.consul = { @@ -21,4 +21,8 @@ # https://www.consul.io/docs/install/ports networking.firewall.allowedTCPPorts = [ 8300 8301 8302 8500 8600 ]; networking.firewall.allowedUDPPorts = [ 8301 8302 8600 ]; + + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "consul" + ]; } diff --git a/modules/loki.nix b/modules/loki.nix index b965d8e..e152a69 100644 --- a/modules/loki.nix +++ b/modules/loki.nix @@ -43,7 +43,7 @@ let }; limits_config = { - enforce_metric_name = false; + allow_structured_metadata = false; reject_old_samples = true; reject_old_samples_max_age = "168h"; }; diff --git a/x230.nix b/x230.nix index cca4ab3..1d0a7bb 100644 --- a/x230.nix +++ b/x230.nix @@ -82,7 +82,7 @@ sway = { enable = true; - extraPackages = with pkgs; [ chayang swaylock swayidle alacritty dmenu sway-contrib.grimshot ]; + extraPackages = with pkgs; [ chayang swaylock swayidle alacritty sway-contrib.grimshot wmenu ]; }; neovim = { @@ -135,7 +135,7 @@ services = { avahi = { enable = true; - nssmdns = true; + nssmdns4 = true; openFirewall = true; };