~kaction/config

cfc5cf18ef7467511039ec075280a3959b1abcc0 — Dmitry Bogatov 2 months ago 79a4688
Add nixfmt with sort-binders feature into universe
3 files changed, 28 insertions(+), 2 deletions(-)

M flake.lock
M flake.nix
M universe/default.nix
M flake.lock => flake.lock +17 -0
@@ 52,6 52,22 @@
        "url": "https://git.sr.ht/~kaction/nix-sys"
      }
    },
    "nixfmt-src": {
      "flake": false,
      "locked": {
        "lastModified": 1593919403,
        "narHash": "sha256-kJpjjF3+6x/0AUjZAQui3QiGtnC7wMAcKBP602l405s=",
        "rev": "e8cb6686d0c12594e590b96379ef470337276eb1",
        "revCount": 170,
        "type": "git",
        "url": "https://git.sr.ht/~kaction/nixfmt"
      },
      "original": {
        "rev": "e8cb6686d0c12594e590b96379ef470337276eb1",
        "type": "git",
        "url": "https://git.sr.ht/~kaction/nixfmt"
      }
    },
    "nixpkgs": {
      "locked": {
        "lastModified": 1612914251,


@@ 102,6 118,7 @@
        "future": "future",
        "mk-passwd": "mk-passwd",
        "nix-sys": "nix-sys",
        "nixfmt-src": "nixfmt-src",
        "nixpkgs": "nixpkgs_3"
      }
    }

M flake.nix => flake.nix +10 -1
@@ 11,7 11,12 @@
  inputs.mk-passwd.url = "git+https://git.sr.ht/~kaction/mk-passwd?tag=0.1.1";
  inputs.nix-sys.url =
    "git+https://git.sr.ht/~kaction/nix-sys?rev=fbc860acdae3c716d50d8844ac52a57ccb76e61e";
  outputs = { self, nixpkgs, mk-passwd, nix-sys, future }:
  inputs.nixfmt-src = {
    url =
      "git+https://git.sr.ht/~kaction/nixfmt?rev=e8cb6686d0c12594e590b96379ef470337276eb1";
    flake = false;
  };
  outputs = { self, nixpkgs, mk-passwd, nix-sys, future, nixfmt-src }:
    let
      system = "x86_64-linux"; # See note [On supported architectures]
      pkgs = import nixpkgs { inherit system; };


@@ 88,6 93,10 @@

          nix = pkgs.nixFlakes;

          nixfmt = with pkgs.haskell;
            lib.doJailbreak
            (packages.ghc884.callCabal2nix "nixfmt" nixfmt-src { });

          posixrc = callPackage ./universe/posixrc { };
          psql = pkgs.postgresql_10;
          rewrite-paths =

M universe/default.nix => universe/default.nix +1 -1
@@ 47,7 47,7 @@ buildEnv {
    mutt
    newsboat
    nix # unstable Nix with flakes support
    ## nixfmt
    nixfmt
    nnn # file manager for poorly named files
    openssh
    pkgsStatic.par # Like fmt(1), but better.