bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove 'with' from most modules

Browse source
This commit is contained in:
Filippo Berto 2023-08-15 18:33:34 +02:00
parent 40032f7fd9
commit 7459ae0e96
No known key found for this signature in database
GPG key ID: FE98AE5EC52B1056
27 changed files with 222 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/hm/development/cpp.nix
View file

@ -1,9 +1,10 @@
{ pkgs, config, lib, ... }: {
home.packages =
lib.optionals config.programs.helix.enable builtins.attrValues
{
lib.optionals config.programs.helix.enable
(builtins.attrValues {
inherit (pkgs) clang-tools cmake-language-server;
} ++ lib.optionals config.programs.kakoune.enable builtins.attrValues {
}) ++
lib.optionals config.programs.kakoune.enable (builtins.attrValues {
inherit (pkgs) clang-tools cmake-language-server;
};
});
}

15
modules/hm/development/data.nix
View file

@ -1,11 +1,10 @@
{ config, pkgs, lib, ... }: {
home.packages =
lib.optionals config.programs.helix.enable builtins.attrValues
{
inherit (pkgs) yaml-language-server taplo-cli;
inherit (pkgs.nodePackages) vscode-langservers-extracted;
} ++ lib.optionals config.programs.kakoune.enable builtins.attrValues {
inherit (pkgs) yaml-language-server;
home.packages = lib.optionals config.programs.helix.enable
(builtins.attrValues {
inherit (pkgs) yaml-language-server taplo-cli;
inherit (pkgs.nodePackages) vscode-langservers-extracted;
};
}) ++ lib.optionals config.programs.kakoune.enable (builtins.attrValues {
inherit (pkgs) yaml-language-server;
inherit (pkgs.nodePackages) vscode-langservers-extracted;
});
}

7
modules/hm/development/docker.nix
View file

@ -1,9 +1,6 @@
{ pkgs, config, lib, ... }: {
home.packages =
builtins.attrValues { inherit (pkgs) docker-compose docker-machine; }
++ lib.optionals config.programs.helix.enable builtins.attrValues {
inherit (pkgs.nodePackages) dockerfile-language-server-nodejs;
};
home.packages = (builtins.attrValues { inherit (pkgs) docker-compose docker-machine; })
++ lib.optionals config.programs.helix.enable (builtins.attrValues { inherit (pkgs.nodePackages) dockerfile-language-server-nodejs; });
home.shellAliases = {
"dkcd" = "docker-compose down";
"dkc" = "docker-compose";

5
modules/hm/development/go.nix
View file

@ -4,6 +4,7 @@
goPath = ".go";
};
home.packages = lib.optionals config.programs.helix.enable [ pkgs.gopls ]
++ (lib.optionals config.programs.kakoune.enable [ pkgs.gopls ]);
home.packages =
(lib.optionals config.programs.helix.enable [ pkgs.gopls ]) ++
(lib.optionals config.programs.kakoune.enable [ pkgs.gopls ]);
}

11
modules/hm/development/javascript.nix
View file

@ -1,11 +1,10 @@
{ pkgs, lib, config, ... }: {
home.packages =
lib.optionals config.programs.helix.enable builtins.attrValues
{
inherit (pkgs.nodePackages) typescript-language-server;
} ++ lib.optionals config.programs.kakoune.enable builtins.attrValues {
home.packages = lib.optionals config.programs.helix.enable
(builtins.attrValues {
inherit (pkgs.nodePackages) typescript-language-server;
};
}) ++ lib.optionals config.programs.kakoune.enable (builtins.attrValues {
inherit (pkgs.nodePackages) typescript-language-server;
});
programs.neovim.withNodeJs = true;
}

7
modules/hm/development/nix.nix
View file

@ -1,8 +1,7 @@
{ pkgs, config, lib, ... }: {
home.packages = builtins.attrValues
{
inherit (pkgs) nixpkgs-fmt nixfmt nix-prefetch-scripts nix-review nix-tree;
} ++ lib.optionals config.programs.helix.enable [ pkgs.nil ]
home.packages = (builtins.attrValues {
inherit (pkgs) nixpkgs-fmt nixfmt nix-prefetch-scripts nix-review nix-tree;
}) ++ lib.optionals config.programs.helix.enable [ pkgs.nil ]
++ lib.optionals config.programs.kakoune.enable [ pkgs.rnix-lsp ];
programs.neovim.plugins = [ pkgs.vimPlugins.vim-nix ];
}

24
modules/hm/development/python.nix
View file

@ -5,16 +5,18 @@ let
pyPkgs = py.pkgs;
in
{
home.packages = [ py pyPkgs.black ]
++ lib.optionals config.programs.helix.enable ([
pyPkgs.python-lsp-server
pyPkgs.pyls-flake8
pyPkgs.pyls-isort
] ++ pyPkgs.python-lsp-server.optional-dependencies.all)
++ lib.optionals config.programs.kakoune.enable ([
pyPkgs.python-lsp-server
pyPkgs.pyls-flake8
pyPkgs.pyls-isort
] ++ pyPkgs.python-lsp-server.optional-dependencies.all);
home.packages = [ py pyPkgs.black ] ++
lib.optionals config.programs.helix.enable ((builtins.attrValues {
inherit (pyPkgs)
python-lsp-server
pyls-flake8
pyls-isort;
}) ++ pyPkgs.python-lsp-server.optional-dependencies.all) ++
lib.optionals config.programs.kakoune.enable ((builtins.attrValues {
inherit (pyPkgs)
python-lsp-server
pyls-flake8
pyls-isort;
}) ++ pyPkgs.python-lsp-server.optional-dependencies.all);
programs.neovim.withPython3 = true;
}

33
modules/hm/development/rust.nix
View file

@ -3,22 +3,19 @@
[build]
rustc-wrapper = "${pkgs.sccache}/bin/sccache"
'';
home.packages = builtins.attrValues
{
inherit (pkgs)
bacon cargo cargo-audit cargo-criterion cargo-deadlinks cargo-expand
cargo-flamegraph cargo-fuzz cargo-hack cargo-hakari cargo-inspect
cargo-modules cargo-outdated cargo-profiler cargo-release cargo-show-asm
cargo-spellcheck cargo-tarpaulin cargo-udeps cargo-watch cargo-workspaces
clippy rustc rustfmt;
# cargo-about
# cargo-auditable
# cargo-deny
# cargo-deps
# cargo-feature
} ++ lib.optionals config.programs.helix.enable
(builtins.attrValues { inherit (pkgs) lldb rust-analyzer; })
++ lib.optionals config.programs.kakoune.enable
(builtins.attrValues { inherit (pkgs) rust-analyzer; });
home.packages = (builtins.attrValues {
inherit (pkgs)
bacon cargo cargo-audit cargo-criterion cargo-deadlinks cargo-expand
cargo-flamegraph cargo-fuzz cargo-hack cargo-hakari cargo-inspect
cargo-modules cargo-outdated cargo-profiler cargo-release cargo-show-asm
cargo-spellcheck cargo-tarpaulin cargo-udeps cargo-watch cargo-workspaces
clippy rustc rustfmt;
# cargo-about
# cargo-auditable
# cargo-deny
# cargo-deps
# cargo-feature
})
++ lib.optionals config.programs.helix.enable (builtins.attrValues { inherit (pkgs) lldb rust-analyzer; })
++ lib.optionals config.programs.kakoune.enable (builtins.attrValues { inherit (pkgs) rust-analyzer; });
}