gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29: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

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

@ -27,12 +27,16 @@ in {
out.set = removeAttrs cfg cfg.attrs; out.set = removeAttrs cfg cfg.attrs;
}; };
deploy.tf.deploy.systems."${config.networking.hostName}" = with tf.resources; { deploy.tf.deploy.systems."${config.networking.hostName}" =
isRemote = (config.networking.hostName != builtins.getEnv "HOME_HOSTNAME"); with tf.resources; {
isRemote =
(config.networking.hostName != builtins.getEnv "HOME_HOSTNAME");
nixosConfig = config; nixosConfig = config;
connection = tf.resources.${config.networking.hostName}.connection.set; connection = tf.resources.${config.networking.hostName}.connection.set;
triggers.copy."${config.networking.hostName}" = tf.resources.${config.networking.hostName}.refAttr "id"; triggers.copy."${config.networking.hostName}" =
triggers.secrets."${config.networking.hostName}" = tf.resources.${config.networking.hostName}.refAttr "id"; 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}" = deploy.tf.dns.records."kittywitch_net_${config.networking.hostName}" =

13
pkgs/default.nix
View file

@ -2,10 +2,13 @@
let let
pkgs = import sources.nixpkgs { inherit config; }; pkgs = import sources.nixpkgs { inherit config; };
overlay = self: super: rec { overlay = self: super:
dino = super.callPackage "${sources.qyliss-nixlib}/overlays/patches/dino" { rec {
/* dino = super.callPackage "${sources.qyliss-nixlib}/overlays/patches/dino" {
inherit (super) dino; inherit (super) dino;
}; };
*/
discord = super.discord.override { nss = self.nss; }; discord = super.discord.override { nss = self.nss; };
@ -26,7 +29,8 @@ let
screenstub = super.callPackage ./screenstub { }; screenstub = super.callPackage ./screenstub { };
buildFirefoxXpiAddon = { pname, version, addonId, url, sha256, meta, ... }: buildFirefoxXpiAddon =
{ pname, version, addonId, url, sha256, meta, ... }:
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -59,6 +63,7 @@ let
kat-tw-export = super.callPackage ./kat-tw-export { }; kat-tw-export = super.callPackage ./kat-tw-export { };
kat-scrot = super.callPackage ./kat-scrot { }; kat-scrot = super.callPackage ./kat-scrot { };
} // super.lib.optionalAttrs (builtins.pathExists ../private/pkgs) (import ../private/pkgs { inherit super self; }); } // super.lib.optionalAttrs (builtins.pathExists ../private/pkgs)
(import ../private/pkgs { inherit super self; });
in (pkgs.extend (import (sources.arc-nixexprs + "/overlay.nix"))).extend overlay 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 { mkShell {
shellHook = '' shellHook = ''