fix mkPackages

move "lint" command to /packages
This commit is contained in:
Gerg-L 2023-12-10 17:01:30 -05:00
parent 7f33afb985
commit a132ccf4b6
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
4 changed files with 71 additions and 88 deletions

View file

@ -1,4 +1,4 @@
{nvim-flake, nixfmt, ...}:
{nvim-flake, self, ...}:
{pkgs, config, ...}:
{
local = {
@ -44,59 +44,31 @@
];
environment = {
systemPackages =
let
fmt = pkgs.nixfmt.overrideAttrs {
version = "0.6.0-${nixfmt.shortRev}";
src = nixfmt;
};
in
builtins.attrValues {
inherit (pkgs)
bitwarden # store stuff
qbittorrent # steal stuff
pavucontrol # gui volume control
pcmanfm # file manager
librewolf # best browser
vlc # play stuff
ripgrep
fd
jq
xautoclick
prismlauncher
deadnix
statix
nix-index
element-desktop
webcord
# QMK configuration
via
qmk
;
inherit (nvim-flake.packages) neovim;
inherit fmt;
lint = pkgs.writeShellApplication {
name = "lint";
runtimeInputs = [
fmt
pkgs.deadnix
pkgs.statix
pkgs.fd
];
text = ''
if [ -z "''${1:-""}" ]; then
fd '.*\.nix' . -x statix fix -- {} \;
fd '.*\.nix' . -X deadnix -e -- {} \; -X nixfmt {} \;
else
statix fix -- "$1"
deadnix -e "$1"
nixfmt "$1"
fi
'';
};
};
systemPackages = builtins.attrValues {
inherit (pkgs)
bitwarden # store stuff
qbittorrent # steal stuff
pavucontrol # gui volume control
pcmanfm # file manager
librewolf # best browser
vlc # play stuff
ripgrep
fd
jq
xautoclick
prismlauncher
deadnix
statix
nix-index
element-desktop
webcord
# QMK configuration
via
qmk
;
inherit (nvim-flake.packages) neovim;
inherit (self.packages) lint;
};
etc = {
"jdks/17".source = "${pkgs.openjdk17}/bin";
"jdks/8".source = "${pkgs.openjdk8}/bin";