Updated consul docu

config/doom/config.el

@@ -119,6 +119,10 @@
   (setq pipenv-with-projectile t)
   (setenv "PIPENV_MAX_DEPTH" "10"))
 
+;; (with-eval-after-load 'eglot
+;;   (add-to-list 'eglot-server-programs
+;;                '(python-mode . ("ty" "server"))))
+
 ;; -----------------------------------------------------------------------------
 ;; Web (HTML + CSS)
 ;; -----------------------------------------------------------------------------

config/doom/init.el

@@ -136,7 +136,9 @@
        ;;idris             ; a language you can depend on
        json              ; At least it ain't XML
        ;;(java +meghanada) ; the poster child for carpal tunnel syndrome
-       ;;javascript        ; all(hope(abandon(ye(who(enter(here))))))
+       (javascript       ; all(hope(abandon(ye(who(enter(here))))))
+        +lsp
+        +tree-sitter)
        ;;julia             ; a better, faster MATLAB
        ;;kotlin            ; a better, slicker Java(Script)
        latex             ; writing papers in Emacs has never been so fun
@@ -154,8 +156,9 @@
        php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
-       (python
+       (python           ; beautiful is better than ugly
-        +lsp)          ; beautiful is better than ugly
+        +lsp
+        +tree-sitter)
        ;;qt                ; the 'cutest' gui framework ever
        ;;racket            ; a DSL for DSLs
        ;;raku              ; the artist formerly known as perl6
@@ -171,7 +174,10 @@
        ;;solidity          ; do you need a blockchain? No.
        ;;swift             ; who asked for emoji variables?
        ;;terra             ; Earth and Moon in alignment for performance.
-       ;;web               ; the tubes
+       (web              ; the tubes
+        +html
+        +css
+        +lsp)
        yaml              ; JSON, but readable
 
        :email

docs/consul.org

@@ -8,8 +8,11 @@ agenix -i ~/.ssh/id_reykjavik -d consul.d/consul-agent-ca-key.pem.age > ~/tmp/co
 #+end_src
 Create the keypair using consul:
 #+begin_src bash
-nix-shell -p consul
+NIXPKGS_ALLOW_UNFREE=1 nix-shell -p consul
-consul tls cert create -server -dc samfelag
+# Server cert
+consul tls cert create -server -dc samfelag --ca=/home/marc/tmp/consul-agent-ca.pem --key=/home/marc/tmp/consul-agent-ca-key.pem
+# Client cert
+consul tls cert create -client -dc samfelag --ca=/home/marc/tmp/consul-agent-ca.pem --key=/home/marc/tmp/consul-agent-ca-key.pem
 #+end_src
 * ACLs
 ** Policies

hosts/reykjavik/default.nix

@@ -110,5 +110,7 @@ in
 
   # - Extra / Temporary --------------------------
   programs.dconf.enable = true; # Inkscape crashes
+  environment.systemPackages = with pkgs; [
+  ];
   fonts.packages = [];
 }

modules/dev/claude.nix

@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.samfelag.modules.dev.claude;
+in
+{
+  options.samfelag.modules.dev.claude = with lib.types; {
+    enable = lib.mkEnableOption "claude";
+  };
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      claude
+    ];
+  };
+}

modules/editors/emacs.nix

@@ -7,6 +7,11 @@ let
   hyprCfg = config.samfelag.modules.desktop.wm.hyprland;
   emacsPackages = epkgs: [
     epkgs.vterm
+    (epkgs.treesit-grammars.with-grammars (grammars: [
+      grammars.tree-sitter-typescript
+      grammars.tree-sitter-tsx
+      grammars.tree-sitter-python
+    ]))
   ];
   emacsWithPackages = with pkgs; ((emacsPackagesFor emacs-unstable).emacsWithPackages emacsPackages);
 in {