hectic-lab/util.nix
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: format (alejandra)

Browse Source
This commit is contained in:
zerosummed
2025-02-14 21:06:51 +03:00
parent 70021da132
commit e1c484b1c0
14 changed files with 363 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
buildPostgresqlExtension.nix
View File

@@ -55,40 +55,33 @@
# This last approach is the one we're taking in this file. To make sure the removal of the # This last approach is the one we're taking in this file. To make sure the removal of the
# nested nix/store happens immediately after the installPhase, before any other postInstall # nested nix/store happens immediately after the installPhase, before any other postInstall
# hooks run, this needs to be run in an override of `mkDerivation` and not in a setup hook. # hooks run, this needs to be run in an override of `mkDerivation` and not in a setup hook.
{ {
lib, lib,
stdenv, stdenv,
postgresql, postgresql,
nix-update-script, nix-update-script,
}: }: args: let
buildPostgresqlExtension = finalAttrs: {enableUpdateScript ? true, ...} @ prevAttrs: {
args:
let
buildPostgresqlExtension =
finalAttrs:
{
enableUpdateScript ? true,
...
}@prevAttrs:
{
passthru = passthru =
prevAttrs.passthru or { } prevAttrs.passthru
or {}
// lib.optionalAttrs enableUpdateScript { // lib.optionalAttrs enableUpdateScript {
updateScript = updateScript =
prevAttrs.passthru.updateScript or (nix-update-script ( prevAttrs.passthru.updateScript
or (nix-update-script (
lib.optionalAttrs (lib.hasInfix "unstable" prevAttrs.version) { lib.optionalAttrs (lib.hasInfix "unstable" prevAttrs.version) {
extraArgs = [ "--version=branch" ]; extraArgs = ["--version=branch"];
} }
)); ));
}; };
buildInputs = [ postgresql ] ++ prevAttrs.buildInputs or [ ]; buildInputs = [postgresql] ++ prevAttrs.buildInputs or [];
installFlags = [ installFlags =
[
"DESTDIR=${placeholder "out"}" "DESTDIR=${placeholder "out"}"
] ++ prevAttrs.installFlags or [ ]; ]
++ prevAttrs.installFlags or [];
postInstall = postInstall =
'' ''
@@ -144,4 +137,4 @@ let
+ prevAttrs.postInstall or ""; + prevAttrs.postInstall or "";
}; };
in in
stdenv.mkDerivation (lib.extends buildPostgresqlExtension (lib.toFunction args)) stdenv.mkDerivation (lib.extends buildPostgresqlExtension (lib.toFunction args))

162
flake.nix
View File

