helix.drv @main -
refs -
log -
-
https://git.jolheiser.com/helix.drv.git
chore: remove lua, get templ from nixpkgs, and clean up config
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signature
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmXPnOEACgkQuFOtpdp7
v3pKARAAk8MYXyM1+KKcxruKySg42XzJFLnZRRACT5Mr4ZTsJEEYc5B97S+QTctU
MSIUfHp4+2h3433+FqVmHx/8jDe0ZxvBsdcxikvPYGIFgCbWKnAC2u1FKy/4cRUF
nIdNvDWpmDFCkqep8PE5Viv7ULLD7X+FnsmUAGjPEshUyCBJO0DpA95zATsJskGt
kbV/5x9ZpdOKdytwTas1OEVz3fxQNHufeQUOpzvOmsUT3zqasGbtKwNgWkna02Yk
13jFFHbhLjtSD7mt3PT8ijF0wD6VX0kY2CsywlBgdnZUW07i8vsTOS9sM8axBHNY
9L1r2shdcb6uG96vbpSXr0bM9HH6zXuc7XY2Rutv27ZFh4P/qE2RLCBfzPJJhMsA
DhCmcSDMlGZqdsfwgd31WF+ved14ZaxylzEG4QUdfEJxxmBaKOUYNkre31GMo6QI
rscRQs735lK321HzOiFl1fCM1bjXazwCNt+2tfZANAvRUg7RKf9Xsp1af+Ko4uce
QmDq0j37XCRtuFQJbh/Hb61xBC3cTq1pPcJOznCTI0dx1zO9KG/BSSKVAXh9kivh
bHyCEt4byhyUapYrD4as1rL2TQ7xKY1cBDjF6bSkpEvz2ZGmD9QCr2vjUk9HaWau
5tjEcytQ9wpMkYo6beNnzfZ+1TfaN1rI9qXy0BwjFrShwmD5tt0=
=/6eX
-----END PGP SIGNATURE-----
diff --git a/config.nix b/config.nix
index 24e654b94eb75a12cfcdd51ee3bbd22b0d13b2bd..e5bdaaa8f1315f866ca4f681c09e9885f1e3f079 100644
--- a/config.nix
+++ b/config.nix
@@ -1,29 +1,6 @@
{pkgs ? import <nixpkgs> {}}: let
- 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/"];
settings = {
theme = "catppuccin_mocha_transparent";
@@ -37,12 +14,12 @@ insert = "bar";
normal = "block";
select = "underline";
};
- file-picker = {hidden = false;};
+ file-picker.hidden = false;
indent-guides = {
render = true;
skip-levels = 1;
};
- soft-wrap = {enable = true;};
+ soft-wrap.enable = true;
statusline = {
right = [
"version-control"
@@ -52,8 +29,9 @@ "position"
"file-encoding"
];
};
- version = "0.2.334";
+{pkgs ? import <nixpkgs> {}}: let
repo = "templ";
+ templ = pkgs.buildGoModule rec {
};
keys = {
normal = {
@@ -180,13 +158,6 @@ name = "go";
formatter = {
command = "sh";
args = ["-c" "set -o pipefail; ${gotools}/bin/goimports | ${gofumpt}/bin/gofumpt"];
- };
- }
- {
- name = "lua";
- formatter = with nodePackages; {
- command = "${lua-fmt}/bin/luafmt";
- args = ["--stdin"];
};
}
{
diff --git a/flake.lock b/flake.lock
index 0d1df4988dd5ce40e75d36e710af586c21a63708..b8cc80555d5aa320b0e23c9a819c3e391b30ffc8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,12 @@ {
"nodes": {
"nixpkgs": {
"locked": {
+ "lastModified": 1708001613,
+ "nodes": {
"lastModified": 1699343069,
- "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d",
+ "rev": "085589047343aad800c4d305cf7b98e8a3d51ae2",
"type": "github"
},
"original": {