diff options
| -rw-r--r-- | README | 74 | ||||
| -rw-r--r-- | overlays/default.nix | 2 | ||||
| -rw-r--r-- | overlays/patches/neomutt/1388.patch | 29 | ||||
| -rw-r--r-- | overlays/patches/neomutt/default.nix | 13 |
4 files changed, 57 insertions, 61 deletions
@@ -1,24 +1,64 @@ -LIBKOOKIE -========= + +---------------------------+ + | | + | LIBKOOKIE | + | | + +---------------------------+ -This is my personal collection of nix expressions. It replaces my old -[`kookiepkgs`][0] and [`nixcfg`][1] repositories. It contains a subtree -of nixpkgs, overlays and modules. +This is my personal collection of nix expressions. -- `overlays/patches`: patches to upstream packages -- `overlays/pkgs`: custom out-of-nixpkgs packages -- `nixpkgs`: subtree of nixpkgs (follows unstable) -- `modules`: system configuration modules -- `roots`: available entry-points (machines) -- `ext`: possible private extensions -The `build` script can be used to build, and then switch to new system -configurations. To invoke the `-s` option, root priviledges are -required. +Structure +--------- +This repository contains a subtree of nixpkgs, a set of custum +modules, a set of overlays for both custom and patched packages, as +well as root configurations for each of my computers. +libkookie replaces my old kookiepkgs, and nixcfg repos, which are no +longer maintained or used. ---- +- overlays/patches: patches to upstream packages +- overlays/kookie: custom out-of-nixpkgs packages +- ovrelays/staging: packages that aren't part of upstream yet +- nixpkgs: subtree of nixpkgs (follows unstable) +- modules: system configuration modules +- roots: available entry-points (machines) +- ext: possible private extensions -[0]: https://git.sr.ht/~spacekookie/kookiepkgs -[1]: https://git.sr.ht/~spacekookie/nixcfg + +How to use +---------- + +You can customise a root configuration to fit your use-case more +closely and then use the "build" scrip to build a complete system, and +also switch to a new configuration with -s, which requires root +privilenges. + +The custom modules are organised into use-cases, and computer types. +Some things will be in the root of that directory because they are +relevant on both my workstation computers, and servers. Inside a +primary module there are often sub-modules for individual components +or even classes of components (such as graphics, or hardware). + + +Contribute +---------- + +While this repository is also sometimes mirrored on github, the main +tree lives on sourcehut [1]. You can send patches to me either +directly [2], or to my public-inbox [3], which is a public mailing +list where I post conversations on various subjects, as well as accept +patches on. + +[1]: https://git.sr.ht/~spacekookie/libkookie +[2]: kookie@spacekookie.de +[3]: https://lists.sr.ht/~spacekookie/public-inbox + + +License +------- + +The nixpkgs subtree, as well as the package overlays are licensed +under the MIT public license for the best compatibility with upstream +NixOS. My custom modules and root configurations are licensed under +the GNU Public License 3.0 (or later). diff --git a/overlays/default.nix b/overlays/default.nix index 7681eddb432..da474e91cdf 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -14,7 +14,5 @@ self: super: { nodemcu-uploader = self.callPackage ./staging/nodemcu-uploader { }; pleroma = self.callPackage ./staging/pleroma { }; - emacs-ergoemacs-mode = self.callPackage ./patches/emacs-ergoemacs-mode { }; htop = self.callPackage ./patches/htop { inherit (super) htop; }; - neomutt = self.callPackages ./patches/neomutt { inherit (super) neomutt; }; } diff --git a/overlays/patches/neomutt/1388.patch b/overlays/patches/neomutt/1388.patch deleted file mode 100644 index 581c4e2b4af..00000000000 --- a/overlays/patches/neomutt/1388.patch +++ /dev/null @@ -1,29 +0,0 @@ -From aaee4ae3272416ad0d66a4984f3398552df13cef Mon Sep 17 00:00:00 2001 -From: Alyssa Ross <hi@alyssa.is> -Date: Sun, 4 Nov 2018 17:01:05 +0000 -Subject: [PATCH] Work around mutt_expando_format buffer overflow - -This doesn't actually fix the overflow, but at least makes it less -likely to be encountered. - -See https://github.com/neomutt/neomutt/issues/1388. ---- - muttlib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/muttlib.c b/muttlib.c -index 431d759b9..1498c5a45 100644 ---- a/muttlib.c -+++ b/muttlib.c -@@ -773,7 +773,7 @@ void mutt_expando_format(char *buf, size_t buflen, size_t col, int cols, const c - FILE *filter = NULL; - char *recycler = NULL; - -- char src2[STRING]; -+ char src2[LONG_STRING]; - mutt_str_strfcpy(src2, src, mutt_str_strlen(src) + 1); - src = src2; - --- -2.19.1 - diff --git a/overlays/patches/neomutt/default.nix b/overlays/patches/neomutt/default.nix deleted file mode 100644 index 3f295a5a574..00000000000 --- a/overlays/patches/neomutt/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -/* LONGER NEOMUTT PARAMETER LISTS PATCH - * - * Because of how my neomutt config handles GPG - * encryption, neomutt needs to be patched to - * allow for a longer argument buffer. - * Luckily someone had already written a patch - * for this, so I didn't have to :) - */ -{ neomutt }: - -neomutt.overrideAttrs ({ patches ? [], ... }: { - patches = patches ++ [ ./1388.patch ]; -}) |