chore: remove lua, get templ from nixpkgs, and clean up config

Signed-off-by: jolheiser <john.olheiser@gmail.com>
main
jolheiser 2024-02-16 11:35:29 -06:00
parent 20a5d8a2ee
commit c0ff0424a6
Signed by: jolheiser
GPG Key ID: B853ADA5DA7BBF7A
2 changed files with 7 additions and 39 deletions

View File

@ -1,29 +1,4 @@
{pkgs ? import <nixpkgs> {}}: let {pkgs ? import <nixpkgs> {}}: {
templ = pkgs.buildGoModule rec {
pname = "templ";
version = "0.2.334";
src = pkgs.fetchFromGitHub {
owner = "a-h";
repo = "templ";
rev = "v${version}";
sha256 = "sha256-liELstdoh0/KaOY8TnjCmTgp2CYWk9rZnMuK1RUb3OM=";
};
vendorSha256 = "sha256-7QYF8BvLpTcDstkLWxR0BgBP0NUlJ20IqW/nNqMSBn4=";
ldflags = ["-s" "-w" "-X=github.com/a-h/templ.Version=${version}"];
subPackages = ["cmd/templ"];
meta = with pkgs.lib; {
description = "A language for writing HTML user interfaces in Go. ";
homepage = "https://github.com/a-h/templ";
license = licenses.mit;
mainProgram = "templ";
};
};
in {
ignore = [".idea/" "result" "node_modules/" "dist/"]; ignore = [".idea/" "result" "node_modules/" "dist/"];
settings = { settings = {
theme = "catppuccin_mocha_transparent"; theme = "catppuccin_mocha_transparent";
@ -37,12 +12,12 @@ in {
normal = "block"; normal = "block";
select = "underline"; select = "underline";
}; };
file-picker = {hidden = false;}; file-picker.hidden = false;
indent-guides = { indent-guides = {
render = true; render = true;
skip-levels = 1; skip-levels = 1;
}; };
soft-wrap = {enable = true;}; soft-wrap.enable = true;
statusline = { statusline = {
right = [ right = [
"version-control" "version-control"
@ -52,7 +27,7 @@ in {
"file-encoding" "file-encoding"
]; ];
}; };
lsp = {display-messages = true;}; lsp.display-messages = true;
}; };
keys = { keys = {
normal = { normal = {
@ -181,13 +156,6 @@ in {
args = ["-c" "set -o pipefail; ${gotools}/bin/goimports | ${gofumpt}/bin/gofumpt"]; args = ["-c" "set -o pipefail; ${gotools}/bin/goimports | ${gofumpt}/bin/gofumpt"];
}; };
} }
{
name = "lua";
formatter = with nodePackages; {
command = "${lua-fmt}/bin/luafmt";
args = ["--stdin"];
};
}
{ {
name = "python"; name = "python";
auto-format = true; auto-format = true;

View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1699343069, "lastModified": 1708001613,
"narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", "narHash": "sha256-woOmAXW05XnqlLn7dKzCkRAEOSOdA/Z2ndVvKcjid94=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", "rev": "085589047343aad800c4d305cf7b98e8a3d51ae2",
"type": "github" "type": "github"
}, },
"original": { "original": {