Compare commits

..

No commits in common. "89791b21a881c4053968020da07966ebf38f62cb" and "339a49447b7aa5654cb256f4fb242e4636281eaa" have entirely different histories.

8 changed files with 32 additions and 34 deletions

View file

@ -1,9 +1,4 @@
{ { config, pkgs, lib, ... }:
config,
pkgs,
lib,
...
}:
let let
cfg = config.luj.programs.kitty; cfg = config.luj.programs.kitty;
in in
@ -28,7 +23,7 @@ with lib;
name = "FiraCode Nerd Font Mono Reg"; name = "FiraCode Nerd Font Mono Reg";
package = with pkgs; (nerdfonts.override { fonts = [ "FiraCode" ]; }); package = with pkgs; (nerdfonts.override { fonts = [ "FiraCode" ]; });
}; };
themeFile = "Catppuccin-Mocha"; theme = "Catppuccin-Mocha";
}; };
}; };

View file

@ -76,10 +76,10 @@
"fetchType": "tarball", "fetchType": "tarball",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"branch": "release-24.11", "branch": "release-24.05",
"revision": "f3111f62a23451114433888902a55cf0692b408d", "revision": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
"url": "https://github.com/nix-community/home-manager/archive/f3111f62a23451114433888902a55cf0692b408d.tar.gz", "url": "https://github.com/nix-community/home-manager/archive/2f23fa308a7c067e52dfcc30a0758f47043ec176.tar.gz",
"hash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=" "hash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM="
}, },
"home-manager-unstable": { "home-manager-unstable": {
"type": "GitHub", "type": "GitHub",
@ -166,10 +166,10 @@
"fetchType": "tarball", "fetchType": "tarball",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"branch": "nixos-24.11", "branch": "nixos-24.05",
"revision": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "revision": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
"url": "https://github.com/nixos/nixpkgs/archive/62c435d93bf046a5396f3016472e8f7c8e2aed65.tar.gz", "url": "https://github.com/nixos/nixpkgs/archive/e8c38b73aeb218e27163376a2d617e61a2ad9b59.tar.gz",
"hash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=" "hash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g="
}, },
"stateless-uptime-kuma": { "stateless-uptime-kuma": {
"type": "Git", "type": "Git",

View file

@ -58,8 +58,10 @@
]; ];
routes = [ routes = [
{ {
Gateway = "163.172.91.1"; routeConfig = {
Destination = "0.0.0.0/0"; Gateway = "163.172.91.1";
Destination = "0.0.0.0/0";
};
} }
]; ];
dhcpV6Config = { dhcpV6Config = {

View file

@ -64,12 +64,11 @@
database.createLocally = true; database.createLocally = true;
database.passwordFile = "/run/agenix/keycloak-db"; database.passwordFile = "/run/agenix/keycloak-db";
settings = { settings = {
hostname = "https://auth.julienmalka.me"; hostname = "auth.julienmalka.me";
hostname-admin-url = "https://auth.julienmalka.me"; hostname-admin-url = "https://auth.julienmalka.me";
http-port = 8080; http-port = 8080;
hostname-backchannel-dynamic = true; hostname-strict-backchannel = true;
proxy-headers = "forwarded"; proxy = "edge";
http-enabled = true;
}; };
themes = { themes = {
keywind = pkgs.keycloak-keywind; keywind = pkgs.keycloak-keywind;

View file

@ -59,10 +59,12 @@
}; };
wireguardPeers = [ wireguardPeers = [
{ {
PublicKey = "oYsN1Qy+a7dwVOKapN5s5KJOmhSflLHZqh+GLMeNpHw="; wireguardPeerConfig = {
AllowedIPs = [ "0.0.0.0/0" ]; PublicKey = "oYsN1Qy+a7dwVOKapN5s5KJOmhSflLHZqh+GLMeNpHw=";
Endpoint = "[${lib.snowfield.akhaten.ips.public.ipv6}]:51821"; AllowedIPs = [ "0.0.0.0/0" ];
PersistentKeepalive = 25; Endpoint = "[${lib.snowfield.akhaten.ips.public.ipv6}]:51821";
PersistentKeepalive = 25;
};
} }
]; ];
}; };
@ -71,14 +73,16 @@
matchConfig.Name = "wg0"; matchConfig.Name = "wg0";
addresses = [ addresses = [
{ {
Address = "10.100.45.2/24"; addressConfig.Address = "10.100.45.2/24";
AddPrefixRoute = false; addressConfig.AddPrefixRoute = false;
} }
]; ];
routes = [ routes = [
{ {
Gateway = "10.100.45.1"; routeConfig = {
Destination = "10.100.45.0/24"; Gateway = "10.100.45.1";
Destination = "10.100.45.0/24";
};
} }
]; ];
DHCP = "no"; DHCP = "no";

View file

@ -33,7 +33,7 @@
systemd.network.networks."10-wan" = { systemd.network.networks."10-wan" = {
matchConfig.Name = "enp0s3"; matchConfig.Name = "enp0s3";
DHCP = "ipv4"; DHCP = "ipv4";
addresses = [ { Address = "2603:c027:c001:89aa:aad9:34b3:f3c9:924f"; } ]; addresses = [ { addressConfig.Address = "2603:c027:c001:89aa:aad9:34b3:f3c9:924f"; } ];
linkConfig.RequiredForOnline = "routable"; linkConfig.RequiredForOnline = "routable";
}; };

View file

@ -38,10 +38,10 @@
luj.nginx.enable = true; luj.nginx.enable = true;
services.mysql.enable = true; services.mysql.enable = true;
services.mysql.package = pkgs.mariadb; services.mysql.package = pkgs.mysql;
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud30; package = pkgs.nextcloud29;
https = true; https = true;
hostName = "nuage.malka.family"; hostName = "nuage.malka.family";
settings.overwriteProtocol = "https"; settings.overwriteProtocol = "https";

View file

@ -77,6 +77,4 @@ buildGoModule rec {
vendorHash = "sha256-U1vMIig2/mncH07o1AZ2mUor5lq5WmNsfY/X2GbSGQA="; vendorHash = "sha256-U1vMIig2/mncH07o1AZ2mUor5lq5WmNsfY/X2GbSGQA=";
meta.mainProgram = "readeck";
} }