From 76e5fdb122fd82276f06552df5c12e6af65a8506 Mon Sep 17 00:00:00 2001 From: tdro Date: Sat, 13 Jan 2024 08:02:52 -0500 Subject: .vim/vimrc: Update snippets --- .vim/snippets/package.nix | 27 +++++++++++++++++++++++++++ .vim/snippets/shell.nix | 24 +++++++++++++++--------- .vim/vimrc | 7 ++++--- 3 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 .vim/snippets/package.nix diff --git a/.vim/snippets/package.nix b/.vim/snippets/package.nix new file mode 100644 index 0000000..31cb944 --- /dev/null +++ b/.vim/snippets/package.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchgit }: + +stdenv.mkDerivation rec { + pname = ""; + version = ""; + + src = fetchgit { + rev = version; + url = ""; + sha256 = ""; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir "$out" + runHook postInstall + ''; + + meta = { + homepage = ""; + description = ""; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + }; +} diff --git a/.vim/snippets/shell.nix b/.vim/snippets/shell.nix index 6647b8c..2e58365 100644 --- a/.vim/snippets/shell.nix +++ b/.vim/snippets/shell.nix @@ -1,16 +1,22 @@ let - name = ""; - + name = "nix-shell.pure"; pkgs = import { }; -in pkgs.mkShell { + shell = pkgs.writeShellApplication { + inherit name; + text = '' + /usr/bin/env --ignore-environment /bin/sh -c ${ + pkgs.writeScript name '' + export PS1='\h (${name}) \W \$ ' + export PATH=${pkgs.lib.strings.makeBinPath [ pkgs.busybox ]} + /bin/sh + '' + }; + ''; + }; +in pkgs.mkShell { inherit name; - - buildInputs = [ ]; - - shellHook = '' - export PS1='\h (${name}) \W \$ ' - ''; + shellHook = "exec ${shell}/bin/${shell.name}"; } diff --git a/.vim/vimrc b/.vim/vimrc index b48b1d8..cb9b902 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -223,10 +223,11 @@ vnoremap y "my\"" . v:register . "y`y" "------------------Snippets-------------------" -nnoremap ,html :-1read $HOME/.vim/snippets/skeleton.html3jwf>a -nnoremap ,nix-module :-1read $HOME/.vim/snippets/module.nix4jf"a -nnoremap ,nix-shell :-1read $HOME/.vim/snippets/shell.nix2jf"a nnoremap ,awk :-1read $HOME/.vim/snippets/skeleton.awk +nnoremap ,nix-shell :-1read $HOME/.vim/snippets/shell.nix2jf"a +nnoremap ,nix-module :-1read $HOME/.vim/snippets/module.nix4jf"a +nnoremap ,nix-package :-1read $HOME/.vim/snippets/package.nix3jf"a +nnoremap ,html :-1read $HOME/.vim/snippets/skeleton.html3jwf>a "---------------Plugin Settings---------------" -- cgit v1.2.3