Replace rnix-lsp with nil

This commit is contained in:
Natsu Kagami 2023-12-10 01:58:58 +01:00
parent 61c02e0a02
commit 4c491f359c
Signed by: nki
GPG key ID: 55A032EB38B49ADB
5 changed files with 3 additions and 79 deletions

77
flake.lock generated
View file

@ -816,27 +816,6 @@
} }
}, },
"naersk_2": { "naersk_2": {
"inputs": {
"nixpkgs": [
"rnix-lsp",
"nixpkgs"
]
},
"locked": {
"lastModified": 1655042882,
"narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=",
"owner": "nix-community",
"repo": "naersk",
"rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github"
}
},
"naersk_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"youmubot", "youmubot",
@ -999,22 +978,6 @@
} }
}, },
"nixpkgs_11": { "nixpkgs_11": {
"locked": {
"lastModified": 1656753965,
"narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1685533922, "lastModified": 1685533922,
"narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=", "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=",
@ -1201,26 +1164,6 @@
"type": "github" "type": "github"
} }
}, },
"rnix-lsp": {
"inputs": {
"naersk": "naersk_2",
"nixpkgs": "nixpkgs_11",
"utils": "utils_2"
},
"locked": {
"lastModified": 1669555118,
"narHash": "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=",
"owner": "nix-community",
"repo": "rnix-lsp",
"rev": "95d40673fe43642e2e1144341e86d0036abd95d9",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "rnix-lsp",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"arion": "arion", "arion": "arion",
@ -1241,7 +1184,6 @@
"nixpkgs": "nixpkgs_10", "nixpkgs": "nixpkgs_10",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur", "nur": "nur",
"rnix-lsp": "rnix-lsp",
"secrets": "secrets", "secrets": "secrets",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"swayfx": "swayfx", "swayfx": "swayfx",
@ -1577,26 +1519,11 @@
"type": "github" "type": "github"
} }
}, },
"utils_2": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"youmubot": { "youmubot": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_10", "flake-utils": "flake-utils_10",
"naersk": "naersk_3", "naersk": "naersk_2",
"nixpkgs": "nixpkgs_12" "nixpkgs": "nixpkgs_11"
}, },
"locked": { "locked": {
"lastModified": 1701010022, "lastModified": 1701010022,

View file

@ -27,7 +27,6 @@
# --- # ---
# Imported apps # Imported apps
rnix-lsp.url = "github:nix-community/rnix-lsp";
youmubot.url = "github:natsukagami/youmubot"; youmubot.url = "github:natsukagami/youmubot";
swayfx = { swayfx = {
url = github:WillPower3309/swayfx; url = github:WillPower3309/swayfx;

View file

@ -42,7 +42,6 @@ in
yarn yarn
## Nix ## Nix
cachix cachix
rnix-lsp
## Latex ## Latex
tectonic tectonic
texlab texlab

View file

@ -106,7 +106,7 @@ let
roots = [ "*.nimble" ".git" ]; roots = [ "*.nimble" ".git" ];
}; };
nix = { nix = {
command = "rnix-lsp"; command = "${pkgs.nil}/bin/nil";
filetypes = [ "nix" ]; filetypes = [ "nix" ];
roots = [ "flake.nix" "shell.nix" ".git" ]; roots = [ "flake.nix" "shell.nix" ".git" ];
}; };

View file

@ -13,7 +13,6 @@ let
typst-lsp = final.unstable.typst-lsp; typst-lsp = final.unstable.typst-lsp;
}; };
overlay-imported = final: prev: { overlay-imported = final: prev: {
rnix-lsp = inputs.rnix-lsp.defaultPackage."${final.system}";
sway = prev.sway.override { sway-unwrapped = final.swayfx-unwrapped; }; sway = prev.sway.override { sway-unwrapped = final.swayfx-unwrapped; };
deploy-rs = inputs.deploy-rs.packages.default; deploy-rs = inputs.deploy-rs.packages.default;
dtth-phanpy = inputs.dtth-phanpy.packages.${final.system}.default; dtth-phanpy = inputs.dtth-phanpy.packages.${final.system}.default;