update sources: NixOS 25.11

3 files changed, 23 insertions, 21 deletions

diff --git a/home/home-minimal.nix b/home/home-minimal.nix
index cfeb2b2..6f872bf 100644
--- a/home/home-minimal.nix
+++ b/home/home-minimal.nix
@@ -119,16 +119,17 @@
 
   programs.git = {
     enable = true;
-    package = pkgs.gitAndTools.gitFull;
-    userEmail = "stuebinm@disroot.org";
-    userName = "stuebinm";
+    package = pkgs.gitFull;
 
     signing = {
       # signByDefault = true;
       key = "0x8FBE8AAD32FA12B7";
     };
 
-    extraConfig = {
+    settings = {
+      user.email = "stuebinm@disroot.org";
+      user.name = "stuebinm";
+
       log.showSignature = true;
       init.defaultBranch = "main";
       merge.conflictStyle = "zdiff3";
@@ -180,17 +181,18 @@
 
     # diff-so-fancy.enable = true;
     # difftastic.enable = true;
-    delta = {
-      enable = false;
-      options = {
-        decorations = {
-          commit-decoration-style = "bold yellow";
-          file-decoration-style = "bold blue";
-          file-style = "bold yellow";
-        };
-        features = "decorations line-numbers navigate";
-        whitespace-error-style = "22 reverse";
+  };
+
+  programs.delta = {
+    enable = false;
+    options = {
+      decorations = {
+        commit-decoration-style = "bold yellow";
+        file-decoration-style = "bold blue";
+        file-style = "bold yellow";
       };
+      features = "decorations line-numbers navigate";
+      whitespace-error-style = "22 reverse";
     };
   };
 
diff --git a/home/packages-minimal.nix b/home/packages-minimal.nix
index b1121ac..20eb6df 100644
--- a/home/packages-minimal.nix
+++ b/home/packages-minimal.nix
@@ -16,7 +16,7 @@
     # nix tools
     nixpkgs-review nix-top nix-diff nix-tree
     # git
-    gitAndTools.gitAnnex git-bug git-appraise mergiraf
+    git-annex git-bug git-appraise mergiraf
     # other things
     gauche
     # html, js & co
diff --git a/home/packages.nix b/home/packages.nix
index 2bdee84..c4e918b 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -10,7 +10,7 @@ in
 
     # internet apps & clients
     firefox keepassxc mumble lynx offpunk
-    openconnect tdesktop monolith magic-wormhole-rs
+    openconnect telegram-desktop monolith magic-wormhole-rs
     dino
     # graphics & audio
     audacity blender darktable ffmpeg-full
@@ -18,7 +18,7 @@ in
     gst_all_1.gstreamer vimiv-qt
     # LaTeX & documents
     xournalpp pandoc zathura pdfpc
-    poppler_utils typst rustex
+    poppler-utils typst rustex
     (texlive.combine {
       inherit (texlive) scheme-full;
       pkgFilter = pkg: lib.elem pkg.tlType [ "run" "bin" "doc" ];
@@ -26,9 +26,9 @@ in
     # general cli utils
     almanac libnotify grim slurp (zbar.override { enableVideo = false; withXorg = false; })
     wl-clipboard showrt
-    kijetesantakaluotokieni mpc_cli dufs progress hledger
+    kijetesantakaluotokieni mpc dufs progress hledger
     wineWowPackages.full sops xdg-utils exiftool
-    mercurial darcs git-annex-remote-remarkable2 git-who
+    mercurial darcs git-annex-remote-remarkable2 # git-who
     rlwrap
     inputs.ocaml-forester.legacyPackages.${system}.forester
     # graphical utils
@@ -47,7 +47,7 @@ in
     # other functional things
     racket dhall dune_2 ocamlPackages.utop ocamlPackages.ocp-indent
     ocamlPackages.merlin ocaml gauche
-    (agda.withPackages (p: [ p.standard-library p.cubical ]))
+    (agda.withPackages (p: [ p.standard-library p.cubical p.agda-categories ]))
 
     # html, js & co
     jq ijq html-tidy nodePackages.stylelint nodePackages.js-beautify zola
@@ -63,7 +63,7 @@ in
     # nix things
     npins nix-output-monitor direnv
     # isabelle
-    (isabelle.mkEnv "isabelle-env" "fish") isabat
+    # (isabelle.mkEnv "isabelle-env" "fish") isabat
 
     (import inputs.traveltext { inherit pkgs; })
   ];