hm: add jdk17

This commit is contained in:
Motiejus Jakštys 2023-12-12 13:16:02 +02:00 committed by Motiejus Jakštys
parent c884efca71
commit 286d8dec9f
1 changed files with 12 additions and 22 deletions

View File

@ -15,27 +15,21 @@
}; };
home.packages = with pkgs; home.packages = with pkgs;
( lib.mkMerge [
if fullDesktop (lib.mkIf fullDesktop [
then [
go go
zigpkgs."0.11.0" zigpkgs."0.11.0"
] ])
else [] (lib.mkIf hmOnly [
)
++ (
if hmOnly
then [
ncdu ncdu
tokei tokei
jdk17
scrcpy scrcpy
yt-dlp yt-dlp
vimv-rs vimv-rs
hyperfine hyperfine
] ])
else [] ];
);
programs = { programs = {
direnv.enable = true; direnv.enable = true;
@ -71,17 +65,13 @@
vimdiffAlias = true; vimdiffAlias = true;
defaultEditor = true; defaultEditor = true;
plugins = with pkgs.vimPlugins; plugins = with pkgs.vimPlugins;
[ lib.mkMerge [
fugitive [fugitive]
] (lib.mkIf fullDesktop [
++ (
if fullDesktop
then [
vim-go vim-go
zig-vim zig-vim
] ])
else [] ];
);
extraConfig = builtins.readFile ./vimrc; extraConfig = builtins.readFile ./vimrc;
} }
(lib.mkIf fullDesktop { (lib.mkIf fullDesktop {