diff --git a/flake.lock b/flake.lock index ce373e9..57208b2 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1730184279, - "narHash": "sha256-6OB+WWR6gnaWiqSS28aMJypKeK7Pjc2Wm6L0MtOrTuA=", + "lastModified": 1732324260, + "narHash": "sha256-0xzQvoId/P008QkTSAdFVv465P9rL9nYkIOWXL5pdsY=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "b379bd4d872d159e5189053ce9a4adf86d56db4b", + "rev": "698a62c628c2ec423aa770d8ec0e1d0bcf4fca1a", "type": "github" }, "original": { @@ -43,11 +43,11 @@ }, "darwin-stable": { "locked": { - "lastModified": 1731613620, - "narHash": "sha256-Qb4cpVp1pr29mvbqMROn7BcYt60GJ948RSM4UKU2DV4=", + "lastModified": 1731989499, + "narHash": "sha256-mYVmnkkyVcY9e2FmbrT+ZTCjrijOeVT+QtIv6omhkmM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f4a0fbc120cd775346111246b453f8af94afc1d1", + "rev": "8d48200ead5adea71485965f92405575c66dab04", "type": "github" }, "original": { @@ -94,11 +94,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -145,11 +145,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -225,11 +225,11 @@ ] }, "locked": { - "lastModified": 1730143473, - "narHash": "sha256-6VWdHbcCFvlQDIFzj2ZSU1N707+mT1lbkGvdy3ijD5o=", + "lastModified": 1731958485, + "narHash": "sha256-XFXc8oa8K9qon+yFpYKw8PRer4M5vX4teJ8N+9RFfrY=", "owner": "arxanas", "repo": "git-branchless", - "rev": "f8052bbc4963a140080119341e06ab520dece339", + "rev": "2be0fd031979e37dfdf8870a3058f1802af4f7b1", "type": "github" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1730016908, - "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", + "lastModified": 1732303962, + "narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=", "owner": "nix-community", "repo": "home-manager", - "rev": "e83414058edd339148dc142a8437edb9450574c8", + "rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c", "type": "github" }, "original": { @@ -296,11 +296,11 @@ "neorg": { "flake": false, "locked": { - "lastModified": 1730041546, - "narHash": "sha256-g36AORPIxxgyxlLem2AyhLSrCVbX7CROsAi19c9GQXQ=", + "lastModified": 1732289702, + "narHash": "sha256-8RQ+PFnIcjPoNJQB/qz+zv1fjVjFEwPhuAh+JL7GPL4=", "owner": "nvim-neorg", "repo": "neorg", - "rev": "b34337f7152435aad72f3d988edb22ad0df42cc5", + "rev": "7a893a176a7d9c074a5371865b53c6aa4e223991", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1730045915, - "narHash": "sha256-smxGaPnAVT2wqtKo8+ieoN8bMUwvJuu5QnYgwtbwdQo=", + "lastModified": 1732292430, + "narHash": "sha256-2CpaK1JJQYUGLcfUsuJiVKI3EXn8w1VaJnB8adsHQUA=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "64f81dff656b5670d5c25dff579f258b8cc9e92c", + "rev": "360b57c1da03f0b64b3fd588a283918bc52ea5d1", "type": "github" }, "original": { @@ -368,14 +368,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, "nixpkgs_2": { @@ -396,11 +396,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1729980323, - "narHash": "sha256-eWPRZAlhf446bKSmzw6x7RWEE4IuZgAp8NW3eXZwRAY=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "86e78d3d2084ff87688da662cf78c2af085d8e73", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { diff --git a/modules/nvim.nix b/modules/nvim.nix index f344644..899c1b4 100644 --- a/modules/nvim.nix +++ b/modules/nvim.nix @@ -22,72 +22,16 @@ require('basic') EOF ''; - packages.vimPackages = let + packages.global = let plugins = pkgs.vimPlugins; - ts = plugins.nvim-treesitter.withPlugins ( - g: [ - g.bibtex - g.comment - g.cpp - g.css - g.csv - g.dhall - g.diff - g.djot - g.dot - g.editorconfig - g.eex - g.elixir - g.erlang - g.fennel - g.fish - g.git_config - g.git_rebase - g.gitattributes - g.gitcommit - g.glsl - g.graphql - g.haskell - g.haskell_persistent - g.hcl - g.heex - g.html - g.javascript - g.jq - g.json - g.julia - g.just - g.make - g.mermaid - g.nickel - g.nix - g.po - g.printf - g.prolog - g.racket - g.regex - g.robots - g.ruby - g.rust - g.scheme - g.sql - g.ssh_config - g.terraform - g.toml - g.typescript - g.typst - g.yaml - g.zig - ] - ); in { start = [ plugins.packer-nvim plugins.vim-nickel - plugins.lua-utils-nvim - plugins.neorg - plugins.neorg-telescope - ts + # plugins.lua-utils-nvim + # plugins.neorg + # plugins.neorg-telescope + plugins.nvim-treesitter.withAllGrammars ]; opt = []; @@ -96,7 +40,7 @@ }; in { nixpkgs.overlays = [ - inputs.neorg-overlay.overlays.default + # inputs.neorg-overlay.overlays.default ]; home.sessionVariables.EDITOR = "nvim";