mirror of
https://github.com/gensokyo-zone/infrastructure.git
synced 2026-02-09 12:29:19 -08:00
nixdirfmt + getAlias function
This commit is contained in:
parent
589bef29fa
commit
5da38c626d
7 changed files with 89 additions and 83 deletions
|
|
@ -1,10 +1,12 @@
|
|||
{ config, tf, meta, kw, pkgs, lib, sources, ... }: with lib; let
|
||||
oci-root = meta.deploy.targets.oci-root.tf;
|
||||
addr_ipv6_nix = let
|
||||
addr_ipv6_nix =
|
||||
let
|
||||
prefix = head (splitString "/" (oci-root.resources.oci_kw_subnet.importAttr "ipv6cidr_block"));
|
||||
in assert hasSuffix "::" prefix; prefix + "7";
|
||||
in
|
||||
assert hasSuffix "::" prefix; prefix + "7";
|
||||
in
|
||||
{
|
||||
{
|
||||
imports = (with (import (sources.tf-nix + "/modules")); [
|
||||
nixos.ubuntu-linux
|
||||
nixos.oracle
|
||||
|
|
@ -54,4 +56,4 @@ in
|
|||
ipv4_attr = "public_ip";
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
group = "knot";
|
||||
};
|
||||
|
||||
/* environment.etc."katdns/zones/kittywit.ch.zone".text = let
|
||||
/* environment.etc."katdns/zones/kittywit.ch.zone".text = let
|
||||
dns = pkgs.dns;
|
||||
in dns.lib.toString "kittywit.ch." (import ./kittywit.ch.nix {inherit dns; }); */
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,9 @@ in
|
|||
nano = ''
|
||||
${pkgs.kitty}/bin/kitty +kitten icat ${./nano.png}
|
||||
'';
|
||||
getAlias = ''
|
||||
printf '%s\n' $aliases[$1]
|
||||
'';
|
||||
} // shellFunAliases {
|
||||
sed = "sd";
|
||||
find = "fd";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
let initvim = pkgs.callPackage
|
||||
let
|
||||
initvim = pkgs.callPackage
|
||||
({ stdenv, elinks, nodejs }: stdenv.mkDerivation {
|
||||
name = "init.vim";
|
||||
src = ./init.vim;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
let
|
||||
# we don't have lib without sources, so we need optionalAttrs
|
||||
optionalAttrs = cond: as: if cond then as else {};
|
||||
optionalAttrs = cond: as: if cond then as else { };
|
||||
# Sources are from niv.
|
||||
sources = import ./nix/sources.nix // optionalAttrs (builtins.pathExists ./overlays/exprs/default.nix) {
|
||||
katexprs = ./overlays/exprs;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
{ sources, ... }: final: prev: {
|
||||
dns = import ( sources.kirelagin + "/dns") { pkgs = final; };
|
||||
dns = import (sources.kirelagin + "/dns") { pkgs = final; };
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue