From 258d7318771e29ef8814ff972907e02706499234 Mon Sep 17 00:00:00 2001 From: Patrick Neff Date: Mon, 3 Jun 2024 23:44:04 +0200 Subject: [PATCH] updates --- flake.lock | 506 +++++++++++++----- flake.nix | 15 +- lib/mkNixVim.nix | 4 +- .../home-manager/shell/borgmatic/default.nix | 2 +- modules/nixvim/default.nix | 3 +- .../nixvim/plugins/lsp/languages/default.nix | 1 + modules/nixvim/plugins/lsp/languages/php.nix | 7 + modules/nixvim/plugins/lsp/languages/rust.nix | 2 +- modules/nixvim/plugins/neorg.nix | 4 +- modules/nixvim/plugins/none-ls.nix | 3 + pkgs/nixvim/default.nix | 18 +- 11 files changed, 408 insertions(+), 157 deletions(-) create mode 100644 modules/nixvim/plugins/lsp/languages/php.nix diff --git a/flake.lock b/flake.lock index 3723df4..10043d7 100644 --- a/flake.lock +++ b/flake.lock @@ -35,27 +35,27 @@ "rev": "735cabc0cd3f3bfc4a5962fd4b69089da1e6982c", "revCount": 2, "type": "git", - "url": "ssh://gitea@pi1.odie.intranet/odie/csleeptimer.git" + "url": "ssh://gitea@git.niederkassel.neff-steindesign.de/odie/csleeptimer.git" }, "original": { "type": "git", - "url": "ssh://gitea@pi1.odie.intranet/odie/csleeptimer.git" + "url": "ssh://gitea@git.niederkassel.neff-steindesign.de/odie/csleeptimer.git" } }, "devshell": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1711099426, - "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", + "lastModified": 1713532798, + "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", "owner": "numtide", "repo": "devshell", - "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", + "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", "type": "github" }, "original": { @@ -67,11 +67,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", "type": "github" }, "original": { @@ -81,6 +81,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -96,7 +112,39 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -110,7 +158,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_4": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -152,11 +200,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -174,11 +222,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -194,11 +242,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -207,6 +255,21 @@ "type": "github" } }, + "flake-root": { + "locked": { + "lastModified": 1713493429, + "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", + "owner": "srid", + "repo": "flake-root", + "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "flake-root", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": [ @@ -228,15 +291,12 @@ } }, "flake-utils_2": { - "inputs": { - "systems": "systems" - }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -246,6 +306,21 @@ } }, "flake-utils_3": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -260,9 +335,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1705309234, @@ -278,9 +353,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1701680307, @@ -296,29 +371,87 @@ "type": "github" } }, - "flake-utils_6": { + "git-hooks": { "inputs": { - "systems": "systems_4" + "flake-compat": "flake-compat_4", + "gitignore": "gitignore", + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ], + "nixpkgs-stable": [ + "neovim-nightly-overlay", + "nixpkgs" + ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "lastModified": 1716213921, + "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks_2": { + "inputs": { + "flake-compat": "flake-compat_7", + "gitignore": "gitignore_2", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716213921, + "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", "type": "github" } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "neovim-nightly-overlay", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "nixvim", - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, @@ -345,11 +478,11 @@ ] }, "locked": { - "lastModified": 1710478346, - "narHash": "sha256-Xjf8BdnQG0tLhPMlqQdwCIjOp7Teox0DP3N/jjyiGM4=", + "lastModified": 1713898448, + "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "64e7763d72c1e4c1e5e6472640615b6ae2d40fbf", + "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", "type": "github" }, "original": { @@ -365,11 +498,11 @@ ] }, "locked": { - "lastModified": 1713166971, - "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", + "lastModified": 1716736760, + "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", + "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239", "type": "github" }, "original": { @@ -386,11 +519,11 @@ ] }, "locked": { - "lastModified": 1712989663, - "narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=", + "lastModified": 1716457508, + "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", "owner": "nix-community", "repo": "home-manager", - "rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0", + "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", "type": "github" }, "original": { @@ -399,46 +532,82 @@ "type": "github" } }, - "neovim-flake": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, + "neorg": { + "flake": false, "locked": { - "dir": "contrib", - "lastModified": 1713051308, - "narHash": "sha256-DaaiUHENmPl1vPrQIJY7sl/LspPBQ/XiLIVeLfqpkKw=", - "owner": "neovim", - "repo": "neovim", - "rev": "a92822835521574710a830a7de0e692bf7517fb8", + "lastModified": 1716833832, + "narHash": "sha256-YG2XuJbQEMOgdUV0CgM5h+tn7mLJvafD6dHw+9ibYx4=", + "owner": "nvim-neorg", + "repo": "neorg", + "rev": "431a4cdc06d3c48ac6ef6160bc684687a5f0a80a", "type": "github" }, "original": { - "dir": "contrib", - "owner": "neovim", - "repo": "neovim", + "owner": "nvim-neorg", + "repo": "neorg", + "type": "github" + } + }, + "neorg-overlay": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "neorg": "neorg", + "neorg-telescope": "neorg-telescope", + "nixpkgs": [ + "nixpkgs" + ], + "norg": "norg", + "norg-meta": "norg-meta" + }, + "locked": { + "lastModified": 1716833859, + "narHash": "sha256-yHFB3bVkzrAzphpnAvThVFDtI/yihmCk2Isf4jKYbkc=", + "owner": "nvim-neorg", + "repo": "nixpkgs-neorg-overlay", + "rev": "13eec7842a7426826ef269105a6fb579758fbf35", + "type": "github" + }, + "original": { + "owner": "nvim-neorg", + "repo": "nixpkgs-neorg-overlay", + "type": "github" + } + }, + "neorg-telescope": { + "flake": false, + "locked": { + "lastModified": 1716308299, + "narHash": "sha256-zR+r57qnfJ0V1EtsN+gyfHYTTI0I5i/GtjoAYvVmH5Y=", + "owner": "nvim-neorg", + "repo": "neorg-telescope", + "rev": "6069bf428fac56f8c028864eb1bf8beb668fca09", + "type": "github" + }, + "original": { + "owner": "nvim-neorg", + "repo": "neorg-telescope", "type": "github" } }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", + "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", - "neovim-flake": "neovim-flake", + "neovim-src": "neovim-src", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1713053047, - "narHash": "sha256-x17vugcgPuF+w5MpeYUbOlmUw/8tz7W4UetHKCode0E=", + "lastModified": 1716827514, + "narHash": "sha256-5qS9Jn3FaEFMGGhS/1mLOUifMFDLPcLczjcdaN7xgyE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "8fa4fbe03aa7475441dd1b9c62e36feea083bfb0", + "rev": "7849e018a09688cd71bde887113954b3ce08739c", "type": "github" }, "original": { @@ -447,6 +616,22 @@ "type": "github" } }, + "neovim-src": { + "flake": false, + "locked": { + "lastModified": 1716642936, + "narHash": "sha256-l53vGzYIy6tI1rYBlbxW502sDgpmZ4i/uTdWWtPKPtM=", + "owner": "neovim", + "repo": "neovim", + "rev": "52389e724366ebb2fb58f08c657f580900dd09ee", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -474,11 +659,11 @@ ] }, "locked": { - "lastModified": 1711763326, - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", + "lastModified": 1716511055, + "narHash": "sha256-5Fe/DGgvMhPEMl9VdVxv3zvwRcwNDmW5eRJ0gk72w7U=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", + "rev": "0bea8222f6e83247dd13b055d83e64bce02ee532", "type": "github" }, "original": { @@ -489,7 +674,7 @@ }, "nixgl": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] @@ -526,8 +711,8 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ] @@ -548,16 +733,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712791164, - "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", - "owner": "nixos", + "lastModified": 1644486793, + "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -595,24 +780,58 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1644486793, + "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_6", "flake-parts": "flake-parts_4", + "flake-root": "flake-root", + "git-hooks": "git-hooks_2", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks" + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1713087347, - "narHash": "sha256-RpRIJcbAjR3SF6tarvdG0ErN9afifG/zjxNlntRQrw4=", + "lastModified": 1716814660, + "narHash": "sha256-lDy4PXkwQs3qBxVCdwOcNDJbWBCMJcoGfsHnr3U3Okg=", "owner": "nix-community", "repo": "nixvim", - "rev": "ad6a08b69528fdaf7e12c90da06f9a34f32d7ea6", + "rev": "4175fac0ea144679b9818bfc3c7becfbd68e25a4", "type": "github" }, "original": { @@ -621,6 +840,47 @@ "type": "github" } }, + "norg": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1672582520, + "narHash": "sha256-kv3UiJUqMSF1qd3r4OCWomVTHTYjwX/EBRWm8mOSdwg=", + "owner": "nvim-neorg", + "repo": "tree-sitter-norg", + "rev": "d7a466e182a532065a559dbfc7a847271d5e9c29", + "type": "github" + }, + "original": { + "owner": "nvim-neorg", + "ref": "dev", + "repo": "tree-sitter-norg", + "type": "github" + } + }, + "norg-meta": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1713028366, + "narHash": "sha256-8qSdwHlfnjFuQF4zNdLtU2/tzDRhDZbo9K54Xxgn5+8=", + "owner": "nvim-neorg", + "repo": "tree-sitter-norg-meta", + "rev": "6f0510cc516a3af3396a682fbd6655486c2c9d2d", + "type": "github" + }, + "original": { + "owner": "nvim-neorg", + "repo": "tree-sitter-norg-meta", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1712577859, @@ -636,49 +896,22 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_6", - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "csleeptimer": "csleeptimer", "flake-parts": "flake-parts", "flake-utils": "flake-utils", "home-manager": "home-manager", + "neorg-overlay": "neorg-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-colors": "nix-colors", "nixgl": "nixgl", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim", "nur": "nur", - "systems": "systems_5" + "systems": "systems_3" } }, "systems": { @@ -726,33 +959,24 @@ "type": "github" } }, - "systems_4": { + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "lastModified": 1715940852, + "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", + "owner": "numtide", + "repo": "treefmt-nix", "type": "github" } } diff --git a/flake.nix b/flake.nix index 77cf42a..e5057bb 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,7 @@ inputs.neovim-nightly-overlay.overlays.default inputs.nur.overlay inputs.nixgl.overlay + inputs.neorg-overlay.overlays.default outputs.overlays.kodi ]; in @@ -104,7 +105,12 @@ } // flakeLib.mkHomeConfiguration { inherit inputs outputs nixpkgs flakeLib overlays; - vars = vars // {hostName = "odie-dev"; domain = "niederkasse.neff-steindesign.de"; }; + vars = + vars + // { + hostName = "odie-dev"; + domain = "niederkasse.neff-steindesign.de"; + }; system = "x86_64-linux"; }; } @@ -155,5 +161,12 @@ systems.follows = "systems"; }; }; + neorg-overlay = { + url = "github:nvim-neorg/nixpkgs-neorg-overlay"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; + }; }; } diff --git a/lib/mkNixVim.nix b/lib/mkNixVim.nix index a060359..aa532c9 100644 --- a/lib/mkNixVim.nix +++ b/lib/mkNixVim.nix @@ -1,10 +1,10 @@ { - system, + pkgs, module, inputs, ... }: let - nixvim' = inputs.nixvim.legacyPackages.${system}; + nixvim' = inputs.nixvim.legacyPackages.${pkgs.system}; nvim = nixvim'.makeNixvimWithModule module; in nvim diff --git a/modules/home-manager/shell/borgmatic/default.nix b/modules/home-manager/shell/borgmatic/default.nix index a1d0ce2..71e69f2 100644 --- a/modules/home-manager/shell/borgmatic/default.nix +++ b/modules/home-manager/shell/borgmatic/default.nix @@ -18,7 +18,7 @@ lib.mkIf config.services.borgmatic.enable { ] ++ commonExcludes; repositories = [ { - "path" = "ssh://odie@svartalbenheim.odie.intranet/./borg-backup"; + "path" = "ssh://odie@svartalbenheim.odie.home.arpa/./borg-backup"; "label" = "svartalbenheim"; } ]; diff --git a/modules/nixvim/default.nix b/modules/nixvim/default.nix index d75a701..5a8e5df 100644 --- a/modules/nixvim/default.nix +++ b/modules/nixvim/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +_: { imports = [ ./colorscheme.nix ./options.nix @@ -8,7 +8,6 @@ ]; config = { - package = pkgs.neovim-nightly; viAlias = true; vimAlias = true; }; diff --git a/modules/nixvim/plugins/lsp/languages/default.nix b/modules/nixvim/plugins/lsp/languages/default.nix index 3d846fc..4995064 100644 --- a/modules/nixvim/plugins/lsp/languages/default.nix +++ b/modules/nixvim/plugins/lsp/languages/default.nix @@ -16,5 +16,6 @@ ./c.nix ./templ.nix ./sql.nix + ./php.nix ]; } diff --git a/modules/nixvim/plugins/lsp/languages/php.nix b/modules/nixvim/plugins/lsp/languages/php.nix new file mode 100644 index 0000000..08844f9 --- /dev/null +++ b/modules/nixvim/plugins/lsp/languages/php.nix @@ -0,0 +1,7 @@ +{ + plugins.lsp = { + servers = { + phpactor.enable = true; + }; + }; +} diff --git a/modules/nixvim/plugins/lsp/languages/rust.nix b/modules/nixvim/plugins/lsp/languages/rust.nix index fa81f7f..84909e8 100644 --- a/modules/nixvim/plugins/lsp/languages/rust.nix +++ b/modules/nixvim/plugins/lsp/languages/rust.nix @@ -2,7 +2,7 @@ plugins = { rustaceanvim = { enable = true; - extraOptions = { + settings = { server = { default_settings = { rust-analyzer = { diff --git a/modules/nixvim/plugins/neorg.nix b/modules/nixvim/plugins/neorg.nix index 731d1c8..44b9608 100644 --- a/modules/nixvim/plugins/neorg.nix +++ b/modules/nixvim/plugins/neorg.nix @@ -1,6 +1,6 @@ -{ +_: { plugins.neorg = { - enable = true; + enable = false; modules = { "core.defaults" = { __empty = null; diff --git a/modules/nixvim/plugins/none-ls.nix b/modules/nixvim/plugins/none-ls.nix index 4807b75..8f854ef 100644 --- a/modules/nixvim/plugins/none-ls.nix +++ b/modules/nixvim/plugins/none-ls.nix @@ -10,6 +10,9 @@ commitlint.enable = true; cppcheck.enable = true; }; + formatting = { + phpcbf.enable = true; + }; }; }; } diff --git a/pkgs/nixvim/default.nix b/pkgs/nixvim/default.nix index bd4e964..6ffd839 100644 --- a/pkgs/nixvim/default.nix +++ b/pkgs/nixvim/default.nix @@ -5,17 +5,21 @@ flakeLib, ... }: let + pkgs = flakeLib.mkPkgs { + inherit system nixpkgs; + overlays = [ + inputs.neovim-nightly-overlay.overlays.default + ]; + }; module = flakeLib.mkNixVimModule { - pkgs = flakeLib.mkPkgs { - inherit system nixpkgs; - overlays = [ - inputs.neovim-nightly-overlay.overlays.default - ]; - }; + inherit pkgs; + extraSpecialArgs = { + inherit inputs; + }; module = import ../../modules/nixvim; }; nvim = flakeLib.mkNixVim { - inherit system inputs module; + inherit pkgs inputs module; }; in nvim