tree-wide: format with nixfmt

Another saturday another useless formatter change.
It's my dotfiles, after all

alejandra doesn't handle c-style inline comments well.
This commit is contained in:
Primrose 2025-11-08 10:15:58 +08:00
parent ec704b5272
commit ebf8468807
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
116 changed files with 1895 additions and 1689 deletions

View file

@ -4,56 +4,65 @@
let
sources = import ../../npins;
in
{pkgs ? import sources.pin-florashell {}}:
pkgs.mkShell (let
libs = with pkgs; [
zlib
libpq
libsodium
];
{
pkgs ? import sources.pin-florashell { },
}:
pkgs.mkShell (
let
libs = with pkgs; [
zlib
libpq
libsodium
];
hlib = pkgs.haskell.lib;
hlib = pkgs.haskell.lib;
callHackage = {
callHackage =
{
name,
version,
}: let
pkg = pkgs.haskell.packages.ghc910.callHackage name version {};
}:
let
pkg = pkgs.haskell.packages.ghc910.callHackage name version { };
in
hlib.dontCheck (hlib.doJailbreak pkg);
in {
name = "flora";
packages = with pkgs; let
hlib.dontCheck (hlib.doJailbreak pkg);
in
{
name = "flora";
packages =
with pkgs;
let
haskellPackages = haskell.packages.ghc910;
in
# These don't build directly and need to be pinned
map callHackage [
{
name = "fourmolu";
version = "0.17.0.0";
}
{
name = "postgresql-migration";
version = "0.2.1.8";
}
]
++ [
haskellPackages.ghcid
haskellPackages.cabal-fmt
haskellPackages.cabal-install
haskellPackages.ghc
haskellPackages.haskell-language-server
# These don't build directly and need to be pinned
map callHackage [
{
name = "fourmolu";
version = "0.17.0.0";
}
{
name = "postgresql-migration";
version = "0.2.1.8";
}
]
++ [
haskellPackages.ghcid
haskellPackages.cabal-fmt
haskellPackages.cabal-install
haskellPackages.ghc
haskellPackages.haskell-language-server
postgresql_14
postgresqlTestHook
postgresql_14
postgresqlTestHook
yarn
yarn
pkg-config
esbuild
changelog-d
]
++ libs;
pkg-config
esbuild
changelog-d
]
++ libs;
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath libs;
})
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath libs;
}
)

View file

@ -1,20 +1,26 @@
{pkgs ? import <nixpkgs> {}}: let
{
pkgs ? import <nixpkgs> { },
}:
let
inherit (pkgs) lib;
in
pkgs.mkShell {
name = "forgejo";
packages = with pkgs; [
gnumake
pkgs.mkShell {
name = "forgejo";
packages = with pkgs; [
gnumake
go
golangci-lint
gofumpt
go
golangci-lint
gofumpt
nodejs
nodePackages.npm
];
nodejs
nodePackages.npm
];
LD_LIBRARY_PATH = lib.makeLibraryPath (with pkgs; [
LD_LIBRARY_PATH = lib.makeLibraryPath (
with pkgs;
[
libuuid
]);
}
]
);
}

View file

@ -1,4 +1,6 @@
{pkgs ? import <nixpkgs> {}}:
{
pkgs ? import <nixpkgs> { },
}:
pkgs.mkShell rec {
name = "haddock2";

View file

@ -1,53 +1,59 @@
let
sources = import ../../npins;
in
{pkgs ? import sources.pin-masna3shell {}}:
pkgs.mkShell (let
libs = with pkgs; [
zlib
libpq
libsodium
];
{
pkgs ? import sources.pin-masna3shell { },
}:
pkgs.mkShell (
let
libs = with pkgs; [
zlib
libpq
libsodium
];
hlib = pkgs.haskell.lib;
hlib = pkgs.haskell.lib;
callHackage = {
callHackage =
{
name,
version,
haskellPackages ? pkgs.haskellPackages,
}: let
pkg = haskellPackages.callHackage name version {};
}:
let
pkg = haskellPackages.callHackage name version { };
in
hlib.dontCheck (hlib.doJailbreak pkg);
hlib.dontCheck (hlib.doJailbreak pkg);
haskellPackages = pkgs.haskell.packages.ghc910;
in {
name = "masna3";
packages =
[
pkgs.haskell.packages.ghc9102.ghc
pkgs.haskell.packages.ghc9102.haskell-language-server
haskellPackages = pkgs.haskell.packages.ghc910;
in
{
name = "masna3";
packages = [
pkgs.haskell.packages.ghc9102.ghc
pkgs.haskell.packages.ghc9102.haskell-language-server
haskellPackages.cabal-install
haskellPackages.postgresql-migration
(callHackage {
name = "fourmolu";
version = "0.18.0.0";
haskellPackages = pkgs.haskell.packages.ghc912;
})
(callHackage {
name = "hlint";
version = "3.10";
haskellPackages = pkgs.haskell.packages.ghc912;
})
pkgs.haskell.packages.ghc98.apply-refact
haskellPackages.ghc-tags
haskellPackages.cabal-gild
haskellPackages.cabal-install
haskellPackages.postgresql-migration
(callHackage {
name = "fourmolu";
version = "0.18.0.0";
haskellPackages = pkgs.haskell.packages.ghc912;
})
(callHackage {
name = "hlint";
version = "3.10";
haskellPackages = pkgs.haskell.packages.ghc912;
})
pkgs.haskell.packages.ghc98.apply-refact
haskellPackages.ghc-tags
haskellPackages.cabal-gild
pkgs.gnumake
pkgs.pkg-config
]
++ libs;
pkgs.gnumake
pkgs.pkg-config
]
++ libs;
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath libs;
})
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath libs;
}
)

View file

@ -1,37 +1,40 @@
let
sources = import ../../npins;
in
{pkgs ? import sources.pin-necro-man-nixpkgs {}}: let
shell = {
{
pkgs ? import sources.pin-necro-man-nixpkgs { },
}:
let
shell =
{
mkShell,
#
pkgs,
python310Packages,
texlive,
}:
mkShell {
name = "necro-manual";
packages = [
pkgs.emacs
python310Packages.pygments
mkShell {
name = "necro-manual";
packages = [
pkgs.emacs
python310Packages.pygments
(texlive.combine {
inherit
(texlive)
scheme-medium
#
wrapfig
capt-of
minted
upquote
todonotes
fvextra
catchfile
xstring
framed
;
})
];
};
in
pkgs.callPackage shell {}
(texlive.combine {
inherit (texlive)
scheme-medium
#
wrapfig
capt-of
minted
upquote
todonotes
fvextra
catchfile
xstring
framed
;
})
];
};
in
pkgs.callPackage shell { }

View file

@ -1,14 +1,16 @@
let
sources = import ../../npins;
in
{pkgs ? import sources.pin-vim-tw {}}:
pkgs.mkShell {
name = "vim-tw";
packages = with pkgs; [
haskellPackages.cabal-fmt
haskellPackages.cabal-install
haskellPackages.ghc
haskellPackages.haskell-language-server
haskellPackages.retrie
];
}
{
pkgs ? import sources.pin-vim-tw { },
}:
pkgs.mkShell {
name = "vim-tw";
packages = with pkgs; [
haskellPackages.cabal-fmt
haskellPackages.cabal-install
haskellPackages.ghc
haskellPackages.haskell-language-server
haskellPackages.retrie
];
}