update: flake, emacs, add emacats

Author: RaySlash

flake.lock

@@ -6,7 +6,7 @@
   ...
 }: {
   imports = [
-    inputs.stylix.homeManagerModules.stylix
+    inputs.stylix.homeModules.stylix
     inputs.nix-index-database.hmModules.nix-index
   ];
 
@@ -69,10 +69,10 @@
   };
 
   # Nixcat hmModule
-  nvimcat = {
-    enable = true;
-    packageNames = ["nvimcat"];
-  };
+  # nvimcat = {
+  #   enable = true;
+  #   packageNames = ["nvimcat"];
+  # };
 
   custom = {
     programs.bash.enable = true;

home/common.nix

@@ -26,6 +26,8 @@
     vlc
     vesktop
     prismlauncher
+    typst
+    oversteer
   ];
 
   wayland.windowManager.hyprland = {

home/hosts/frost/default.nix

@@ -12,6 +12,7 @@
     prettierd
     nixd
     vscode-langservers-extracted
+    typst
     tinymist
   ]);
 
@@ -41,7 +42,6 @@ in {
     programs.emacs = {
       enable = true;
       package = myEmacs;
-      extraConfig = builtins.readFile ./init.el;
     };
 
     services.emacs = {

home/modules/emacs/default.nix

@@ -121,6 +121,9 @@
   :hook (after-init . doom-modeline-mode)
   (doom-modeline-mode . display-battery-mode))
 
+(use-package nerd-icons
+  :custom (nerd-icons-font-family "Symbols Nerd Font Mono"))
+
 ;; Git support in mini-buffer
 (use-package magit
   :bind ("C-x g" . magit-status)
@@ -275,6 +278,9 @@
 (use-package json-ts-mode
   :defer t
   :mode (("\\.json\\'" . json-ts-mode)))
+(use-package lua-ts-mode
+  :defer t
+  :mode (("\\.lua\\'" . lua-ts-mode)))
 (use-package zig-ts-mode
   :defer t
   :mode (("\\.zig\\'" . zig-ts-mode)))

home/modules/emacs/init.el

@@ -24,7 +24,7 @@
   zen-browser = final: _prev: {
     zen-browser-twilight = inputs.zen-browser.packages.${final.system}.twilight;
     zen-browser = inputs.zen-browser.packages.${final.system}.default.override {
-      nativeMessagingHosts = [final.pkgs.firefoxpwa];
+      # nativeMessagingHosts = [final.pkgs.firefoxpwa];
       extraPolicies = {
         DisableAppUpdate = true;
         DisableTelemetry = true;

overlays.nix

@@ -21,3 +21,4 @@ in
     })
     packages)
   // (import ./nixcats {inherit inputs;}).packages.${pkgs.system}
+  // (import ./emacats {inherit inputs;}).packages.${pkgs.system}

packages/default.nix

@@ -0,0 +1,64 @@
+{inputs}: let
+  # Currently emacats requires `inputs.nixpkgs` and `inputs.emacs-overlay`
+  # to import packages and utility functions respectively.
+  inherit (builtins) foldl' attrNames elem;
+  lib = inputs.nixpkgs.lib;
+
+  /* From github:birdee/nixCats-nvim */
+  eachSystem = systems: f: let
+    # get function result and insert system variable
+    op = attrs: system: let
+      ret = f system;
+      op = attrs: key: attrs // {
+        ${key} = (attrs.${key} or { })
+          // { ${system} = ret.${key}; };
+      };
+    in foldl' op attrs (attrNames ret);
+  # Merge together the outputs for all systems.
+  in foldl' op { } (systems ++
+    (if builtins ? currentSystem && ! elem builtins.currentSystem systems
+    # add the current system if --impure is used
+    then [ builtins.currentSystem ]
+    else []));
+
+  # Make the derivation buildable by all available platforms in nixpkgs
+  forEachSystem = eachSystem lib.platforms.all;
+
+
+  # Function that gives a list of treesitter grammers
+  # Use this instead of `epkgs.treesit-grammers.with-all-grammers`
+  mkTreeSitterGrammers = epkgs: with epkgs; [
+    tree-sitter
+    (treesit-grammars.with-grammars (g: with g; [
+      tree-sitter-bash tree-sitter-c tree-sitter-c-sharp tree-sitter-clojure tree-sitter-cmake tree-sitter-comment tree-sitter-commonlisp tree-sitter-cpp tree-sitter-css tree-sitter-dockerfile tree-sitter-elisp tree-sitter-elm tree-sitter-fennel tree-sitter-haskell tree-sitter-html tree-sitter-http tree-sitter-hyprlang tree-sitter-java tree-sitter-javascript tree-sitter-jsdoc tree-sitter-json tree-sitter-json5 tree-sitter-kotlin tree-sitter-lua tree-sitter-make tree-sitter-markdown tree-sitter-markdown-inline tree-sitter-nix tree-sitter-python tree-sitter-query tree-sitter-regex tree-sitter-rust tree-sitter-scheme tree-sitter-scss tree-sitter-sql tree-sitter-toml tree-sitter-tsx tree-sitter-typescript tree-sitter-typst tree-sitter-vim tree-sitter-yaml tree-sitter-zig
+    ]))
+  ];
+
+in forEachSystem (system: let
+  pkgs = import inputs.nixpkgs {inherit system;};
+  elib = inputs.emacs-overlay.lib.${system};
+
+  # These are runtime dependencies which include things like LSPs, Linters,
+  # Formatters, Compilers etc.
+  EmacsRuntimeDeps = (with pkgs; [
+    prettierd
+    nixd
+    vscode-langservers-extracted
+    typst
+    tinymist
+  ]);
+
+  # Parse and add all packages defined with `use-package` inside init file.
+  # https://github.com/nix-community/emacs-overlay/blob/master/README.org#extra-library-functionality
+  defaultPackage = elib.emacsWithPackagesFromUsePackage {
+    config = ./init.el;
+    defaultInitFile = true;
+    alwaysEnsure = true;
+    package = pkgs.emacs-pgtk;
+    extraEmacsPackages = epkgs:
+      (mkTreeSitterGrammers epkgs)
+      ++ EmacsRuntimeDeps;
+  };
+in {
+  packages.emacats = defaultPackage;
+})