Update to 25.11, manually pull in deprecated stuff for emacswayland

I do not understand why helm-ag and helm-sweep were removed in MELPA… They work perfectly fine.

8 files changed, 76 insertions, 17 deletions

diff --git a/gui/apps/dev.nix b/gui/apps/dev.nix
index 5202d3c..55cc56d 100644
--- a/gui/apps/dev.nix
+++ b/gui/apps/dev.nix
@@ -1,4 +1,4 @@
-{ pkgs, pkgs-unstable, ... }:
+{ pkgs, pkgs-unstable, pkgs-oldstable, ... }:
 
 {
   home = {
@@ -9,8 +9,9 @@
       meld
 
     # Visualization and CAD
-      paraview
-      pkgs-unstable.blender
+      pkgs-oldstable.paraview
+
+      blender
       freecad
       meshlab
 
diff --git a/gui/apps/web.nix b/gui/apps/web.nix
index 3fcb931..53f244b 100644
--- a/gui/apps/web.nix
+++ b/gui/apps/web.nix
@@ -3,7 +3,7 @@
 {
   home = {
     packages = [
-      pkgs.tdesktop
+      pkgs.telegram-desktop
       pkgs.tigervnc
       pkgs.remmina
       pkgs.zotero
diff --git a/gui/conf/init.el b/gui/conf/init.el
index af4bd71..b543c6b 100644
--- a/gui/conf/init.el
+++ b/gui/conf/init.el
@@ -492,6 +492,9 @@
   :init
   (projectile-mode))
 
+(use-package ag
+  :ensure t)
+
 (use-package helm-ag
   :ensure t)
 
@@ -603,6 +606,9 @@
     ad-do-it
     (message "org-tangle took %f sec" (float-time (time-subtract (current-time) time)))))
 
+(use-package gptel
+  :ensure t)
+
 (let ((mu4e-config "~/.emacs.d/email.el"))
  (when (file-exists-p mu4e-config)
    (load-file mu4e-config)))
@@ -614,4 +620,21 @@
 (use-package envrc
   :ensure t)
 
+(use-package gptel
+  :ensure t
+  :config
+  (defun read-file-contents (file-path)
+    "Read the contents of FILE-PATH and return it as a string."
+    (with-temp-buffer
+      (insert-file-contents file-path)
+      (buffer-string)))
+  (defun gptel-api-key ()
+    (read-file-contents "~/.kit-ai-api"))
+  (setq gptel-backend (gptel-make-openai "KIT-Toolbox"
+                        :host "ki-toolbox.scc.kit.edu"
+                        :endpoint "/api/v1/chat/completions"
+                        :stream t
+                        :key #'gptel-api-key
+                        :models '("azure.gpt-5"))))
+
 (envrc-global-mode)
diff --git a/gui/conf/metakr.org b/gui/conf/metakr.org
index 29643cf..16c9717 100644
--- a/gui/conf/metakr.org
+++ b/gui/conf/metakr.org
@@ -83,8 +83,8 @@ For quick iteration all colors are stored in a table.
 | org-tag                 | #E4E093 |
 | org-block-line          | #161616 |
 | org-block-bg            | #080808 |
-| org-agenda-structure-fg | #aaaaaa |
-| org-agenda-structure-bg | #080808 |
+| org-agenda-structure-fg | #000000 |
+| org-agenda-structure-bg | #F2F2F2 |
 | org-agenda-today-fg     | #dddddd |
 | org-agenda-today-bg     | #000000 |
 | org-special-keyword     | #777777 |
@@ -335,9 +335,11 @@ For quick iteration all colors are stored in a table.
    :weight normal)
   (org-agenda-structure
    :foreground @org-agenda-structure-fg
-   :background @bg
-   :box (:line-width 3 :color @bg)
-   :underline @org-agenda-structure-bg)
+   :background @org-agenda-structure-bg)
+  ;(org-agenda-structural-header
+  ; :inherit fixed-pitch
+  ; :weight bold
+  ; :foreground @org-todo)
   (org-scheduled
    :foreground @org-scheduled)
   (org-scheduled-today
diff --git a/gui/conf/niri.kdl b/gui/conf/niri.kdl
index f795bcb..3741a60 100644
--- a/gui/conf/niri.kdl
+++ b/gui/conf/niri.kdl
@@ -13,6 +13,11 @@ output "eDP-1" {
     scale 1
 }
 
+output "HDMI-1" {
+    mode "1920x1080"
+    scale 1
+}
+
 input {
     keyboard {
         xkb {
diff --git a/gui/emacs.nix b/gui/emacs.nix
index 8d3e123..d197bce 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -31,6 +31,7 @@
         (add-to-list 'exec-path "${pkgs.universal-ctags}/bin")
         (add-to-list 'exec-path "${pkgs.global}/bin")
         (add-to-list 'exec-path "${pkgs.pandoc}/bin")
+        (add-to-list 'exec-path "${pkgs.silver-searcher}/bin")
       '';
     };
 
@@ -43,28 +44,55 @@
         cp ${custom-runtime-env-el} $out/share/emacs/site-lisp/custom-runtime-env.el
       '';
     };
+
   in {
     enable = true;
 
     package = pkgs.emacsWithPackagesFromUsePackage {
-      override = final: prev: {
-        org = prev.org.overrideAttrs(old: { patches = []; } );
-      };
-
       package = pkgs.emacs-unstable-pgtk;
 
       config = ./conf/init.el;
       alwaysEnsure = false;
 
-      extraEmacsPackages = epkgs: (with epkgs.melpaPackages; [
+      override = final: prev: prev // {
+        org = prev.org.overrideAttrs(old: { patches = []; } );
+
+        helm-ag = prev.trivialBuild {
+          pname = "helm-ag";
+          version = "0.64";
+          src = pkgs.fetchFromGitHub {
+            owner = "emacsattic";
+            repo = "helm-ag";
+            rev = "a7b43d9622ea5dcff3e3e0bb0b7dcc342b272171";
+            hash = "sha256-bIuZPMsY0iwkUFOfB6rGno0WvlPtbqqgujwhUb6nTLw=";
+          };
+          buildInputs = [ prev.melpaPackages.helm ];
+        };
+
+        helm-swoop = prev.trivialBuild {
+          pname = "helm-swoop";
+          version = "1.7.4";
+          src = pkgs.fetchFromGitHub {
+            owner = "emacsattic";
+            repo = "helm-swoop";
+            rev = "df90efd4476dec61186d80cace69276a95b834d2";
+            hash = "sha256-T93IoHTRkBrX9J//WPbS3zEEjKFqNzBsYrHaKM5U2QY=";
+          };
+          buildInputs = [ prev.melpaPackages.helm ];
+        };
+      };
+
+      extraEmacsPackages = epkgs:
+            (with epkgs.melpaPackages; [
         pdf-tools
         mu4e-alert
       ]) ++ (with epkgs.elpaPackages; [
         auctex
       ]) ++ (with epkgs.nongnuPackages; [
         org-contrib
+      ]) ++ (with epkgs; [
+        mu4e
       ])++ [
-        epkgs.mu4e
         akr-color-theme
         custom-runtime-env
       ];
diff --git a/gui/pass.nix b/gui/pass.nix
index b400292..00e66df 100644
--- a/gui/pass.nix
+++ b/gui/pass.nix
@@ -8,7 +8,7 @@ let
 
     text = ''
       #!/usr/bin/env bash
-      ${pkgs.rofi-wayland}/bin/rofi -dmenu -p "pass" "$@"
+      ${pkgs.rofi}/bin/rofi -dmenu -p "pass" "$@"
     '';
   };
 
diff --git a/gui/rofi.nix b/gui/rofi.nix
index 6df45ff..8155f1d 100644
--- a/gui/rofi.nix
+++ b/gui/rofi.nix
@@ -3,7 +3,7 @@
 {
   programs.rofi = {
     enable = true;
-    package = pkgs.rofi-wayland;
+    package = pkgs.rofi;
     location = "top";
     font = "Iosevka 12";