Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NEW Athame-zsh #74804

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
Expand Up @@ -7670,4 +7670,9 @@
githubId = 52650;
name = "Marc Busqué";
};
bananPasha = {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use BananchickPasha instead of bananPasha to match the GitHub username

name = "Pavlo Vlasenko";
email = "smidy999green@gmail.com";
github = "BananchickPasha";
};
}
39 changes: 39 additions & 0 deletions pkgs/shells/zsh/athame-zsh.nix
@@ -0,0 +1,39 @@
{stdenv, vim, zsh, ncurses, isNeovim ? false}:
let athame = fetchGit {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use fetchFromGitHub

rev = "ded4200cb3312334d99ace794c4b308cd45f6b6e";
url = "https://github.com/ardagnir/athame";
};
vimbed = fetchGit {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use fetchFromGitHub

rev = "6b8e8cb45353167988c7bbbe2d9cd4d41989e490";
url = "https://github.com/ardagnir/vimbed";
};
vimbin = if isNeovim then "${vim}/bin/nvim" else "${vim}/bin/vim";
in
zsh.overrideAttrs(o: {
pname = "athame-zsh";
unpackPhase = ''
tar xf $src
mv zsh-${o.version}/* ./
cp "${athame}/athame".* ./Src/Zle
cp ${athame}/athame_util.h ./Src/Zle
cp ${athame}/athame_zsh.h ./Src/Zle/athame_intermediary.h
cp -r ${vimbed} ./Src/Zle/vimbed
'';
buildInputs = [vim ncurses zsh];
makeFlags = [
"ATHAME_VIM_BIN=${vimbin}"
"ATHAME_USE_JOBS_DEFAULT=1"
];
postPatch = ''
#echo \'#!/bin/sh\' > patcher.sh
#sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
patch -p1 -i ${athame}/zsh.patch
'';
meta = with stdenv.lib; {
description = "Athame patches zsh to add full Vim support by routing your keystrokes through an actual Vim process.";
homepage = https://github.com/ardagnir/athame;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ bananPasha ];
};
})
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
Expand Up @@ -669,7 +669,9 @@ in
};

async = callPackage ../development/tools/async {};


athame-zsh = callPackage ../shells/zsh/athame-zsh.nix {};

atheme = callPackage ../servers/irc/atheme { };

atinout = callPackage ../tools/networking/atinout { };
Expand Down