update and minor stuff

flake.lock

@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743387206,
+        "lastModified": 1745557122,
-        "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=",
+        "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146",
+        "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743367904,
+        "lastModified": 1745742390,
-        "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=",
+        "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c",
+        "rev": "26245db0cb552047418cfcef9a25da91b222d6c7",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1743315132,
+        "lastModified": 1745794561,
-        "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
+        "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "52faf482a3889b7619003c0daec593a1912fddc1",
+        "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0",
         "type": "github"
       },
       "original": {
@@ -81,11 +81,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1743416833,
+        "lastModified": 1745913556,
-        "narHash": "sha256-JBz6KWbF4MFgQVpwrq7FaUsPxDN/wQEbUAUHmm1Q494=",
+        "narHash": "sha256-hKf2z9fw7vwRBa4CCijolsZt+fqSCixSGai2MS0l+Wg=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "a3f52fa7fae676916064a4b32cf306f15a79b408",
+        "rev": "670e6a286982af78be5fc0b5109356db2d361119",
         "type": "github"
       },
       "original": {

home/fish.nix

@@ -8,14 +8,8 @@
     ktiubox   = "rsync -vaL --delete ~/box/ root@ktiu.net:/var/www/html/box/";
     ymd       = "date +'%Y-%m-%d'";
     pulluni   = "ssh tstraube@login.server.uni-frankfurt.de \"cd uni-tstraube && git pull\"";
-    pullstat  = "ssh tstraube@login.server.uni-frankfurt.de \"cd stat24 && git pull\"";
+    pullstat  = "tar czf - -C ~/teach/2025_statistik/skript/public/ . | ssh tstraube@login.server.uni-frankfurt.de 'tar xzf - -C ~/public_html/c/stat25'";
-    pullds    = "ssh tstraube@login.server.uni-frankfurt.de \"cd ds23 && git pull\"";
-    pullmla   = "ssh tstraube@login.server.uni-frankfurt.de \"cd malta23 && git pull\"";
-    pulldkg   = "ssh till@geocom.uni-frankfurt.de \"cd /var/www/dkg_lp && git pull\"";
     pullgrid  = "ssh till@geocom.uni-frankfurt.de \"cd /var/www/grid && git pull\"";
-    pullgridp = "ssh till@geocom.uni-frankfurt.de \"cd /var/www/grid_preview && git pull\"";
-    pullsneak = "ssh till@geocom.uni-frankfurt.de \"cd /var/www/dkg_lp_prev && git pull\"";
-    pullkhole = "ssh root@ktiu.net \"cd /var/www/karaoke && git pull\"";
     buildfk   = "curl -X POST -d '{}' https://api.netlify.com/build_hooks/65dc8705b91d7cbaf0a1e1b5";
     showbox   = "chromium-browser -app=https://user.uni-frankfurt.de/~tstraube/box";
     showc     = "chromium-browser -app=https://user.uni-frankfurt.de/~tstraube/c/";

home/mail/default.nix

@@ -9,20 +9,24 @@
       port 587
     '';
   };
+
   programs.mbsync.enable = true;
   programs.neomutt = {
     enable = true;
     vimKeys = true;
     extraConfig = builtins.readFile ./config.neomuttrc;
   };
+
   programs.notmuch.enable = true;
-  # xdg.configFile."notmuch/default/config".source = ./notmuch.config;
+
   xdg.configFile."neomutt/bindings.neomuttrc".source = ./bindings.neomuttrc;
   xdg.configFile."neomutt/smime.neomuttrc".source = ./smime.neomuttrc;
   xdg.configFile."neomutt/mailcap".source = ./neomutt_mailcap;
+
   accounts.email = {
     maildirBasePath = "${config.xdg.dataHome}/mail";
     accounts = {
+
       gu = {
         primary = true;
         address = "straube@geo.uni-frankfurt.de";
@@ -80,14 +84,15 @@
           '';
         };
       };
+
       t9e = {
         address = "till@t9e.me";
         realName = "Till Straube";
-        imap.host = "mail.ktiu.net";
+        imap.host = "arielle.ktiu.net";
-        smtp.host = "mail.ktiu.net";
+        smtp.host = "arielle.ktiu.net";
         smtp.tls.useStartTls = true;
         notmuch.enable = true;
-        userName = "till";
+        userName = "till@t9e.me";
         signature.text = ''
           Till Straube (he/him)
         '';
@@ -97,13 +102,10 @@
           sendMailCommand = "/home/till/.nix-profile/bin/msmtp";
           extraConfig = ''
             set my_mbsync_acct='t9e'
-
             set mbox='+Archive'
             set my_junk='+Junk'
-
             unset crypt_auto_pgp
             unset crypt_auto_smime
-
             unalternates *
             alternates @t9e.me$
             set reverse_name
@@ -121,8 +123,9 @@
           enable = true;
           extraConfig.from = "*@t9e.me";
         };
-        passwordCommand = "secret-tool lookup server mail.ktiu.net account till";
+        passwordCommand = "secret-tool lookup server arielle.ktiu.net account till@t9e.me";
       };
+
       ktiu = {
         address = "till@ktiu.net";
         realName = "Till Straube";
@@ -171,6 +174,7 @@
         };
         passwordCommand = "secret-tool lookup server shorbut.ktiu.net account till";
       };
+
       ksh = {
         address = "kein_schlussstrich_hessen@systemli.org";
         realName = "Kein Schlussstrich Hessen";
@@ -215,49 +219,7 @@
         };
         passwordCommand = "secret-tool lookup server mail.systemli.org account kein_schlussstrich_hessen@systemli.org";
       };
-      # dkg = {
-      #   address = "kontakt@dkg2023.de";
-      #   realName = "DKG Orga-Team";
-      #   imap.host = "mail.privateemail.com";
-      #   smtp.host = "mail.privateemail.com";
-      #   smtp.tls.useStartTls = true;
-      #   notmuch.enable = true;
-      #   userName = "helpdesk@dkg2023.de";
-      #   signature.text = ''
-      #     DKG '23
-      #     https://dkg2023.de
-      #   '';
-      #   signature.showSignature = "append";
-      #   neomutt = {
-      #     enable = true;
-      #     sendMailCommand = "/home/till/.nix-profile/bin/msmtp";
-      #     extraConfig = ''
-      #       set my_mbsync_acct='dkg'
 
-      #       set mbox='+Archive'
-      #       set my_junk='+Junk'
-
-      #       set crypt_auto_pgp
-      #       unset crypt_auto_smime
-
-      #       unalternates *
-      #       alternates @dkg2023.de$
-      #       set reverse_name
-      #       set my_signature = ${
-      #         pkgs.writeText
-      #           "signature.txt"
-      #           config.accounts.email.accounts.dkg.signature.text
-      #       }
-      #       color status yellow default
-      #     '';
-      #   };
-      #   mbsync.enable = true;
-      #   msmtp = {
-      #     enable = true;
-      #     extraConfig.from = "*@dkg2023.de";
-      #   };
-      #   passwordCommand = "secret-tool lookup server mail.privateemail.com account helpdesk@dkg2023.de";
-      # };
     };
   };
 }