diff options
| author | Azat Bahawi <azat@bahawi.net> | 2023-06-10 22:21:25 +0300 |
|---|---|---|
| committer | Azat Bahawi <azat@bahawi.net> | 2023-06-10 22:21:25 +0300 |
| commit | 2d4e9a5abfc08386250f42ba0f0c25ae63073d3e (patch) | |
| tree | 9ebbc36a66679886df3f7ce673935a58f96f15c9 /modules/common | |
| parent | c52fc7e6f12b0bceda5853cb541728139f34fafe (diff) | |
2023-06-10
Diffstat (limited to 'modules/common')
| -rw-r--r-- | modules/common/common/shell/default.nix | 20 | ||||
| -rw-r--r-- | modules/common/emacs/default.nix | 3 | ||||
| -rw-r--r-- | modules/common/profiles/headful.nix | 1 |
3 files changed, 13 insertions, 11 deletions
diff --git a/modules/common/common/shell/default.nix b/modules/common/common/shell/default.nix index 1eebfa2..2b034e6 100644 --- a/modules/common/common/shell/default.nix +++ b/modules/common/common/shell/default.nix @@ -1,6 +1,7 @@ { lib, pkgs, + pkgsStable, this, ... }: @@ -64,15 +65,16 @@ with lib; { pkg = if this.isHeadful then - (coreutils.overrideAttrs (_: super: { - patches = - super.patches - ++ [ - (fetchpatch { - url = "https://raw.githubusercontent.com/jarun/advcpmv/ea268d870b475edd5960dcd55d5378abc9705958/advcpmv-0.9-9.1.patch"; - hash = "sha256-d+SRT/R4xmfHLAdOr7m4R3WFiW64P5ZH6iqDvErYCyg="; - }) - ]; + # FIXME Update this to 9.3 when patches[1] become available + # + # [1]: https://github.com/jarun/advcpmv + (pkgsStable.coreutils.overrideAttrs (_: _: { + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/jarun/advcpmv/ea268d870b475edd5960dcd55d5378abc9705958/advcpmv-0.9-9.1.patch"; + hash = "sha256-d+SRT/R4xmfHLAdOr7m4R3WFiW64P5ZH6iqDvErYCyg="; + }) + ]; })) else coreutils; in "${pkg}/bin/coreutils --coreutils-prog=${value}")) diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix index d9a5922..5499d48 100644 --- a/modules/common/emacs/default.nix +++ b/modules/common/emacs/default.nix @@ -113,8 +113,7 @@ in { shfmt # :lang sh :editor format sqlite # :lang (org +roam2) :tools lookup texlab # lang (tex +lsp) - # FIXME https://github.com/NixOS/nixpkgs/issues/235434 - # texlive.combined.scheme-full # :lang org tex + texlive.combined.scheme-full # :lang org tex unzip # :tools debugger wordnet # :tools (lookup +dictionary +offline) yaml-language-server # :lang (yaml +lsp) diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix index 6ec092d..968b287 100644 --- a/modules/common/profiles/headful.nix +++ b/modules/common/profiles/headful.nix @@ -32,6 +32,7 @@ in { ''; packages = with pkgs; [ + anki comma fd ripgrep |