From d856e726cac27f070b38e4e82dcc6cd1dd79bce6 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 12 May 2024 15:53:25 +0100 Subject: [PATCH] fmt: format teh flake --- flake.nix | 84 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/flake.nix b/flake.nix index 7ccb8b0..ee6b913 100644 --- a/flake.nix +++ b/flake.nix @@ -3,56 +3,60 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - utils.url = "github:numtide/flake-utils"; + utils.url = "github:numtide/flake-utils"; bfom.url = "gitlab:silver_rust/bfom"; }; - /* - sudo nano /etc/nix/nix.conf - trusted-users = {username} - */ + /* + sudo nano /etc/nix/nix.conf + trusted-users = {username} + */ nixConfig = { extra-substituters = "https://nix-cache.skynet.ie/skynet-cache"; extra-trusted-public-keys = "skynet-cache:OdfA4Or0JcHiHf05fsiIR4nZT2z2yDEtkoLqhntGAz4="; }; - outputs = { self, nixpkgs, utils, bfom }: utils.lib.eachDefaultSystem (system: - let - pkgs = import nixpkgs { - system = "${system}"; - config = { - allowUnfree = true; - permittedInsecurePackages = [ - # for obsidian - "electron-25.9.0" - # for wkhtmltopdf - "qtwebkit-5.212.0-alpha4" - ]; + outputs = { + self, + nixpkgs, + utils, + bfom, + }: + utils.lib.eachDefaultSystem (system: let + pkgs = import nixpkgs { + system = "${system}"; + config = { + allowUnfree = true; + permittedInsecurePackages = [ + # for obsidian + "electron-25.9.0" + # for wkhtmltopdf + "qtwebkit-5.212.0-alpha4" + ]; + }; + }; + in rec { + # `nix develop` + devShell = pkgs.mkShell { + nativeBuildInputs = with pkgs; [obsidian]; + shellHook = '' + ${pkgs.obsidian}/bin/obsidian & + BG_PID=$! + trap "kill -9 $BG_PID" EXIT + ''; }; - }; - in rec { - # `nix develop` - devShell = pkgs.mkShell { - nativeBuildInputs = with pkgs; [ obsidian ]; - shellHook = '' - ${pkgs.obsidian}/bin/obsidian & - BG_PID=$! - trap "kill -9 $BG_PID" EXIT - ''; - }; - packages = { - handovers = pkgs.writeShellScriptBin "format_handovers" '' - export PATH=${pkgs.lib.makeBinPath [ pkgs.wkhtmltopdf bfom.defaultPackage.x86_64-linux ]}:$PATH - ${./_scripts/format_handovers.sh} - ''; + packages = { + handovers = pkgs.writeShellScriptBin "format_handovers" '' + export PATH=${pkgs.lib.makeBinPath [pkgs.wkhtmltopdf bfom.defaultPackage.x86_64-linux]}:$PATH + ${./_scripts/format_handovers.sh} + ''; - minutes = pkgs.writeShellScriptBin "format_minutes" '' - export PATH=${pkgs.lib.makeBinPath [ pkgs.wkhtmltopdf bfom.defaultPackage.x86_64-linux ]}:$PATH - ${./_scripts/format_minutes.sh} - ''; - }; - - }); + minutes = pkgs.writeShellScriptBin "format_minutes" '' + export PATH=${pkgs.lib.makeBinPath [pkgs.wkhtmltopdf bfom.defaultPackage.x86_64-linux]}:$PATH + ${./_scripts/format_minutes.sh} + ''; + }; + }); }