Update deps

flake.lock

@@ -109,11 +109,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1697073574,
-        "narHash": "sha256-Np603TUNj+fzQYmaNPS7pmsy52KHq4fpWP5GCpTJ38Y=",
+        "lastModified": 1697230660,
+        "narHash": "sha256-Faw7qTLNVZYxW1nBHKhfrKY0lOicJaxxHh5u/Gq4M3Q=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "3c41ae36ff12afbada9396c7d8282c2c74f74e06",
+        "rev": "6ad5c9c17cbd5514ce0cc2692dd82dd6d8e5d879",
         "type": "github"
       },
       "original": {
@@ -325,11 +325,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1697096379,
-        "narHash": "sha256-cVrwPg8uOC5P6JoVaVW+nd41WWJTNiFhm1jhDi+nMLQ=",
+        "lastModified": 1697296029,
+        "narHash": "sha256-qPg9sZKluvhoPqo+fglYsLOr/0ZGLpFdQ96Vr36lg4U=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "840e1864c2de2b4b192a4df1865b69093904b139",
+        "rev": "28ef4a44925a1b1cbf291347aba43012ab038523",
         "type": "github"
       },
       "original": {
@@ -350,11 +350,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1697099947,
-        "narHash": "sha256-cVn+IR5c4T2rL76iSTpWsDMdscoL5LfQjX9YrRd1K/g=",
+        "lastModified": 1697306287,
+        "narHash": "sha256-iuNgvbG4mhSIXDApkKY7sonDHOmdPoquCCnSvDX7ugI=",
         "ref": "refs/heads/master",
-        "rev": "4675eb25f8abed4c994b4225848d4ac1607c17e5",
-        "revCount": 526,
+        "rev": "0efc998fac8152859bead770b2c75afd320e6240",
+        "revCount": 528,
         "type": "git",
         "url": "https://git.kempkens.io/daniel/nix-overlay"
       },
@@ -385,11 +385,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1697049401,
-        "narHash": "sha256-I/wCJBpW/K23h3o42bUD3OIeRQ5TRVoecu/RGIpfx6w=",
+        "lastModified": 1697100850,
+        "narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "d6b554a85caac840430a822aae963c811e9c7e26",
+        "rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565",
         "type": "github"
       },
       "original": {
@@ -401,11 +401,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1697005890,
-        "narHash": "sha256-pEI8Xg3FChTZMpzHtoe2wJOK6e2MJjc25Q5G9fHorkc=",
+        "lastModified": 1697185576,
+        "narHash": "sha256-fI0j3DnpxYMt/BENvrCRzLACUrhw5vNV0hctkCAjOq4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "52f7404b62181b4ef439bb644b3dfa58e9eb2ce7",
+        "rev": "4f2b18d41893ffbf9487a86a874791a681601260",
         "type": "github"
       },
       "original": {

home/config/direnv/direnvrc

@@ -51,8 +51,13 @@ project_node() {
 }
 
 project_python() {
+  export PYTHONUSERBASE=$(direnv_layout_dir)/python-user
+  path_add PYTHONPATH $(realpath $PYTHONUSERBASE/lib/python*/site-packages)
+
   export POETRY_HOME=$(direnv_layout_dir)/poetry/data
   export POETRY_CACHE_DIR=$(direnv_layout_dir)/poetry/cache
+
+  PATH_add $PYTHONUSERBASE/bin
 }
 
 project_ruby() {

home/config/nvim/nifoc/formatting.fnl

@@ -12,7 +12,8 @@
       (usercmd :FormatEnableBuffer mod.enable-for-buffer
                {:desc "Enable Formatting for the current buffer"})
       (aucmd :BufWritePre
-             {:callback #(mod.maybe-format-buffer $1.buf)
+             {:pattern "*"
+              :callback #(mod.maybe-format-buffer $1.buf)
               :group augroup
               :desc "Run Formatter before saving"})))
 
@@ -38,6 +39,9 @@
   (fn mod.maybe-format-buffer [bufnr]
     (let [ft vim.bo.filetype]
       (if (= b.nifoc_formatter_disabled 1) nil
-          (conform.format {: bufnr :lsp_fallback (format-with-lsp? ft)}))))
+          (conform.format {: bufnr
+                           :async false
+                           :timeout_ms 1000
+                           :lsp_fallback (format-with-lsp? ft)}))))
 
   mod)

