fix(avante): disable auto_suggestions

chore: update flake
feat: improve luasnip
2024-10-11 11:41:19 +02:00 · 2024-10-08 09:42:32 +02:00 · 2024-10-07 09:31:06 +02:00 · 2024-09-15 15:32:43 +02:00 · 2024-09-15 15:31:39 +02:00
20 changed files with 436 additions and 330 deletions
--- a/flake.lock
+++ b/flake.lock
@ -43,11 +43,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723920171,
-        "narHash": "sha256-dVCMrAe+D/5S91erhwQj2DSzHOVzAanWqoy+vPWB9DY=",
+        "lastModified": 1727261104,
+        "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "71d49670fe246cdaff4860b0effba0ab9f163b72",
+        "rev": "b82fdaff917582a9d568969e15e61b398c71e990",
        "type": "github"
      },
      "original": {
@ -59,11 +59,11 @@
    "arkenfox-userjs": {
      "flake": false,
      "locked": {
-        "lastModified": 1722919020,
-        "narHash": "sha256-tTKGJXg/yicwpCI9WwFmbKYL6cyQ0OOetbvT9i/psUk=",
+        "lastModified": 1724661688,
+        "narHash": "sha256-XLswsa2u2qsUPsLYRYn6lwis7VwSjAW6BRNdI4brbSM=",
        "owner": "arkenfox",
        "repo": "user.js",
-        "rev": "11582f905a21971eb5869b48ef8c3f2d4eac4d89",
+        "rev": "f906f7f3b41fe3f6aaa744980431f4fdcd086379",
        "type": "github"
      },
      "original": {
@ -89,22 +89,6 @@
        "type": "github"
      }
    },
-    "avante-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1725237964,
-        "narHash": "sha256-3jwSkCHr5iaeEIjt2lz/SQl7gbrkFiJ0FjspX6Ufa88=",
-        "owner": "yetone",
-        "repo": "avante.nvim",
-        "rev": "d520f0933323ba982c9665d8e4fe91000ff14e99",
-        "type": "github"
-      },
-      "original": {
-        "owner": "yetone",
-        "repo": "avante.nvim",
-        "type": "github"
-      }
-    },
    "darwin": {
      "inputs": {
        "nixpkgs": [
@ -150,11 +134,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1723685519,
-        "narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=",
+        "lastModified": 1728109432,
+        "narHash": "sha256-wmbErh8FG7dRKOtMMpHUqDtFjeqt9Zjx4zssSeTalwU=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "276a0d055a720691912c6a34abb724e395c8e38a",
+        "rev": "48ebb577855fb2398653f033b3b2208a9249203d",
        "type": "github"
      },
      "original": {
@ -246,11 +230,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1722555600,
-        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "lastModified": 1727826117,
+        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
        "type": "github"
      },
      "original": {
@ -267,11 +251,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722555600,
-        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "lastModified": 1727826117,
+        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
        "type": "github"
      },
      "original": {
@ -327,11 +311,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
        "type": "github"
      },
      "original": {
@ -345,11 +329,11 @@
        "systems": "systems_4"
      },
      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
        "type": "github"
      },
      "original": {
@ -372,11 +356,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723803910,
-        "narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=",
+        "lastModified": 1727805723,
+        "narHash": "sha256-b8flytpuc4Ey/g3mcvpS/ICORcD4h56QDZeP5LogevY=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba",
+        "rev": "2f5ae3fc91db865eff2c5a418da85a0fbe6238a3",
        "type": "github"
      },
      "original": {
@ -433,11 +417,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724857454,
-        "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
+        "lastModified": 1728092656,
+        "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
+        "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
        "type": "github"
      },
      "original": {
@ -520,11 +504,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719226092,
-        "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=",
+        "lastModified": 1724947644,
+        "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=",
        "owner": "hercules-ci",
        "repo": "hercules-ci-effects",
-        "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5",
+        "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef",
        "type": "github"
      },
      "original": {
@ -561,11 +545,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723399884,
-        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
+        "lastModified": 1728041527,
+        "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
+        "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
        "type": "github"
      },
      "original": {
@ -579,11 +563,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1722636442,
-        "narHash": "sha256-+7IS0n3/F0I5j6ZbrVlLcIIPHY3o+/vLAqg/G48sG+w=",
+        "lastModified": 1725551787,
+        "narHash": "sha256-6LgsZHz8w3g4c9bRUwRAR+WIMwFGGf3P1VZQcKNRf2o=",
        "owner": "hyprwm",
        "repo": "contrib",
-        "rev": "9d67858b437d4a1299be496d371b66fc0d3e01f6",
+        "rev": "1e531dc49ad36c88b45bf836081a7a2c8927e072",
        "type": "github"
      },
      "original": {
@ -608,11 +592,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722623071,
-        "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
+        "lastModified": 1727532803,
+        "narHash": "sha256-ZaZ7h7PY8mQc4vtGmVqWLAq9CAO02gHMyNR5yY8zDmM=",
        "owner": "hyprwm",
        "repo": "hyprcursor",
-        "rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
+        "rev": "b98726e431d4d3ed58bd58bee1047cdb81cec69f",
        "type": "github"
      },
      "original": {
@ -625,6 +609,7 @@
      "inputs": {
        "aquamarine": "aquamarine",
        "hyprcursor": "hyprcursor",
+        "hyprland-protocols": "hyprland-protocols",
        "hyprlang": "hyprlang",
        "hyprutils": "hyprutils",
        "hyprwayland-scanner": "hyprwayland-scanner",
@ -633,11 +618,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1723969407,
-        "narHash": "sha256-COChiv/1EsfN0aVQcDBPXqNR/T5sUXtalsuO1RGvwcY=",
+        "lastModified": 1728223706,
+        "narHash": "sha256-HrsylIpk+17wwsh/+sgUBmL7VHakF+EWv9v9Dx1268I=",
        "ref": "refs/heads/main",
-        "rev": "1006663b6eaa55149e9a21aa8a34e41c85eb08ca",
-        "revCount": 5103,
+        "rev": "4e41cda27ed4176005082436cb35878335e63fae",
+        "revCount": 5301,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@ -649,6 +634,31 @@
      }
    },
    "hyprland-protocols": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1727451107,
+        "narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "type": "github"
+      }
+    },
+    "hyprland-protocols_2": {
      "inputs": {
        "nixpkgs": [
          "hyprland",
@ -691,11 +701,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1721324361,
-        "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
+        "lastModified": 1725997860,
+        "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
+        "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876",
        "type": "github"
      },
      "original": {
@ -716,11 +726,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722869141,
-        "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=",
+        "lastModified": 1727300645,
+        "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "0252fd13e78e60fb0da512a212e56007515a49f7",
+        "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
        "type": "github"
      },
      "original": {
@ -741,11 +751,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1721324119,
-        "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
+        "lastModified": 1726874836,
+        "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
+        "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e",
        "type": "github"
      },
      "original": {
@ -756,11 +766,11 @@
    },
    "impermanence": {
      "locked": {
-        "lastModified": 1719091691,
-        "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
+        "lastModified": 1727649413,
+        "narHash": "sha256-FA53of86DjFdeQzRDVtvgWF9o52rWK70VHGx0Y8fElQ=",
        "owner": "nix-community",
        "repo": "impermanence",
-        "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
+        "rev": "d0b38e550039a72aff896ee65b0918e975e6d48e",
        "type": "github"
      },
      "original": {
@ -788,11 +798,11 @@
    },
    "master": {
      "locked": {
-        "lastModified": 1723976400,
-        "narHash": "sha256-WpKvJffFrcvNMGMR3hNtQIRa/CTAvrWYohPMAFElLJE=",
+        "lastModified": 1728286420,
+        "narHash": "sha256-o2MfGdzZsQxcBDlAiYASBqMrAUOgz2b/EzzCtIo6RNI=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "7c87c474f1b4f020b1ab9d2b962fde094c2599cf",
+        "rev": "a825406b157355e5fe73c48d04db97439a02edc9",
        "type": "github"
      },
      "original": {
@ -833,11 +843,11 @@
        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1723969597,
-        "narHash": "sha256-nNSmyoR8k2gEw9LZ+nFcBQm+bquflzw2R44BeJ4gmKk=",
+        "lastModified": 1727852635,
+        "narHash": "sha256-eY0Y5ZDMo5IS+K42kMwAMCLsYHoAgPW3R4UxeGfzP0U=",
        "owner": "nix-community",
        "repo": "neovim-nightly-overlay",
-        "rev": "ec3ee3674c80882ac54d93b5575426c66e3f430d",
+        "rev": "377cf41246ee443c86c4ae48f66f5100038fe158",
        "type": "github"
      },
      "original": {
@ -849,11 +859,11 @@
    "neovim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1723936741,
-        "narHash": "sha256-x/0wYCshhLSA9zW4fvPK+W6g3gTqE8fMJQZrIucDyXg=",
+        "lastModified": 1727825968,
+        "narHash": "sha256-7DbbGIAbJesqYEkZh2FaEo5wycZ/cRbvZP6k01Z5+ZM=",
        "owner": "neovim",
        "repo": "neovim",
-        "rev": "d1bdeacb00186ba72fa61f3c7f2951fd018ae21d",
+        "rev": "2168d772b864fd05109fb4299e409d4bdc1df39d",
        "type": "github"
      },
      "original": {
@ -870,11 +880,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724561770,
-        "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
+        "lastModified": 1727999297,
+        "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
+        "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b",
        "type": "github"
      },
      "original": {
@ -890,11 +900,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723950649,
-        "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=",
+        "lastModified": 1728263287,
+        "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=",
        "owner": "Mic92",
        "repo": "nix-index-database",
-        "rev": "392828aafbed62a6ea6ccab13728df2e67481805",
+        "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259",
        "type": "github"
      },
      "original": {
@ -981,14 +991,14 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1722555339,
-        "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
+        "lastModified": 1727825735,
+        "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
      }
    },
    "nixpkgs-regression": {
@ -1041,11 +1051,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1723603349,
-        "narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=",
+        "lastModified": 1725194671,
+        "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb",
+        "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
        "type": "github"
      },
      "original": {
@ -1073,11 +1083,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1723637854,
-        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
+        "lastModified": 1727348695,
+        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
+        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
        "type": "github"
      },
      "original": {
@ -1089,11 +1099,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1723856861,
-        "narHash": "sha256-OTDg91+Zzs2SpU3csK4xVdSQFoG8cK1lNUwKmTqERyE=",
+        "lastModified": 1727747005,
+        "narHash": "sha256-2PBox0LkPhxirg1asEIpvfFARjq5KLw0EHPCy4unjPs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "cd7b95ee3725af7113bacbce91dd6549cee58ca5",
+        "rev": "9682b2197dabc185fcca802ac1ac21136e48fcc2",
        "type": "github"
      },
      "original": {
@ -1121,11 +1131,11 @@
    },
    "nixpkgs_7": {
      "locked": {
-        "lastModified": 1723891200,
-        "narHash": "sha256-uljX21+D/DZgb9uEFFG2dkkQbPZN+ig4Z6+UCLWFVAk=",
+        "lastModified": 1728249353,
+        "narHash": "sha256-7NBJm1jfMeAowE1J2oljYqWVvI9X7FyyxBY4O8uB/Os=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "a0d6390cb3e82062a35d0288979c45756e481f60",
+        "rev": "c8a17040be4a20b29589cb4043a9e0c36af1930e",
        "type": "github"
      },
      "original": {
@ -1137,11 +1147,11 @@
    },
    "nixpkgs_8": {
      "locked": {
-        "lastModified": 1724819573,
-        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
+        "lastModified": 1728018373,
+        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
        "type": "github"
      },
      "original": {
@ -1186,11 +1196,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1724968633,
-        "narHash": "sha256-eb2NCdLwfXL1MuTAkoDncSl2lCJwyylV5/NM1Ws2P/U=",
+        "lastModified": 1728245494,
+        "narHash": "sha256-bulK/Z+SEJaHM2PPk7W/kRvO51Ag9bTebcaWai9EEJc=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "2704133fe3ca616b22ed6685cc67180456eb4160",
+        "rev": "33d030d23c9b88bb29e300d702aade58c3734612",
        "type": "github"
      },
      "original": {
@ -1201,11 +1211,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1723976478,
-        "narHash": "sha256-eF815/buOMQlX2XbtNgN3GtA9bwv4psLbckU9iTBsxs=",
+        "lastModified": 1728282432,
+        "narHash": "sha256-ftGSLQ5W9Jq8lQa3+ta/v7RtnY3MNwLQ6ybXtLbbLSw=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "575ee4dc4dc7c031663bdcfe2e8779abacc80d0a",
+        "rev": "baa11edb344e5715eedaeb2a92b6bc5c220a69e4",
        "type": "github"
      },
      "original": {
@ -1223,11 +1233,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724584782,
-        "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=",
+        "lastModified": 1728017046,
+        "narHash": "sha256-ofWYux/uUAv8wq7sWw8XWke0sh8p4qYxSOn8d+EaJ8c=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087",
+        "rev": "ba81d9c1eae20fc3a1cd066062a05ac2e799e629",
        "type": "github"
      },
      "original": {
@ -1244,11 +1254,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1723803910,
-        "narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=",
+        "lastModified": 1728092656,
+        "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba",
+        "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
        "type": "github"
      },
      "original": {
@ -1260,11 +1270,11 @@
    "river": {
      "flake": false,
      "locked": {
-        "lastModified": 1723715391,
-        "narHash": "sha256-Tc0FYZJsQ/YDFl7czKfsDxTEUr1a0d41MyRrdyhdcjw=",
+        "lastModified": 1727948541,
+        "narHash": "sha256-pC8D581CMhh3XCVBbwZ/8woAuD58ilGCrBX4ic5G9Zo=",
        "ref": "refs/heads/master",
-        "rev": "f82b2f58163eb092941d7d2e05e1d0eeaa9f50fe",
-        "revCount": 1293,
+        "rev": "fd55f51ba1b53af95fe3a24611490d42a895ef98",
+        "revCount": 1297,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/riverwm/river"
@ -1280,7 +1290,6 @@
        "agenix": "agenix",
        "arkenfox-userjs": "arkenfox-userjs",
        "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
-        "avante-nvim": "avante-nvim",
        "devshell": "devshell",
        "disko": "disko",
        "flake-parts": "flake-parts",
@ -1305,11 +1314,11 @@
    },
    "stable": {
      "locked": {
-        "lastModified": 1723688146,
-        "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
+        "lastModified": 1728193676,
+        "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
+        "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6",
        "type": "github"
      },
      "original": {
@ -1422,11 +1431,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724833132,
-        "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
+        "lastModified": 1727984844,
+        "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
+        "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
        "type": "github"
      },
      "original": {
@ -1455,11 +1464,19 @@
    },
    "xdph": {
      "inputs": {
-        "hyprland-protocols": "hyprland-protocols",
+        "hyprland-protocols": "hyprland-protocols_2",
        "hyprlang": [
          "hyprland",
          "hyprlang"
        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
        "nixpkgs": [
          "hyprland",
          "nixpkgs"
@ -1470,11 +1487,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722365976,
-        "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=",
+        "lastModified": 1727524473,
+        "narHash": "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341",
+        "rev": "7e500e679ede40e79cf2d89b5f5fa3e34923bd26",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -28,8 +28,6 @@

    # Neovim
    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
-    avante-nvim.flake = false;
-    avante-nvim.url = "github:yetone/avante.nvim";

    nixvim.url = "github:nix-community/nixvim";
    nixvim.inputs.devshell.follows = "devshell";
--- a/hosts/nixos-laptop/default.nix
+++ b/hosts/nixos-laptop/default.nix
@ -137,6 +137,7 @@
  boot = {
    supportedFilesystems = [ "zfs" ];
    loader.systemd-boot.enable = true;
+    loader.efi.canTouchEfiVariables = true;
  };

  # SERVICES
--- a/hosts/nixos-laptop/disko.nix
+++ b/hosts/nixos-laptop/disko.nix
@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, pkgs, ... }:

 {
  # needed for zfs pool
@ -76,9 +76,27 @@
    };
  };
  # rollback to blank
-  boot.initrd.postDeviceCommands = lib.mkAfter ''
-    zfs rollback -r zroot/encrypted/root@blank
+  boot.initrd.systemd.services.rollback = {
+    description = "Rollback ZFS datasets to a pristine state";
+    wantedBy = [
+      "initrd.target"
+    ];
+    after = [
+      "zfs-import-zroot.service"
+    ];
+    before = [
+      "sysroot.mount"
+    ];
+    path = with pkgs; [
+      zfs
+    ];
+    unitConfig.DefaultDependencies = "no";
+    serviceConfig.Type = "oneshot";
+    script = ''
+      zfs rollback -r zroot/encrypted/root@blank && echo "rollback complete"
    '';
+  };
+  boot.initrd.systemd.enable = true;
  fileSystems."/persist".neededForBoot = true;
  # HACK: to fix issue of agenix running before impermanence
  age.identityPaths = [
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@ -12,10 +12,6 @@ in

  config = mkIf cfg.enable {
    home-manager.users.moritz = {
-      xdg.configFile."nvim/snippets" = {
-        recursive = true;
-        source = ./plugins/snippets;
-      };

      home.packages = with pkgs; [
        xdotool # for vimtex
--- a/modules/programs/nvim/new_plugins/avante.nix
+++ b/modules/programs/nvim/new_plugins/avante.nix
@ -0,0 +1,37 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    extraPlugins = with pkgs.vimPlugins; [
+      nui-nvim
+      render-markdown-nvim
+      avante-nvim
+    ];
+    extraConfigLuaPost = ''
+      require("render-markdown").setup({ file_types = {"markdown", "Avante"} })
+
+      require("avante_lib").load()
+      require("avante").setup({
+        provider = "openai",
+        auto_suggestions_provider = "openai",
+        behaviour = {
+          -- auto_suggestions = true,
+        },
+        openai = {
+          model = "gpt-4o",
+          api_key_name = "cmd:cat /run/agenix/openai"
+        }
+      })
+    '';
+    # plugins.copilot-lua.enable = true;
+    # plugins.copilot-lua.suggestion.enabled = false;
+    # plugins.copilot-lua.panel.enabled = false;
+    plugins.dressing.enable = true;
+    # performance.combinePlugins.standalonePlugins = [ "copilot.lua" ];
+  };
+  age.secrets."openai".file = ../../../../secrets/openai.age;
+  age.secrets."openai".owner = "moritz";
+}
--- a/modules/programs/nvim/new_plugins/cmp.nix
+++ b/modules/programs/nvim/new_plugins/cmp.nix
@ -5,6 +5,15 @@ let
 in
 {
  home-manager.users.moritz.programs.nixvim = {
+    extraConfigLuaPre = ''
+      local has_words_before = function()
+        if vim.api.nvim_buf_get_option(0, "buftype") == "prompt" then
+          return false
+        end
+        local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+        return col ~= 0 and vim.api.nvim_buf_get_text(0, line-1, 0, line-1, col, {})[1]:match("^%s@*$") == nil
+      end
+    '';
    plugins.cmp = {
      autoEnableSources = true;
      enable = true;
@ -27,7 +36,7 @@ in
              ["<Tab>"] = cmp.mapping(function(fallback)
                if cmp.visible() then
                  cmp.select_next_item({ behavior = cmp.SelectBehavior.Select })
-                elseif require("luasnip").locally_jumpable(1) then
+                elseif require("luasnip").locally_jumpable(1) and has_words_before() then
                  require("luasnip").jump(1)
                else
                  fallback()
--- a/modules/programs/nvim/new_plugins/conform.nix
+++ b/modules/programs/nvim/new_plugins/conform.nix
@ -0,0 +1,73 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.conform-nvim = {
+      enable = true;
+      settings.formatters_by_ft = {
+        "*" = [ "codespell" "trim_whitespace" ];
+        elixir = [ "mix" ];
+        gleam = [ "gleam" ];
+        go = [ "gofmt" ];
+        json = [ "jq" ];
+        lua = [ "stylua" ];
+        nix.__raw = ''{ "nixpkgs_fmt", "alejandra", stop_after_first=true }'';
+        python.__raw = ''
+          function(bufnr)
+            return { first("ruff_organize_imports", "isort"), first("ruff_format", "black")}
+          end
+        '';
+        rust = [ "rustfmt" ];
+        sh = [ "shfmt" ];
+        tex = [ "latexindent" ];
+        toml = [ "taplo" ];
+        yaml = [ "yamlfix" ];
+      };
+    };
+    opts.formatexpr = "v:lua.require'conform'.formatexpr()";
+    extraConfigLuaPre = ''
+      ---@param bufnr integer
+      ---@param ... string
+      ---@return string
+      local function first(bufnr, ...)
+        local conform = require("conform")
+        for i = 1, select("#", ...) do
+          local formatter = select(i, ...)
+          if conform.get_formatter_info(formatter, bufnr).available then
+            return formatter
+          end
+        end
+        return select(1, ...)
+      end
+
+      vim.api.nvim_create_user_command("Format", function(opts)
+        require("conform").format({ formatters = opts.fargs })
+      end, {
+        nargs = "+",
+        complete = function()
+          local formatters_by_ft = require("conform").formatters_by_ft
+          local names = formatters_by_ft[vim.bo.filetype] or formatters_by_ft["_"] or {}
+          names = vim.list_extend(names, formatters_by_ft["*"] or {})
+          names = vim.tbl_flatten(names)
+          local formatters = vim.tbl_map(require("conform").get_formatter_info, names)
+          formatters = vim.tbl_filter(function(formatter)
+            return formatter.available
+          end, formatters)
+          return vim.tbl_map(function(formatter_info)
+            return formatter_info.name
+          end, formatters)
+        end,
+      })
+    '';
+    performance.combinePlugins.standalonePlugins = [
+      "conform.nvim"
+    ];
+    keymaps = [
+      { key = "<leader>cf"; action.__raw = ''function() require("conform").format() end''; options.desc = "Format current file"; }
+    ];
+  };
+
+}
--- a/modules/programs/nvim/new_plugins/lspsaga.nix
+++ b/modules/programs/nvim/new_plugins/lspsaga.nix
@ -5,11 +5,14 @@ let
 in
 {
  home-manager.users.moritz.programs.nixvim = {
-    plugins.lspsaga = {
+    plugins = {
+      lspsaga = {
        enable = true;
        codeAction.keys.quit = "<esc>";
        lightbulb.virtualText = false;
      };
+      web-devicons.enable = true;
+    };
    keymapsOnEvents = {
      LspAttach = [
        {
--- a/modules/programs/nvim/new_plugins/luasnip.nix
+++ b/modules/programs/nvim/new_plugins/luasnip.nix
@ -4,7 +4,12 @@ let
  inherit (lib) mkEnableOption mkIf readFile;
 in
 {
-  home-manager.users.moritz.programs.nixvim = {
+  home-manager.users.moritz = {
+    xdg.configFile."nvim/snippets" = {
+      recursive = true;
+      source = ../snippets;
+    };
+    programs.nixvim = {
      plugins.luasnip = {
        enable = true;
        settings = {
@ -23,5 +28,11 @@ in
          ft_func.__raw = ''require("luasnip.extras.filetype_functions").from_pos_or_filetype'';
        };
      };
+      extraConfigLuaPost = ''
+        require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets" })
+        require("luasnip.loaders.from_snipmate").lazy_load({ paths = "~/.config/nvim/snippets" })
+        require("luasnip.loaders.from_vscode").lazy_load()
+      '';
+    };
  };
 }
--- a/modules/programs/nvim/new_plugins/other.nix
+++ b/modules/programs/nvim/new_plugins/other.nix
@ -22,71 +22,7 @@ in
          keymaps.todoTelescope.key = "<leader>fc";
        };
      }
-      {
-        plugins.conform-nvim = {
-          enable = true;
-          settings.formatters_by_ft = {
-            "*" = [ "codespell" "trim_whitespace" ];
-            elixir = [ "mix" ];
-            gleam = [ "gleam" ];
-            go = [ "gofmt" ];
-            json = [ "jq" ];
-            lua = [ "stylua" ];
-            nix.__raw = ''{ "nixpkgs_fmt", "alejandra", stop_after_first=true }'';
-            python.__raw = ''
-              function(bufnr)
-                return { first("ruff_organize_imports", "isort"), first("ruff_format", "black")}
-              end
-            '';
-            rust = [ "rustfmt" ];
-            sh = [ "shfmt" ];
-            tex = [ "latexindent" ];
-            toml = [ "taplo" ];
-            yaml = [ "yamlfix" ];
-          };
-        };
-        opts.formatexpr = "v:lua.require'conform'.formatexpr()";
-        extraConfigLuaPre = ''
-          ---@param bufnr integer
-          ---@param ... string
-          ---@return string
-          local function first(bufnr, ...)
-            local conform = require("conform")
-            for i = 1, select("#", ...) do
-              local formatter = select(i, ...)
-              if conform.get_formatter_info(formatter, bufnr).available then
-                return formatter
-              end
-            end
-            return select(1, ...)
-          end

-          vim.api.nvim_create_user_command("Format", function(opts)
-            require("conform").format({ formatters = opts.fargs })
-          end, {
-            nargs = "+",
-            complete = function()
-              local formatters_by_ft = require("conform").formatters_by_ft
-              local names = formatters_by_ft[vim.bo.filetype] or formatters_by_ft["_"] or {}
-              names = vim.list_extend(names, formatters_by_ft["*"] or {})
-              names = vim.tbl_flatten(names)
-              local formatters = vim.tbl_map(require("conform").get_formatter_info, names)
-              formatters = vim.tbl_filter(function(formatter)
-                return formatter.available
-              end, formatters)
-              return vim.tbl_map(function(formatter_info)
-                return formatter_info.name
-              end, formatters)
-            end,
-          })
-        '';
-        performance.combinePlugins.standalonePlugins = [
-          "conform.nvim"
-        ];
-        keymaps = [
-          { key = "<leader>cf"; action.__raw = ''function() require("conform").format() end''; options.desc = "Format current file"; }
-        ];
-      }
      {
        keymaps = [
          { key = "<esc>"; action = "<cmd>noh<cr><esc>"; options.desc = "Escape and clear hlsearch"; mode = [ "i" "n" ]; }
@ -94,7 +30,8 @@ in
      }
      { plugins.oil.enable = true; }
      {
-        plugins.telescope = {
+        plugins = {
+          telescope = {
            enable = true;
            extensions.fzf-native.enable = true;
            keymaps = {
@ -124,9 +61,11 @@ in
              };
            };
          };
+          web-devicons.enable = true;
+        };
      }
      { plugins.nvim-autopairs.enable = true; }
-      { plugins.surround.enable = true; }
+      { plugins.vim-surround.enable = true; }
      {
        plugins.lint.enable = true;
        # TODO: add linters
@ -145,27 +84,6 @@ in
      { plugins.friendly-snippets.enable = true; }
      { plugins.direnv.enable = true; }
      { plugins.crates-nvim.enable = true; }
-      {
-        extraPlugins = [
-          (pkgs.vimUtils.buildVimPlugin {
-            pname = "avante.nvim";
-            src = inputs.avante-nvim;
-            version = lib.my.mkVersionInput inputs.avante-nvim;
-          })
-          pkgs.vimPlugins.nui-nvim
-        ];
-        extraConfigLuaPost = ''
-          require("avante").setup({
-            provider = "copilot",
-            auto_suggestions_provider = "copilot",
-          })
-        '';
-        plugins.copilot-lua.enable = true;
-        plugins.copilot-lua.suggestion.enabled = false;
-        plugins.copilot-lua.panel.enabled = false;
-        plugins.dressing.enable = true;
-        performance.combinePlugins.standalonePlugins = [ "copilot.lua" ];
-      }
    ];
  };
 }
--- a/modules/programs/nvim/plugins/snippets/elixir.lua
+++ b/modules/programs/nvim/plugins/snippets/elixir.lua
@ -1,46 +0,0 @@
-local ls = require("luasnip")
-local s = ls.snippet
-local sn = ls.snippet_node
-local isn = ls.indent_snippet_node
-local t = ls.text_node
-local i = ls.insert_node
-local f = ls.function_node
-local c = ls.choice_node
-local d = ls.dynamic_node
-local r = ls.restore_node
-local events = require("luasnip.util.events")
-local ai = require("luasnip.nodes.absolute_indexer")
-local extras = require("luasnip.extras")
-local l = extras.lambda
-local rep = extras.rep
-local p = extras.partial
-local m = extras.match
-local n = extras.nonempty
-local dl = extras.dynamic_lambda
-local fmt = require("luasnip.extras.fmt").fmt
-local fmta = require("luasnip.extras.fmt").fmta
-local conds = require("luasnip.extras.expand_conditions")
-local postfix = require("luasnip.extras.postfix").postfix
-local types = require("luasnip.util.types")
-local parse = require("luasnip.util.parser").parse_snippet
-local ms = ls.multi_snippet
-local k = require("luasnip.nodes.key_indexer").new_key
-
-local def_template = [[
-def {fname}({args}) do
-  {final}
-end
-]]
-
-local def = s(
-  "def",
-  fmt(def_template, {
-    fname = i(1, "fname"),
-    args = i(2),
-    final = i(3),
-  }, { priority = 1001 })
-)
-
-return {
-  def,
-}
--- a/modules/programs/nvim/snippets/elixir.snippets
+++ b/modules/programs/nvim/snippets/elixir.snippets
@ -0,0 +1,71 @@
+snippet defmodule "Define a new module"
+  defmodule ${1} do
+    ${2}
+  end
+
+snippet def "Define a function"
+  def ${1} do
+    ${2}
+  end
+
+snippet defw "Define a function with guard"
+  def ${1}(${2}) when ${3} do
+    ${4}
+  end
+
+snippet defa "Define a function with arguments"
+  def ${1}(${2}) do
+    ${3}
+  end
+
+snippet defp "Define a private function"
+  defp ${1} do
+    ${2}
+  end
+
+snippet defpw "Define a private function with guard"
+  defp ${1}(${2}) when ${3} do
+    ${4}
+  end
+
+snippet defpa "Define a private function with arguments"
+  defp ${1}(${2}) do
+    ${3}
+  end
+
+snippet defmacro "Define a macro"
+  defmacro ${1}(${2}) do
+    ${3}
+  end
+  
+snippet defmacrow "Define a macro with guard"
+  defmacro ${1}(${2}) when ${3} do
+    ${4}
+  end
+
+snippet quote "Quote block"
+  quote do
+    ${1}
+  end
+
+snippet quoteb "Quote block with bind_quoted"
+  quote bind_quoted: [${1}] do
+    ${2}
+  end
+
+snippet do "Do block"
+  do
+    ${1}
+  end
+
+snippet if "If block"
+  if ${1} do
+    ${2}
+  end
+
+snippet ife "If-Else block"
+  if ${1} do
+    ${2}
+  else
+    ${3}
+  end
--- a/modules/programs/nvim/plugins/snippets/gleam.lua
+++ b/modules/programs/nvim/plugins/snippets/gleam.lua
--- a/modules/programs/nvim/plugins/snippets/heex.lua
+++ b/modules/programs/nvim/plugins/snippets/heex.lua
--- a/modules/programs/nvim/plugins/snippets/python.lua
+++ b/modules/programs/nvim/plugins/snippets/python.lua
--- a/modules/programs/nvim/snippets/snippets.snippets
+++ b/modules/programs/nvim/snippets/snippets.snippets
@ -0,0 +1,7 @@
+snippet snip
+	snippet ${1:trigger} "${2:description}"
+		${0:${VISUAL}}
+snippet v
+	{VISUAL}
+snippet $
+	${${1:1}:${0:text}}
--- a/modules/programs/river/default.nix
+++ b/modules/programs/river/default.nix
@ -138,14 +138,6 @@ in
      # add waybar as a status bar
      programs.waybar = {
        enable = true;
-        package = pkgs.waybar.overrideAttrs (old: {
-          patches = old.patches or [ ] ++ [
-            (pkgs.fetchpatch {
-              url = "https://gitlab.archlinux.org/archlinux/packaging/packages/waybar/-/raw/0306af03fcb6de6aee1e288f42b0bf1b223513bd/a544f4b2cdcf632f1a4424b89f6e3d85ef5aaa85.patch";
-              sha256 = "sha256-S/1oUj9Aj6BElNTsDY8CTcKtS1j7Gl54JFgCywH05pg=";
-            })
-          ];
-        });

        # start using systemd service
        systemd = {
--- a/secrets/openai.age
+++ b/secrets/openai.age
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@ -26,4 +26,5 @@ in
  "root-password.age".publicKeys = personal;
  "moritz-password.age".publicKeys = personal;
  "exercism.age".publicKeys = personal;
+  "openai.age".publicKeys = personal;
 }
Author	SHA1	Message	Date
Moritz Böhme	8376321b37	fix(avante): disable auto_suggestions	2024-10-11 11:41:19 +02:00
Moritz Böhme	87473baed4	chore: update flake	2024-10-08 09:42:32 +02:00
Moritz Böhme	22a6b5156c	feat: improve luasnip	2024-10-07 09:31:06 +02:00
Moritz Böhme	85bab070c6	feat(nvim): move conform to own file	2024-09-15 15:32:43 +02:00
Moritz Böhme	9a66c10241	feat(nvim): move avante to own file and use openai	2024-09-15 15:31:39 +02:00