last commit before modifying image

3 files changed, 69 insertions, 29 deletions

diff --git a/config/emacs.el b/config/emacs.el
index ddde018..76948b5 100644
--- a/config/emacs.el
+++ b/config/emacs.el
@@ -4,6 +4,11 @@
 
 (use-package emacs
   :custom
+  ;; global defaults
+  (setq-default indent-tabs-mode nil)  ;; no real tabs, only spaces
+  (setq-default tab-width 2)           ;; just in case, make a "tab" show as 4 spaces
+  (setq-default standard-indent 2)     ;; base indentation
+
   ;; Startup errors
   (warning-minimum-level :emergency "Supress emacs warnings")
   (confirm-kill-processes nil "Don't ask to quit")
@@ -254,22 +259,32 @@
   :after (org)
   :hook (org-mode . (lambda () (org-superstar-mode 1))))
 
-(use-package eglot
-  :hook
-  (prog-mode . eglot-ensure)
-  (nix-mode . eglot-ensure)
-  :config
-  (add-to-list 'eglot-server-programs '(nix-mode . ("nil"))))
+;; (use-package eglot
+ ;;   :hook
+ ;;   (prog-mode . eglot-ensure)
+ ;;   (nix-mode . eglot-ensure)
+ ;;   :config
+ ;;   (add-to-list 'eglot-server-programs '(nix-mode . ("nil"))))
+
+ (use-package lsp
+   :hook
+   (prog-mode . lsp))
 
-(use-package lsp
-  :hook
-  (prog-mode . lsp))
+(with-eval-after-load 'lsp-mode
+  (setq lsp-typescript-format-enable t
+        lsp-typescript-indent-size 4
+        lsp-typescript-tab-size 4
+        lsp-typescript-indent-style "spaces"))
+
+(use-package editorconfig
+  :config
+  (editorconfig-mode 1))
 
-(use-package flycheck
-  :config (global-flycheck-mode))
+ (use-package flycheck
+   :config (global-flycheck-mode))
 
