Compare commits

..

No commits in common. "63c2616be9322f659dccfd972df11cdbb1cca1d7" and "a9da0426fbbbd4fdc7b7b1d23437621f288cbfe9" have entirely different histories.

2 changed files with 57 additions and 47 deletions

84
flake.lock generated
View file

@ -68,11 +68,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741786315, "lastModified": 1739841949,
"narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,11 +110,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1742576675, "lastModified": 1740475513,
"narHash": "sha256-2JbkmTzqfb5c/zk2xM6JKHZzgN1YsxblgqucbI0P4bU=", "narHash": "sha256-3I91L2+qV3DZ0dnCPTdehX82le93OLMYVoZk6KoJHBE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "610d71db8074a369a0498572ff75b444d284409d", "rev": "1f5b2624c2ee0491b1767be073765d6b9a3c67f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -222,11 +222,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742569620, "lastModified": 1740432748,
"narHash": "sha256-igC2cu+cPRB3E4QwKR+vGagyAtoyB+DrmWwDKm8jkaw=", "narHash": "sha256-BCeFtoJ/+LrZc03viRJWHfzAqqG8gPu/ikZeurv05xs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8a68f18e96bcab13e4f97bece61e6602298a3141", "rev": "c12dcc9b61429b2ad437a7d4974399ad8f910319",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -240,14 +240,15 @@
"nixpkgs": [ "nixpkgs": [
"nix-on-droid", "nix-on-droid",
"nixpkgs" "nixpkgs"
] ],
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1709445365, "lastModified": 1663932797,
"narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", "narHash": "sha256-IH8ZBW99W2k7wKLS+Sat9HiKX1TPZjFTnsPizK5crok=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", "rev": "de3758e31a3a1bc79d569f5deb5dac39791bf9b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -266,11 +267,11 @@
"nmt": "nmt" "nmt": "nmt"
}, },
"locked": { "locked": {
"lastModified": 1705252799, "lastModified": 1666720474,
"narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", "narHash": "sha256-iWojjDS1D19zpeZXbBdjWb9MiKmVVFQCqtJmtTXgPx8=",
"owner": "Gerschtli", "owner": "Gerschtli",
"repo": "nix-formatter-pack", "repo": "nix-formatter-pack",
"rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", "rev": "14876cc8fe94a3d329964ecb073b4c988c7b61f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -307,11 +308,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1742422364, "lastModified": 1740367490,
"narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -386,11 +387,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1742512142, "lastModified": 1740339700,
"narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -478,11 +479,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742300892, "lastModified": 1737465171,
"narHash": "sha256-QmF0proyjXI9YyZO9GZmc7/uEu5KVwCtcdLsKSoxPAI=", "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "ea26a82dda75bee6783baca6894040c8e6599728", "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -509,11 +510,11 @@
"scss-reset": { "scss-reset": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1631450058, "lastModified": 1735394400,
"narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=", "narHash": "sha256-XjsvC5IkG75OiTTQ2XCtyzL2JeONmUzLuCorlFsxGbQ=",
"owner": "andreymatin", "owner": "andreymatin",
"repo": "scss-reset", "repo": "scss-reset",
"rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91", "rev": "2d71f63f45c7879eb09879d368f2cdd138cd3847",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -530,11 +531,11 @@
"nixpkgs-24_11": "nixpkgs-24_11" "nixpkgs-24_11": "nixpkgs-24_11"
}, },
"locked": { "locked": {
"lastModified": 1742413977, "lastModified": 1740409919,
"narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=", "narHash": "sha256-Y6m+gyRLZjFqoSspLZd3BWUdf9KAIYm/favaiAbmrY0=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "b4fbffe79c00f19be94b86b4144ff67541613659", "rev": "f23faf97d6668a4847be5d5c6399493e596b406d",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -546,11 +547,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1742512142, "lastModified": 1740339700,
"narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -589,6 +590,21 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"utils": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -426,20 +426,18 @@ in
aliases = [ aliases = [
"lx@failco.de" "lx@failco.de"
"alex@failco.de" "alex@failco.de"
"abuse@failco.de"
"postmaster@failco.de"
"abuse@kobjolke.de"
"postmaster@kobjolke.de"
"abuse@jakalx.net"
"postmaster@jakalx.net"
]; ];
catchAll = [ catchAll = [
"failco.de"
"kobjolke.de"
]; ];
}; };
"alex@jakalx.net" = { "alex@jakalx.net" = {
hashedPasswordFile = config.age.secrets.mailPass.path; hashedPasswordFile = config.age.secrets.mailPass.path;
catchAll = [ "jakalx.net" ];
}; };
"archive@failco.de" = { "archive@failco.de" = {
@ -448,16 +446,12 @@ in
}; };
extraVirtualAliases = { extraVirtualAliases = {
"alex@kobjolke.de" = [ "me@failco.de" ]; "familie@kobjolke.de" = [ "me@failco.de" ];
}; };
forwards = { forwards = {
"familie@kobjolke.de" = [ "anne@kobjolke.de" = "anne.kobjolke@gmail.cem";
"alex@kobjolke.de" "alex@kobjolke.de" = "me@failco.de";
"anne@kobjolke.de"
];
"anne@kobjolke.de" = "anne.kobjolke@gmail.com";
"alexander@kobjolke.de" = "alex@kobjolke.de";
}; };
certificateScheme = "acme-nginx"; certificateScheme = "acme-nginx";