~kaction/config

a549523bfb364f9f9d0766477e804d9f020038ea — Dmitry Bogatov 7 months ago 8084b99 + 0eea61b
Merge branch 'snapshot-20.09'

* snapshot-20.09:
  dhall: use version from base snapshot
  Purge dependency on coreutils
  Purge dependency on pam
  universe: temporary exclude dhall
  vim: be explicit about snipMate parser version
  Upgrade base snapshot to release 20.09
M flake.lock => flake.lock +7 -8
@@ 2,18 2,17 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
        "lastModified": 1606194000,
        "narHash": "sha256-pDD4Qz+NHM25IX1Ercy9kqh1HyeVg7xlgUOZ7MZBSs8=",
        "ref": "fork/0",
        "rev": "4882bdae7c4471279515dc1f427f6762429cb2f4",
        "revCount": 250143,
        "lastModified": 1612057845,
        "narHash": "sha256-FslNuG72XCR+Sbxl0jgw71ccSgdLm2iTVI7h/LtUDM0=",
        "ref": "master",
        "rev": "3682b2d9affc30f1fa02028ed8e8cfae88ef5cc2",
        "revCount": 267091,
        "type": "git",
        "url": "https://github.com/kaction/nixpkgs"
        "url": "https://github.com/nixos/nixpkgs?tag=20.09"
      },
      "original": {
        "ref": "fork/0",
        "type": "git",
        "url": "https://github.com/kaction/nixpkgs"
        "url": "https://github.com/nixos/nixpkgs?tag=20.09"
      }
    },
    "root": {

M flake.nix => flake.nix +3 -2
@@ 5,8 5,7 @@
# me. Maybe I will regret it, who knows?
{
  description = "Personal flake of ~kaction";
  inputs.nixpkgs.url = "git+https://github.com/kaction/nixpkgs?ref=fork/0";

  inputs.nixpkgs.url = "git+https://github.com/nixos/nixpkgs?tag=20.09";
  outputs = { self, nixpkgs }:
    let
      system = "x86_64-linux"; # See note [On supported architectures]


@@ 69,6 68,8 @@
            ./universe/w3m
            ./universe/doas
            ./universe/mutt
            ./universe/hub
            ./universe/findutils
          ]);

          rebuildedStatic = builtins.listToAttrs (map rebuildStatic [

M nixpkgs/overlays.d/config.d/vim/vim/share/vim/vim82/vimrc => nixpkgs/overlays.d/config.d/vim/vim/share/vim/vim82/vimrc +1 -0
@@ 91,3 91,4 @@ imap <S-Tab> <Plug>snipMateBack
smap <S-Tab> <Plug>snipMateBack

imap <C-s> <Plug>snipMateShow
let g:snipMate = { 'snippet_version': 1 }

M universe/default.nix => universe/default.nix +6 -9
@@ 31,13 31,10 @@ let
      diohsc
      dvtm
      dropbox_uploader
      dhall-latest.dhall
      dhall-latest.dhall-bash
      dhall-latest.dhall-docs
      dhall-latest.dhall-json
      dhall-latest.dhall-yaml
      dhall-latest.dhall-lsp-server
      dhall-latest.dhall-nixpkgs
      dhall
      dhall-bash
      dhall-json
      dhall-lsp-server
      fasm
      fasm-arch
      file # This is part of base system.


@@ 45,7 42,7 @@ let
      git
      git-bug
      git-recall
      gitAndTools.hub
      hub
      gnupg
      groff
      kpcli


@@ 58,7 55,7 @@ let
      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.

A universe/findutils/default.nix => universe/findutils/default.nix +4 -0
@@ 0,0 1,4 @@
{ findutils, busybox }:
let
  stage1 = findutils.override { coreutils = busybox; };
in stage1

A universe/hub/default.nix => universe/hub/default.nix +4 -0
@@ 0,0 1,4 @@
{ hub, git }:
let
  stage1 = hub.override { inherit git; };
in stage1

M universe/libusb1/default.nix => universe/libusb1/default.nix +1 -1
@@ 1,4 1,4 @@
{ libusb1 }:
let
  stage1 = libusb1.override { enableSystemd = false; };
  stage1 = libusb1.override { enableUdev = false; };
in stage1

M universe/pass/default.nix => universe/pass/default.nix +2 -2
@@ 1,7 1,7 @@
{ pass, git, gnupg, busybox }:
{ pass, git, gnupg, findutils, busybox }:
let
  stage1 = pass.override {
    inherit git gnupg;
    inherit git gnupg findutils;
    x11Support = false;
    waylandSupport = false;
    qrencode = busybox;