-(use-package platformio-mode
-  :hook (prog-mode . platformio-conditionally-enable))
+ (use-package platformio-mode
+:hook (prog-mode . platformio-conditionally-enable))
 
 (use-package irony-mode
   :hook (
@@ -409,7 +424,7 @@
     "m l" '(lyrics-fetcher-show-lyrics :wk "Music lyrics")
     "o p" '(treemacs :wk "Project Drawer")
     "o P" '(treemacs-projectile :wk "Import Projectile project to treemacs")
-    "f f" '(eglot-format :wk "Format code buffer")
+    ;; "f f" '(eglot-format :wk "Format code buffer")
     "i p c" '(prestonpan :wk "Connect to my IRC server")
     "i l c" '(liberachat :wk "Connect to libera chat server")
     "i e c" '(efnet :wk "Connect to efnet chat server")
diff --git a/config/emacs.org b/config/emacs.org
index ca040d4..dab81d6 100644
--- a/config/emacs.org
+++ b/config/emacs.org
@@ -25,6 +25,11 @@ Emacs is self documenting, after all!
 #+begin_src emacs-lisp
   (use-package emacs
     :custom
+    ;; global defaults
+    (setq-default indent-tabs-mode nil)  ;; no real tabs, only spaces
+    (setq-default tab-width 2)           ;; just in case, make a "tab" show as 4 spaces
+    (setq-default standard-indent 2)     ;; base indentation
+
     ;; Startup errors
     (warning-minimum-level :emergency "Supress emacs warnings")
     (confirm-kill-processes nil "Don't ask to quit")
@@ -332,22 +337,32 @@ Org superstar adds those nice looking utf-8 bullets:
 ** LSP
 We set up eglot, the LSP manager for emacs, now built in:
 #+begin_src emacs-lisp
-  (use-package eglot
-    :hook
-    (prog-mode . eglot-ensure)
-    (nix-mode . eglot-ensure)
-    :config
-    (add-to-list 'eglot-server-programs '(nix-mode . ("nil"))))
+   ;; (use-package eglot
+   ;;   :hook
+   ;;   (prog-mode . eglot-ensure)
+   ;;   (nix-mode . eglot-ensure)
+   ;;   :config
+   ;;   (add-to-list 'eglot-server-programs '(nix-mode . ("nil"))))
+
+   (use-package lsp
+     :hook
+     (prog-mode . lsp))
 
-  (use-package lsp
-    :hook
-    (prog-mode . lsp))
+  (with-eval-after-load 'lsp-mode
+    (setq lsp-typescript-format-enable t
+          lsp-typescript-indent-size 4
+          lsp-typescript-tab-size 4
+          lsp-typescript-indent-style "spaces"))
+
+  (use-package editorconfig
+    :config
+    (editorconfig-mode 1))
 
-  (use-package flycheck
-    :config (global-flycheck-mode))
+   (use-package flycheck
+     :config (global-flycheck-mode))
 
-  (use-package platformio-mode
-    :hook (prog-mode . platformio-conditionally-enable))
+   (use-package platformio-mode
+  :hook (prog-mode . platformio-conditionally-enable))
 #+end_src
 *** C/C++
 Specific configuration for C (I also use the clangd lsp):
@@ -514,7 +529,7 @@ emacs keybindings.
       "m l" '(lyrics-fetcher-show-lyrics :wk "Music lyrics")
       "o p" '(treemacs :wk "Project Drawer")
       "o P" '(treemacs-projectile :wk "Import Projectile project to treemacs")
-      "f f" '(eglot-format :wk "Format code buffer")
+      ;; "f f" '(eglot-format :wk "Format code buffer")
       "i p c" '(prestonpan :wk "Connect to my IRC server")
       "i l c" '(liberachat :wk "Connect to libera chat server")
       "i e c" '(efnet :wk "Connect to efnet chat server")
diff --git a/config/nix.org b/config/nix.org
index 125547a..13cd687 100644
--- a/config/nix.org
+++ b/config/nix.org
@@ -32,6 +32,9 @@ so that adding new configurations that add modifications is made simple.
         url = "github:oddlama/nix-topology";
         inputs.nixpkgs.follows = "nixpkgs";
       };
+      deep-research = {
+        url = "github:ret2pop/ollama-deep-researcher";
+      };
       home-manager = {
   	    url = "github:nix-community/home-manager/release-25.05";
   	    inputs.nixpkgs.follows = "nixpkgs";
@@ -50,7 +53,7 @@ so that adding new configurations that add modifications is made simple.
       };
     };
 
-    outputs = { self, nixpkgs, home-manager, nur, disko, lanzaboote, sops-nix, nix-topology, nixos-dns, ... }@attrs:
+    outputs = { self, nixpkgs, home-manager, nur, disko, lanzaboote, sops-nix, nix-topology, nixos-dns, deep-research, ... }@attrs:
       let
         system = "x86_64-linux";
         pkgs = import nixpkgs { inherit system; };
@@ -69,6 +72,11 @@ so that adding new configurations that add modifications is made simple.
               { networking.hostName = "${hostname}"; }
               nix-topology.nixosModules.default
             ] else [
+              {
+                environment.systemPackages = with nixpkgs.lib; [
+                  deep-research.packages.${system}.deep-research
+                ];
+              }
               nix-topology.nixosModules.default
               lanzaboote.nixosModules.lanzaboote
               disko.nixosModules.disko
@@ -1516,6 +1524,7 @@ I have many imports that we'll go through next.
   			                kdePackages.kdenlive
   			                kicad
                         murmur
+                        silver-searcher
   					          ]) else []);
 
       monorepo.profiles = {
@@ -2891,6 +2900,7 @@ standard.
       export EXTRA_CCFLAGS="-I/usr/include"
       source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh
       export QT_QPA_PLATFORM="wayland"
+      export OLLAMA_MODEL="qwen3:14b"
       '';
 
       localVariables = {