From 0005228f2a64bd36ca3a926859f9ae16a1f4e114 Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Thu, 15 Feb 2024 19:24:20 +0100 Subject: [PATCH] resolved config; nixvim: remove depr. options --- flake.lock | 42 ++++++++++++++++++++-------------------- home/modules/nixvim.nix | 9 --------- hosts/lilith/default.nix | 8 ++++---- 3 files changed, 25 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index f7c7dff..d7743a6 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1707816110, - "narHash": "sha256-pyEubQVR0ccPcTyOytpH9WjF6NB+Vvnzon1y9eZVXzM=", + "lastModified": 1707969829, + "narHash": "sha256-3OGHlhhJwM9o7Tl1vbC6ehvMZAcGvEhOsd8RKY93VR4=", "owner": "rycee", "repo": "nur-expressions", - "rev": "0baeda8baf7638873038057945f8c6a5e77927cb", + "rev": "d6054eda1bec2eef94411d88c09f20541ce478a7", "type": "gitlab" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1707683400, - "narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=", + "lastModified": 1707919853, + "narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=", "owner": "nix-community", "repo": "home-manager", - "rev": "21b078306a2ab68748abf72650db313d646cf2ca", + "rev": "043ba285c6dc20f36441d48525402bcb9743c498", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1707467182, - "narHash": "sha256-/Bw/xgCXfj4nXDd8Xq+r1kaorfsYkkomMf5w5MpsDyA=", + "lastModified": 1707919853, + "narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=", "owner": "nix-community", "repo": "home-manager", - "rev": "5b9156fa9a8b8beba917b8f9adbfd27bf63e16af", + "rev": "043ba285c6dc20f36441d48525402bcb9743c498", "type": "github" }, "original": { @@ -181,11 +181,11 @@ ] }, "locked": { - "lastModified": 1706833576, - "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=", + "lastModified": 1707707289, + "narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7", + "rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1707689078, - "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=", + "lastModified": 1707956935, + "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8", + "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1707689078, - "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=", + "lastModified": 1707956935, + "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8", + "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", "type": "github" }, "original": { @@ -269,11 +269,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1707839619, - "narHash": "sha256-s4/sa1ubbbqL3Cksk2isMqJ5cgeHygARBTlr4AvJRTQ=", + "lastModified": 1708003742, + "narHash": "sha256-Y2ET4HnijBUhVww5qs7bA076UyJq2X1zyKiTTcVP3x8=", "owner": "nix-community", "repo": "nixvim", - "rev": "3f12558d495ac34ee053b6c778f60f921de95dd8", + "rev": "2594863af79adcd140a80e8b1008333198d70830", "type": "github" }, "original": { diff --git a/home/modules/nixvim.nix b/home/modules/nixvim.nix index fd5ceb5..d43c48a 100644 --- a/home/modules/nixvim.nix +++ b/home/modules/nixvim.nix @@ -31,7 +31,6 @@ eslint.enable = true; rust-analyzer = { enable = true; - installLanguageServer = false; installCargo = false; installRustc = false; }; @@ -53,14 +52,6 @@ navigation.enable = true; }; cursorline.enable = true; - #nvim-cmp = { - # enable = true; - # sources = [ - # {name = "nvim_lsp";} - # {name = "path";} - # {name = "buffer";} - # ]; - #}; nvim-cmp = { enable = true; autoEnableSources = true; diff --git a/hosts/lilith/default.nix b/hosts/lilith/default.nix index e227212..045d46b 100644 --- a/hosts/lilith/default.nix +++ b/hosts/lilith/default.nix @@ -169,17 +169,17 @@ }; networking.nameservers = [ - "9.9.9.9#nine.nine.nine.nine" + #"9.9.9.9#nine.nine.nine.nine" "1.1.1.1#one.one.one.one" "1.0.0.1#one.zero.zero.one" ]; services.resolved = { enable = true; - dnssec = "true"; + #dnssec = "true"; domains = [ "~." ]; - fallbackDns = ["9.9.9.9#nine.nine.nine.nine"]; + fallbackDns = ["1.1.1.1#one.one.one.one"]; extraConfig = '' - DNSOverTLS=yes + MulticastDNS=yes ''; }; #networking.wireguard.enable = true;