From aefef6e7fb897bd9534fbeb5dd24752ccb15efb9 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Fri, 8 Nov 2024 15:38:01 +0530 Subject: [PATCH] feat: Update stuff --- common/gui.nix | 2 - common/home.nix | 7 +- common/kitty.nix | 2 +- common/tmux.nix | 3 +- flake.lock | 485 ++++++++++++++++++++++++++-------------------- neovim/flake.lock | 167 +++++++++------- neovim/nvim.nix | 28 +-- nixos/ryu.nix | 2 +- 8 files changed, 390 insertions(+), 306 deletions(-) diff --git a/common/gui.nix b/common/gui.nix index 802cb8c5..6d1433e7 100644 --- a/common/gui.nix +++ b/common/gui.nix @@ -25,8 +25,6 @@ lib.attrsets.optionalAttrs device.hasGui { # }; home.packages = with pkgs; [ - _1password - neovide ] ++ lib.optionals pkgs.stdenv.isLinux [ (mpv-unwrapped.wrapper {mpv = mpv-unwrapped.override {sixelSupport = true;};}) diff --git a/common/home.nix b/common/home.nix index ee3a6be1..e23fedb1 100644 --- a/common/home.nix +++ b/common/home.nix @@ -54,8 +54,7 @@ in { home.packages = with pkgs; [ - spotify-player - + # spotify-player sd go pandoc @@ -244,8 +243,8 @@ in { set fish_greeting yes | fish_config theme save "Catppuccin Mocha" ''; + # ${pkgs.spotify-player}/bin/spotify_player generate fish | source interactiveShellInit = '' - ${pkgs.spotify-player}/bin/spotify_player generate fish | source ${pkgs.pfetch-rs}/bin/pfetch function _aichat_fish set -l _old (commandline) @@ -311,7 +310,7 @@ in { enable = true; # enableAliases = true; git = true; - icons = true; + icons = "auto"; }; # carapace = { # # enable = true; diff --git a/common/kitty.nix b/common/kitty.nix index bfd45d75..4317a815 100644 --- a/common/kitty.nix +++ b/common/kitty.nix @@ -23,7 +23,7 @@ darwinLaunchOptions = [ "--single-instance" ]; - theme = "Catppuccin-Mocha"; + themeFile = "Catppuccin-Mocha"; package = inputs.nixpkgs-master.legacyPackages.${device.system}.kitty; }; } diff --git a/common/tmux.nix b/common/tmux.nix index 5eb79f1a..5c6bfb63 100644 --- a/common/tmux.nix +++ b/common/tmux.nix @@ -11,7 +11,6 @@ in { programs.tmux = { enable = true; - shell = "${pkgs.fish}/bin/fish"; terminal = "tmux-256color"; prefix = "C-q"; historyLimit = 100000; @@ -68,6 +67,8 @@ in { set -ga update-environment TERM_PROGRAM set -sg escape-time 10 set -sa terminal-features ',wezterm:RGB' + set -g default-command "${pkgs.fish}/bin/fish"; + set -g default-shell "${pkgs.fish}/bin/fish"; diff --git a/flake.lock b/flake.lock index fd347982..06dc2565 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1725305631, - "narHash": "sha256-RcpR2sN4BlNW6lEOIsa119QqgANsZM4Lrs1FnPSEHic=", + "lastModified": 1728048122, + "narHash": "sha256-2P7BjsQHpAjp+zjftGXSGwo0gepR79KJbBNRKJxsUyk=", "owner": "cachix", "repo": "cachix-deploy-flake", - "rev": "aaca8c67c1d86fc3908ff0c471991a08e829426e", + "rev": "f363e7ba6661f0e342707b98224c85599fdfb1cc", "type": "github" }, "original": { @@ -200,11 +200,11 @@ }, "crane_2": { "locked": { - "lastModified": 1727316705, - "narHash": "sha256-/mumx8AQ5xFuCJqxCIOFCHTVlxHkMT21idpbgbm/TIE=", + "lastModified": 1730060262, + "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", "owner": "ipetkov", "repo": "crane", - "rev": "5b03654ce046b5167e7b0bccbd8244cb56c16f0e", + "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", "type": "github" }, "original": { @@ -214,18 +214,12 @@ } }, "crane_3": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", + "lastModified": 1730652660, + "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", "owner": "ipetkov", "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", + "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", "type": "github" }, "original": { @@ -260,11 +254,11 @@ }, "crane_5": { "locked": { - "lastModified": 1725409566, - "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", + "lastModified": 1730652660, + "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", "owner": "ipetkov", "repo": "crane", - "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", + "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", "type": "github" }, "original": { @@ -313,11 +307,11 @@ ] }, "locked": { - "lastModified": 1715871485, - "narHash": "sha256-ywapEXmBBI+DVRx/YYC6+6Lk+W8vhShz1uJNvqPKzng=", + "lastModified": 1727999297, + "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "cb02884fa1ff5a619a44ab5f1bcc4dedd2d623c2", + "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b", "type": "github" }, "original": { @@ -357,11 +351,11 @@ ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -399,11 +393,11 @@ ] }, "locked": { - "lastModified": 1715822638, - "narHash": "sha256-Z4ZoyK8jYRmBZwMaEZLEmAilrfdpekwwwohliqC14/E=", + "lastModified": 1727977578, + "narHash": "sha256-DBORKcmQ7ZjA4qE1MsnF1MmZSokOGrw4W9vTCioOv2U=", "owner": "nix-community", "repo": "disko", - "rev": "476eef8d85aa09389ae7baf6e6b60357f6a01432", + "rev": "574400001b3ffe555c7a21e0ff846230759be2ed", "type": "github" }, "original": { @@ -656,11 +650,11 @@ ] }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -677,11 +671,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -699,11 +693,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -721,11 +715,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -764,11 +758,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -902,11 +896,11 @@ "systems": "systems_17" }, "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": { @@ -991,11 +985,11 @@ "systems": "systems_10" }, "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": { @@ -1072,11 +1066,11 @@ ] }, "locked": { - "lastModified": 1725513492, - "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -1101,11 +1095,11 @@ ] }, "locked": { - "lastModified": 1725513492, - "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -1131,11 +1125,11 @@ ] }, "locked": { - "lastModified": 1728092656, - "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -1237,11 +1231,11 @@ "gp-nvim": { "flake": false, "locked": { - "lastModified": 1725969177, - "narHash": "sha256-Tvcu8oRfbuc7JX+uYFmpMjzcrnUudJMEMxjd+yNfn5o=", + "lastModified": 1726734798, + "narHash": "sha256-QUZrFU/+TPBEU8yi9gmyRYjI/u7DP88AxcS0RMk7Jvk=", "owner": "Robitx", "repo": "gp.nvim", - "rev": "f4cbbf489fb621ae8f4e512c38ae234ce1157fa7", + "rev": "2372d5323c6feaa2e9c19f7ccb537c615d878e18", "type": "github" }, "original": { @@ -1253,11 +1247,11 @@ "guihua": { "flake": false, "locked": { - "lastModified": 1717591195, - "narHash": "sha256-V5rlORFlhgjAT0n+LcpMNdY+rEqQpur/KGTGH6uFxMY=", + "lastModified": 1730516234, + "narHash": "sha256-XpUsbj1boDfbyE8C6SdOvZdkd97682VVC81fvQ5WA/4=", "owner": "ray-x", "repo": "guihua.lua", - "rev": "225db770e36aae6a1e9e3a65578095c8eb4038d3", + "rev": "d783191eaa75215beae0c80319fcce5e6b3beeda", "type": "github" }, "original": { @@ -1276,11 +1270,11 @@ ] }, "locked": { - "lastModified": 1724947644, - "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", + "lastModified": 1730903510, + "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", + "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141", "type": "github" }, "original": { @@ -1296,11 +1290,11 @@ ] }, "locked": { - "lastModified": 1728026342, - "narHash": "sha256-3mGqKM1jSkc2DrJvR/HCTav0Chd1n8/s1eJ9Y5GzNVM=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "30e04f3d477256de3eb6a7cff608e220087537d4", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -1318,11 +1312,11 @@ ] }, "locked": { - "lastModified": 1726357542, - "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -1339,11 +1333,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -1481,11 +1475,11 @@ ] }, "locked": { - "lastModified": 1721324361, - "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", + "lastModified": 1728168612, + "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", + "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", "type": "github" }, "original": { @@ -1504,11 +1498,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1727695344, - "narHash": "sha256-lQYfVILqK+b+XPwaQeGSA0tAKDajVqUoP719ZifIEh8=", + "lastModified": 1730911842, + "narHash": "sha256-stAVRv13iACAIJ6mheJOwZXWD24YDupyshaUDovVNi4=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "d9c2a5e0b790bfd1bdc7ab39ce188bcc5519b1b4", + "rev": "4fc133c96fa1ad2968cad44f8e9e9e923cd0381a", "type": "github" }, "original": { @@ -1554,11 +1548,11 @@ ] }, "locked": { - "lastModified": 1721324102, - "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", + "lastModified": 1727300645, + "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "962582a090bc233c4de9d9897f46794280288989", + "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", "type": "github" }, "original": { @@ -1602,11 +1596,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1727770824, - "narHash": "sha256-yoH573fanJFdskKPEr0kmyTbHnk5mjlIukbAFZfWqOQ=", + "lastModified": 1730812834, + "narHash": "sha256-pZ8PMNXrI5yvPWjFy2CW0740DwQZuKkEdNeJd/lfnFc=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "83c4f77bbd0dc7b96f4fadab1b8dc91d45077480", + "rev": "e53a9067b03de002a07f85e5302e3774e53521f2", "type": "github" }, "original": { @@ -1615,6 +1609,64 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "neovim", + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "neovim", + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, + "ixx_2": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane_3", @@ -1627,11 +1679,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1727792571, - "narHash": "sha256-KBzRQVE1j2vrSg8WfYJ+vEvFBC25+2VsFSK7VL2kc1M=", + "lastModified": 1730739295, + "narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e2365a1d8dccdcf4bca5111672e80df67d90957d", + "rev": "cef39a78679c266300874e7a7000b4da066228d4", "type": "github" }, "original": { @@ -1671,11 +1723,11 @@ ] }, "locked": { - "lastModified": 1727037144, - "narHash": "sha256-pxV+e/IGccFn4VcLJ4buEj6yOmoqmdqaLMoFzUbijvs=", + "lastModified": 1730699102, + "narHash": "sha256-xkplzGzjywMPOpfTOw5oXbwuH4X14VfXEa3m10aHqrY=", "owner": "musnix", "repo": "musnix", - "rev": "45250275206d366c8328ed1c57ceebffc945ba43", + "rev": "3feabdc65fb3466f07f306fa5f4e9c43234186e6", "type": "github" }, "original": { @@ -1705,11 +1757,11 @@ "navigator": { "flake": false, "locked": { - "lastModified": 1725848935, - "narHash": "sha256-c6LjkRlR4g8lAqI7GqqtJ/tn48Gx2PxXYeeAM/YORbg=", + "lastModified": 1729765416, + "narHash": "sha256-54GXyf4Q77dNCg4NZzNcHvr07nVvi9uYreTKMnRisAg=", "owner": "ray-x", "repo": "navigator.lua", - "rev": "df3d3a09d5b4986558062425639ca8dd1e9a34c2", + "rev": "e2e870c606d28b4247a205972e56a6de2325e34e", "type": "github" }, "original": { @@ -1803,11 +1855,11 @@ "neorg_2": { "flake": false, "locked": { - "lastModified": 1725804232, - "narHash": "sha256-IOhb06MIC8LLPpa1XnZ7TRqKWUabHeBa3X2p9Y/bT4s=", + "lastModified": 1730333767, + "narHash": "sha256-qTo8rxwvANrgP8UccFhzsNsH+Jbmqv2iOlw0ccLNYm4=", "owner": "nvim-neorg", "repo": "neorg", - "rev": "ba35900b21921c439e676b063a79c8fad914eac9", + "rev": "488507bb996f75ee29073f50dec32fa220867ca5", "type": "github" }, "original": { @@ -1819,11 +1871,11 @@ "neorg_3": { "flake": false, "locked": { - "lastModified": 1727821831, - "narHash": "sha256-yfWQ6yKytu1jkWUtRZTVICslUWej6jVYv7frmSB7/6Q=", + "lastModified": 1730333767, + "narHash": "sha256-qTo8rxwvANrgP8UccFhzsNsH+Jbmqv2iOlw0ccLNYm4=", "owner": "nvim-neorg", "repo": "neorg", - "rev": "afc9a37bf021acb0853e95714c4c6436e1588286", + "rev": "488507bb996f75ee29073f50dec32fa220867ca5", "type": "github" }, "original": { @@ -1856,7 +1908,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-B2LjQTL+huRMyKPzvyzPbL19cV9tOaMCifdGgBjhjCQ=", + "narHash": "sha256-SxRzNzv1nQdSIWbc1HNmhKBjLz6Oe2IeSfcUA8X3TzY=", "path": "./neovim", "type": "path" }, @@ -1868,11 +1920,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1726482815, - "narHash": "sha256-M2syKjdJH3uBCOAm9PZndNI46m6xGLXsOadUSen8wpY=", + "lastModified": 1730893053, + "narHash": "sha256-ifiJfPkhyg/9I9aJSbtcHy3jRV4CLig7iF9ACQUycPU=", "owner": "neovim", "repo": "neovim", - "rev": "a0d8c2b86e788ce4273f0b8df258cd9e8e432d38", + "rev": "f7e32fb6e626ab198bf401765236783890f3a0d6", "type": "github" }, "original": { @@ -1890,11 +1942,11 @@ ] }, "locked": { - "lastModified": 1726188813, - "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", + "lastModified": 1730779758, + "narHash": "sha256-5WI9AnsBwhLzVRnQm3Qn9oAbROnuLDQTpaXeyZCK8qw=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", + "rev": "0e3f3f017c14467085f15d42343a3aaaacd89bcb", "type": "github" }, "original": { @@ -1910,11 +1962,11 @@ ] }, "locked": { - "lastModified": 1730698801, - "narHash": "sha256-sq68bCmk4tCXSt5CoRNimfigIZSLJSpNi/gjFtNLjRE=", + "lastModified": 1731032247, + "narHash": "sha256-OjLft7fwkmiRLXQsGAudGFZxEYXOT0nHwrQ9GbsBqJ4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "189d2d422c773fa065cc9c72e6806f007ebb9be0", + "rev": "2fbf4a8417c28cf45bae6e6e97248cbbd9b78632", "type": "github" }, "original": { @@ -1931,11 +1983,11 @@ ] }, "locked": { - "lastModified": 1728385805, - "narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=", + "lastModified": 1730779758, + "narHash": "sha256-5WI9AnsBwhLzVRnQm3Qn9oAbROnuLDQTpaXeyZCK8qw=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc", + "rev": "0e3f3f017c14467085f15d42343a3aaaacd89bcb", "type": "github" }, "original": { @@ -1970,11 +2022,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1727658919, - "narHash": "sha256-YAePt2GldkkRJ08LvZNHcuS6shIVStj+K+1DZN3gbnM=", + "lastModified": 1730604744, + "narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f9fdf8285690a351e8998f1e703ebdf9cdf51dee", + "rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318", "type": "github" }, "original": { @@ -1999,11 +2051,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1715150548, - "narHash": "sha256-pb2xIGuzzkPOjUlZnBahpfQWVvtCSOcW8vLL7rQUiEY=", + "lastModified": 1727531568, + "narHash": "sha256-lt8fmizvl6iRDNz7/Yqor1MmU5fcUyv3oajtUsUmthA=", "owner": "numtide", "repo": "nixos-anywhere", - "rev": "242444d228636b1f0e89d3681f04a75254c29f66", + "rev": "b6168ba67a8fad0636b5111a906dfbdf3abe2dee", "type": "github" }, "original": { @@ -2014,7 +2066,7 @@ }, "nixos-images": { "inputs": { - "nixos-2311": [ + "nixos-stable": [ "cachix-deploy-flake", "nixos-anywhere", "nixos-stable" @@ -2026,11 +2078,11 @@ ] }, "locked": { - "lastModified": 1702375325, - "narHash": "sha256-kEdrh6IB7xh7YDwZ0ZVCngCs+uoS9gx4ydEoJRnM1Is=", + "lastModified": 1727367213, + "narHash": "sha256-7O4pi8MmcJpA0nYUQkdolvKGyu6zNjf2gFYD1Q0xppc=", "owner": "nix-community", "repo": "nixos-images", - "rev": "d655cc02fcb9ecdcca4f3fb307e291a4b5be1339", + "rev": "3e7978bab153f39f3fc329ad346d35a8871420f7", "type": "github" }, "original": { @@ -2041,16 +2093,16 @@ }, "nixos-stable": { "locked": { - "lastModified": 1702233072, - "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=", + "lastModified": 1727264057, + "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348", + "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -2091,11 +2143,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1728034208, - "narHash": "sha256-7rqJNMXMQK8iZJ/fHsjeI23xE55+t8NEN5D2WVoF4UU=", + "lastModified": 1731045408, + "narHash": "sha256-Obq4OmTKvIsEmS8UqGwJklzn7j6ndkQDblObb1un+gA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f207b543e2c3b0c14a461dd3ea50f6af55781db1", + "rev": "a54c7dcc8e79ec17aab7edcefd9e96a94b2ecaf7", "type": "github" }, "original": { @@ -2123,11 +2175,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1725762081, - "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", + "lastModified": 1730602179, + "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", + "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", "type": "github" }, "original": { @@ -2139,11 +2191,12 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1713995372, - "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", - "path": "/nix/store/22chir190mpfvp59lgh39q7fp7w77br9-source", - "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", - "type": "path" + "lastModified": 1727998858, + "narHash": "sha256-IeBVJ75Bd7yWz8i3m225x5Q25O1Wk8cBWi8DI7bCgSo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "73bed75dbd3de6d4fca3f81ce25a0cc7766afff6", + "type": "github" }, "original": { "id": "nixpkgs", @@ -2152,11 +2205,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1727716680, - "narHash": "sha256-uMVkVHL4r3QmlZ1JM+UoJwxqa46cgHnIfqGzVlw5ca4=", + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b5b22b42c0d10c7d2463e90a546c394711e3a724", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { @@ -2198,11 +2251,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { @@ -2214,11 +2267,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -2276,11 +2329,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1726502324, - "narHash": "sha256-I/WFSIBeIjlY3CgSJ6IRYxP2aEJ6b42Y1HAeATlBh48=", + "lastModified": 1731009822, + "narHash": "sha256-VwGfFYHjizs7yQwh8JRlDUVkHLPc34jdqkQ2vyv6ddY=", "owner": "nix-community", "repo": "nixvim", - "rev": "2e3083e42509c399b224239f6d7fa17976b18536", + "rev": "aabbd60633947baba11db44df84f402edc241440", "type": "github" }, "original": { @@ -2304,11 +2357,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1728485062, - "narHash": "sha256-+2e9hAM2GVDF3gywdQI/OA7s4f0Z9rvFuiVxePI41QM=", + "lastModified": 1731009822, + "narHash": "sha256-VwGfFYHjizs7yQwh8JRlDUVkHLPc34jdqkQ2vyv6ddY=", "owner": "nix-community", "repo": "nixvim", - "rev": "61ec39764fbe1e4f21cf801ea7b9209d527c8135", + "rev": "aabbd60633947baba11db44df84f402edc241440", "type": "github" }, "original": { @@ -2330,11 +2383,11 @@ ] }, "locked": { - "lastModified": 1726550932, - "narHash": "sha256-3iDVHqGq8mhP46XqIpepiURz4RJXwGUO0cHtplHhbX0=", + "lastModified": 1730914682, + "narHash": "sha256-UHFvVeJY64rA5HKoeKCLuJET224GEDGdj7/m1PuShgw=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "90aaa1e9e6ff67b29840d357413f822056212c08", + "rev": "59630b2edb91b71ac0a60b865aaa91cd39946577", "type": "github" }, "original": { @@ -2356,11 +2409,11 @@ "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1726621796, - "narHash": "sha256-LVrXwElj1mYcHTZADzIB0eoXon+kDFkeTkeC3f7IIbY=", + "lastModified": 1731010605, + "narHash": "sha256-W0dUDwGcL856Yc2dWnwL4Xu/y0+24qBVEFBzVpmTIvg=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "1f0b123a6b1e4d670e5e7ab5acfc32333846377c", + "rev": "d9ccf1ae1782327308b030d52fbd7f57816d6e8e", "type": "github" }, "original": { @@ -2381,11 +2434,11 @@ "norg-meta": "norg-meta_2" }, "locked": { - "lastModified": 1728010124, - "narHash": "sha256-XRlWaz/3kf8Hhr0zUqdGUh+1kwmhvaV/pQkp8nNUvzc=", + "lastModified": 1731010605, + "narHash": "sha256-W0dUDwGcL856Yc2dWnwL4Xu/y0+24qBVEFBzVpmTIvg=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "af0cd49b1b2168f873d670a148f6a5ed6e0d9860", + "rev": "d9ccf1ae1782327308b030d52fbd7f57816d6e8e", "type": "github" }, "original": { @@ -2478,11 +2531,11 @@ }, "nur": { "locked": { - "lastModified": 1728031607, - "narHash": "sha256-yX5u88dJ8916JQ3O5VD92tI98M9MwLzKqRENkqLs3ik=", + "lastModified": 1731046912, + "narHash": "sha256-6179UmFKew/FkNVNbsafu7UAkA/UGw7+wD8oG3pCC5A=", "owner": "nix-community", "repo": "nur", - "rev": "2eda69b6d70f2564f95a7b5c41c00b3ac0307ef5", + "rev": "52598f7f9f9fac06c47150a19550fb7fea88346d", "type": "github" }, "original": { @@ -2494,6 +2547,7 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_6", + "ixx": "ixx", "nixpkgs": [ "neovim", "nixvim", @@ -2501,11 +2555,11 @@ ] }, "locked": { - "lastModified": 1726392886, - "narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=", + "lastModified": 1730760712, + "narHash": "sha256-F4H98tjNgySlSLItuOqHYo9LF85rFoS/Vr0uOrq7BM4=", "owner": "NuschtOS", "repo": "search", - "rev": "97d34b70deed4878fcb2449ac89dab717d72efa1", + "rev": "aa5214c81b904a19f7a54f7a8f288f7902586eee", "type": "github" }, "original": { @@ -2517,17 +2571,18 @@ "nuschtosSearch_2": { "inputs": { "flake-utils": "flake-utils_10", + "ixx": "ixx_2", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1728423244, - "narHash": "sha256-+YwNsyIFj3dXyLVQd1ry4pCNmtOpbceKUrkNS8wp9Ho=", + "lastModified": 1730760712, + "narHash": "sha256-F4H98tjNgySlSLItuOqHYo9LF85rFoS/Vr0uOrq7BM4=", "owner": "NuschtOS", "repo": "search", - "rev": "f276cc3b391493ba3a8b30170776860f9520b7fa", + "rev": "aa5214c81b904a19f7a54f7a8f288f7902586eee", "type": "github" }, "original": { @@ -2576,11 +2631,11 @@ "openapi-tui": { "flake": false, "locked": { - "lastModified": 1722073494, - "narHash": "sha256-y8A43FV3PfYHaMMHE3uGRBaftga/pVSivCfV4iwUROA=", + "lastModified": 1728055673, + "narHash": "sha256-EUWL16cHgPF88CoCD9sqnxLOlmWoe1tu5ps01AYwwzc=", "owner": "zaghaghi", "repo": "openapi-tui", - "rev": "f56c596ccd0033bbff49bb5b8cf6b6c9ea89b388", + "rev": "67fc6e3ef223ae6c43a0cd0ad624807a30828a42", "type": "github" }, "original": { @@ -2619,11 +2674,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1730302582, + "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", "type": "github" }, "original": { @@ -2635,11 +2690,11 @@ "rest-nvim": { "flake": false, "locked": { - "lastModified": 1726329214, - "narHash": "sha256-Xg2rVQurH/7qnYoIDHeYjRg9rOImeGiWBd/XMI+MTg8=", + "lastModified": 1728616090, + "narHash": "sha256-bn5z+2D0vk0JE9SONOv99N95kgIx2EFpHkFdLJiZTDI=", "owner": "rest-nvim", "repo": "rest.nvim", - "rev": "9f6f9dd928d612e52e756f0a0c057ee3cf16c39b", + "rev": "113dce7749eb22b84cbde052d1cdc1f70702ed58", "type": "github" }, "original": { @@ -2728,11 +2783,11 @@ ] }, "locked": { - "lastModified": 1727663505, - "narHash": "sha256-83j/GrHsx8GFUcQofKh+PRPz6pz8sxAsZyT/HCNdey8=", + "lastModified": 1730341826, + "narHash": "sha256-RFaeY7EWzXOmAL2IQEACbnrEza3TgD5UQApHR4hGHhY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c2099c6c7599ea1980151b8b6247a8f93e1806ee", + "rev": "815d1b3ee71716fc91a7bd149801e1f04d45fbc5", "type": "github" }, "original": { @@ -2749,11 +2804,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1730601085, + "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825", "type": "github" }, "original": { @@ -2796,11 +2851,11 @@ ] }, "locked": { - "lastModified": 1728008962, - "narHash": "sha256-MjGMCVKqafsrqLQYJHHKXJkvocTjkxKjadBfN952/Zw=", + "lastModified": 1731032894, + "narHash": "sha256-dQSyYPmrQiPr+PGEd+K8038rubFGz7G/dNXVeaGWE0w=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "862d0c1e5fe2348a22044f225afef39b75df8cf0", + "rev": "d52f2a4c103a0acf09ded857b9e2519ae2360e59", "type": "github" }, "original": { @@ -2817,11 +2872,11 @@ ] }, "locked": { - "lastModified": 1726453838, - "narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=", + "lastModified": 1730687492, + "narHash": "sha256-xQVadjquBA/tFxDt5A55LJ1D1AvkVWsnrKC2o+pr8F4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2", + "rev": "41814763a2c597755b0755dbe3e721367a5e420f", "type": "github" }, "original": { @@ -2838,11 +2893,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1727734513, - "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", + "lastModified": 1731046033, + "narHash": "sha256-ZYtgpPlqakexMm6TAtW9aCiqZzqM/CC+C4OIlTuhqjI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3198a242e547939c5e659353551b0668ec150268", + "rev": "c9f6b151cc3578f6517a5dbd152f0e29cc6d875f", "type": "github" }, "original": { @@ -3128,11 +3183,11 @@ "tree-sitter-d2": { "flake": false, "locked": { - "lastModified": 1694985317, - "narHash": "sha256-Auap3+yBBxv4RyiSaQ1sHKsSfzgrKdq0F1ethWnM+pE=", + "lastModified": 1730834872, + "narHash": "sha256-wlGDBtXSCvCoEHap8bJIi6oCiChU40cqz43ZmIbq/ow=", "owner": "ravsii", "repo": "tree-sitter-d2", - "rev": "c21126b5ee97b0dffe4b2f982932739f0a772743", + "rev": "db3cfff85d2ad97b23f71925c78c842512766a60", "type": "github" }, "original": { @@ -3144,11 +3199,11 @@ "tree-sitter-just": { "flake": false, "locked": { - "lastModified": 1722314416, - "narHash": "sha256-EVISh9r+aJ6Og1UN8bGCLk4kVjS/cEOYyhqHF40ztqg=", + "lastModified": 1730072251, + "narHash": "sha256-8vr55zhJOJxZhc8bXZpvO6a/eEYUJQ+HBWC4xRYbrgk=", "owner": "IndianBoy42", "repo": "tree-sitter-just", - "rev": "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21", + "rev": "1014d2fd6396856c312054d6c30df4d78b62966c", "type": "github" }, "original": { @@ -3166,11 +3221,11 @@ ] }, "locked": { - "lastModified": 1702376629, - "narHash": "sha256-9uAY8a7JN4DvLe/g4OoldqPbcNZ09YOVXID+CkIqL70=", + "lastModified": 1727252110, + "narHash": "sha256-3O7RWiXpvqBcCl84Mvqa8dXudZ1Bol1ubNdSmQt7nF4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "390018a9398f9763bfc05ffe6443ce0622cb9ba6", + "rev": "1bff2ba6ec22bc90e9ad3f7e94cca0d37870afa3", "type": "github" }, "original": { @@ -3188,11 +3243,11 @@ ] }, "locked": { - "lastModified": 1725271838, - "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", + "lastModified": 1730321837, + "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", + "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "type": "github" }, "original": { @@ -3209,11 +3264,11 @@ ] }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1730321837, + "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "type": "github" }, "original": { @@ -3280,11 +3335,11 @@ "rust-overlay": "rust-overlay_7" }, "locked": { - "lastModified": 1726515093, - "narHash": "sha256-Y2OHV3QfLPQj3Q4+TmrMeRXthwigU/YSBv2g8y8GWWU=", + "lastModified": 1730748983, + "narHash": "sha256-72uoWm/34SU5aHgvUJgKqYMhvt4Y9X39bFhcDwVS+P0=", "owner": "dj95", "repo": "zjstatus", - "rev": "d1c662c1052adec6f14f3ee8a51cecebe4a29ffa", + "rev": "d5794fbec93860ead015b0beee70489f50cd87b1", "type": "github" }, "original": { diff --git a/neovim/flake.lock b/neovim/flake.lock index 325bc268..0be8057b 100644 --- a/neovim/flake.lock +++ b/neovim/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -123,11 +123,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -183,11 +183,11 @@ "systems": "systems" }, "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": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1725513492, - "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -288,11 +288,11 @@ ] }, "locked": { - "lastModified": 1725513492, - "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -348,11 +348,11 @@ "gp-nvim": { "flake": false, "locked": { - "lastModified": 1725969177, - "narHash": "sha256-Tvcu8oRfbuc7JX+uYFmpMjzcrnUudJMEMxjd+yNfn5o=", + "lastModified": 1726734798, + "narHash": "sha256-QUZrFU/+TPBEU8yi9gmyRYjI/u7DP88AxcS0RMk7Jvk=", "owner": "Robitx", "repo": "gp.nvim", - "rev": "f4cbbf489fb621ae8f4e512c38ae234ce1157fa7", + "rev": "2372d5323c6feaa2e9c19f7ccb537c615d878e18", "type": "github" }, "original": { @@ -364,11 +364,11 @@ "guihua": { "flake": false, "locked": { - "lastModified": 1717591195, - "narHash": "sha256-V5rlORFlhgjAT0n+LcpMNdY+rEqQpur/KGTGH6uFxMY=", + "lastModified": 1730516234, + "narHash": "sha256-XpUsbj1boDfbyE8C6SdOvZdkd97682VVC81fvQ5WA/4=", "owner": "ray-x", "repo": "guihua.lua", - "rev": "225db770e36aae6a1e9e3a65578095c8eb4038d3", + "rev": "d783191eaa75215beae0c80319fcce5e6b3beeda", "type": "github" }, "original": { @@ -386,11 +386,11 @@ ] }, "locked": { - "lastModified": 1724947644, - "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", + "lastModified": 1730903510, + "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", + "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1726357542, - "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -420,14 +420,42 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, "navigator": { "flake": false, "locked": { - "lastModified": 1725848935, - "narHash": "sha256-c6LjkRlR4g8lAqI7GqqtJ/tn48Gx2PxXYeeAM/YORbg=", + "lastModified": 1729765416, + "narHash": "sha256-54GXyf4Q77dNCg4NZzNcHvr07nVvi9uYreTKMnRisAg=", "owner": "ray-x", "repo": "navigator.lua", - "rev": "df3d3a09d5b4986558062425639ca8dd1e9a34c2", + "rev": "e2e870c606d28b4247a205972e56a6de2325e34e", "type": "github" }, "original": { @@ -505,11 +533,11 @@ "neorg_2": { "flake": false, "locked": { - "lastModified": 1725804232, - "narHash": "sha256-IOhb06MIC8LLPpa1XnZ7TRqKWUabHeBa3X2p9Y/bT4s=", + "lastModified": 1730333767, + "narHash": "sha256-qTo8rxwvANrgP8UccFhzsNsH+Jbmqv2iOlw0ccLNYm4=", "owner": "nvim-neorg", "repo": "neorg", - "rev": "ba35900b21921c439e676b063a79c8fad914eac9", + "rev": "488507bb996f75ee29073f50dec32fa220867ca5", "type": "github" }, "original": { @@ -521,11 +549,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1726482815, - "narHash": "sha256-M2syKjdJH3uBCOAm9PZndNI46m6xGLXsOadUSen8wpY=", + "lastModified": 1730893053, + "narHash": "sha256-ifiJfPkhyg/9I9aJSbtcHy3jRV4CLig7iF9ACQUycPU=", "owner": "neovim", "repo": "neovim", - "rev": "a0d8c2b86e788ce4273f0b8df258cd9e8e432d38", + "rev": "f7e32fb6e626ab198bf401765236783890f3a0d6", "type": "github" }, "original": { @@ -542,11 +570,11 @@ ] }, "locked": { - "lastModified": 1726188813, - "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", + "lastModified": 1730779758, + "narHash": "sha256-5WI9AnsBwhLzVRnQm3Qn9oAbROnuLDQTpaXeyZCK8qw=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", + "rev": "0e3f3f017c14467085f15d42343a3aaaacd89bcb", "type": "github" }, "original": { @@ -557,11 +585,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726463316, - "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -618,11 +646,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1726502324, - "narHash": "sha256-I/WFSIBeIjlY3CgSJ6IRYxP2aEJ6b42Y1HAeATlBh48=", + "lastModified": 1731009822, + "narHash": "sha256-VwGfFYHjizs7yQwh8JRlDUVkHLPc34jdqkQ2vyv6ddY=", "owner": "nix-community", "repo": "nixvim", - "rev": "2e3083e42509c399b224239f6d7fa17976b18536", + "rev": "aabbd60633947baba11db44df84f402edc241440", "type": "github" }, "original": { @@ -643,11 +671,11 @@ ] }, "locked": { - "lastModified": 1726550932, - "narHash": "sha256-3iDVHqGq8mhP46XqIpepiURz4RJXwGUO0cHtplHhbX0=", + "lastModified": 1730914682, + "narHash": "sha256-UHFvVeJY64rA5HKoeKCLuJET224GEDGdj7/m1PuShgw=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "90aaa1e9e6ff67b29840d357413f822056212c08", + "rev": "59630b2edb91b71ac0a60b865aaa91cd39946577", "type": "github" }, "original": { @@ -668,11 +696,11 @@ "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1726621796, - "narHash": "sha256-LVrXwElj1mYcHTZADzIB0eoXon+kDFkeTkeC3f7IIbY=", + "lastModified": 1731010605, + "narHash": "sha256-W0dUDwGcL856Yc2dWnwL4Xu/y0+24qBVEFBzVpmTIvg=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "1f0b123a6b1e4d670e5e7ab5acfc32333846377c", + "rev": "d9ccf1ae1782327308b030d52fbd7f57816d6e8e", "type": "github" }, "original": { @@ -725,17 +753,18 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1726392886, - "narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=", + "lastModified": 1730760712, + "narHash": "sha256-F4H98tjNgySlSLItuOqHYo9LF85rFoS/Vr0uOrq7BM4=", "owner": "NuschtOS", "repo": "search", - "rev": "97d34b70deed4878fcb2449ac89dab717d72efa1", + "rev": "aa5214c81b904a19f7a54f7a8f288f7902586eee", "type": "github" }, "original": { @@ -779,11 +808,11 @@ "rest-nvim": { "flake": false, "locked": { - "lastModified": 1726329214, - "narHash": "sha256-Xg2rVQurH/7qnYoIDHeYjRg9rOImeGiWBd/XMI+MTg8=", + "lastModified": 1728616090, + "narHash": "sha256-bn5z+2D0vk0JE9SONOv99N95kgIx2EFpHkFdLJiZTDI=", "owner": "rest-nvim", "repo": "rest.nvim", - "rev": "9f6f9dd928d612e52e756f0a0c057ee3cf16c39b", + "rev": "113dce7749eb22b84cbde052d1cdc1f70702ed58", "type": "github" }, "original": { @@ -861,11 +890,11 @@ "tree-sitter-d2": { "flake": false, "locked": { - "lastModified": 1694985317, - "narHash": "sha256-Auap3+yBBxv4RyiSaQ1sHKsSfzgrKdq0F1ethWnM+pE=", + "lastModified": 1730834872, + "narHash": "sha256-wlGDBtXSCvCoEHap8bJIi6oCiChU40cqz43ZmIbq/ow=", "owner": "ravsii", "repo": "tree-sitter-d2", - "rev": "c21126b5ee97b0dffe4b2f982932739f0a772743", + "rev": "db3cfff85d2ad97b23f71925c78c842512766a60", "type": "github" }, "original": { @@ -877,11 +906,11 @@ "tree-sitter-just": { "flake": false, "locked": { - "lastModified": 1722314416, - "narHash": "sha256-EVISh9r+aJ6Og1UN8bGCLk4kVjS/cEOYyhqHF40ztqg=", + "lastModified": 1730072251, + "narHash": "sha256-8vr55zhJOJxZhc8bXZpvO6a/eEYUJQ+HBWC4xRYbrgk=", "owner": "IndianBoy42", "repo": "tree-sitter-just", - "rev": "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21", + "rev": "1014d2fd6396856c312054d6c30df4d78b62966c", "type": "github" }, "original": { @@ -898,11 +927,11 @@ ] }, "locked": { - "lastModified": 1725271838, - "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", + "lastModified": 1730321837, + "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", + "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "type": "github" }, "original": { diff --git a/neovim/nvim.nix b/neovim/nvim.nix index 09af89ad..4bf3be1b 100644 --- a/neovim/nvim.nix +++ b/neovim/nvim.nix @@ -52,7 +52,7 @@ in rec { "openapikey" ( if pkgs.stdenv.isDarwin then '' - ${pkgs._1password}/bin/op item get 'OpenAI API Token' --fields label='api key' + ${pkgs._1password-cli}/bin/op item get 'OpenAI API Token' --fields label='api key' '' else '' /run/wrappers/bin/op item get 'OpenAI API Token' --fields label='api key' @@ -183,18 +183,20 @@ in rec { noice = { enable = true; - notify.enabled = false; - lsp.override = { - "vim.lsp.util.convert_input_to_markdown_lines" = true; - "vim.lsp.util.stylize_markdown" = true; - "cmp.entry.get_documentation" = true; - }; - presets = { - bottom_search = false; - command_palette = true; - long_message_to_split = true; - inc_rename = false; - lsp_doc_border = true; + settings = { + notify.enabled = false; + lsp.override = { + "vim.lsp.util.convert_input_to_markdown_lines" = true; + "vim.lsp.util.stylize_markdown" = true; + "cmp.entry.get_documentation" = true; + }; + presets = { + bottom_search = false; + command_palette = true; + long_message_to_split = true; + inc_rename = false; + lsp_doc_border = true; + }; }; }; diff --git a/nixos/ryu.nix b/nixos/ryu.nix index 23f84b90..afefc12e 100644 --- a/nixos/ryu.nix +++ b/nixos/ryu.nix @@ -10,7 +10,7 @@ }: { imports = [(modulesPath + "/installer/scan/not-detected.nix")]; programs = { - _1password.enable = true; + _1password-cli.enable = true; _1password-gui = { enable = true; polkitPolicyOwners = ["servius"];