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

Package kotlin-language-server and jdtls again

Browse source
This commit is contained in:
Charlotte Van Petegem 2021-07-03 11:55:53 +02:00
parent 56955f9898
commit 5726b5211f
No known key found for this signature in database
GPG key ID: 019E764B7184435A
4 changed files with 102 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

83
flake.nix
View file

@ -15,42 +15,53 @@
utils.url = "github:gytis-ivaskevicius/flake-utils-plus/master";
};
outputs = inputs@{ self, nixpkgs, agenix, emacs-overlay, home-manager, utils }: utils.lib.systemFlake {
inherit self inputs;
# This config can only be evaluated on x86_64-linux because of IFD
supportedSystems = [ "x86_64-linux" ];
channels.nixpkgs = {
input = nixpkgs;
patches = map (patch: ./patches + "/${patch}") (builtins.filter (x: x != ".keep") (builtins.attrNames (builtins.readDir ./patches)));
overlaysBuilder = _: [ emacs-overlay.overlay ];
};
hostDefaults = {
modules = [
({ lib, ... }: {
environment.etc = lib.mapAttrs' (key: val: { name = "channels/${key}"; value = { source = val.outPath; }; }) inputs;
nix.nixPath = [ "/etc/channels" ];
})
utils.nixosModules.saneFlakeDefaults
agenix.nixosModules.age
home-manager.nixosModules.home-manager
./modules
];
extraArgs = { nixosConfigurations = self.nixosConfigurations; };
};
hosts = {
kharbranth.modules = [ ./machines/kharbranth ];
kholinar.modules = [ ./machines/kholinar ];
lasting-integrity.modules = [ ./machines/lasting-integrity ];
urithiru.modules = [ ./machines/urithiru ];
};
devShellBuilder = channels:
let pkgs = channels.nixpkgs; in
pkgs.mkShell {
buildInputs = [
pkgs.nixpkgs-fmt
(pkgs.writeShellScriptBin "fetchpatch" "curl -L https://github.com/NixOS/nixpkgs/pull/$1.patch -o patches/$1.patch")
agenix.defaultPackage.x86_64-linux
outputs = inputs@{ self, nixpkgs, agenix, emacs-overlay, home-manager, utils }:
let
customPackages = callPackage: {
jdtls = callPackage ./packages/jdtls { };
kotlin-language-server = callPackage ./packages/kotlin-language-server { };
}; in
utils.lib.systemFlake {
inherit self inputs;
# This config can only be evaluated on x86_64-linux because of IFD
supportedSystems = [ "x86_64-linux" ];
channels.nixpkgs = {
input = nixpkgs;
patches = map (patch: ./patches + "/${patch}") (builtins.filter (x: x != ".keep") (builtins.attrNames (builtins.readDir ./patches)));
overlaysBuilder = _: [
emacs-overlay.overlay
(self: super: customPackages self.callPackage)
];
};
};
hostDefaults = {
modules = [
({ lib, ... }: {
environment.etc = lib.mapAttrs' (key: val: { name = "channels/${key}"; value = { source = val.outPath; }; }) inputs;
nix.nixPath = [ "/etc/channels" ];
})
utils.nixosModules.saneFlakeDefaults
agenix.nixosModules.age
home-manager.nixosModules.home-manager
./modules
];
extraArgs = { nixosConfigurations = self.nixosConfigurations; };
};
hosts = {
kharbranth.modules = [ ./machines/kharbranth ];
kholinar.modules = [ ./machines/kholinar ];
lasting-integrity.modules = [ ./machines/lasting-integrity ];
urithiru.modules = [ ./machines/urithiru ];
};
devShellBuilder = channels:
let pkgs = channels.nixpkgs; in
pkgs.mkShell {
buildInputs = [
pkgs.nixpkgs-fmt
(pkgs.writeShellScriptBin "fetchpatch" "curl -L https://github.com/NixOS/nixpkgs/pull/$1.patch -o patches/$1.patch")
agenix.defaultPackage.x86_64-linux
];
};
packagesBuilder = channels:
let pkgs = channels.nixpkgs; in customPackages pkgs.callPackage;
};
}