diff --git a/home-manager-modules/git/default.nix b/home-manager-modules/git/default.nix index f9db92c..ac93457 100644 --- a/home-manager-modules/git/default.nix +++ b/home-manager-modules/git/default.nix @@ -22,12 +22,6 @@ with lib; signByDefault = true; key = "6FC74C847011FD83"; }; - maintenance = { - enable = true; - repositories = [ - "/home/julien/dev/nixpkgs" - ]; - }; delta.enable = true; ignores = [ ".direnv" ]; extraConfig = { diff --git a/lon.lock b/lon.lock index 72c8dfc..f324783 100644 --- a/lon.lock +++ b/lon.lock @@ -157,9 +157,9 @@ "owner": "nixos", "repo": "nixpkgs", "branch": "nixos-24.11", - "revision": "a880f49904d68b5e53338d1e8c7bf80f59903928", - "url": "https://github.com/nixos/nixpkgs/archive/a880f49904d68b5e53338d1e8c7bf80f59903928.tar.gz", - "hash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=" + "revision": "ebe2788eafd539477f83775ef93c3c7e244421d3", + "url": "https://github.com/nixos/nixpkgs/archive/ebe2788eafd539477f83775ef93c3c7e244421d3.tar.gz", + "hash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=" }, "proxmox": { "type": "GitHub", @@ -186,9 +186,9 @@ "owner": "nixos", "repo": "nixpkgs", "branch": "nixos-unstable", - "revision": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", - "url": "https://github.com/nixos/nixpkgs/archive/063dece00c5a77e4a0ea24e5e5a5bd75232806f8.tar.gz", - "hash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=" + "revision": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "url": "https://github.com/nixos/nixpkgs/archive/e3e32b642a31e6714ec1b712de8c91a3352ce7e1.tar.gz", + "hash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=" } } } diff --git a/machines/biblios/garage.nix b/machines/biblios/garage.nix index 8fffad5..8c59865 100644 --- a/machines/biblios/garage.nix +++ b/machines/biblios/garage.nix @@ -10,7 +10,7 @@ in { services.garage = { enable = true; - package = pkgs.garage_1_1_0; + package = pkgs.garage_1_0_1; settings = { replication_factor = 1; diff --git a/machines/core-security/kanidm.nix b/machines/core-security/kanidm.nix index cd5ea57..9b4521e 100644 --- a/machines/core-security/kanidm.nix +++ b/machines/core-security/kanidm.nix @@ -1,12 +1,11 @@ { pkgs, config, ... }: let certificate = config.security.acme.certs."auth.luj.fr"; - kanidm = pkgs.kanidm_1_5; in { services.kanidm = { enableServer = true; - package = kanidm; + package = pkgs.kanidm_1_4; serverSettings = rec { domain = "auth.luj.fr"; origin = "https://${domain}"; @@ -17,7 +16,7 @@ in }; }; - environment.systemPackages = [ kanidm ]; + environment.systemPackages = [ pkgs.kanidm_1_4 ]; users.users.kanidm.extraGroups = [ certificate.group ]; diff --git a/machines/fischer/home-julien.nix b/machines/fischer/home-julien.nix index f3af91a..f132c8b 100644 --- a/machines/fischer/home-julien.nix +++ b/machines/fischer/home-julien.nix @@ -78,7 +78,6 @@ unstable.nixfmt-rfc-style kanidm yubioath-flutter - ltex-ls ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); diff --git a/machines/gallifrey/hardware.nix b/machines/gallifrey/hardware.nix index 5a253e5..f7a11d7 100644 --- a/machines/gallifrey/hardware.nix +++ b/machines/gallifrey/hardware.nix @@ -22,7 +22,7 @@ boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; - boot.kernelPackages = pkgs.linuxPackages_6_13; + boot.kernelPackages = pkgs.linuxPackages_6_11; fileSystems."/data" = { device = "/dev/disk/by-uuid/4680be45-8156-4bf0-8b0b-e7493aaf37c0"; diff --git a/machines/gustave/default.nix b/machines/gustave/default.nix index 47715bd..ab57b08 100644 --- a/machines/gustave/default.nix +++ b/machines/gustave/default.nix @@ -23,8 +23,6 @@ users.users.julien.linger = true; - services.backup.includes = [ "/home/julien/Maildir" ]; - services.openssh.extraConfig = '' HostCertificate /etc/ssh/ssh_host_ed25519_key-cert.pub HostKey /etc/ssh/ssh_host_ed25519_key @@ -115,19 +113,11 @@ services.forgejo = { enable = true; package = pkgs.unstable.forgejo; - database.type = "postgres"; settings = { server = { ROOT_URL = "https://git.luj.fr/"; 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; }; };