Format project using nixfmt rfc candidate.

This commit is contained in:
Kevin Baensch 2024-11-20 20:32:38 +01:00
parent 1f63817684
commit a9f7fe416f
Signed by: derped
GPG key ID: C0F1D326C7626543
91 changed files with 1347 additions and 1000 deletions

View file

@ -3,7 +3,8 @@
config,
pkgs,
...
}: {
}:
{
config.machine.pkgsets.base.pkgs = with pkgs; [
age
sops

View file

@ -2,7 +2,8 @@
config,
pkgs,
...
}: {
}:
{
config.machine.pkgsets.cpp.pkgs = with pkgs; [
clang
cmake

View file

@ -2,10 +2,24 @@
config,
pkgs,
...
}: {
}:
{
config.machine.pkgsets.dict.pkgs = with pkgs; [
translate-shell
(hunspellWithDicts (with pkgs.hunspellDicts; [de-de en-us]))
(aspellWithDicts (d: with d; [de en en-computers en-science]))
(hunspellWithDicts (
with pkgs.hunspellDicts;
[
de-de
en-us
]
))
(aspellWithDicts (
d: with d; [
de
en
en-computers
en-science
]
))
];
}

View file

@ -2,7 +2,8 @@
config,
pkgs,
...
}: {
}:
{
config.machine.pkgsets.extra.pkgs = with pkgs; [
alsaUtils
binutils-unwrapped

View file

@ -2,6 +2,10 @@
config,
pkgs,
...
}: {
config.machine.pkgsets.haskell-tools.pkgs = with pkgs; [cabal-install hlint]; # ghcid
}:
{
config.machine.pkgsets.haskell-tools.pkgs = with pkgs; [
cabal-install
hlint
]; # ghcid
}

View file

@ -4,8 +4,11 @@
fn,
pkgs,
...
}: {
config.machine.pkgsets.haskell.pkgwrap = pkgs.haskellPackages.ghcWithPackages (pkgs: (fn.pkgFilter config.machine.pkgsets.haskell.pkgs));
}:
{
config.machine.pkgsets.haskell.pkgwrap = pkgs.haskellPackages.ghcWithPackages (
pkgs: (fn.pkgFilter config.machine.pkgsets.haskell.pkgs)
);
config.machine.pkgsets.haskell.pkgs = with pkgs.haskellPackages; [
hindent
mtl

View file

@ -4,7 +4,8 @@
pkgs,
...
}:
with lib; {
with lib;
{
config.machine.pkgsets.latex.pkgs = with pkgs; [
texlive.combined.scheme-full
texlab

View file

@ -1,7 +1,8 @@
{
pkgs,
...
}: {
}:
{
config.machine.pkgsets.mail_utils.pkgs = with pkgs; [
aerc
abook

View file

@ -1,6 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
config.machine.pkgsets.nodejs.pkgs =
(with pkgs; [nodejs yarn deno])
(with pkgs; [
nodejs
yarn
deno
])
++ (with pkgs.nodePackages; [
autoprefixer
mermaid-cli

View file

@ -4,11 +4,12 @@
fn,
pkgs,
...
}: {
}:
{
config.machine.pkgsets.php.pkgwrap = fn.pkgFilter config.machine.pkgsets.php.pkgs;
config.machine.pkgsets.php.pkgs =
(with pkgs.php82Packages; [
composer
])
++ (with pkgs; [php82]);
++ (with pkgs; [ php82 ]);
}

View file

@ -5,8 +5,11 @@
pkgs,
...
}:
with lib; {
config.machine.pkgsets.python3.pkgwrap = pkgs.python3.withPackages (ps: (fn.pkgFilter config.machine.pkgsets.python3.pkgs));
with lib;
{
config.machine.pkgsets.python3.pkgwrap = pkgs.python3.withPackages (
ps: (fn.pkgFilter config.machine.pkgsets.python3.pkgs)
);
config.machine.pkgsets.python3.pkgs = with pkgs.python3Packages; [
bpython
flake8

View file

@ -1,15 +1,22 @@
{config, ...}: let
mozRust = with builtins;
(map (p:
import ((fetchTarball {
{ config, ... }:
let
mozRust =
with builtins;
(map (
p:
import (
(fetchTarball {
url = "https://github.com/mozilla/nixpkgs-mozilla/archive/e912ed4.tar.gz";
sha256 = "08fvzb8w80bkkabc1iyhzd15f4sm7ra10jn32kfch5klgl0gj3j3";
})
+ p))) [
(toPath "/lib-overlay.nix")
(toPath "/rust-overlay.nix")
];
stablepkgs = import <nixos-stable> {overlays = mozRust;};
+ p
)
))
[
(toPath "/lib-overlay.nix")
(toPath "/rust-overlay.nix")
];
stablepkgs = import <nixos-stable> { overlays = mozRust; };
# https://rust-lang.github.io/rustup-components-history
nightly = stablepkgs.rustChannelOf {
@ -27,18 +34,26 @@
"rustfmt-preview"
];
}
// {src = nightly.rust-src;};
// {
src = nightly.rust-src;
};
inherit (nightly) cargo;
};
rustPNightly = stablepkgs.recurseIntoAttrs (stablepkgs.makeRustPlatform {
inherit (rustNightly) rustc cargo;
});
in {
rustPNightly = stablepkgs.recurseIntoAttrs (
stablepkgs.makeRustPlatform {
inherit (rustNightly) rustc cargo;
}
);
in
{
config.machine.pkgsets.rustpkgs.pkgs =
(with stablepkgs; [
diesel-cli
carnix
rustracer
])
++ (with rustNightly; [rustc cargo]);
++ (with rustNightly; [
rustc
cargo
]);
}

View file

@ -2,7 +2,8 @@
config,
pkgs,
...
}: {
}:
{
config.machine.pkgsets.server.pkgs = with pkgs; [
audit
certbot

View file

@ -4,7 +4,8 @@
pkgs,
...
}:
with lib; {
with lib;
{
config.machine.pkgsets.tracking.pkgs = with pkgs; [
aw-qt
aw-server-rust

View file

@ -2,6 +2,7 @@
config,
pkgs,
...
}: {
config.machine.pkgsets.uniProgs.pkgs = with pkgs; [qucs];
}:
{
config.machine.pkgsets.uniProgs.pkgs = with pkgs; [ qucs ];
}

View file

@ -2,9 +2,11 @@
config,
pkgs,
...
}: let
}:
let
cfg = config.machine;
in {
in
{
config.machine.pkgsets.xpkgs.pkgs = with pkgs; [
acpilight
feh