home/config/nvim/plugins/lsp.fnl

@@ -22,8 +22,7 @@
                                    (when (client.supports_method :textDocument/inlayHint)
                                      (vim.lsp.inlay_hint bufnr true)
                                      (setup-inlay-hint-toggle bufnr))
-                                   (diagnostic.maybe-enable-lsp client bufnr)
-                                   ((. (require :lsp-notify) :setup) {})))
+                                   (diagnostic.maybe-enable-lsp client bufnr)))
                      :group augroup
                      :desc "Automatic LSP setup"})
   ;; Servers

home/programs/nvim/default.nix

@@ -282,8 +282,6 @@ in
           config = builtins.readFile ../../config/nvim/plugins/notify.fnl;
           type = "fennel";
         }
-
-        nvim-lsp-notify
       ];
   };
 

home/programs/nvim/plugins.nix

@@ -30,23 +30,23 @@ in
   };
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "2023-10-10";
+    version = "2023-10-14";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "8b43796d93b09c9f63076c69664e585d7ef28b62";
-      sha256 = "1qnxv138j1ai58h7nzk4x422ymvxgbfag8bc2f9xygnnbkj37ja1";
+      rev = "0f93724569ebf27b6b3bc7130d8044a9020a8cc5";
+      sha256 = "16alghaa7xkkbzs1ai80shf44yy3w60zzkxjzk2frlkhjnk34w4i";
       fetchSubmodules = false;
     };
   };
   nvim-web-devicons = buildVimPlugin {
     pname = "nvim-web-devicons";
-    version = "2023-10-09";
+    version = "2023-10-14";
     src = fetchFromGitHub {
       owner = "kyazdani42";
       repo = "nvim-web-devicons";
-      rev = "a1e6268779411048a87f767a27380089362a0ce2";
-      sha256 = "019i9iy9zri12whq5kdpfia8zbpp7x5p5snk4j6bb0p7hb7caljp";
+      rev = "3af745113ea537f58c4b1573b64a429fefad9e07";
+      sha256 = "103spgpvwm4pv32h954sv68p6qjizkm4fdvyzndjgw9x9bah5ksh";
       fetchSubmodules = false;
     };
   };
@@ -63,12 +63,12 @@ in
   };
   nvim-osc52 = buildVimPlugin {
     pname = "nvim-osc52";
-    version = "2023-10-12";
+    version = "2023-10-13";
     src = fetchFromGitHub {
       owner = "ojroques";
       repo = "nvim-osc52";
-      rev = "5752263ff386f20e9f3b9ca3aaf408efdab08659";
-      sha256 = "1a09d6x5ix7iy8jww9nkmxnrrksln65as0rs7a7b7zfpcwk11vag";
+      rev = "78652ac4c992214e46fccb95364044d98b0a6a44";
+      sha256 = "1afvyj10arv1lwzxd8hbpzi5gp2ks6hs9yr9sp6q8g02x61bk9wa";
       fetchSubmodules = false;
     };
   };
@@ -118,23 +118,23 @@ in
   };
   nvim-treesitter = buildVimPlugin {
     pname = "nvim-treesitter";
-    version = "2023-10-12";
+    version = "2023-10-14";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "49f7194e4c4d3c9ed891b0968798c062e8ac5a3d";
-      sha256 = "0pz0z4zv1vi83nnk3fmdk4z02sjj5ihdfca4gdyw68jj2nmmv66f";
+      rev = "ad02fbcdfc391017cad462e04e4740d2887cfa2e";
+      sha256 = "1wvgzsn9dpbdksz5y4pp2r2cjw5zf1gnav681wnv3qnf7081ds4c";
       fetchSubmodules = false;
     };
   };
   vim-just = buildVimPlugin {
     pname = "vim-just";
-    version = "2023-10-06";
+    version = "2023-10-13";
     src = fetchFromGitHub {
       owner = "NoahTheDuke";
       repo = "vim-just";
-      rev = "b2113d846c1f5a400ac9c2f5ef762de8f99dc745";
-      sha256 = "14nqxx0lmqbydcxxjxy2jw0nkgawlkcl4bjnm38wvyj5vibhmy8v";
+      rev = "3038ffac026a13edaf1bbb898f25d808b6b0c92a";
+      sha256 = "1dh3jhfvv0vk1khxi3hfy80xnvk021vj3rrlmj3jjgarda06psmv";
       fetchSubmodules = false;
     };
   };
