From 6bd1373eab68b2f6d64dd534ca99e850c597677a Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Fri, 15 Dec 2023 05:35:06 -0700 Subject: [PATCH] zsh/neovim: initial bits for ocaml/opam support.. maybe --- configs/neovim.nix | 6 +++++- configs/zsh.nix | 2 ++ pkgs/tic-80.nix | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 pkgs/tic-80.nix diff --git a/configs/neovim.nix b/configs/neovim.nix index f056093..7e1ae5e 100644 --- a/configs/neovim.nix +++ b/configs/neovim.nix @@ -146,7 +146,6 @@ let in { environment.systemPackages = with pkgs; [ - nixpkgs-fmt elmPackages.elm elmPackages.elm-format elmPackages.elm-language-server @@ -160,9 +159,14 @@ in luaformatter luajitPackages.lua-lsp manix + nixpkgs-fmt nodejs nodePackages.prettier nodePackages.typescript-language-server + ocaml + ocamlPackages.ocamlformat + ocamlPackages.utop + opam perl perlPackages.PerlCritic perlPackages.PLS diff --git a/configs/zsh.nix b/configs/zsh.nix index 2fb9b1a..292f3f2 100644 --- a/configs/zsh.nix +++ b/configs/zsh.nix @@ -64,6 +64,8 @@ fi } + #[[ ! -r $HOME/.opam/opam-init/init.zsh ]] || source $HOME/.opam/opam-init/init.zsh > /dev/null 2> /dev/null + eval "$(direnv hook zsh)" ''; }; diff --git a/pkgs/tic-80.nix b/pkgs/tic-80.nix new file mode 100644 index 0000000..39d0126 --- /dev/null +++ b/pkgs/tic-80.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkgs +, ... +}: +stdenv.mkDerivation rec { + pname = "tic-80"; + version = "1.1.2837"; + + src = fetchFromGitHub { + owner = "nesbox"; + repo = "TIC-80"; + rev = "v${version}"; + sha256 = ""; + }; + + nativeBuildInputs = with pkgs; [ + gcc + pkg-config + SDL2 + ruby + lua + ]; + + meta = with lib; { + description = "Fantasy computer for making, playing and sharing games."; + homepage = "https://tic80.com"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ qbit ]; + }; +}