diff --git a/flake.lock b/flake.lock index 2de6960..974dc05 100644 --- a/flake.lock +++ b/flake.lock @@ -260,11 +260,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728067476, - "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=", + "lastModified": 1727907660, + "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030", + "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", "type": "github" }, "original": { @@ -292,11 +292,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728145679, - "narHash": "sha256-qd1nr2b+WUiyzJva650LBX/3hDBru0ZSVxKHSm1BE0w=", + "lastModified": 1727871072, + "narHash": "sha256-t+YLQwBB1soQnVjT6d7nQq4Tidaw7tpB8i6Zvpc+Zbs=", "owner": "nix-community", "repo": "nixvim", - "rev": "6594472fd275f6dcf5a9fba4a83d2f7fa2cf2b8a", + "rev": "0ca98d02104f7f0a703787a7a080a570b7f1bedd", "type": "github" }, "original": { @@ -373,11 +373,11 @@ ] }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1727431250, + "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", "type": "github" }, "original": { @@ -388,11 +388,11 @@ }, "unstable": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { diff --git a/home/options.nix b/home/options.nix index 9b44f43..e758c65 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" [ - # FIXME: readd on new lix version with fix [ "devenv" ] # a devshell alternative + [ "devenv" ] # a devshell alternative [ "jq" ] # json parser [ "just" ] # just a command runner [ "typos" ] # low false positive rate typo checker diff --git a/nvim/extraPlugins/generated.nix b/nvim/extraPlugins/generated.nix index 4267687..9771550 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-08-31"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "michaelrommel"; repo = "nvim-silicon"; - rev = "9fe6001dc8cad4d9c53bcfc8649e3dc76ffa169c"; - sha256 = "1qczi06yndkr2pmwidlkgmk0395x189sznvscn4fnr96jx58j5yl"; + rev = "feb882f04c992b797daa118101a239fb3bedfc04"; + sha256 = "03dy4q2dbgiyydi9wvpij6s2aggdpr3lgd9cqqv0i2m1m0qb9gad"; }; meta.homepage = "https://github.com/michaelrommel/nvim-silicon/"; }; diff --git a/nvim/plugins.nix b/nvim/plugins.nix index 9db807f..f4b0dd1 100644 --- a/nvim/plugins.nix +++ b/nvim/plugins.nix @@ -205,7 +205,6 @@ in mode = "symbol"; extraOptions.maxwidth = 50; }; - lsp-lines.enable = true; lualine = { enable = true; settings.options.theme = lib.mkForce "gruvbox"; diff --git a/nvim/standalone.nix b/nvim/standalone.nix index 155d91b..b786eac 100644 --- a/nvim/standalone.nix +++ b/nvim/standalone.nix @@ -53,11 +53,13 @@ ]; # 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