From 2a48b68ff25828121be3bd964233d9bc5e3c637f Mon Sep 17 00:00:00 2001 From: rasmus-kirk Date: Sat, 26 Oct 2024 08:33:33 +0000 Subject: [PATCH] Updated flake --- .helix/languages.toml | 6 ++++++ flake.lock | 12 +++++------- flake.nix | 18 +++++------------- 3 files changed, 16 insertions(+), 20 deletions(-) create mode 100644 .helix/languages.toml diff --git a/.helix/languages.toml b/.helix/languages.toml new file mode 100644 index 0000000..1579820 --- /dev/null +++ b/.helix/languages.toml @@ -0,0 +1,6 @@ +[[language]] +name = "nix" +language-servers = [ "nixd" ] + +[language-server.nixd] +command = "nixd" diff --git a/flake.lock b/flake.lock index ef7f8b9..6ea6013 100644 --- a/flake.lock +++ b/flake.lock @@ -3,15 +3,16 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ + "vpnconfinement", "nixpkgs" ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -38,7 +39,6 @@ }, "root": { "inputs": { - "flake-parts": "flake-parts", "nixpkgs": "nixpkgs", "submerger": "submerger", "vpnconfinement": "vpnconfinement" @@ -88,9 +88,7 @@ }, "vpnconfinement": { "inputs": { - "flake-parts": [ - "flake-parts" - ], + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index cd260de..844e846 100644 --- a/flake.nix +++ b/flake.nix @@ -1,11 +1,6 @@ { description = "The Nixarr Media Server Nixos Module"; - nixConfig = { - extra-substituters = ["https://nix-community.cachix.org"]; - extra-trusted-public-keys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="]; - }; - inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; @@ -46,19 +41,16 @@ default = pkgs.mkShell { packages = with pkgs; [ alejandra + nixd ]; }; }); - packages = forAllSystems ({ pkgs } : { - default = pkgs.mkShell rec { - docs = pkgs.callPackage ./mkDocs.nix {inherit inputs;}; - default = docs; - }; + packages = forAllSystems ({ pkgs } : rec { + docs = pkgs.callPackage ./mkDocs.nix {inherit inputs;}; + default = docs; }); - formatters = forAllSystems ({ pkgs } : { - default = pkgs.alejandra; - }); + formatter = forAllSystems ({pkgs}: pkgs.alejandra); }; }