kylekrein/emacs-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

with-lsps

Browse source
This commit is contained in:
Aleksandr Lebedev 2025-07-07 14:16:43 +02:00
parent 2697f0eeef
commit 4c81585270
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flake.nix
View file

@ -37,7 +37,7 @@
]; ];
}; };
}; };
packages.x86_64-linux.x11 = import ./package.nix { packages.x86_64-linux.with-lsps = import ./package.nix {
pkgs = import nixpkgs { pkgs = import nixpkgs {
system = "x86_64-linux"; system = "x86_64-linux";
overlays = [ overlays = [
@ -45,9 +45,9 @@
nix-org-babel.overlays.default nix-org-babel.overlays.default
]; ];
}; };
x11 = true; withLsps = true;
}; };
packages.aarch64-linux.x11 = import ./package.nix { packages.aarch64-linux.with-lsps = import ./package.nix {
pkgs = import nixpkgs { pkgs = import nixpkgs {
system = "aarch64-linux"; system = "aarch64-linux";
overlays = [ overlays = [
@ -55,7 +55,7 @@
nix-org-babel.overlays.default nix-org-babel.overlays.default
]; ];
}; };
x11 = true; withLsps = true;
}; };
}; };
} }

9
package.nix
View file

@ -1,6 +1,6 @@
{ {
pkgs, pkgs,
x11 ? false, withLsps ? false,
... ...
}: let }: let
configFile = pkgs.tangleOrgBabelFile "default.el" ./config.org { configFile = pkgs.tangleOrgBabelFile "default.el" ./config.org {
@ -26,10 +26,7 @@
# }; # };
defaultInitFile = true; defaultInitFile = true;
# Package is optional, defaults to pkgs.emacs # Package is optional, defaults to pkgs.emacs
package = package = pkgs.emacs30-pgtk;
if x11
then pkgs.emacs30
else pkgs.emacs30-pgtk;
# By default emacsWithPackagesFromUsePackage will only pull in # By default emacsWithPackagesFromUsePackage will only pull in
# packages with `:ensure`, `:ensure t` or `:ensure <package name>`. # packages with `:ensure`, `:ensure t` or `:ensure <package name>`.
@ -66,7 +63,7 @@
tree-sitter-langs tree-sitter-langs
treesit-grammars.with-all-grammars treesit-grammars.with-all-grammars
el-easydraw el-easydraw
])); ]) ++ (with pkgs; lib.optional (withLsps) [ csharp-ls clang-tools cmake-language-server ]));
# Optionally override derivations. # Optionally override derivations.
override = final: prev: { override = final: prev: {