From 78da69c2c765d67314426cf9efe243be8b7b6e89 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Sun, 1 Dec 2024 17:58:31 +0100
Subject: [PATCH] fix(eval): silence some eval warnings
---
home-manager-modules/kitty/default.nix | 9 +++++++--
machines/akhaten/default.nix | 6 ++----
machines/gustave/default.nix | 20 ++++++++------------
packages/readeck/default.nix | 2 ++
4 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/home-manager-modules/kitty/default.nix b/home-manager-modules/kitty/default.nix
index 490a398..27af898 100644
--- a/home-manager-modules/kitty/default.nix
+++ b/home-manager-modules/kitty/default.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+ config,
+ pkgs,
+ lib,
+ ...
+}:
let
cfg = config.luj.programs.kitty;
in
@@ -23,7 +28,7 @@ with lib;
name = "FiraCode Nerd Font Mono Reg";
package = with pkgs; (nerdfonts.override { fonts = [ "FiraCode" ]; });
};
- theme = "Catppuccin-Mocha";
+ themeFile = "Catppuccin-Mocha";
};
};
diff --git a/machines/akhaten/default.nix b/machines/akhaten/default.nix
index 9525926..7668263 100644
--- a/machines/akhaten/default.nix
+++ b/machines/akhaten/default.nix
@@ -58,10 +58,8 @@
];
routes = [
{
- routeConfig = {
- Gateway = "163.172.91.1";
- Destination = "0.0.0.0/0";
- };
+ Gateway = "163.172.91.1";
+ Destination = "0.0.0.0/0";
}
];
dhcpV6Config = {
diff --git a/machines/gustave/default.nix b/machines/gustave/default.nix
index d795e1e..3c42fbd 100644
--- a/machines/gustave/default.nix
+++ b/machines/gustave/default.nix
@@ -59,12 +59,10 @@
};
wireguardPeers = [
{
- wireguardPeerConfig = {
- PublicKey = "oYsN1Qy+a7dwVOKapN5s5KJOmhSflLHZqh+GLMeNpHw=";
- AllowedIPs = [ "0.0.0.0/0" ];
- Endpoint = "[${lib.snowfield.akhaten.ips.public.ipv6}]:51821";
- PersistentKeepalive = 25;
- };
+ PublicKey = "oYsN1Qy+a7dwVOKapN5s5KJOmhSflLHZqh+GLMeNpHw=";
+ AllowedIPs = [ "0.0.0.0/0" ];
+ Endpoint = "[${lib.snowfield.akhaten.ips.public.ipv6}]:51821";
+ PersistentKeepalive = 25;
}
];
};
@@ -73,16 +71,14 @@
matchConfig.Name = "wg0";
addresses = [
{
- addressConfig.Address = "10.100.45.2/24";
- addressConfig.AddPrefixRoute = false;
+ Address = "10.100.45.2/24";
+ AddPrefixRoute = false;
}
];
routes = [
{
- routeConfig = {
- Gateway = "10.100.45.1";
- Destination = "10.100.45.0/24";
- };
+ Gateway = "10.100.45.1";
+ Destination = "10.100.45.0/24";
}
];
DHCP = "no";
diff --git a/packages/readeck/default.nix b/packages/readeck/default.nix
index 8c0b3cd..9d42a59 100644
--- a/packages/readeck/default.nix
+++ b/packages/readeck/default.nix
@@ -77,4 +77,6 @@ buildGoModule rec {
vendorHash = "sha256-U1vMIig2/mncH07o1AZ2mUor5lq5WmNsfY/X2GbSGQA=";
+ meta.mainProgram = "readeck";
+
}