gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

project-wide: nixdirfmt

Browse source
This commit is contained in:
kat witch 2021-04-28 22:36:36 +01:00
parent ed5eb10d0e
commit 19ba7b13c0
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
6 changed files with 78 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

26
hosts/athame/meta.nix
View file

@ -90,19 +90,19 @@ with config.resources; {
# cname.target = "athame.kittywit.ch.";
#};
# connection = {
# host = athame.refAttr "ipv4_address";
# port = 62954;
# };
# connection = {
# host = athame.refAttr "ipv4_address";
# port = 62954;
# };
#triggers.switch = lib.mapAttrs (name: record:
# {
# A = config.lib.tf.terraformExpr
# ''join(",", ${record.out.resource.namedRef}.addresses)'';
# AAAA = config.lib.tf.terraformExpr
# ''join(",", ${record.out.resource.namedRef}.addresses)'';
# CNAME = record.out.resource.refAttr "cname";
# SRV = record.out.resource.refAttr "id";
# }.${record.out.type}) config.dns.records;
#triggers.switch = lib.mapAttrs (name: record:
# {
# A = config.lib.tf.terraformExpr
# ''join(",", ${record.out.resource.namedRef}.addresses)'';
# AAAA = config.lib.tf.terraformExpr
# ''join(",", ${record.out.resource.namedRef}.addresses)'';
# CNAME = record.out.resource.refAttr "cname";
# SRV = record.out.resource.refAttr "id";
# }.${record.out.type}) config.dns.records;
}

18
modules/nixos/tf-glue/default.nix
View file

@ -27,13 +27,17 @@ in {
out.set = removeAttrs cfg cfg.attrs;
};
deploy.tf.deploy.systems."${config.networking.hostName}" = with tf.resources; {
isRemote = (config.networking.hostName != builtins.getEnv "HOME_HOSTNAME");
nixosConfig = config;
connection = tf.resources.${config.networking.hostName}.connection.set;
triggers.copy."${config.networking.hostName}" = tf.resources.${config.networking.hostName}.refAttr "id";
triggers.secrets."${config.networking.hostName}" = tf.resources.${config.networking.hostName}.refAttr "id";
};
deploy.tf.deploy.systems."${config.networking.hostName}" =
with tf.resources; {
isRemote =
(config.networking.hostName != builtins.getEnv "HOME_HOSTNAME");
nixosConfig = config;
connection = tf.resources.${config.networking.hostName}.connection.set;
triggers.copy."${config.networking.hostName}" =
tf.resources.${config.networking.hostName}.refAttr "id";
triggers.secrets."${config.networking.hostName}" =
tf.resources.${config.networking.hostName}.refAttr "id";
};
deploy.tf.dns.records."kittywitch_net_${config.networking.hostName}" =
mkIf (config.hexchen.network.enable) {

97
pkgs/default.nix
View file

@ -2,63 +2,68 @@
let
pkgs = import sources.nixpkgs { inherit config; };
overlay = self: super: rec {
dino = super.callPackage "${sources.qyliss-nixlib}/overlays/patches/dino" {
inherit (super) dino;
};
overlay = self: super:
rec {
discord = super.discord.override { nss = self.nss; };
/* dino = super.callPackage "${sources.qyliss-nixlib}/overlays/patches/dino" {
inherit (super) dino;
};
*/
ncmpcpp = super.ncmpcpp.override {
visualizerSupport = true;
clockSupport = true;
};
discord = super.discord.override { nss = self.nss; };
waybar = super.waybar.override { pulseSupport = true; };
notmuch = super.callPackage ./notmuch { inherit (super) notmuch; };
unstable = import sources.nixpkgs-unstable { inherit (self) config; };
nur = import sources.NUR {
nurpkgs = self;
pkgs = self;
};
screenstub = super.callPackage ./screenstub { };
buildFirefoxXpiAddon = { pname, version, addonId, url, sha256, meta, ... }:
pkgs.stdenv.mkDerivation {
name = "${pname}-${version}";
inherit meta;
src = builtins.fetchurl { inherit url sha256; };
preferLocalBuild = true;
allowSubstitutes = false;
buildCommand = ''
dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
mkdir -p "$dst"
install -v -m644 "$src" "$dst/${addonId}.xpi"
'';
ncmpcpp = super.ncmpcpp.override {
visualizerSupport = true;
clockSupport = true;
};
obs-studio = super.obs-studio.override { pipewireSupport = true; };
waybar = super.waybar.override { pulseSupport = true; };
ff-sponsorblock = super.callPackage ./ff-sponsorblock { };
notmuch = super.callPackage ./notmuch { inherit (super) notmuch; };
kat-glauca-dns = super.callPackage ./kat-glauca-dns { };
unstable = import sources.nixpkgs-unstable { inherit (self) config; };
nur = import sources.NUR {
nurpkgs = self;
pkgs = self;
};
kat-website = super.callPackage ./kat-website { };
screenstub = super.callPackage ./screenstub { };
kat-weather = super.callPackage ./kat-weather { };
buildFirefoxXpiAddon =
{ pname, version, addonId, url, sha256, meta, ... }:
pkgs.stdenv.mkDerivation {
name = "${pname}-${version}";
kat-gpg-status = super.callPackage ./kat-gpg-status { };
inherit meta;
kat-tw-export = super.callPackage ./kat-tw-export { };
src = builtins.fetchurl { inherit url sha256; };
kat-scrot = super.callPackage ./kat-scrot { };
} // super.lib.optionalAttrs (builtins.pathExists ../private/pkgs) (import ../private/pkgs { inherit super self; });
preferLocalBuild = true;
allowSubstitutes = false;
buildCommand = ''
dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
mkdir -p "$dst"
install -v -m644 "$src" "$dst/${addonId}.xpi"
'';
};
obs-studio = super.obs-studio.override { pipewireSupport = true; };
ff-sponsorblock = super.callPackage ./ff-sponsorblock { };
kat-glauca-dns = super.callPackage ./kat-glauca-dns { };
kat-website = super.callPackage ./kat-website { };
kat-weather = super.callPackage ./kat-weather { };
kat-gpg-status = super.callPackage ./kat-gpg-status { };
kat-tw-export = super.callPackage ./kat-tw-export { };
kat-scrot = super.callPackage ./kat-scrot { };
} // super.lib.optionalAttrs (builtins.pathExists ../private/pkgs)
(import ../private/pkgs { inherit super self; });
in (pkgs.extend (import (sources.arc-nixexprs + "/overlay.nix"))).extend overlay

2
shell.nix
View file

@ -1,4 +1,4 @@
with (import <nixpkgs> {});
with (import <nixpkgs> { });
mkShell {
shellHook = ''