diff --git a/flake.lock b/flake.lock index d4d2798..5a5e95c 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1745557122, - "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "owner": "nix-community", "repo": "home-manager", - "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745742390, - "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=", + "lastModified": 1750646418, + "narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26245db0cb552047418cfcef9a25da91b222d6c7", + "rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745794561, - "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745913556, - "narHash": "sha256-hKf2z9fw7vwRBa4CCijolsZt+fqSCixSGai2MS0l+Wg=", + "lastModified": 1751030875, + "narHash": "sha256-x4EqjJUyJ3mHRtFYQP+FSDzT4A+1DEDig1LtwTsIJTc=", "owner": "nix-community", "repo": "nur", - "rev": "670e6a286982af78be5fc0b5109356db2d361119", + "rev": "48ce5dd4e350f18380810882dd787839c6433dda", "type": "github" }, "original": { diff --git a/home/calendars.nix b/home/calendars.nix index 3051570..bb3b888 100644 --- a/home/calendars.nix +++ b/home/calendars.nix @@ -59,32 +59,38 @@ in accounts.calendar.basePath = "${config.xdg.dataHome}/calendars"; accounts.calendar.accounts = { + till = calDefaults // { khal.enable = true; primary = true; khal.color = "light blue"; remote = myRemote "personal"; }; + mitlisa = calDefaults // { khal.enable = true; khal.color = "light magenta"; remote = myRemote "lisa-und-till"; }; + family = calDefaults // { khal.enable = true; khal.color = "dark magenta"; remote = myRemote "family"; }; + bdays = calDefaults // { khal.enable = true; khal.color = "yellow"; remote = myRemote "geburtstage"; }; + polit = calDefaults // { khal.enable = true; khal.color = "dark gray"; remote = myRemote "polit"; }; + ihg = calDefaults // { khal.enable = true; khal.color = "dark cyan"; @@ -93,6 +99,7 @@ in url = "https://geocom.uni-frankfurt.de/radicale/ihg/5012a739-dbaf-334b-f093-8db1860bc26e/"; }; }; + "eintracht_m" = calDefaults // { khal.enable = true; khal.color = "light red"; @@ -101,6 +108,7 @@ in url = "http://i.cal.to/ical/257/eintrachtfrankfurt/spielplan/28ae0d30.f781380b-e6f28bd4.ics"; }; }; + "eintracht_f" = calDefaults // { khal.enable = true; khal.color = "dark red"; @@ -109,6 +117,16 @@ in url = "http://i.cal.to/ical/5940/eintrachtfrankfurt/spielplan-frauen-profis/28ae0d30.f781380b-1763bff2.ics"; }; }; + + "feiertage" = calDefaults // { + khal.enable = true; + khal.color = "dark green"; + remote = { + type = "http"; + url = "https://ics.tools/Feiertage/hessen.ics"; + }; + }; + "grid" = calDefaults // { khal.enable = true; khal.color = "light green"; diff --git a/home/default.nix b/home/default.nix index 41db11a..5a96759 100644 --- a/home/default.nix +++ b/home/default.nix @@ -5,7 +5,6 @@ home.packages = with pkgs; [ # messenger - element-desktop signal-desktop tdesktop @@ -30,7 +29,6 @@ # media bookworm - heroic anki-bin freetube qbittorrent diff --git a/home/mail/config.neomuttrc b/home/mail/config.neomuttrc index 870ebec..cc7b6d3 100644 --- a/home/mail/config.neomuttrc +++ b/home/mail/config.neomuttrc @@ -54,7 +54,8 @@ folder-hook . source ~/.config/neomutt/bindings.neomuttrc # source ~/.config/neomutt/pgp.neomuttrc # Compose -set editor = "nvim -c 'call woof#init#Init()'" +# set editor = "nvim -c 'call woof#init#Init()'" +set editor = "nvim" set edit_headers set forward_format = "Fwd: %s" set forward_attachments diff --git a/home/r.nix b/home/r.nix index 9507685..3248ad8 100644 --- a/home/r.nix +++ b/home/r.nix @@ -44,6 +44,7 @@ eurostat extrafont ggplot2 + ggridges jsonlite kableExtra knitr @@ -60,6 +61,7 @@ RColorBrewer readODS revealjs + restatis rlist rmarkdown rnaturalearth diff --git a/system/web-server/mail/postfix.nix b/system/web-server/mail/postfix.nix index a00fba8..e5a1130 100644 --- a/system/web-server/mail/postfix.nix +++ b/system/web-server/mail/postfix.nix @@ -2,13 +2,13 @@ let - submissionHeaderCleanupRules = pkgs.writeText "submission_header_cleanup_rules" '' - /^Received:/ IGNORE - /^X-Originating-IP:/ IGNORE - /^X-Mailer:/ IGNORE - /^User-Agent:/ IGNORE - /^X-Enigmail:/ IGNORE - /^Message-ID:\s+<(.*?)@.*?>/ REPLACE Message-ID: <$1@ktiu.net> + submissionheadercleanuprules = pkgs.writetext "submission_header_cleanup_rules" '' + /^received:/ ignore + /^x-originating-ip:/ ignore + /^x-mailer:/ ignore + /^user-agent:/ ignore + /^x-enigmail:/ ignore + /^message-id:\s+<(.*?)@.*?>/ replace message-id: <$1@ktiu.net> ''; in {