Compare commits

...

9 commits

7 changed files with 28 additions and 10 deletions

View file

@ -22,6 +22,12 @@ with lib;
signByDefault = true; signByDefault = true;
key = "6FC74C847011FD83"; key = "6FC74C847011FD83";
}; };
maintenance = {
enable = true;
repositories = [
"/home/julien/dev/nixpkgs"
];
};
delta.enable = true; delta.enable = true;
ignores = [ ".direnv" ]; ignores = [ ".direnv" ];
extraConfig = { extraConfig = {

View file

@ -157,9 +157,9 @@
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"branch": "nixos-24.11", "branch": "nixos-24.11",
"revision": "ebe2788eafd539477f83775ef93c3c7e244421d3", "revision": "a880f49904d68b5e53338d1e8c7bf80f59903928",
"url": "https://github.com/nixos/nixpkgs/archive/ebe2788eafd539477f83775ef93c3c7e244421d3.tar.gz", "url": "https://github.com/nixos/nixpkgs/archive/a880f49904d68b5e53338d1e8c7bf80f59903928.tar.gz",
"hash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=" "hash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8="
}, },
"proxmox": { "proxmox": {
"type": "GitHub", "type": "GitHub",
@ -186,9 +186,9 @@
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"branch": "nixos-unstable", "branch": "nixos-unstable",
"revision": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "revision": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8",
"url": "https://github.com/nixos/nixpkgs/archive/e3e32b642a31e6714ec1b712de8c91a3352ce7e1.tar.gz", "url": "https://github.com/nixos/nixpkgs/archive/063dece00c5a77e4a0ea24e5e5a5bd75232806f8.tar.gz",
"hash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=" "hash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE="
} }
} }
} }

View file

@ -10,7 +10,7 @@ in
{ {
services.garage = { services.garage = {
enable = true; enable = true;
package = pkgs.garage_1_0_1; package = pkgs.garage_1_1_0;
settings = { settings = {
replication_factor = 1; replication_factor = 1;

View file

@ -1,11 +1,12 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
let let
certificate = config.security.acme.certs."auth.luj.fr"; certificate = config.security.acme.certs."auth.luj.fr";
kanidm = pkgs.kanidm_1_5;
in in
{ {
services.kanidm = { services.kanidm = {
enableServer = true; enableServer = true;
package = pkgs.kanidm_1_4; package = kanidm;
serverSettings = rec { serverSettings = rec {
domain = "auth.luj.fr"; domain = "auth.luj.fr";
origin = "https://${domain}"; origin = "https://${domain}";
@ -16,7 +17,7 @@ in
}; };
}; };
environment.systemPackages = [ pkgs.kanidm_1_4 ]; environment.systemPackages = [ kanidm ];
users.users.kanidm.extraGroups = [ certificate.group ]; users.users.kanidm.extraGroups = [ certificate.group ];

View file

@ -78,6 +78,7 @@
unstable.nixfmt-rfc-style unstable.nixfmt-rfc-style
kanidm kanidm
yubioath-flutter yubioath-flutter
ltex-ls
] ]
++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);

View file

@ -22,7 +22,7 @@
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.kernelPackages = pkgs.linuxPackages_6_11; boot.kernelPackages = pkgs.linuxPackages_6_13;
fileSystems."/data" = { fileSystems."/data" = {
device = "/dev/disk/by-uuid/4680be45-8156-4bf0-8b0b-e7493aaf37c0"; device = "/dev/disk/by-uuid/4680be45-8156-4bf0-8b0b-e7493aaf37c0";

View file

@ -23,6 +23,8 @@
users.users.julien.linger = true; users.users.julien.linger = true;
services.backup.includes = [ "/home/julien/Maildir" ];
services.openssh.extraConfig = '' services.openssh.extraConfig = ''
HostCertificate /etc/ssh/ssh_host_ed25519_key-cert.pub HostCertificate /etc/ssh/ssh_host_ed25519_key-cert.pub
HostKey /etc/ssh/ssh_host_ed25519_key HostKey /etc/ssh/ssh_host_ed25519_key
@ -113,11 +115,19 @@
services.forgejo = { services.forgejo = {
enable = true; enable = true;
package = pkgs.unstable.forgejo; package = pkgs.unstable.forgejo;
database.type = "postgres";
settings = { settings = {
server = { server = {
ROOT_URL = "https://git.luj.fr/"; ROOT_URL = "https://git.luj.fr/";
LANDING_PAGE = "luj"; LANDING_PAGE = "luj";
}; };
#openid.ENABLE_OPENID_SIGNIN = true;
openid.ENABLE_OPENID_SIGNUP = true;
oauth2_client.REGISTER_EMAIL_CONFIRM = false;
oauth2_client.ENABLE_AUTO_REGISTRATION = true;
oauth2_client.UPDATE_AVATAR = true;
oauth2_client.ACCOUNT_LINKING = "auto";
service.ALLOW_ONLY_EXTERNAL_REGISTRATION = true;
}; };
}; };