diff --git a/flake.lock b/flake.lock index df9abf5..079315d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1761605067, - "narHash": "sha256-XlXxfbRET+JrBLnnknmlO6rEazTe/S4Nycnkls6Oe0Q=", + "lastModified": 1759772810, + "narHash": "sha256-8/sO67+Q6yNfFD39W5SXQHDbf/tQUHWFhCdxgRRGVCQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8929c5ea8ff351a777bc983b0b8e0a46587e6909", + "rev": "2b78ecc45e163d655c08c9a4cffb4a91c66d0493", "type": "github" }, "original": { @@ -34,11 +34,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1761323006, - "narHash": "sha256-6BjkqZCo2DLVxW6BHyElt2cZdG6Dhzao8hPfWYm0sIQ=", + "lastModified": 1759715887, + "narHash": "sha256-9wXyswKnUenlZyO/aIy0gr1hF0IhuEJ0UOwvqjDSGjA=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "a7138a0ee04d8af42c262554eccee168bbf1454f", + "rev": "92f269971c33a6e2f405da8b14f01cd109b9a3a3", "type": "github" }, "original": { @@ -66,11 +66,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1761039842, - "narHash": "sha256-ovvtTZgqL6MFvuI3byx+boWm6ErZX06+v6a3VoctREc=", + "lastModified": 1759157591, + "narHash": "sha256-sicE0/Vgc03X+Qxqlu5CM7NGd+6FE9RGx6OjZUa6Umw=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "ccf25a5452b8697a823de3e5ecda63ed3d723b79", + "rev": "73813308abc2eaeff2bc0d3f2f79270c491be9d7", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1761343950, - "narHash": "sha256-HycEAgAsU8IxFiYfyp5ZGN+z6wYyCarIESxA9TDuJ3s=", + "lastModified": 1759424904, + "narHash": "sha256-Smt9v6/XyHUdUiIPyCPQSRvWCeMMhYITSZWd9M7Jlvs=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "bfd67f1402b97ac619cb538f4bbaed12a7fa89aa", + "rev": "7e6af36c846017122e07e68803bbf95f3c729ca3", "type": "github" }, "original": { @@ -162,11 +162,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1761343239, - "narHash": "sha256-obGnux+K0blHROEOAy7Ct18vxiO4Qez8XJB5l23KgMs=", + "lastModified": 1759454886, + "narHash": "sha256-T6mWvScsU0IsB3wFre5+TrNIbpQCA0flf7BNrGQIb+M=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "4341619da06779ae310ee9c3d6d70edfefed7152", + "rev": "8e17e50b519ba360bcfd5dfb5843ccac9be500ba", "type": "github" }, "original": { @@ -178,11 +178,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1761396780, - "narHash": "sha256-Nz/XbItShbrnKtj0+gcEDBFO5y00g0EG5CHqdJGK2j0=", + "lastModified": 1759668198, + "narHash": "sha256-WmWGygttH78KajAaIvlwRW47G7UGJuPV0YIfEZkse6I=", "owner": "catppuccin", "repo": "nvim", - "rev": "8c4125e3c746976ba025dc5d908fa22c6aa09486", + "rev": "e79d09fa347b367e0e7f693bfe87dba932a8cbd1", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1760385962, - "narHash": "sha256-PtpD6Uc4GK4dSJynWH5d6c7XOWXfYODXJ3FyOY1eZNo=", + "lastModified": 1757363000, + "narHash": "sha256-hfoJDD4ZKIx1IZjmZba117wRe3ELyGqG8ZqxDnRVmIk=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "9109589b542773c9ad2a34067a085874f255577b", + "rev": "14aba23ce4168e6d6acbf78ab1d33739c3894f68", "type": "github" }, "original": { @@ -226,11 +226,11 @@ "nvim_plugin-folke/lazy.nvim": { "flake": false, "locked": { - "lastModified": 1761488113, - "narHash": "sha256-jBmtFzzdGYe3N3kvWHvR7FGXtA+/t36efxsAqhLmaxU=", + "lastModified": 1759439283, + "narHash": "sha256-FjQ2rj3BvC8fh60IT0ExrBOmdDLdXFexffef6iKcPFQ=", "owner": "folke", "repo": "lazy.nvim", - "rev": "ed4dc336a73c18da6fea6e1cf7ad6e1b76d281eb", + "rev": "59334064f8604ca073791c25dcc5c9698865406e", "type": "github" }, "original": { @@ -258,11 +258,11 @@ "nvim_plugin-folke/which-key.nvim": { "flake": false, "locked": { - "lastModified": 1759952076, - "narHash": "sha256-N31+V5L0gd+TUo9nVtNGRmMVmM9fMxOwldCfuLYT4hU=", + "lastModified": 1758639622, + "narHash": "sha256-JNkjlv6QpnuaYCAFcBPjV7IavVLzj8QEX/Zi3sbdyrU=", "owner": "folke", "repo": "which-key.nvim", - "rev": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00", + "rev": "904308e6885bbb7b60714c80ab3daf0c071c1492", "type": "github" }, "original": { @@ -322,11 +322,11 @@ "nvim_plugin-hrsh7th/nvim-cmp": { "flake": false, "locked": { - "lastModified": 1760792454, - "narHash": "sha256-wkESSNUViVI5DE+3t4AVTaSLQ/hTB43vrm+PH6uA8H4=", + "lastModified": 1744514599, + "narHash": "sha256-l5z+PT4S9b09d2M+J/tHVd9W9Ss3eQQk5Ykpz2Qjxxw=", "owner": "hrsh7th", "repo": "nvim-cmp", - "rev": "a7bcf1d88069fc67c9ace8a62ba480b8fe879025", + "rev": "b5311ab3ed9c846b585c0c15b7559be131ec4be9", "type": "github" }, "original": { @@ -338,11 +338,11 @@ "nvim_plugin-j-hui/fidget.nvim": { "flake": false, "locked": { - "lastModified": 1761243883, - "narHash": "sha256-XXTeJweQRIsC/WFhFxFbepOETV8e5Wfmh513su2Wve0=", + "lastModified": 1758578970, + "narHash": "sha256-ieY3zaQAydzadpPiW1/IYakVHhp+wyEOpCQntgDOObs=", "owner": "j-hui", "repo": "fidget.nvim", - "rev": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a", + "rev": "3f5475949679953af6d78654db29b944fa826e6a", "type": "github" }, "original": { @@ -370,11 +370,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1760888451, - "narHash": "sha256-eGpB7YYWbyCCGYXEYAM432srSp/lUo5C1b0J3OYjwnY=", + "lastModified": 1759324477, + "narHash": "sha256-GDK9I3SNRyZe59+GsnDC0L2KjGr150dWo4S3DUwhT7U=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "20ad4419564d6e22b189f6738116b38871082332", + "rev": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197", "type": "github" }, "original": { @@ -450,11 +450,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1759852544, - "narHash": "sha256-wVEX0lCxeipvwCfdd2JbQwnhgg6UrTXixC8E1OiEblI=", + "lastModified": 1758714671, + "narHash": "sha256-POnQfsZAv93+0uCbKFcNgyQxn3u8nNqgnx0uTqCkCq8=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb", + "rev": "335a6044be16d7701001059cba9baa36fbeef422", "type": "github" }, "original": { @@ -466,11 +466,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1761585884, - "narHash": "sha256-m/gd+cb7X2a7R6JSbHes0QjGs+zuj4698Qyi/OW0R1g=", + "lastModified": 1759623626, + "narHash": "sha256-Cz4LDzz7v3kBS1mbxZjprogqHFghYr5xMfSN3us2Ltk=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "be0d1d14b8504c1c0965b608dc7ed39f2d588c91", + "rev": "96a4f5efc7705f613ddd47fb5d1445c172acb213", "type": "github" }, "original": { @@ -482,11 +482,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1761605346, - "narHash": "sha256-3Aulaw6KMmrcoQQxhRhQhjZ2fg6MSU4Q7qAWtrVsOcA=", + "lastModified": 1759548517, + "narHash": "sha256-K56vjTUkQ/NdA6vq5942zUknPiCUbMByiEW540dR8R0=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "2b52bc2190c8efde2e4de02d829a138666774c7c", + "rev": "e688b486fe9291f151eae7e5c0b5a5c4ef980847", "type": "github" }, "original": { @@ -546,11 +546,11 @@ "nvim_plugin-nvim-lualine/lualine.nvim": { "flake": false, "locked": { - "lastModified": 1760596863, - "narHash": "sha256-hdrAdG3hC2sAevQ6a9xizqPgEgnNKxuc5rBYn0pKM1c=", + "lastModified": 1754970649, + "narHash": "sha256-lWt2kpW+hsTMWt8tar/+AISTDrIt4Jn27NmI9j+Xt4s=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "3946f0122255bc377d14a59b27b609fb3ab25768", + "rev": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955", "type": "github" }, "original": { @@ -626,11 +626,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1760921408, - "narHash": "sha256-QCUp/6qX/FS8LrZ6K+pvC/mHkYW8xfzQZEB2y0VOStQ=", + "lastModified": 1759222332, + "narHash": "sha256-TmQd8Xx9xw3G9PfPH+DZeSECfiUoO7XKCUSyQ4O0hMk=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "64e2192f5250796aa4a7f33c6ad888515af50640", + "rev": "87d096a39cb2d5d43e6771563575ff042a79f48b", "type": "github" }, "original": { @@ -642,11 +642,11 @@ "nvim_plugin-nvim-tree/nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1761440007, - "narHash": "sha256-klBjUtj0AvarN5a6O8Hh2t5BuOTe/m3ps2cHnlxVJvE=", + "lastModified": 1759188261, + "narHash": "sha256-lVrakFrpIP9lp7sMfMb33KeMPIkcn1qBFVytJzKCfuE=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "8dcb311b0c92d460fac00eac706abd43d94d68af", + "rev": "b8221e42cf7287c4dcde81f232f58d7b947c210d", "type": "github" }, "original": { @@ -658,11 +658,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1761077440, - "narHash": "sha256-QdZstxKsEILwe7eUZCmMdyLPyvNKc/e7cfdYQowHWPQ=", + "lastModified": 1757521884, + "narHash": "sha256-+yj8bstmffVByX3Z/1vkUYdXvpmWGbPt+RDfkBnV11w=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "ec308c7827b5f8cb2dd0ad303a059c945dd21969", + "rev": "41847d3dafb5004464708a3db06b14f12bde548a", "type": "github" }, "original": { @@ -706,11 +706,11 @@ "nvim_plugin-rmagatti/auto-session": { "flake": false, "locked": { - "lastModified": 1761491368, - "narHash": "sha256-F2MtkBCVAObRwniSvFjv5MmYnCaj1YSUf0Nk5MF1F4Y=", + "lastModified": 1759618137, + "narHash": "sha256-+RYQi685tyV73WNXpgr/Q5p3o21dSUkQmSoif+EPBVM=", "owner": "rmagatti", "repo": "auto-session", - "rev": "f0eb3d69848389869572b82b336d7a6887e88e43", + "rev": "0385a9ad378d70608c2e6e4c14b3b126ce30fc51", "type": "github" }, "original": { @@ -719,7 +719,7 @@ "type": "github" } }, - "nvim_plugin-ron-rs/ron.vim": { + "nvim_plugin-ron/ron.vim": { "flake": false, "locked": { "lastModified": 1660904719, @@ -770,11 +770,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1761160784, - "narHash": "sha256-yUUDxYuIjbFHUscEKpFV6IaraDNOA4hdcGljPHG/+sU=", + "lastModified": 1759554032, + "narHash": "sha256-JX+vFs+8n4PS7Xwq68MW2mjlDaLlUx6CxMqhf9ArfXQ=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "9fd3d5e0b689ec1bf400c53cbbec72c6fdf24081", + "rev": "9d859cbfbde7a1bd1770e7c97aef30ec5a237a71", "type": "github" }, "original": { @@ -882,11 +882,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1761595323, - "narHash": "sha256-KkiU2xmpfIbpuijvcXDw+LWKWuBgxjwY7jEQIasN5Kw=", + "lastModified": 1759697885, + "narHash": "sha256-PwqJ7/FCfK4AqFgguZ2Tac5RWhehSEfI1N6ySSuTbZc=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "93adf9844dcbe09a37e7a72eaa286d33d38bf628", + "rev": "30b98a4c25d6152c14084020f703b6d56e1f1122", "type": "github" }, "original": { @@ -942,7 +942,7 @@ "nvim_plugin-rafamadriz/friendly-snippets": "nvim_plugin-rafamadriz/friendly-snippets", "nvim_plugin-rcarriga/nvim-notify": "nvim_plugin-rcarriga/nvim-notify", "nvim_plugin-rmagatti/auto-session": "nvim_plugin-rmagatti/auto-session", - "nvim_plugin-ron-rs/ron.vim": "nvim_plugin-ron-rs/ron.vim", + "nvim_plugin-ron/ron.vim": "nvim_plugin-ron/ron.vim", "nvim_plugin-saadparwaiz1/cmp_luasnip": "nvim_plugin-saadparwaiz1/cmp_luasnip", "nvim_plugin-sindrets/diffview.nvim": "nvim_plugin-sindrets/diffview.nvim", "nvim_plugin-stevearc/conform.nvim": "nvim_plugin-stevearc/conform.nvim", @@ -963,11 +963,11 @@ ] }, "locked": { - "lastModified": 1761532837, - "narHash": "sha256-78mCSQgC/a6/0vWYrvE/g9E3gGsJLyBBGtmHe3ZOLG4=", + "lastModified": 1759718104, + "narHash": "sha256-TbkLsgdnXHUXR4gOQBmhxkEE9ne+eHmX1chZHWRogy0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4f5f89f1cfd8553b1285a4a0879ea1b2b05ad286", + "rev": "edea9f33f9a03f615ad3609a40fbcefe0ec835ca", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 348e44b..448c668 100644 --- a/flake.nix +++ b/flake.nix @@ -124,8 +124,8 @@ "nvim_plugin-Saecki/crates.nvim".flake = false; "nvim_plugin-rafamadriz/friendly-snippets".url = "github:rafamadriz/friendly-snippets"; "nvim_plugin-rafamadriz/friendly-snippets".flake = false; - "nvim_plugin-ron-rs/ron.vim".url = "github:ron-rs/ron.vim"; - "nvim_plugin-ron-rs/ron.vim".flake = false; + "nvim_plugin-ron/ron.vim".url = "github:ron-rs/ron.vim"; + "nvim_plugin-ron/ron.vim".flake = false; "nvim_plugin-nosduco/remote-sshfs.nvim".url = "github:nosduco/remote-sshfs.nvim"; "nvim_plugin-nosduco/remote-sshfs.nvim".flake = false; }; diff --git a/init.lua b/init.lua index a796a9c..103aee4 100644 --- a/init.lua +++ b/init.lua @@ -18,7 +18,7 @@ require("keymaps") -- When using nix, it will set lazy via LAZY env variable. local lazypath = vim.env.LAZY or (vim.fn.stdpath("data") .. "/lazy/lazy.nvim") -if not (vim.uv or vim.loop).fs_stat(lazypath) then +if not vim.loop.fs_stat(lazypath) then if NIX then error("LAZY environment variable to nix store was not found: " .. vim.env.LAZY) return diff --git a/lua/plugins/ron.lua b/lua/plugins/ron.lua index e179005..b1aae95 100644 --- a/lua/plugins/ron.lua +++ b/lua/plugins/ron.lua @@ -1,4 +1,4 @@ return { - "ron-rs/ron.vim", + "ron/ron.vim", lazy = false, } diff --git a/lua/tools/scratch-files.lua b/lua/tools/scratch-files.lua index c326a28..7614d0c 100644 --- a/lua/tools/scratch-files.lua +++ b/lua/tools/scratch-files.lua @@ -1,6 +1,5 @@ local extensions = { "json", - "jsonc", "sql", "html", "txt",