From 72b581f47444869abe5ed226bb6ced2519413be9 Mon Sep 17 00:00:00 2001 From: Brian Hicks Date: Mon, 10 Feb 2020 13:13:23 -0600 Subject: [PATCH] add black as a formatter and format stuff with it --- dotfiles/kakoune.nix | 18 ++++++++++++++++++ occasional-scripts/chapters.py | 4 ++-- occasional-scripts/flashcardify.py | 8 ++++---- shell.nix | 3 +++ 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dotfiles/kakoune.nix b/dotfiles/kakoune.nix index ae78f9b..5307b30 100644 --- a/dotfiles/kakoune.nix +++ b/dotfiles/kakoune.nix @@ -146,6 +146,24 @@ in { option = ".*.hs"; } + # Python + { + name = "WinCreate"; + option = ".*.py"; + commands = '' + evaluate-commands %sh{ + if which black > /dev/null; then + echo 'set-option buffer formatcmd "black - --quiet --fast"' + fi + } + ''; + } + { + commands = "format"; + name = "BufWritePre"; + option = ".*.py"; + } + # Indents { name = "WinCreate"; diff --git a/occasional-scripts/chapters.py b/occasional-scripts/chapters.py index c8eb26b..323fd8d 100644 --- a/occasional-scripts/chapters.py +++ b/occasional-scripts/chapters.py @@ -3,7 +3,7 @@ from __future__ import print_function, unicode_literals import argparse parser = argparse.ArgumentParser() -parser.add_argument('num_chapters', type=int) +parser.add_argument("num_chapters", type=int) args = parser.parse_args() task_templates = [ @@ -12,6 +12,6 @@ task_templates = [ "make flashcards for chapter {}", ] -for i in range(1, args.num_chapters+1): +for i in range(1, args.num_chapters + 1): for template in task_templates: print(template.format(i)) diff --git a/occasional-scripts/flashcardify.py b/occasional-scripts/flashcardify.py index d7af955..34540e7 100644 --- a/occasional-scripts/flashcardify.py +++ b/occasional-scripts/flashcardify.py @@ -3,12 +3,12 @@ import sys import argparse parser = argparse.ArgumentParser() -parser.add_argument('--name', default=None) +parser.add_argument("--name", default=None) args = parser.parse_args() -for line in sys.stdin.read().split('\n'): - out = line.strip('- ').split('|') +for line in sys.stdin.read().split("\n"): + out = line.strip("- ").split("|") if args.name is not None: out.append(args.name) - print('\t'.join(out)) + print("\t".join(out)) diff --git a/shell.nix b/shell.nix index cdf50be..650708b 100644 --- a/shell.nix +++ b/shell.nix @@ -10,6 +10,9 @@ stdenv.mkDerivation { ## meta-information for managing dotfiles niv.niv + ## formatting + python3Packages.black + ## sample projects # elm # elmPackages.elm