@@ -231,23 +231,23 @@ in
   };
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2023-10-12";
+    version = "2023-10-14";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "60e7d993849cb8161cb1ffbedbb47a0c947e76be";
-      sha256 = "1gvyx373kl87692dvscbabg1pri1zagpp8hqanqy3m78j25i8l36";
+      rev = "8f3ddc448769f563248654a5099c943c7139137e";
+      sha256 = "1719sbp9w70d6fngmfxrw3bp8ix4icz857f2ba7ig8zfbzbdi4xw";
       fetchSubmodules = false;
     };
   };
   nvim-jdtls = buildVimPlugin {
     pname = "nvim-jdtls";
-    version = "2023-09-19";
+    version = "2023-10-13";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-jdtls";
-      rev = "3ca419c52a7c20a2565237db2c110ed68fc7e6f1";
-      sha256 = "1jy5yklfc3fvajy5mqwfi4h6p5bxb71ar1hnck8k8hciggrijhrq";
+      rev = "a09f8cdd75c546eb024d0f0b5b3ad185f05b738f";
+      sha256 = "1ck1f55y19m049bqwb3j77sq5glwafy48w7b01z324qdj68vhy6n";
       fetchSubmodules = false;
     };
   };
@@ -275,23 +275,23 @@ in
   };
   nvim-lint = buildVimPlugin {
     pname = "nvim-lint";
-    version = "2023-10-12";
+    version = "2023-10-14";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-lint";
-      rev = "0f54481d7537a6872f7bb021575366657e123474";
-      sha256 = "0v0d1lmsxv2hpzjm1862cq5j8rl02kpapqzzarczpqmy26p6snmn";
+      rev = "6d596b87862909370f4d1e6535cc9fad80c89fe6";
+      sha256 = "17c16fc94lzi04q7r6yfz50cycq6pbih884gkvlgkyyy92b6bcqn";
       fetchSubmodules = false;
     };
   };
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
-    version = "2023-10-11";
+    version = "2023-10-14";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "conform.nvim";
-      rev = "4db76a68b47aa6e9777e4da4aed16f0fff74920e";
-      sha256 = "0smbn35mby5k6679djdx9n1ivwp1rriahzsp8kya7h3751qxfnlx";
+      rev = "b36221f642a66e0813c061aa8a10cf1b533c8a0f";
+      sha256 = "09v6wp0fzlfp1rcnzkjw438x2d6r6z6spimr24ajswaxh1gjkxqb";
       fetchSubmodules = false;
     };
   };
@@ -383,15 +383,4 @@ in
       fetchSubmodules = false;
     };
   };
-  nvim-lsp-notify = buildVimPlugin {
-    pname = "nvim-lsp-notify";
-    version = "2023-03-19";
-    src = fetchFromGitHub {
-      owner = "mrded";
-      repo = "nvim-lsp-notify";
-      rev = "9986955e0423f2f5cdb3bd4f824bc980697646a0";
-      sha256 = "06zaydcsmmdblqvrkiv827lv3z9smf90v57f62fqgbxn5rhx38r7";
-      fetchSubmodules = false;
-    };
-  };
 }

home/programs/nvim/plugins.yaml

@@ -44,4 +44,3 @@
 - src: axieax/urlview.nvim
 - src: lewis6991/gitsigns.nvim
 - src: rcarriga/nvim-notify
-- src: mrded/nvim-lsp-notify