Merge remote-tracking branch 'origin/main'

users/carsten/conf/doom/init.el

@@ -115,7 +115,7 @@
        :lang
        ;;agda              ; types of types of types of types...
        ;;beancount         ; mind the GAAP
-       ;;(cc +lsp)         ; C > C++ == 1
+       (cc +lsp)         ; C > C++ == 1
        ;;clojure           ; java with a lisp
        ;;common-lisp       ; if you've seen one lisp, you've seen them all
        ;;coq               ; proofs-as-programs
@@ -173,7 +173,7 @@
        ;;swift             ; who asked for emoji variables?
        ;;terra             ; Earth and Moon in alignment for performance.
        ;;web               ; the tubes
-       ;;yaml              ; JSON, but readable
+       yaml              ; JSON, but readable
        ;;zig               ; C, but simpler
 
        :email

users/carsten/conf/doom/packages.el

@@ -49,3 +49,4 @@
 ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
 ;(unpin! t)
 (package! catppuccin-theme)
+(package! meson-mode)

users/carsten/conf/emacs.nix

@@ -19,13 +19,10 @@
           if [ ! -d "$DOOMLOCALDIR" ]; then
             ${config.xdg.configHome}/emacs/bin/doom install
           else
-            ${config.xdg.configHome}/emacs/bin/doom sync -u
+            ${config.xdg.configHome}/emacs/bin/doom sync -u -e
           fi
       ''}";
     };
-    #"doom/themes/catppuccin-theme.el" = {
-    #  source = config.lib.file.mkOutOfStoreSymlink "~/source/ctp-emacs/catppuccin-theme.el";
-    #};
     "emacs" = {
       source = pkgs.fetchgit {
         url = "https://github.com/doomemacs/doomemacs";
@@ -40,7 +37,7 @@
           if [ ! -d "$DOOMLOCALDIR" ]; then
             ${config.xdg.configHome}/emacs/bin/doom install
           else
-            ${config.xdg.configHome}/emacs/bin/doom sync -u
+            ${config.xdg.configHome}/emacs/bin/doom sync -u -e
           fi
         ''}";
     };

users/carsten/pkgs/default.nix

@@ -9,6 +9,7 @@
       epkgs.vterm
       epkgs.pdf-tools
       epkgs.auctex
+      (pkgs.callPackage ./spectre-el.nix {})
     ];
   };
 
@@ -29,5 +30,18 @@
     pavucontrol
     (ripgrep.override { withPCRE2 = true; })
     yq
+
+    # Local
+    #(callPackage ./libspectre.nix {})
+
+    # Rust
+    llvmPackages_latest.lld
+    llvmPackages_latest.llvm
+    rustc
+    cargo
+    gcc
+
+    # language-servers
+    rust-analyzer
   ];
 }

users/carsten/pkgs/libspectre.nix

@@ -0,0 +1,40 @@
+{ lib, stdenv, fetchgit, libsodium, meson, pkg-config, ninja }:
+
+stdenv.mkDerivation rec {
+  pname = "libspectre";
+  version = "1.0.0";
+
+  src = fetchgit {
+     url = "https://github.com/nyxkrage/spectre-lib";
+     rev = "da65b8ac4502eb7ec0f0ce57c5d6d6bf79b1d3e4";
+     sha256 = "sha256-iHhUPNl1GkVLRJNAMqvyDpTU1dXUDWnwgFOnRGo7Ikc=";
+  };
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
+  nativeBuildInputs = [
+    meson
+    pkg-config
+    ninja
+  ];
+
+  buildInputs = [
+    libsodium
+  ];
+
+  outputs = [ "out" "dev" ];
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "A modern and easy-to-use crypto library";
+    homepage = "https://spectre.app/";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ nyxkrage ];
+    platforms = platforms.all;
+  };
+}

users/carsten/pkgs/spectre-el.nix

@@ -0,0 +1,50 @@
+{ lib, stdenv, fetchgit, meson, ninja, pkg-config, callPackage, emacs }:
+
+stdenv.mkDerivation rec {
+  pname = "spectre-emacs";
+  version = "0.1.0";
+
+  src = fetchgit {
+    url = "https://github.com/nyxkrage/spectre-emacs";
+    rev = "ceb5898f5f96c200a029349c83168132ac6e309f";
+    sha256 = "sha256-3JLoHUZ+5jBeGeOhkOmQ/GDMG4q266GX3LiB0GNgbiw=";
+  };
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
+
+  nativeBuildInputs = [
+    meson
+    pkg-config
+    ninja
+    emacs
+  ];
+
+  buildInputs = [
+    (callPackage ./libspectre.nix {})
+  ];
+
+  configurePhase = ''
+    meson setup build --libdir $out/share/emacs/site-lisp/elpa/${pname}-${version}
+    cd build
+  '';
+
+  buildPhase = ''
+    ninja
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/emacs/site-lisp/elpa/${pname}-${version}
+    ninja install
+    cd ..
+    cp spectre.el $out/share/emacs/site-lisp/elpa/${pname}-${version}
+  '';
+
+  outputs = [ "out" ];
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+}