Upgrade to nixos-24.05

wagdav · Jun 1, 2024 · 418b34b · 418b34b
1 parent e9c7b57
commit 418b34b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/flake.lock b/flake.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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;
     };