about summary refs log tree commit diff stats
path: root/flake.nix
diff options
context:
space:
mode:
Diffstat (limited to 'flake.nix')
-rw-r--r--flake.nix61
1 files changed, 31 insertions, 30 deletions
diff --git a/flake.nix b/flake.nix
index 8d3e40c..b67caa5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "Nixos server config";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11-small";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05-small";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
 
     library.url = "git+https://git.foss-syndicate.org/vhack.eu/nix-library?ref=prime";
@@ -48,17 +48,26 @@
     };
 
     # modules
-    disko = {
-      url = "github:nix-community/disko";
+    agenix = {
+      url = "github:ryantm/agenix";
       inputs = {
         nixpkgs.follows = "nixpkgs";
+        systems.follows = "systems";
       };
     };
-    agenix = {
-      url = "github:ryantm/agenix";
+    back = {
+      url = "git+https://git.foss-syndicate.org/vhack.eu/git_bug/back?ref=prime";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         systems.follows = "systems";
+        flake-utils.follows = "flake-utils";
+        treefmt-nix.follows = "treefmt-nix";
+      };
+    };
+    disko = {
+      url = "github:nix-community/disko";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
       };
     };
     impermanence = {
@@ -66,22 +75,11 @@
       inputs = {};
     };
     simple-nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
       inputs = {
         flake-compat.follows = "flake-compat";
-        nixpkgs.follows = "nixpkgs";
-      };
-    };
-
-    # bins
-    ragenix = {
-      url = "github:yaxitech/ragenix";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        agenix.follows = "agenix";
-        flake-utils.follows = "flake-utils";
-        rust-overlay.follows = "rust-overlay";
-        crane.follows = "crane";
+        nixpkgs-25_05.follows = "nixpkgs";
+        nixpkgs.follows = "nixpkgs-unstable";
       };
     };
   };
@@ -94,12 +92,11 @@
     treefmt-nix,
     deploy-rs,
     # modules
-    simple-nixos-mailserver,
-    impermanence,
-    disko,
     agenix,
-    # bins
-    ragenix,
+    back,
+    disko,
+    impermanence,
+    simple-nixos-mailserver,
     ...
   } @ attrs: let
     system = "x86_64-linux";
@@ -128,10 +125,11 @@
       };
 
     extraModules = [
-      simple-nixos-mailserver.nixosModule
+      agenix.nixosModules.default
+      back.nixosModules.default
       disko.nixosModules.default
       impermanence.nixosModules.impermanence
-      agenix.nixosModules.default
+      simple-nixos-mailserver.nixosModule
     ];
 
     tests = import ./tests {inherit pkgs specialArgs nixLib;};
@@ -155,13 +153,16 @@
 
     devShells."${system}" = {
       default = pkgs.mkShell {
-        packages = with pkgs; [
+        packages = [
           pkgs.deploy-rs
 
-          git-bug
+          pkgs.git-bug
+
+          # Used to update the stalwart-mail spamfilter
+          pkgs.nix-update
 
-          cocogitto
-          ragenix.packages."${system}".default
+          pkgs.cocogitto
+          pkgs.ragenix
         ];
       };
     };