From af80cf73dbaff1eb8a9a354d323f761402e281bd Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Mon, 9 Oct 2023 23:37:08 +0200 Subject: [PATCH] helix got fixed upstream --- flake.lock | 163 ++----------------------- flake.nix | 1 - hosts/nuc/modules/networks/default.nix | 1 + users/rouven/modules/helix/default.nix | 26 ++-- 4 files changed, 31 insertions(+), 160 deletions(-) diff --git a/flake.lock b/flake.lock index ab2331e..3a2a7a7 100644 --- a/flake.lock +++ b/flake.lock @@ -17,36 +17,6 @@ } }, "crane": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": [ - "helix", - "flake-utils" - ], - "nixpkgs": [ - "helix", - "nixpkgs" - ], - "rust-overlay": [ - "helix", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1688772518, - "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", - "owner": "ipetkov", - "repo": "crane", - "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { "inputs": { "flake-compat": [ "lanzaboote", @@ -133,22 +103,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -174,24 +128,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -228,26 +164,6 @@ "type": "github" } }, - "helix": { - "inputs": { - "crane": "crane", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1696761261, - "narHash": "sha256-JZgJJU2rxnenCmt0z1WIl8iVhgbeH3zsoHOWnq/OB9M=", - "owner": "helix-editor", - "repo": "helix", - "rev": "bdf7937a599058daa168fa24b0f52c06d4259cf7", - "type": "github" - }, - "original": { - "id": "helix", - "type": "indirect" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -305,15 +221,15 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_3", + "crane": "crane", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1682802423, @@ -385,18 +301,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1690272529, - "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=", - "owner": "nixos", + "lastModified": 1696604326, + "narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c", + "rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64", "type": "github" }, "original": { - "owner": "nixos", + "id": "nixpkgs", "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "indirect" } }, "nixpkgs-lib": { @@ -446,21 +361,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1696604326, - "narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "pfersel": { "inputs": { "nixpkgs": [ @@ -535,14 +435,13 @@ "root": { "inputs": { "deploy-rs": "deploy-rs", - "helix": "helix", "home-manager": "home-manager", "impermanence": "impermanence", "lanzaboote": "lanzaboote", "nix-colors": "nix-colors", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pfersel": "pfersel", "purge": "purge", "sops-nix": "sops-nix", @@ -550,31 +449,6 @@ } }, "rust-overlay": { - "inputs": { - "flake-utils": [ - "helix", - "flake-utils" - ], - "nixpkgs": [ - "helix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1690424156, - "narHash": "sha256-Bpml+L280tHTQpwpC5/BJbU4HSvEzMvW8IZ4gAXimhE=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "f335a0213504c7e6481c359dc1009be9cf34432c", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "flake-utils": [ "lanzaboote", @@ -634,21 +508,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "trucksimulatorbot": { "inputs": { "images": "images", diff --git a/flake.nix b/flake.nix index 551eb07..ae51d7e 100644 --- a/flake.nix +++ b/flake.nix @@ -63,7 +63,6 @@ , purge , trucksimulatorbot , pfersel - , helix , ... }@attrs: { packages.x86_64-linux = { diff --git a/hosts/nuc/modules/networks/default.nix b/hosts/nuc/modules/networks/default.nix index 7e45280..c108bf3 100644 --- a/hosts/nuc/modules/networks/default.nix +++ b/hosts/nuc/modules/networks/default.nix @@ -6,6 +6,7 @@ useNetworkd = true; enableIPv6 = true; }; + services.lldpd.enable = true; services.resolved = { enable = true; dnssec = "true"; diff --git a/users/rouven/modules/helix/default.nix b/users/rouven/modules/helix/default.nix index 3474a42..3e7582e 100644 --- a/users/rouven/modules/helix/default.nix +++ b/users/rouven/modules/helix/default.nix @@ -1,4 +1,4 @@ -{ pkgs, helix, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ gdb @@ -24,20 +24,32 @@ ]; programs.helix = { enable = true; - # pull helix from the flake to fix random coredumps - package = helix.packages.x86_64-linux.default; + + ## use after helix update + # languages = { + # language-server.rnix-lsp = { + # command = "rnix-lsp"; + # }; + # language = [ + # { + # name = "nix"; + # auto-format = true; + # language-servers = [ "rnix-lsp" ]; + # } + # ]; + # }; + + ## old version languages = { - language-server.rnix-lsp = { - command = "rnix-lsp"; - }; language = [ { name = "nix"; auto-format = true; - language-servers = [ "rnix-lsp" ]; + language-server.command = "rnix-lsp"; } ]; }; + settings = { theme = "dracula"; editor = {