This commit is contained in:
RingOfStorms (Joshua Bell) 2024-11-12 09:41:21 -06:00
parent 15c7bb1506
commit e5d21c1a5e
3 changed files with 81 additions and 82 deletions

View file

@ -12,7 +12,7 @@ Old pre nix config: https://github.com/RingOfStorms/nvim/tree/40eadc9 for refere
### With Nix ### With Nix
```sh ```sh
nix run 'github:ringofstorms/nvim' nix run git+https://git.joshuabell.xyz/nvim
``` ```
in NixOS in NixOS
@ -20,8 +20,7 @@ in NixOS
```nix ```nix
-- in flake.nix#inputs -- in flake.nix#inputs
ringofstorms-nvim = { ringofstorms-nvim = {
url = "github:RingOfStorms/nvim"; url = "git+https://git.joshuabell.xyz/nvim";
inputs.nixpkgs.follows = "nixpkgs";
}; };
-- in nix module -- in nix module
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

156
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729231104, "lastModified": 1731425077,
"narHash": "sha256-bRfk5ns1kp+D9/ngAYm5RhT9f/egXkfL1Xhd5j0c0W8=", "narHash": "sha256-cpbqzVTq814fH5QK9Ry0iGEb8u//l0OCT90cQJOKHyU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ac76a342a8e881cfae21716a9ef0668422882837", "rev": "e6fa8c6399e996409853ae5e38b5fce1c44a06cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,11 +18,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1729044727, "lastModified": 1731239293,
"narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,11 +67,11 @@
"nvim_plugin-L3MON4D3/LuaSnip": { "nvim_plugin-L3MON4D3/LuaSnip": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726165831, "lastModified": 1731421019,
"narHash": "sha256-nkaa1NGOI28Et2QitQB+Spv+J42QVdHE1oywteLcJJw=", "narHash": "sha256-EBhlTaMs5ugDdA6WUcOWI2VL68BOruRUoiaMei4ECPQ=",
"owner": "L3MON4D3", "owner": "L3MON4D3",
"repo": "LuaSnip", "repo": "LuaSnip",
"rev": "e808bee352d1a6fcf902ca1a71cee76e60e24071", "rev": "659c4479529a05cc9b05ef762639a09d366cc690",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -83,11 +83,11 @@
"nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729200469, "lastModified": 1731358022,
"narHash": "sha256-SUuBju402ORBi9PlL5vcz/VHe0yyRB6MTnGEpm4bJtA=", "narHash": "sha256-Li0w+AHSGW/sRJDFGbXipKpWyG2EK1bummTDHMPkiCY=",
"owner": "MeanderingProgrammer", "owner": "MeanderingProgrammer",
"repo": "render-markdown.nvim", "repo": "render-markdown.nvim",
"rev": "bea6f2078e34abdf5c2632f593651bb13205477f", "rev": "78a2eb7fc273f36790aa390262f390a3265eedff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -163,11 +163,11 @@
"nvim_plugin-b0o/schemastore.nvim": { "nvim_plugin-b0o/schemastore.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729191636, "lastModified": 1731351639,
"narHash": "sha256-wmTJdOT7ZA17RJx5CDmqRIh4dSnx6AdlcopeTzNYnSs=", "narHash": "sha256-6jVbzYitS+gHIyuzfuQ2Q9Sujo+8m+PUKFuyfa/xcdI=",
"owner": "b0o", "owner": "b0o",
"repo": "schemastore.nvim", "repo": "schemastore.nvim",
"rev": "ee460baf4c8d29d051906d39b0e095289a3ddc9a", "rev": "64aed5788796d1f241da0afbd096e6dd649694bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -179,11 +179,11 @@
"nvim_plugin-catppuccin/nvim": { "nvim_plugin-catppuccin/nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1728131011, "lastModified": 1731169755,
"narHash": "sha256-j6F078taxuGzr3jngrc+Pc5I1kDdxTLMETgq6Xn4w/4=", "narHash": "sha256-lsnePejThsEygTCKV/rfJJ/h+RSrro91am841iznJe4=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nvim", "repo": "nvim",
"rev": "7be452ee067978cdc8b2c5f3411f0c71ffa612b9", "rev": "637d99e638bc6f1efedac582f6ccab08badac0c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,11 +227,11 @@
"nvim_plugin-folke/lazy.nvim": { "nvim_plugin-folke/lazy.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1727855684, "lastModified": 1731319679,
"narHash": "sha256-WI241RduX495zN/H1vltxNYC88TiDIJSFwZ5UmA+weU=", "narHash": "sha256-fxl5um2Dh7P5iCgGG0vXFKVZfor49djvcS/H9FPqLGg=",
"owner": "folke", "owner": "folke",
"repo": "lazy.nvim", "repo": "lazy.nvim",
"rev": "1159bdccd8910a0fd0914b24d6c3d186689023d9", "rev": "7967abe55752aa90532e6bb4bd4663fe27a264cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,11 +259,11 @@
"nvim_plugin-folke/which-key.nvim": { "nvim_plugin-folke/which-key.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1727856297, "lastModified": 1730919714,
"narHash": "sha256-crECQnWpptz1A/hOndHPEduK6MqWQH8kyf58h+4snHo=", "narHash": "sha256-5t6UnOP2+CXB55/C4YWbp2pE+xKDLMvCJK8m085Fk4w=",
"owner": "folke", "owner": "folke",
"repo": "which-key.nvim", "repo": "which-key.nvim",
"rev": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821", "rev": "68e37e12913a66b60073906f5d3f14dee0de19f2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,11 +323,11 @@
"nvim_plugin-hrsh7th/nvim-cmp": { "nvim_plugin-hrsh7th/nvim-cmp": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1722509464, "lastModified": 1730523275,
"narHash": "sha256-NcodgUp8obTsjgc+5j2dKr0f3FelYikQTJngfZXRZzo=", "narHash": "sha256-iNEoMl/X0nh2sAio1h+dkuobeOXRBXKFJCcElUyyW54=",
"owner": "hrsh7th", "owner": "hrsh7th",
"repo": "nvim-cmp", "repo": "nvim-cmp",
"rev": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30", "rev": "f17d9b4394027ff4442b298398dfcaab97e40c4f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -339,11 +339,11 @@
"nvim_plugin-j-hui/fidget.nvim": { "nvim_plugin-j-hui/fidget.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1720885602, "lastModified": 1730221432,
"narHash": "sha256-fjxdRN08BMU7jTWdhdzh8kW18ZURS9SJCwnTxuz6aFE=", "narHash": "sha256-fQBrkHV54TaOeLYQJ1DE+lr7SFDPN1yqSlzhFm26NAY=",
"owner": "j-hui", "owner": "j-hui",
"repo": "fidget.nvim", "repo": "fidget.nvim",
"rev": "d855eed8a06531a7e8fd0684889b2943f373c469", "rev": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -371,11 +371,11 @@
"nvim_plugin-lewis6991/gitsigns.nvim": { "nvim_plugin-lewis6991/gitsigns.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1727424886, "lastModified": 1730713501,
"narHash": "sha256-o2Y57z7IuIa9wvLlzyslcs3/+iaZzuqM1NImlKAPt5Y=", "narHash": "sha256-FHzufzeVrPnbU5j3UabVTCYXP+QNcb7gMgef0BmuclA=",
"owner": "lewis6991", "owner": "lewis6991",
"repo": "gitsigns.nvim", "repo": "gitsigns.nvim",
"rev": "863903631e676b33e8be2acb17512fdc1b80b4fb", "rev": "4daf7022f1481edf1e8fb9947df13bb07c18e89a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -403,11 +403,11 @@
"nvim_plugin-lukas-reineke/indent-blankline.nvim": { "nvim_plugin-lukas-reineke/indent-blankline.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1728270661, "lastModified": 1731320409,
"narHash": "sha256-OKtaibgT9uPQQmddfj7YKgAYc7lz4ne1dbUz9PdRAvA=", "narHash": "sha256-WVDNi/woG0ohPEYzM83mmXDCRNYnQbqooSDVUtBsJbY=",
"owner": "lukas-reineke", "owner": "lukas-reineke",
"repo": "indent-blankline.nvim", "repo": "indent-blankline.nvim",
"rev": "e7a4442e055ec953311e77791546238d1eaae507", "rev": "7871a88056f7144defca9c931e311a3134c5d509",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -467,11 +467,11 @@
"nvim_plugin-mfussenegger/nvim-lint": { "nvim_plugin-mfussenegger/nvim-lint": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729155978, "lastModified": 1730367889,
"narHash": "sha256-4sGU9yKrIJRlnyRGYVi2aNNycsS+KABTheNnawLGMM8=", "narHash": "sha256-vLsyRc8nbJJBjWebNFy5yrS6w2TmibEeMNpyzFenoTg=",
"owner": "mfussenegger", "owner": "mfussenegger",
"repo": "nvim-lint", "repo": "nvim-lint",
"rev": "16b21a7d04d06661f92f273a0744fd81fb19e09e", "rev": "36da8dd0ddc4f88e0beae234c20e75397326f143",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -483,11 +483,11 @@
"nvim_plugin-mrcjkb/rustaceanvim": { "nvim_plugin-mrcjkb/rustaceanvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729179129, "lastModified": 1731403165,
"narHash": "sha256-CTxEf7w2Pr24Q7QP8sXrq8Yx5eK/Qs0cykMF6gLUNN8=", "narHash": "sha256-W4gVCEneDgtLq/6n+iyxu2lULpjAy/aaBbMEosDGF9w=",
"owner": "mrcjkb", "owner": "mrcjkb",
"repo": "rustaceanvim", "repo": "rustaceanvim",
"rev": "6eb1c41463a0ad02a4fe799321cc7f651b87e576", "rev": "8ece53be36515cb9e76f3d03511643636469502d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -499,11 +499,11 @@
"nvim_plugin-neovim/nvim-lspconfig": { "nvim_plugin-neovim/nvim-lspconfig": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729055524, "lastModified": 1731401169,
"narHash": "sha256-f9CqwKBWZgC2ystm+g7FmsHR0fLcM6Wj+GkSwoUIanw=", "narHash": "sha256-JmNIK/es9svoi73OZXj50eJq+FD0ZBqWYjtcTU+KxUA=",
"owner": "neovim", "owner": "neovim",
"repo": "nvim-lspconfig", "repo": "nvim-lspconfig",
"rev": "541f3a2781de481bb84883889e4d9f0904250a56", "rev": "d2d153a179ed59aa7134d7ebdf4d7dcb156efa22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -531,11 +531,11 @@
"nvim_plugin-nvim-lualine/lualine.nvim": { "nvim_plugin-nvim-lualine/lualine.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723473562, "lastModified": 1731050126,
"narHash": "sha256-gCm7m96PkZyrgjmt7Efc+NMZKStAq1zr7JRCYOgGDuE=", "narHash": "sha256-IN6Qz3jGxUcylYiRTyd8j6me3pAoqJsJXtFUvph/6EI=",
"owner": "nvim-lualine", "owner": "nvim-lualine",
"repo": "lualine.nvim", "repo": "lualine.nvim",
"rev": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056", "rev": "2a5bae925481f999263d6f5ed8361baef8df4f83",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -547,11 +547,11 @@
"nvim_plugin-nvim-telescope/telescope-file-browser.nvim": { "nvim_plugin-nvim-telescope/telescope-file-browser.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726883879, "lastModified": 1729728595,
"narHash": "sha256-44o8sapjIdIJ+UJJH3X8mUcQjWXzOEI05kCFiVQrlO4=", "narHash": "sha256-VJbRi91TTOwUkQYyTM6Njl7MtX8/mOjINiqWYWEtyxg=",
"owner": "nvim-telescope", "owner": "nvim-telescope",
"repo": "telescope-file-browser.nvim", "repo": "telescope-file-browser.nvim",
"rev": "3b8a1e17187cfeedb31decbd625da62398a8ff34", "rev": "626998e5c1b71c130d8bc6cf7abb6709b98287bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -595,11 +595,11 @@
"nvim_plugin-nvim-telescope/telescope.nvim": { "nvim_plugin-nvim-telescope/telescope.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1728518892, "lastModified": 1730164948,
"narHash": "sha256-HWNfj3/b+CUFgWR26IzAuMzlSCEuiK/7n8tWHwqAAik=", "narHash": "sha256-Qa/f+0asQvA8mhIUajC4BGZCI92OqA6ySVoQSC3ZY3s=",
"owner": "nvim-telescope", "owner": "nvim-telescope",
"repo": "telescope.nvim", "repo": "telescope.nvim",
"rev": "df534c3042572fb958586facd02841e10186707c", "rev": "85922dde3767e01d42a08e750a773effbffaea3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -611,11 +611,11 @@
"nvim_plugin-nvim-tree/nvim-tree.lua": { "nvim_plugin-nvim-tree/nvim-tree.lua": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1728892603, "lastModified": 1731275826,
"narHash": "sha256-iYVsOpvKQpPSwVMVRqmKkfsjqU9lsBWWEVkqjT1pH18=", "narHash": "sha256-YIClwxyw4fNos5OIBZOjM0dlCw+yOhDDnq5jONSu7rs=",
"owner": "nvim-tree", "owner": "nvim-tree",
"repo": "nvim-tree.lua", "repo": "nvim-tree.lua",
"rev": "f5f67892996b280ae78b1b0a2d07c4fa29ae0905", "rev": "28eac2801b201f301449e976d7a9e8cfde053ba3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -643,11 +643,11 @@
"nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "nvim_plugin-nvim-treesitter/nvim-treesitter-context": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729198533, "lastModified": 1731163983,
"narHash": "sha256-2JAS86lxUuWVoJ3jJQh4gB0bGEY5jSDUVq1lQRyNhmw=", "narHash": "sha256-oRmhwRIynCNmgKpTtwUIliYf0Qo+zP3ymEWYs+vzx8A=",
"owner": "nvim-treesitter", "owner": "nvim-treesitter",
"repo": "nvim-treesitter-context", "repo": "nvim-treesitter-context",
"rev": "bf6386d9bbb9e53386987beb90264abd4faf5c74", "rev": "158377d700596367a91ea41818f76abdbf75a232",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -659,11 +659,11 @@
"nvim_plugin-preservim/nerdcommenter": { "nvim_plugin-preservim/nerdcommenter": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723109629, "lastModified": 1729604332,
"narHash": "sha256-2ppUyQL9y5m81e9HrcqPD4I1xLidIKn/kpLS6/xfrnw=", "narHash": "sha256-IW4RToMGwOSX0GbNXpBkOqtZ2C9Mgbk6iZWPGX5jDr4=",
"owner": "preservim", "owner": "preservim",
"repo": "nerdcommenter", "repo": "nerdcommenter",
"rev": "3f860f2d981547c18f2c9599e3c358ea488c3be4", "rev": "66c07e4083ab02ed2540ac289cc602c70b858c13",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -707,11 +707,11 @@
"nvim_plugin-rmagatti/auto-session": { "nvim_plugin-rmagatti/auto-session": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1728095376, "lastModified": 1730603060,
"narHash": "sha256-WM/Umjw8EvO6pUoKOG2MYXlmHxgIh42YGKH2w/g02Yg=", "narHash": "sha256-IlrScM5bSg2+JKR2nCZTN2MUSbFUWasSTKZ+k+Oa7+w=",
"owner": "rmagatti", "owner": "rmagatti",
"repo": "auto-session", "repo": "auto-session",
"rev": "9d02776ed42874d37869dc683396234e3724b52d", "rev": "542d338ec5ee027638c8e076110b188a465b45d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -739,11 +739,11 @@
"nvim_plugin-saadparwaiz1/cmp_luasnip": { "nvim_plugin-saadparwaiz1/cmp_luasnip": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696878902, "lastModified": 1730707109,
"narHash": "sha256-nUJJl2zyK/oSwz5RzI9j3gf9zpDfCImCYbPbVsyXgz8=", "narHash": "sha256-86lKQPPyqFz8jzuLajjHMKHrYnwW6+QOcPyQEx6B+gw=",
"owner": "saadparwaiz1", "owner": "saadparwaiz1",
"repo": "cmp_luasnip", "repo": "cmp_luasnip",
"rev": "05a9ab28b53f71d1aece421ef32fee2cb857a843", "rev": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -771,11 +771,11 @@
"nvim_plugin-stevearc/conform.nvim": { "nvim_plugin-stevearc/conform.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729039923, "lastModified": 1731295166,
"narHash": "sha256-X+9+X31AmJqYWQv2QxX5AEovHwGV/K2q6A0RtiIZGGk=", "narHash": "sha256-i36OS+hs8wd3SZgToLh+vkn1gNt3pvzGgCHalASsywA=",
"owner": "stevearc", "owner": "stevearc",
"repo": "conform.nvim", "repo": "conform.nvim",
"rev": "f5bd8419f8a29451e20bdb1061a54fe13d5c8de3", "rev": "8c354323201d04530727d8bdcc4669791ee082ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -867,11 +867,11 @@
"nvim_plugin-zbirenbaum/copilot.lua": { "nvim_plugin-zbirenbaum/copilot.lua": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726092169, "lastModified": 1729295476,
"narHash": "sha256-kHxWWJ6HQTze7l55EdDV1Z1FY+jgWPpspmiKvfHzWjI=", "narHash": "sha256-UY6N2Q+egh+Cn4REZXrSGH9ElWQBedl0n8tWJvGe7vs=",
"owner": "zbirenbaum", "owner": "zbirenbaum",
"repo": "copilot.lua", "repo": "copilot.lua",
"rev": "1a237cf50372830a61d92b0adf00d3b23882e0e1", "rev": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -947,11 +947,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729218602, "lastModified": 1731378398,
"narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=", "narHash": "sha256-a0QWaiX8+AJ9/XBLGMDy6c90GD7HzpxKVdlFwCke5Pw=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94", "rev": "0ae9fc2f2fe5361837d59c0bdebbda176427111e",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -218,7 +218,7 @@
typescript typescript
nodejs_20 nodejs_20
clang clang
zig # zig
(pkgs.rust-bin.stable.latest.default.override { (pkgs.rust-bin.stable.latest.default.override {
extensions = [ extensions = [
"rust-src" "rust-src"