From 68572b7a042818bc3f31bd2fe2ef2bdbb2995cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sat, 5 Oct 2024 03:04:23 +0200 Subject: [PATCH 1/6] [chore] flake.lock: update inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/1719f27dd95fd4206afb9cec9f415b539978827e' (2024-09-30) → 'github:NixOS/nixpkgs/5966581aa04be7eff830b9e1457d56dc70a0b798' (2024-10-02) • Updated input 'nixvim': 'github:nix-community/nixvim/5f4a4b47597d3b9ac26c41ff4e8da28fa662f200' (2024-09-29) → 'github:nix-community/nixvim/0ca98d02104f7f0a703787a7a080a570b7f1bedd' (2024-10-02) • Updated input 'unstable': 'github:NixOS/nixpkgs/06cf0e1da4208d3766d898b7fdab6513366d45b9' (2024-09-29) → 'github:NixOS/nixpkgs/27e30d177e57d912d614c88c622dcfdb2e6e6515' (2024-10-01) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index d72406f..974dc05 100644 --- a/flake.lock +++ b/flake.lock @@ -260,11 +260,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "lastModified": 1727907660, + "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", "type": "github" }, "original": { @@ -292,11 +292,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727645871, - "narHash": "sha256-Os3PAThU5XliKkKa+SHsFyV/EsCHogHcYONmpzb6500=", + "lastModified": 1727871072, + "narHash": "sha256-t+YLQwBB1soQnVjT6d7nQq4Tidaw7tpB8i6Zvpc+Zbs=", "owner": "nix-community", "repo": "nixvim", - "rev": "5f4a4b47597d3b9ac26c41ff4e8da28fa662f200", + "rev": "0ca98d02104f7f0a703787a7a080a570b7f1bedd", "type": "github" }, "original": { @@ -388,11 +388,11 @@ }, "unstable": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { From 9ea7a2248ffee28efcc48d37fc3e8874f8fd6e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sat, 5 Oct 2024 13:53:49 +0200 Subject: [PATCH 2/6] fix(devenv): the new versions are incompatible with lix This incompatibility has been fixed, but no new version of lix has been released. --- home/options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/options.nix b/home/options.nix index e758c65..9b44f43 100644 --- a/home/options.nix +++ b/home/options.nix @@ -193,7 +193,7 @@ in }; neovimAsManPager = lib.mkEnableOption "neovim as the man pager"; extraPackages = mkExtraPackagesOption "dev" [ - [ "devenv" ] # a devshell alternative + # FIXME: readd on new lix version with fix [ "devenv" ] # a devshell alternative [ "jq" ] # json parser [ "just" ] # just a command runner [ "typos" ] # low false positive rate typo checker From fd2f052420fa51e31c3e72ccc50c1effa1cd6d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sat, 5 Oct 2024 22:37:58 +0200 Subject: [PATCH 3/6] chore(nvim): update vendored plugins --- nvim/extraPlugins/generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nvim/extraPlugins/generated.nix b/nvim/extraPlugins/generated.nix index 9771550..4267687 100644 --- a/nvim/extraPlugins/generated.nix +++ b/nvim/extraPlugins/generated.nix @@ -10,12 +10,12 @@ final: prev: { nvim-silicon = buildVimPlugin { pname = "nvim-silicon"; - version = "2024-07-30"; + version = "2024-08-31"; src = fetchFromGitHub { owner = "michaelrommel"; repo = "nvim-silicon"; - rev = "feb882f04c992b797daa118101a239fb3bedfc04"; - sha256 = "03dy4q2dbgiyydi9wvpij6s2aggdpr3lgd9cqqv0i2m1m0qb9gad"; + rev = "9fe6001dc8cad4d9c53bcfc8649e3dc76ffa169c"; + sha256 = "1qczi06yndkr2pmwidlkgmk0395x189sznvscn4fnr96jx58j5yl"; }; meta.homepage = "https://github.com/michaelrommel/nvim-silicon/"; }; From 78d61c2dba3cff52cdf609f64c78c401a05f10f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sat, 5 Oct 2024 22:37:58 +0200 Subject: [PATCH 4/6] fix(nvim): pull silicon from unstable, it has been fixed --- nvim/standalone.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nvim/standalone.nix b/nvim/standalone.nix index b786eac..155d91b 100644 --- a/nvim/standalone.nix +++ b/nvim/standalone.nix @@ -53,13 +53,11 @@ ]; # Formatting & linters extraPackages = [ - # Rust 1.80.0 broke it, waiting for https://github.com/Aloxaf/silicon/pull/254 to be accepted - pkgs.silicon - pkgs.unstable.alejandra pkgs.unstable.luajitPackages.jsregexp + pkgs.unstable.shfmt + pkgs.unstable.silicon pkgs.unstable.statix pkgs.unstable.stylua - pkgs.unstable.shfmt pkgs.unstable.taplo pkgs.unstable.typos pkgs.unstable.yamlfmt From 215b8f99e53629c87c70ecbae70ed41188ecf3cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sat, 5 Oct 2024 22:37:58 +0200 Subject: [PATCH 5/6] feat(nvim): enable lsp-lines Pretty lines when lsp-ing --- nvim/plugins.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nvim/plugins.nix b/nvim/plugins.nix index f4b0dd1..9db807f 100644 --- a/nvim/plugins.nix +++ b/nvim/plugins.nix @@ -205,6 +205,7 @@ in mode = "symbol"; extraOptions.maxwidth = 50; }; + lsp-lines.enable = true; lualine = { enable = true; settings.options.theme = lib.mkForce "gruvbox"; From f3c04248cf7bbc9ac9f17d21ee78c132021a80da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 6 Oct 2024 03:04:55 +0200 Subject: [PATCH 6/6] [chore] flake.lock: update inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/1719f27dd95fd4206afb9cec9f415b539978827e' (2024-09-30) → 'github:NixOS/nixpkgs/6e6b3dd395c3b1eb9be9f2d096383a8d05add030' (2024-10-04) • Updated input 'nixvim': 'github:nix-community/nixvim/5f4a4b47597d3b9ac26c41ff4e8da28fa662f200' (2024-09-29) → 'github:nix-community/nixvim/6594472fd275f6dcf5a9fba4a83d2f7fa2cf2b8a' (2024-10-05) • Updated input 'nixvim/treefmt-nix': 'github:numtide/treefmt-nix/879b29ae9a0378904fbbefe0dadaed43c8905754' (2024-09-27) → 'github:numtide/treefmt-nix/4446c7a6fc0775df028c5a3f6727945ba8400e64' (2024-10-03) • Updated input 'unstable': 'github:NixOS/nixpkgs/06cf0e1da4208d3766d898b7fdab6513366d45b9' (2024-09-29) → 'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb' (2024-10-04) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index d72406f..2de6960 100644 --- a/flake.lock +++ b/flake.lock @@ -260,11 +260,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "lastModified": 1728067476, + "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030", "type": "github" }, "original": { @@ -292,11 +292,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727645871, - "narHash": "sha256-Os3PAThU5XliKkKa+SHsFyV/EsCHogHcYONmpzb6500=", + "lastModified": 1728145679, + "narHash": "sha256-qd1nr2b+WUiyzJva650LBX/3hDBru0ZSVxKHSm1BE0w=", "owner": "nix-community", "repo": "nixvim", - "rev": "5f4a4b47597d3b9ac26c41ff4e8da28fa662f200", + "rev": "6594472fd275f6dcf5a9fba4a83d2f7fa2cf2b8a", "type": "github" }, "original": { @@ -373,11 +373,11 @@ ] }, "locked": { - "lastModified": 1727431250, - "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": { @@ -388,11 +388,11 @@ }, "unstable": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": {