@@ -10,24 +10,31 @@
}; };
}; };
outputs = { self, nixpkgs, rust-overlay }: outputs = {
let self,
nixpkgs,
rust-overlay,
}: let
lib = nixpkgs.lib; lib = nixpkgs.lib;
recursiveUpdate = lib.recursiveUpdate; recursiveUpdate = lib.recursiveUpdate;
supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; supportedSystems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin"];
forSpecSystemsWithPkgs = supportedSystems: pkgOverlays: f: forSpecSystemsWithPkgs = supportedSystems: pkgOverlays: f:
builtins.foldl' (acc: system: builtins.foldl' (
let acc: system: let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = pkgOverlays; overlays = pkgOverlays;
}; };
systemOutputs = f { system = system; pkgs = pkgs; }; systemOutputs = f {
system = system;
pkgs = pkgs;
};
in in
recursiveUpdate acc systemOutputs recursiveUpdate acc systemOutputs
) {} supportedSystems; ) {}
supportedSystems;
forAllSystemsWithPkgs = pkgOverlays: f: forSpecSystemsWithPkgs supportedSystems pkgOverlays f; forAllSystemsWithPkgs = pkgOverlays: f: forSpecSystemsWithPkgs supportedSystems pkgOverlays f;
@@ -37,22 +44,20 @@
dotEnv = builtins.getEnv "DOTENV"; dotEnv = builtins.getEnv "DOTENV";
minorEnvironment = minorEnvironment =
if dotEnv != "" then if dotEnv != ""
if builtins.pathExists dotEnv then then
parseEnv dotEnv if builtins.pathExists dotEnv
else then parseEnv dotEnv
throw "${dotEnv} file not exist" else throw "${dotEnv} file not exist"
else else if builtins.pathExists ./.env
if builtins.pathExists ./.env then then parseEnv ./.env
parseEnv ./.env else {};
else
{};
in in
forAllSystemsWithPkgs [ (import rust-overlay) ] ({ system, pkgs }: forAllSystemsWithPkgs [(import rust-overlay)] ({
{ system,
packages.${system} = pkgs,
let }: {
packages.${system} = let
rust = { rust = {
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.pkgsBuildHost.rust-bin.stable."1.81.0".default pkgs.pkgsBuildHost.rust-bin.stable."1.81.0".default
@@ -63,8 +68,7 @@
inherit (rust) nativeBuildInputs; inherit (rust) nativeBuildInputs;
}; };
}; };
in in {
{
nvim-alias = pkgs.callPackage ./package/nvim-alias.nix {}; nvim-alias = pkgs.callPackage ./package/nvim-alias.nix {};
bolt-unpack = pkgs.callPackage ./package/bolt-unpack.nix {}; bolt-unpack = pkgs.callPackage ./package/bolt-unpack.nix {};
nvim-pager = pkgs.callPackage ./package/nvim-pager.nix {}; nvim-pager = pkgs.callPackage ./package/nvim-pager.nix {};
@@ -81,17 +85,17 @@
}; };
}; };
devShells.${system} = devShells.${system} = let
let
shells = self.devShells.${system}; shells = self.devShells.${system};
in in {
{
default = pkgs.mkShell { default = pkgs.mkShell {
buildInputs = (with self.packages.${system}; [ buildInputs =
(with self.packages.${system}; [
nvim-alias nvim-alias
#prettify-log #prettify-log
nvim-pager nvim-pager
]) ++ (with pkgs; [ ])
++ (with pkgs; [
git git
jq jq
yq-go yq-go
@@ -99,30 +103,34 @@
]); ]);
# environment # environment
PAGER="${self.packages.${system}.nvim-pager}/bin/pager"; PAGER = "${self.packages.${system}.nvim-pager}/bin/pager";
}; };
rust = rust = let
let rustToolchain =
rustToolchain = if builtins.pathExists ./rust-toolchain.toml then if builtins.pathExists ./rust-toolchain.toml
pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml then pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml
else else pkgs.pkgsBuildHost.rust-bin.stable."1.81.0".default;
pkgs.pkgsBuildHost.rust-bin.stable."1.81.0".default;
in in
shells.default // shells.default
(pkgs.mkShell { // (pkgs.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [
rustToolchain rustToolchain
pkgs.pkg-config pkgs.pkg-config
]; ];
}); });
haskell = shells.default // (pkgs.mkShell { haskell =
buildInputs = [ pkgs.stack ]; shells.default
// (pkgs.mkShell {
buildInputs = [pkgs.stack];
}); });
}; };
nixosModules.${system} = { nixosModules.${system} = {
"preset.default" = { pkgs, modulesPath, ... }: { "preset.default" = {
pkgs,
modulesPath,
...
}: {
imports = [ imports = [
(modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
]; ];
@@ -144,7 +152,11 @@
"-vga qxl" "-vga qxl"
]; ];
forwardPorts = [ forwardPorts = [
{ from = "host"; host.port = 40500; guest.port = 22; } {
from = "host";
host.port = 40500;
guest.port = 22;
}
]; ];
}; };
@@ -157,30 +169,31 @@
networking.firewall = { networking.firewall = {
enable = true; enable = true;
allowedTCPPorts = [ ]; allowedTCPPorts = [];
}; };
environment = { environment = {
defaultPackages = []; defaultPackages = [];
systemPackages = (with pkgs; [ systemPackages =
(with pkgs; [
curl curl
neovim neovim
yq-go yq-go
jq jq
htop-vim htop-vim
]) ++ (with self.packages.${system}; [ ])
++ (with self.packages.${system}; [
prettify-log prettify-log
nvim-pager nvim-pager
]); ]);
variables = { variables = {
PAGER=with self.packages.${system}; "${nvim-pager}/bin/pager"; PAGER = with self.packages.${system}; "${nvim-pager}/bin/pager";
}; };
}; };
system.stateVersion = "24.11"; system.stateVersion = "24.11";
}; };
"hardware.hetzner" = { ... }: { "hardware.hetzner" = {...}: {
boot.loader.grub.device = "/dev/sda"; boot.loader.grub.device = "/dev/sda";
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [
"ata_piix" "ata_piix"
@@ -188,13 +201,16 @@
"xen_blkfront" "xen_blkfront"
"vmw_pvscsi" "vmw_pvscsi"
]; ];
boot.initrd.kernelModules = [ "nvme" ]; boot.initrd.kernelModules = ["nvme"];
fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; }; fileSystems."/" = {
device = "/dev/sda1";
fsType = "ext4";
}; };
}; };
}) // { };
overlays.default = })
final: prev: ( // {
overlays.default = final: prev: (
let let
version = "1.6.1"; version = "1.6.1";
buildHttpExt = versionSuffix: let buildHttpExt = versionSuffix: let
@@ -205,7 +221,8 @@
})) { })) {
postgresql = prev."postgresql_${versionSuffix}"; postgresql = prev."postgresql_${versionSuffix}";
}; };
in buildPostgresqlExtension { in
buildPostgresqlExtension {
pname = "http"; pname = "http";
inherit version; inherit version;
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
@@ -214,34 +231,37 @@
rev = "v${version}"; rev = "v${version}";
hash = "sha256-C8eqi0q1dnshUAZjIsZFwa5FTYc7vmATF3vv2CReWPM="; hash = "sha256-C8eqi0q1dnshUAZjIsZFwa5FTYc7vmATF3vv2CReWPM=";
}; };
nativeBuildInputs = with prev; [ pkg-config curl ]; nativeBuildInputs = with prev; [pkg-config curl];
}; };
in in {
{
hectic = self.packages.${prev.system}; hectic = self.packages.${prev.system};
postgresql_17 = prev.postgresql_17 // { pkgs = prev.postgresql_17.pkgs // { http = buildHttpExt "17"; }; }; postgresql_17 = prev.postgresql_17 // {pkgs = prev.postgresql_17.pkgs // {http = buildHttpExt "17";};};
postgresql_16 = prev.postgresql_16 // { pkgs = prev.postgresql_16.pkgs // { http = buildHttpExt "16"; }; }; postgresql_16 = prev.postgresql_16 // {pkgs = prev.postgresql_16.pkgs // {http = buildHttpExt "16";};};
postgresql_15 = prev.postgresql_15 // { pkgs = prev.postgresql_15.pkgs // { http = buildHttpExt "15"; }; }; postgresql_15 = prev.postgresql_15 // {pkgs = prev.postgresql_15.pkgs // {http = buildHttpExt "15";};};
postgresql_14 = prev.postgresql_14 // { pkgs = prev.postgresql_14.pkgs // { http = buildHttpExt "14"; }; }; postgresql_14 = prev.postgresql_14 // {pkgs = prev.postgresql_14.pkgs // {http = buildHttpExt "14";};};
}); }
);
lib = { lib = {
# -- For all systems -- # -- For all systems --
inherit dotEnv minorEnvironment parseEnv forAllSystemsWithPkgs forSpecSystemsWithPkgs; inherit dotEnv minorEnvironment parseEnv forAllSystemsWithPkgs forSpecSystemsWithPkgs;
makeEnvironment = envVars: makeEnvironment = envVars:
builtins.listToAttrs builtins.listToAttrs
(map (name: { inherit name; value = self.lib.getEnv name; }) envVars); (map (name: {
inherit name;
value = self.lib.getEnv name;
})
envVars);
# -- Env processing -- # -- Env processing --
getEnv = varName: let getEnv = varName: let
var = builtins.getEnv varName; var = builtins.getEnv varName;
in in
if var != "" then if var != ""
var then var
else if minorEnvironment ? varName then else if minorEnvironment ? varName
minorEnvironment."${varName}" then minorEnvironment."${varName}"
else else throw (envErrorMessage varName);
throw (envErrorMessage varName);
# -- Cargo.toml -- # -- Cargo.toml --
cargoToml = src: (builtins.fromTOML (builtins.readFile "${src}/Cargo.toml")); cargoToml = src: (builtins.fromTOML (builtins.readFile "${src}/Cargo.toml"));

3
package/bolt-unpack.nix
View File

@@ -1,5 +1,4 @@
{ pkgs, ... }: {pkgs, ...}:
pkgs.writeShellScriptBin "unpack" '' pkgs.writeShellScriptBin "unpack" ''
#!/usr/bin/env sh #!/usr/bin/env sh
set -e set -e

2
package/colorize.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }: {pkgs, ...}:
pkgs.writeShellScriptBin "colorize" '' pkgs.writeShellScriptBin "colorize" ''
awk ' awk '
BEGIN { BEGIN {

2
package/github/gh-tl.nix
View File

@@ -1,5 +1,5 @@
# FIXME: very unstable (on every request opens pager) but works somehow # FIXME: very unstable (on every request opens pager) but works somehow
{ pkgs, ... }: {pkgs, ...}:
pkgs.writeShellScriptBin "gh-tl" '' pkgs.writeShellScriptBin "gh-tl" ''
set -euo pipefail set -euo pipefail

4
package/migration-name.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }: {pkgs, ...}:
pkgs.writeShellScriptBin "migration-name" '' pkgs.writeShellScriptBin "migration-name" ''
curl --silent https://raw.githubusercontent.com/dwyl/english-words/master/words.txt | shuf -n2 | tr '\n' '_' | sed 's/_$//' curl --silent https://raw.githubusercontent.com/dwyl/english-words/master/words.txt | shuf -n2 | tr '\n' '_' | sed 's/_$//'
'' ''

2
package/nvim-alias.nix
View File

@@ -1,6 +1,6 @@
# necessary to load every time .nvimrc # necessary to load every time .nvimrc
# makes some magic to shading nvim but still uses nvim that shaded # makes some magic to shading nvim but still uses nvim that shaded
{ pkgs, ... }: {pkgs, ...}:
pkgs.writeShellScriptBin "nvim" '' pkgs.writeShellScriptBin "nvim" ''
# Source .env file # Source .env file
if [ -f .env ]; then if [ -f .env ]; then

2
package/nvim-pager.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }: {pkgs, ...}:
pkgs.writeShellScriptBin "pager" '' pkgs.writeShellScriptBin "pager" ''
nvim -R --clean -c 'set buftype=nofile' -c 'nnoremap q :q!<CR>' -c 'set nowrap' \ nvim -R --clean -c 'set buftype=nofile' -c 'nnoremap q :q!<CR>' -c 'set nowrap' \
-c 'set runtimepath^=${pkgs.vimPlugins.vim-plugin-AnsiEsc}' \ -c 'set runtimepath^=${pkgs.vimPlugins.vim-plugin-AnsiEsc}' \

12
package/postgres/pg-from/default.nix
View File

@@ -1,9 +1,13 @@
{ cargoToml, nativeBuildInputs, pkgs, ... }: {
let cargoToml,
nativeBuildInputs,
pkgs,
...
}: let
src = ./.; src = ./.;
cargo = cargoToml src; cargo = cargoToml src;
in in
pkgs.rustPlatform.buildRustPackage { pkgs.rustPlatform.buildRustPackage {
pname = cargo.package.name; pname = cargo.package.name;
version = cargo.package.version; version = cargo.package.version;
@@ -12,4 +16,4 @@ pkgs.rustPlatform.buildRustPackage {
cargoLock.lockFile = ./Cargo.lock; cargoLock.lockFile = ./Cargo.lock;
doCheck = true; doCheck = true;
} }

12
package/postgres/pg-migration/default.nix
View File

@@ -1,9 +1,13 @@
{ cargoToml, nativeBuildInputs, pkgs, ... }: {
let cargoToml,
nativeBuildInputs,
pkgs,
...
}: let
src = ./.; src = ./.;
cargo = cargoToml src; cargo = cargoToml src;
in in
pkgs.rustPlatform.buildRustPackage { pkgs.rustPlatform.buildRustPackage {
pname = cargo.package.name; pname = cargo.package.name;
version = cargo.package.version; version = cargo.package.version;
@@ -12,4 +16,4 @@ pkgs.rustPlatform.buildRustPackage {
cargoLock.lockFile = ./Cargo.lock; cargoLock.lockFile = ./Cargo.lock;
doCheck = true; doCheck = true;
} }

12
package/prettify-log/default.nix
View File

@@ -1,9 +1,13 @@
{ cargoToml, nativeBuildInputs, pkgs, ... }: {
let cargoToml,
nativeBuildInputs,
pkgs,
...
}: let
src = ./.; src = ./.;
cargo = cargoToml src; cargo = cargoToml src;
in in
pkgs.rustPlatform.buildRustPackage { pkgs.rustPlatform.buildRustPackage {
pname = cargo.package.name; pname = cargo.package.name;
version = cargo.package.version; version = cargo.package.version;
@@ -12,4 +16,4 @@ pkgs.rustPlatform.buildRustPackage {
cargoLock.lockFile = ./Cargo.lock; cargoLock.lockFile = ./Cargo.lock;
doCheck = true; doCheck = true;
} }

7
package/printobstacle.nix
View File

@@ -1,7 +1,6 @@
{ pkgs, ... }: {pkgs, ...}: let
let
name = "printobstacle"; name = "printobstacle";
in in
pkgs.writeShellScriptBin "${name}" '' pkgs.writeShellScriptBin "${name}" ''
printf "%s%s%s\n" "''${RED}" "$*" "''${RESET}" printf "%s%s%s\n" "''${RED}" "$*" "''${RESET}"
'' ''

7
package/printprogress.nix
View File

@@ -1,7 +1,6 @@
{ pkgs, ... }: {pkgs, ...}: let
let
name = "printprogress"; name = "printprogress";
in in
pkgs.writeShellScriptBin "${name}" '' pkgs.writeShellScriptBin "${name}" ''
printf "%s%s%s\n" "''${YELLOW}" "$*" "''${RESET}" printf "%s%s%s\n" "''${YELLOW}" "$*" "''${RESET}"
'' ''

14
package/supabase-with-env-collection.nix
View File

@@ -1,14 +1,14 @@
{ pkgs, ... }: {pkgs, ...}:
pkgs.writeShellScriptBin "supabase" '' pkgs.writeShellScriptBin "supabase" ''
# Get the root of the repository # Get the root of the repository
GIT_ROOT="$(git rev-parse --show-toplevel 2>/dev/null || echo .)" GIT_ROOT="$(git rev-parse --show-toplevel 2>/dev/null || echo .)"
# Source .env from root of the repo if it exists # Source .env from root of the repo if it exists
if [ -f "$GIT_ROOT/.env" ]; then if [ -f "$GIT_ROOT/.env" ]; then
set -a set -a
. "$GIT_ROOT/.env" . "$GIT_ROOT/.env"
set +a set +a
fi fi
${pkgs.supabase-cli}/bin/supabase --workdir "$GIT_ROOT/web" $@ ${pkgs.supabase-cli}/bin/supabase --workdir "$GIT_ROOT/web" $@
'' ''