Add alejandra

This commit is contained in:
Dave Gallant
2022-05-28 10:30:29 -04:00
parent 80e7729ab4
commit d2aaa3920f
31 changed files with 334 additions and 323 deletions

View File

@@ -1,9 +1,11 @@
{ config, lib, pkgs, ... }:
let
checkBrew = "command -v brew > /dev/null";
in
{
config,
lib,
pkgs,
...
}: let
checkBrew = "command -v brew > /dev/null";
in {
environment = {
extraInit = ''
${checkBrew} || >&2 echo "brew is not installed (install it via https://brew.sh)"
@@ -48,6 +50,5 @@ in
"homebrew/core"
"homebrew/services"
];
};
}

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }: {
{pkgs, ...}: {
imports = [
./brew.nix
./preferences.nix

View File

@@ -1,5 +1,8 @@
{ config, pkgs, ... }: {
{
config,
pkgs,
...
}: {
system.defaults = {
loginwindow = {
GuestEnabled = false;
@@ -51,5 +54,4 @@
AppleShowScrollBars = "Automatic";
};
};
}

View File

@@ -1,5 +1,8 @@
{ stdenv, lib, fetchFromGitHub }:
{
stdenv,
lib,
fetchFromGitHub,
}:
stdenv.mkDerivation rec {
pname = "aws-connect";
version = "1.0.19";

View File

@@ -1,6 +1,8 @@
{ lib, fetchFromGitHub, python3 }:
let
{
lib,
fetchFromGitHub,
python3,
}: let
py = python3.override {
packageOverrides = self: super: {
prettycolors = super.buildPythonPackage rec {
@@ -13,41 +15,41 @@ let
rev = "8b58260f00b0aab789e940f5ee190fa9c3c10925";
sha256 = "sha256-ICFwaRkQ30/sml4GuzXF8TyJAg+ZXnLmKGil18KisUw=";
};
propagatedBuildInputs = [ py.pkgs.colorama ];
propagatedBuildInputs = [py.pkgs.colorama];
};
};
};
in
with py.pkgs;
buildPythonApplication rec {
pname = "aws-role-play";
version = "419e0de612554bfce467da4896e1abcadb78c406";
format = "pyproject";
with py.pkgs;
buildPythonApplication rec {
pname = "aws-role-play";
version = "419e0de612554bfce467da4896e1abcadb78c406";
format = "pyproject";
src = fetchFromGitHub {
owner = "rewindio";
repo = "aws-role-play";
rev = version;
hash = "sha256-o+u/ixL48J2WMWFRkOlWGvXMVwn+BrofzlspOVwmnCo=";
};
src = fetchFromGitHub {
owner = "rewindio";
repo = "aws-role-play";
rev = version;
hash = "sha256-o+u/ixL48J2WMWFRkOlWGvXMVwn+BrofzlspOVwmnCo=";
};
# No tests included
doCheck = false;
# No tests included
doCheck = false;
nativeBuildInputs = [ poetry ];
nativeBuildInputs = [poetry];
propagatedBuildInputs = with py.pkgs; [
boto3
click
colorama
prettycolors
];
propagatedBuildInputs = with py.pkgs; [
boto3
click
colorama
prettycolors
];
passthru.python3 = python3;
passthru.python3 = python3;
meta = with lib; {
homepage = "https://www.rewind.com/";
description = "A CLI tool that makes assuming IAM roles and exporting temporary credentials easier";
license = licenses.mit;
};
}
meta = with lib; {
homepage = "https://www.rewind.com/";
description = "A CLI tool that makes assuming IAM roles and exporting temporary credentials easier";
license = licenses.mit;
};
}

View File

@@ -1,13 +1,10 @@
final: prev: {
aws-connect = prev.callPackage ./aws-connect { };
aws-role-play = prev.callPackage ./aws-role-play { };
keyleds = prev.callPackage ./keyleds { };
lpass = prev.callPackage ./lastpass { };
rfd = prev.callPackage ./rfd { };
srv = prev.callPackage ./srv { };
tmux-sessionizer = prev.callPackage ./tmux-sessionizer { };
vpngate = prev.callPackage ./vpngate { };
yar = prev.callPackage ./yar { };
aws-connect = prev.callPackage ./aws-connect {};
aws-role-play = prev.callPackage ./aws-role-play {};
keyleds = prev.callPackage ./keyleds {};
rfd = prev.callPackage ./rfd {};
srv = prev.callPackage ./srv {};
tmux-sessionizer = prev.callPackage ./tmux-sessionizer {};
vpngate = prev.callPackage ./vpngate {};
yar = prev.callPackage ./yar {};
}

View File

@@ -1,9 +1,9 @@
{ pkgs
, stdenv
, fetchFromGitHub
,
{
pkgs,
stdenv,
fetchFromGitHub,
...
}:
stdenv.mkDerivation rec {
name = "keyleds";
version = "1.1.1";
@@ -16,6 +16,18 @@ stdenv.mkDerivation rec {
sha256 = "sha256-KCWmaRmJTmZgTt7HW9o6Jt1u4x6+G2j6T9EqVt21U18=";
};
nativeBuildInputs = with pkgs; [ cmake pkgconfig ];
buildInputs = with pkgs; [ xlibsWrapper xorg.libXi libuv systemd luajit libyaml ];
postInstall = ''
cat <<EOF >> $out/bin/set-leds.sh
#!/usr/bin/env bash
for d in \$($out/bin/keyledsctl list); do
$out/bin/keyledsctl set-leds -d \$d all=black|| true;
done
EOF
chmod +x $out/bin/set-leds.sh
'';
nativeBuildInputs = with pkgs; [cmake pkgconfig];
buildInputs = with pkgs; [xlibsWrapper xorg.libXi libuv systemd luajit libyaml];
}

View File

@@ -1,46 +0,0 @@
{ stdenv
, lib
, fetchFromGitHub
, asciidoc
, cmake
, docbook_xsl
, pkgconfig
, bash-completion
, curl
, openssl
, libxml2
, libxslt
}:
stdenv.mkDerivation rec {
pname = "lpass";
version = "1.3.4-unreleased";
src = fetchFromGitHub {
owner = "lastpass";
repo = "lastpass-cli";
rev = "8767b5e53192ad4e72d1352db4aa9218e928cbe1";
sha256 = "sha256:1d4m5h9byq5cccdg98m8d8457rbvp28q821d8rpglykgrfgnknwp";
};
nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ];
buildInputs = [ bash-completion curl openssl libxml2 libxslt ];
enableParallelBuilding = true;
installTargets = [ "install" "install-doc" ];
postInstall = ''
install -Dm644 -T ../contrib/lpass_zsh_completion $out/share/zsh/site-functions/_lpass
install -Dm644 -T ../contrib/completions-lpass.fish $out/share/fish/vendor_completions.d/lpass.fish
'';
meta = with lib; {
description =
"Stores, retrieves, generates, and synchronizes passwords securely";
homepage = "https://github.com/lastpass/lastpass-cli";
license = licenses.gpl2Plus;
platforms = platforms.unix;
};
}

View File

@@ -1,39 +1,41 @@
{ lib, fetchFromGitHub, python3 }:
let py = python3.override { };
{
lib,
fetchFromGitHub,
python3,
}: let
py = python3.override {};
in
with py.pkgs;
buildPythonApplication rec {
pname = "rfd";
version = "v0.8.1";
format = "pyproject";
with py.pkgs;
buildPythonApplication rec {
pname = "rfd";
version = "v0.8.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "davegallant";
repo = "rfd";
rev = version;
hash = "sha256-9gOxrKVEqbg2vLO5opoetVSxgwpm/3SV60mK8Le6F48=";
};
src = fetchFromGitHub {
owner = "davegallant";
repo = "rfd";
rev = version;
hash = "sha256-9gOxrKVEqbg2vLO5opoetVSxgwpm/3SV60mK8Le6F48=";
};
# No tests included
doCheck = false;
# No tests included
doCheck = false;
nativeBuildInputs = [ poetry ];
nativeBuildInputs = [poetry];
propagatedBuildInputs = with py.pkgs; [
beautifulsoup4
click
colorama
requests
soupsieve
];
propagatedBuildInputs = with py.pkgs; [
beautifulsoup4
click
colorama
requests
soupsieve
];
passthru.python3 = python3;
passthru.python3 = python3;
meta = with lib; {
homepage = "https://www.redflagdeals.com/";
description = "View RedFlagDeals from the command line";
license = licenses.gpl3;
};
}
meta = with lib; {
homepage = "https://www.redflagdeals.com/";
description = "View RedFlagDeals from the command line";
license = licenses.gpl3;
};
}

View File

@@ -1,5 +1,8 @@
{ lib, fetchFromGitHub, buildGoModule }:
{
lib,
fetchFromGitHub,
buildGoModule,
}:
buildGoModule rec {
pname = "srv";
version = "v0.1.2";
@@ -16,7 +19,7 @@ buildGoModule rec {
meta = with lib; {
description = "a simple rss viewer";
license = licenses.gpl3;
maintainers = with maintainers; [ davegallant ];
maintainers = with maintainers; [davegallant];
platforms = platforms.linux ++ platforms.darwin;
};
}

View File

@@ -1,12 +1,15 @@
{ stdenv, lib, fetchurl }:
{
stdenv,
lib,
fetchurl,
}:
stdenv.mkDerivation rec {
pname = "tmux-sessionizer";
version = "0.0.0";
executable = ./tmux-sessionizer;
phases = [ "unpackPhase" ]; # Remove all other phases
phases = ["unpackPhase"]; # Remove all other phases
unpackPhase = ''
mkdir -p $out/bin
@@ -19,4 +22,3 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
};
}

View File

@@ -1,7 +1,9 @@
{ lib, fetchFromGitHub, buildGoModule }:
{
lib,
fetchFromGitHub,
buildGoModule,
}:
buildGoModule rec {
pname = "vpngate";
version = "v0.1.1";
@@ -18,7 +20,7 @@ buildGoModule rec {
homepage = "https://www.vpngate.net";
description = "a client for vpngate.net";
license = licenses.gpl3;
maintainers = with maintainers; [ davegallant ];
maintainers = with maintainers; [davegallant];
platforms = platforms.linux ++ platforms.darwin;
};
}

View File

@@ -1,5 +1,8 @@
{ lib, fetchFromGitHub, buildGoModule }:
{
lib,
fetchFromGitHub,
buildGoModule,
}:
buildGoModule rec {
pname = "yar";
version = "master";
@@ -16,7 +19,7 @@ buildGoModule rec {
meta = with lib; {
description = "Yar is a tool for plunderin' organizations, users and/or repositories.";
license = licenses.gpl3;
maintainers = with maintainers; [ davegallant ];
maintainers = with maintainers; [davegallant];
platforms = platforms.linux ++ platforms.darwin;
};
}