From 70e95a1ea4882dca5753cdf559769cfb827deeda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 30 Nov 2023 14:46:29 +0100 Subject: [PATCH] chore!: update inputs --- flake.lock | 286 ++++++++++-------- flake.nix | 7 +- .../nvim/plugins/lua/nvim-lspconfig.lua | 15 +- .../nvim/plugins/lua/nvim-treesitter.lua | 3 - modules/programs/nvim/plugins/treesitter.nix | 2 +- overlays/vimPlugins.nix | 5 + 6 files changed, 190 insertions(+), 128 deletions(-) diff --git a/flake.lock b/flake.lock index ca84631..d8f53d5 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "actions-preview-nvim": { "flake": false, "locked": { - "lastModified": 1692778077, - "narHash": "sha256-5HzyrYWGTdorG4JXMv0iQNj9EM702+8g7E18Oct1JiY=", + "lastModified": 1700487072, + "narHash": "sha256-gGUVWsaFLzrUEGK7wY05RtvorbG5oyqlR34PMPQEZ0U=", "owner": "aznhe21", "repo": "actions-preview.nvim", - "rev": "5650c76abfb84d6498330dd045657ba630ecdbba", + "rev": "b2c89c2937d527c22deb194d574d2a93246cd869", "type": "github" }, "original": { @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1696775529, - "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", + "lastModified": 1701216516, + "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", "owner": "ryantm", "repo": "agenix", - "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", + "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1697641173, - "narHash": "sha256-YuGEgJ4bSwvlfSgsUR2s6r1L3ZCdD8pvyU+pY4q+DMk=", + "lastModified": 1700833105, + "narHash": "sha256-8mxKaA0yGx29X+E0ahCjsGXSc29I1+5timNP6cJHGM0=", "owner": "arkenfox", "repo": "user.js", - "rev": "35e8def0b1e5ecf1198e7efe41cfe6aa0415b320", + "rev": "4a510a4b4ceda8a177831a77309f2faccf7e18d5", "type": "github" }, "original": { @@ -81,11 +81,11 @@ ] }, "locked": { - "lastModified": 1696985954, - "narHash": "sha256-dU1lYBWHqxkvbJV3B9oPeqLL0H8FkSKEqjPie+9xPgQ=", + "lastModified": 1701196468, + "narHash": "sha256-xZ1S+8NgxOurbYqh7n3wR3cw+FTP8DyCdb5lg7X+8kw=", "owner": "jcdickinson", "repo": "codeium.nvim", - "rev": "822e762567a0bf50b1a4e733c8c93691934d7606", + "rev": "fd9c9030d402baf2a01cc9db08c39772c0a60324", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1698410321, - "narHash": "sha256-MphuSlgpmKwtJncGMohryHiK55J1n6WzVQ/OAfmfoMc=", + "lastModified": 1700815693, + "narHash": "sha256-JtKZEQUzosrCwDsLgm+g6aqbP1aseUl1334OShEAS3s=", "owner": "numtide", "repo": "devshell", - "rev": "1aed986e3c81a4f6698e85a7452cbfcc4b31a36e", + "rev": "7ad1c417c87e98e56dcef7ecd0e0a2f2e5669d51", "type": "github" }, "original": { @@ -140,11 +140,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1698422527, - "narHash": "sha256-SDu3Xg263t3oXIyTaH0buOvFnKIDeZsvKDBtOz+jRbs=", + "lastModified": 1700927249, + "narHash": "sha256-iqmIWiEng890/ru7ZBf4nUezFPyRm2fjRTvuwwxqk2o=", "owner": "nix-community", "repo": "disko", - "rev": "944d338d24a9d043a3f7461c30ee6cfe4f9cca30", + "rev": "3cb78c93e6a02f494aaf6aeb37481c27a2e2ee22", "type": "github" }, "original": { @@ -206,11 +206,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1698579227, - "narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=", + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f76e870d64779109e41370848074ac4eaa1606ec", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, "original": { @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, "original": { @@ -345,11 +345,11 @@ ] }, "locked": { - "lastModified": 1698165573, - "narHash": "sha256-cnMTgCDnZiQKsf+wVzigpexskqRCFTKgS58Wx2rNU1c=", + "lastModified": 1701009247, + "narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "300e0af24a1bbe32d115beb182efb01785582c45", + "rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09", "type": "github" }, "original": { @@ -402,11 +402,11 @@ ] }, "locked": { - "lastModified": 1698795315, - "narHash": "sha256-fF5ScAWLMHXOuqsbLSG137kS1D+gr9JPtm4H2c4yBbU=", + "lastModified": 1701071203, + "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", "owner": "nix-community", "repo": "home-manager", - "rev": "9bc7d84b8213255ecd5eb6299afdb77c36ece71d", + "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", "type": "github" }, "original": { @@ -420,11 +420,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1698687579, - "narHash": "sha256-BWqQQLhpuQolMiLMTcsc8cNlNzI9+MG/uc184IlP2nA=", + "lastModified": 1700963402, + "narHash": "sha256-JhkanLmYRLekGOysO6JpCWKPlgRoemHPzUrARCGBqYA=", "owner": "hyprwm", "repo": "contrib", - "rev": "bfd3e0efc1af9654808e644b157eb3c170c26fa1", + "rev": "65e567a81176d39be7ce6513d1af23954f00cbec", "type": "github" }, "original": { @@ -442,11 +442,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1698802123, - "narHash": "sha256-Tpx1U6IlnD+wrSvUrBwEvwvK5D8cifIdppB9CwpVQdo=", + "lastModified": 1701344414, + "narHash": "sha256-ViW79jtyafW7Q0T+V83k8gk+a2y27Ua1lqFnDxSFCwA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "7b32b4214d028a173c8192bddaa9e43503326080", + "rev": "29970228c5f71f417b0a3e1b4851d9430ed095dd", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1698097178, - "narHash": "sha256-W4W3pAYNpXp0jLZwK0Bxw6R7n2/UYxp+lnT5mD2/xEM=", + "lastModified": 1701083219, + "narHash": "sha256-0j4Poy2OEZ55GWagfj6ookxG6jXdsDHZLh6vU3DBuz4=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "d6856adaffb77a9cc1aac3d04d98276eaa5602a4", + "rev": "b94f84605d6d6d8d3c17a42a72fc3b01df69ab7f", "type": "github" }, "original": { @@ -513,6 +513,22 @@ "type": "github" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1700492800, + "narHash": "sha256-bGNcbA6AMUWhpuagnVWR1ZBdbUcZVdZtbMaRxY5JiCU=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "d9475611fec95cacec30fbd2c334b270e5265d3b", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, "lowdown-src": { "flake": false, "locked": { @@ -531,11 +547,11 @@ }, "master": { "locked": { - "lastModified": 1698838244, - "narHash": "sha256-uOrd51CisNyM0V+Y+c8uXIQSxQYKKBaINsYtd5I9bJU=", + "lastModified": 1701336116, + "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4be2d0ba3e43534ad23217d66d3abd60613f08ce", + "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", "type": "github" }, "original": { @@ -593,11 +609,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1698359872, - "narHash": "sha256-/migmIszx7Kqa/x9I6hKYATeFSpZ7P+6NKRDA1nkZfk=", + "lastModified": 1701302207, + "narHash": "sha256-DQ7nF2k2dwQDHhh2ohTEmj6Gn2+ow2OFBwCgpBt0nn4=", "owner": "neovim", "repo": "neovim", - "rev": "9dc440400cdb470b317c4169ba916e1cd9a316e1", + "rev": "463b577afb78ad864cd09ac2c51f77653ab4ce48", "type": "github" }, "original": { @@ -616,17 +632,16 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1698364851, - "narHash": "sha256-UQqC71YP6B5uOQ8HZRWQsbiMDKIROLhSNlnFPnDP27Y=", + "lastModified": 1701302639, + "narHash": "sha256-wvFGpQl39xgUikFAN99E2AcmdyYWNbSM8MUXCcdrnWo=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "dacbb092b5d6e97127b3e57007474a5c47305164", + "rev": "3d00c9fc954c278f0aa76d16faef983bf450af8e", "type": "github" }, "original": { "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "dacbb092b5d6e97127b3e57007474a5c47305164", "type": "github" } }, @@ -637,11 +652,11 @@ ] }, "locked": { - "lastModified": 1698550809, - "narHash": "sha256-Um8+Wi6EAH5dCgfgl7OqaVd4wFJn6FKLafcP5QPr/98=", + "lastModified": 1700968077, + "narHash": "sha256-Lax+2g7G3Fe+ckMrHLYTl+97unbmNDmN1qS9MLBkxr4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "1f0981f5baeb78e3c89a8980ff1a39f06876fa8c", + "rev": "bd3aec0ecb0fdde863a7ed2c6caa220c47e22c07", "type": "github" }, "original": { @@ -668,24 +683,23 @@ "nix-super": { "inputs": { "flake-compat": "flake-compat_2", + "libgit2": "libgit2", "lowdown-src": "lowdown-src", - "nixpkgs": [ - "stable" - ], + "nixpkgs": "nixpkgs_7", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1697392285, - "narHash": "sha256-1IBnF9IuStUWoAKJ74HNhV46+9Cbf/yZP6h6hJOJ1Cg=", + "lastModified": 1700941252, + "narHash": "sha256-2c8miJcsG24YEtXOSjvgW0ES1ND5DpY+ymGPq3S56YE=", "owner": "privatevoid-net", "repo": "nix-super", - "rev": "ba035e1ea339a97e6ba6a1dd79e0c0e334240234", + "rev": "c076362db8b438c921d9bbe196ede50205f788c6", "type": "github" }, "original": { "owner": "privatevoid-net", "repo": "nix-super", - "rev": "ba035e1ea339a97e6ba6a1dd79e0c0e334240234", + "rev": "c076362db8b438c921d9bbe196ede50205f788c6", "type": "github" } }, @@ -708,11 +722,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1696019113, - "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { @@ -755,6 +769,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1692934111, + "narHash": "sha256-9EEE59v/esKNMR5zKbLRV9NoRPYvERw5jHQOnfr47bk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1e44a037bbf4fcaba041436e65e87be88f3f495b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1697915759, @@ -789,11 +819,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1698134075, - "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { @@ -821,11 +851,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1698266953, - "narHash": "sha256-jf72t7pC8+8h8fUslUYbWTX5rKsRwOzRMX8jJsGqDXA=", + "lastModified": 1701174899, + "narHash": "sha256-1W+FMe8mWsJKXoBc+QgKmEeRj33kTFnPq7XCjU+bfnA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "75a52265bda7fd25e06e3a67dee3f0354e73243c", + "rev": "010c7296f3b19a58b206fdf7d68d75a5b0a09e9e", "type": "github" }, "original": { @@ -837,11 +867,27 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1698553279, - "narHash": "sha256-T/9P8yBSLcqo/v+FTOBK+0rjzjPMctVymZydbvR/Fak=", + "lastModified": 1701184375, + "narHash": "sha256-E8PLzcEMf/1VtRcu+SeJZHtlNrXveBhGoN4AGYxScRE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e922e146779e250fae512da343cfb798c758509d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1701237617, + "narHash": "sha256-Ryd8xpNDY9MJnBFDYhB37XSFIxCPVVVXAbInNPa95vs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "90e85bc7c1a6fc0760a94ace129d3a1c61c3d035", + "rev": "85306ef2470ba705c97ce72741d56e42d0264015", "type": "github" }, "original": { @@ -851,7 +897,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1689261696, "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", @@ -867,30 +913,14 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1692934111, - "narHash": "sha256-9EEE59v/esKNMR5zKbLRV9NoRPYvERw5jHQOnfr47bk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1e44a037bbf4fcaba041436e65e87be88f3f495b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "none-ls-nvim": { "flake": false, "locked": { - "lastModified": 1698458199, - "narHash": "sha256-r8CyCvGVJG7hLAIlonaqzjxAiybRySkRe/Y9c4krQXE=", + "lastModified": 1701287639, + "narHash": "sha256-JE+6Sl1YaVaJa5ccFqknyl1yfOQPXcoaeLWyMD6ylLk=", "owner": "nvimtools", "repo": "none-ls.nvim", - "rev": "b8fd44ee1616e6a9c995ed5f94ad9f1721d303ef", + "rev": "3a4826687da4310af379515086d71faca4d21288", "type": "github" }, "original": { @@ -901,11 +931,11 @@ }, "nur": { "locked": { - "lastModified": 1698835584, - "narHash": "sha256-2ljVCc2VjvdnRhKRzfZfGwS3mrsHO24Nsr7zf5NxTIg=", + "lastModified": 1701333924, + "narHash": "sha256-w953OKiXjECq44lI+vA1YR0XW/Np/B4OrIIm/d/GntU=", "owner": "nix-community", "repo": "NUR", - "rev": "4c248463ef00cf5a5116940f36f8c154b78b4ded", + "rev": "f0d92d2737c97b37804ca485d10148ee9abccf69", "type": "github" }, "original": { @@ -917,11 +947,11 @@ "nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1698537974, - "narHash": "sha256-8io/dDbFRUyBgzg+oVdpJCGhm59d+AwstyHs9OAWlkY=", + "lastModified": 1701322583, + "narHash": "sha256-nPXJPT3j5nEHoJ8VzOtqcWszzZKcrFBsXmo7RU63CY4=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "d0467b9574b48429debf83f8248d8cee79562586", + "rev": "fcf153fbbf1facd16a71d46b92be8be495123a9f", "type": "github" }, "original": { @@ -933,11 +963,11 @@ "nvim-puppeteer": { "flake": false, "locked": { - "lastModified": 1698399688, - "narHash": "sha256-dXeY7O7Qh+1f5qZuZiCF1/3g2xXsb7sDpWr9IhYaeXw=", + "lastModified": 1699883336, + "narHash": "sha256-pvJasvdIwH2kmZNcKCviItnUZMVUvbtezI72/IMk9iU=", "owner": "chrisgrieser", "repo": "nvim-puppeteer", - "rev": "f3c06a83d24d2af9809c76dc5ec6e4ee1cfc21b6", + "rev": "1a941a8684b937295632bc156d1b17e80de2d717", "type": "github" }, "original": { @@ -968,15 +998,15 @@ "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_3", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1698227354, - "narHash": "sha256-Fi5H9jbaQLmLw9qBi/mkR33CoFjNbobo5xWdX4tKz1Q=", + "lastModified": 1700922917, + "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "bd38df3d508dfcdff52cd243d297f218ed2257bf", + "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78", "type": "github" }, "original": { @@ -988,11 +1018,11 @@ "rofi-wayland": { "flake": false, "locked": { - "lastModified": 1697052256, - "narHash": "sha256-3mTmwoeP7yUg7ldbatvQB+hwHhwuHOoZZb1ozWwSsVw=", + "lastModified": 1701337007, + "narHash": "sha256-1OpY13TDc809/o/HAxYNhZUf2MG8ZETDEojJ2QsNCUE=", "owner": "lbonn", "repo": "rofi", - "rev": "5cd1e3ca2b6b896b2e591b465cc590479ef07aab", + "rev": "78888dd80ddb49a5b3296e55e94aaa41c0f43298", "type": "github" }, "original": { @@ -1025,7 +1055,7 @@ "nix-index-database": "nix-index-database", "nix-lazy-nvim": "nix-lazy-nvim", "nix-super": "nix-super", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "none-ls-nvim": "none-ls-nvim", "nur": "nur", "nvim-lspconfig": "nvim-lspconfig", @@ -1035,6 +1065,7 @@ "rofi-wayland": "rofi-wayland", "smartcolumn-nvim": "smartcolumn-nvim", "stable": "stable", + "statuscol-nvim": "statuscol-nvim", "telekasten-nvim": "telekasten-nvim", "timers": "timers" } @@ -1057,11 +1088,11 @@ }, "stable": { "locked": { - "lastModified": 1698696950, - "narHash": "sha256-FHFL58t6lMumvWqwundC8fDDDLOIvc+JJBNIAlPjrDY=", + "lastModified": 1701053011, + "narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "017ef2132a5bda50bd713aeabce8f918502d4ec1", + "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9", "type": "github" }, "original": { @@ -1071,6 +1102,23 @@ "type": "github" } }, + "statuscol-nvim": { + "flake": false, + "locked": { + "lastModified": 1700946586, + "narHash": "sha256-g36X+9hoOhHlw/DRSYdidQpHTx3ibjXNHJvONi29Yk8=", + "owner": "luukvbaal", + "repo": "statuscol.nvim", + "rev": "fb56a46dc446d3e9b61c269dd4aadbfd509223a7", + "type": "github" + }, + "original": { + "owner": "luukvbaal", + "ref": "0.10", + "repo": "statuscol.nvim", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -1180,7 +1228,7 @@ "timers": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "utils": "utils" }, "locked": { @@ -1219,18 +1267,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1697909146, - "narHash": "sha256-jU0I6FoCKnj4zIBL4daosFWh81U1fM719Z6cae8PxSY=", + "lastModified": 1701291624, + "narHash": "sha256-SWmzxn3gTyZOGEHgSDUJjJdoEKtt/kV6uWrUDx4JCC4=", "owner": "wlroots", "repo": "wlroots", - "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2", + "rev": "d7ecdad4e082cb5817806348de198679a11b35df", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2", + "rev": "d7ecdad4e082cb5817806348de198679a11b35df", "type": "gitlab" } }, @@ -1250,11 +1298,11 @@ ] }, "locked": { - "lastModified": 1697981233, - "narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=", + "lastModified": 1700508250, + "narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2", + "rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 49a344b..43692cf 100644 --- a/flake.nix +++ b/flake.nix @@ -21,8 +21,7 @@ nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; # Programs - nix-super.inputs.nixpkgs.follows = "stable"; - nix-super.url = "github:privatevoid-net/nix-super/ba035e1ea339a97e6ba6a1dd79e0c0e334240234"; + nix-super.url = "github:privatevoid-net/nix-super/c076362db8b438c921d9bbe196ede50205f788c6"; rofi-wayland.flake = false; rofi-wayland.url = "github:lbonn/rofi/wayland"; timers.url = "git+https://gitea.moritzboeh.me/moritz/timers.git"; @@ -37,7 +36,7 @@ }; hmts-nvim.flake = false; hmts-nvim.url = "github:calops/hmts.nvim"; - neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay/dacbb092b5d6e97127b3e57007474a5c47305164"; # HACK: because upstream is broken + neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; nix-lazy-nvim.url = "git+https://git.moritzboeh.me/moritz/NixLazy.nvim"; nvim-lspconfig.flake = false; nvim-lspconfig.url = "github:neovim/nvim-lspconfig"; @@ -53,6 +52,8 @@ none-ls-nvim.url = "github:nvimtools/none-ls.nvim"; neotest-python.flake = false; neotest-python.url = "github:MoritzBoehme/neotest-python/fix-runtimepath-search"; + statuscol-nvim.flake = false; + statuscol-nvim.url = "github:luukvbaal/statuscol.nvim/0.10"; # HACK: fix for neovim-nightly # Hyprland hypr-contrib.url = "github:hyprwm/contrib"; diff --git a/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua b/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua index 99decf0..d34588f 100644 --- a/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua +++ b/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua @@ -81,7 +81,7 @@ local on_attach_def = function(client, bufnr) function() require("telescope.builtin").lsp_type_definitions({ reuse_win = true }) end, - "Goto type defininition", + "Goto type definition", }, r = { "Telescope lsp_references", "Goto references" }, D = { vim.lsp.buf.declaration, "Goto declaration" }, @@ -129,7 +129,6 @@ local servers = { "gopls", "nil_ls", "nixd", - "pylsp", "ruff_lsp", "typst_lsp", } @@ -137,6 +136,18 @@ for _, lsp in ipairs(servers) do lspconfig_setup(lsp, {}) end +lspconfig_setup("pylsp", { + settings = { + pylsp = { + plugins = { + rope_autoimport = { + enabled = true, + }, + }, + }, + }, +}) + lspconfig_setup("rust_analyzer", { settings = { ["rust-analyzer"] = { diff --git a/modules/programs/nvim/plugins/lua/nvim-treesitter.lua b/modules/programs/nvim/plugins/lua/nvim-treesitter.lua index e221fdd..78f9613 100644 --- a/modules/programs/nvim/plugins/lua/nvim-treesitter.lua +++ b/modules/programs/nvim/plugins/lua/nvim-treesitter.lua @@ -4,7 +4,4 @@ require("nvim-treesitter.configs").setup({ highlight = { enable = true, }, - context_commentstring = { - enable = true, - }, }) diff --git a/modules/programs/nvim/plugins/treesitter.nix b/modules/programs/nvim/plugins/treesitter.nix index b76bcbc..dfa88cb 100644 --- a/modules/programs/nvim/plugins/treesitter.nix +++ b/modules/programs/nvim/plugins/treesitter.nix @@ -21,7 +21,7 @@ with builtins; } ''; dependencies = [ - { plugin = nvim-ts-context-commentstring; } + { plugin = nvim-ts-context-commentstring; opts = { }; } ]; } { diff --git a/overlays/vimPlugins.nix b/overlays/vimPlugins.nix index f76f56c..fc07f32 100644 --- a/overlays/vimPlugins.nix +++ b/overlays/vimPlugins.nix @@ -35,6 +35,11 @@ with lib.my; src = inputs.nvim-treesitter; }); + statuscol-nvim = prev.vimPlugins.statuscol-nvim.overrideAttrs (_: { + version = mkVersionInput inputs.statuscol-nvim; + src = inputs.statuscol-nvim; + }); + # HACK: to fix error in nixpkgs version of nvim-lspconfig nvim-lspconfig = prev.vimPlugins.nvim-lspconfig.overrideAttrs (_: { version = mkVersionInput inputs.nvim-lspconfig;