From d482a6d8511203e6f38737bd4647e754e425f31c Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Tue, 9 Jul 2024 17:37:59 +0530 Subject: [PATCH] feat: Update update to latest --- common/home.nix | 10 ++-- flake.lock | 141 +++++++++++++++++++------------------------- neovim/nvim.nix | 2 +- neovim/overlays.nix | 2 +- 4 files changed, 69 insertions(+), 86 deletions(-) diff --git a/common/home.nix b/common/home.nix index 736cf0ea..60271cbc 100644 --- a/common/home.nix +++ b/common/home.nix @@ -81,7 +81,7 @@ in { qmk p7zip yt-dlp - spotdl + # spotdl picat davis gnupg @@ -134,10 +134,10 @@ in { enableFishIntegration = true; enableNushellIntegration = true; }; - thefuck = { - enable = true; - enableFishIntegration = true; - }; + # thefuck = { + # enable = true; + # enableFishIntegration = true; + # }; direnv = { enable = true; # enableFishIntegration = true; // Auto enabled diff --git a/flake.lock b/flake.lock index b8df9915..852e5210 100644 --- a/flake.lock +++ b/flake.lock @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1718078026, - "narHash": "sha256-LbQabH6h86ZzTvDnaZHmMwedRZNB2jYtUQzmoqWQoJ8=", + "lastModified": 1720226507, + "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=", "owner": "ipetkov", "repo": "crane", - "rev": "a3f0c63eed74a516298932b9b1627dd80b9c3892", + "rev": "0aed560c5c0a61c9385bddff471a13036203e11c", "type": "github" }, "original": { @@ -380,22 +380,6 @@ "type": "github" } }, - "flake-compat_10": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-compat_2": { "flake": false, "locked": { @@ -676,11 +660,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719877454, + "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", "type": "github" }, "original": { @@ -1012,7 +996,10 @@ }, "git-hooks_3": { "inputs": { - "flake-compat": "flake-compat_10", + "flake-compat": [ + "nixvim", + "flake-compat" + ], "gitignore": "gitignore_4", "nixpkgs": [ "nixvim", @@ -1024,11 +1011,11 @@ ] }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -1189,11 +1176,11 @@ ] }, "locked": { - "lastModified": 1718716991, - "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", + "lastModified": 1720470846, + "narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=", "owner": "nix-community", "repo": "home-manager", - "rev": "fab8e511d58f9c3f1cf8456abd685bfd381f7ebe", + "rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192", "type": "github" }, "original": { @@ -1232,11 +1219,11 @@ ] }, "locked": { - "lastModified": 1718526747, - "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", + "lastModified": 1719827439, + "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", + "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", "type": "github" }, "original": { @@ -1284,11 +1271,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1717883389, - "narHash": "sha256-2A4Q56JFd3t9j3Xpa0kxw2fjv8nNqgNBOA34rRcLA8I=", + "lastModified": 1720517569, + "narHash": "sha256-NPr3ZhkVEXh89hStLfqA37ZTD5CKS14LEbIVdwrl9PE=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "c5b8ad03d03ddbd2b0ff8615c2f6dba31374b6a8", + "rev": "d8ccc6f96a7e698dc86f89870ba5c7900041f34d", "type": "github" }, "original": { @@ -1332,11 +1319,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1718313789, - "narHash": "sha256-GFKLeZGIfMmLxeBNQyboh41i7Ca58G0tY0m+aOcxMNs=", + "lastModified": 1719927553, + "narHash": "sha256-8DBU91zfxyEZF1mCy1qmvA7mb/ee7AwqEUAT6ScJu40=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "d0bdf31ee9abb22e16cd7ea691da61319cb89990", + "rev": "bcaa13deae4e47caa5fffa7fdaa0981af1fec297", "type": "github" }, "original": { @@ -1358,11 +1345,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1718626451, - "narHash": "sha256-KEM9FwTX4XvWzn/wKcbhS/xI7z3oU89XBfG8WnlHE88=", + "lastModified": 1719818887, + "narHash": "sha256-Bogl1pJlgby7OpR16jp8zwOWV7FHRxCsnNxHcisyIq0=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "93dd69a5b683deb8ab7d6dbb91771a2487745e8c", + "rev": "0e6457c98547ec8866714d4222545e7e8c1ae429", "type": "github" }, "original": { @@ -1535,7 +1522,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-oJ0PGUbKHGwYjnT+u0cgPybFlXQYjwdjbGm2K7rlt2w=", + "narHash": "sha256-7Z8CqsTEaQBAA5zyWJ07t7RAfZ5sgXWiho1LKD1k5e0=", "path": "./neovim", "type": "path" }, @@ -1589,11 +1576,11 @@ ] }, "locked": { - "lastModified": 1718662658, - "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", + "lastModified": 1720469887, + "narHash": "sha256-BwPsGQ/EMqCreUc5j9Efj+wx13AjREtuHhbyHZygcE4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", + "rev": "fabc653517106127e2ed435fb52e7e8854354428", "type": "github" }, "original": { @@ -1610,11 +1597,11 @@ ] }, "locked": { - "lastModified": 1718662658, - "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", + "lastModified": 1719845423, + "narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", + "rev": "ec12b88104d6c117871fad55e931addac4626756", "type": "github" }, "original": { @@ -1628,11 +1615,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1718507237, - "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=", + "lastModified": 1720334033, + "narHash": "sha256-X9pEvvHTVWJphhbUYqXvlLedOndNqGB7rvhSvL2CIgU=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4", + "rev": "685e40e1348007d2cf76747a201bab43d86b38cb", "type": "github" }, "original": { @@ -1840,11 +1827,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1718318537, - "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { @@ -1856,11 +1843,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1718530797, - "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", + "lastModified": 1720418205, + "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", + "rev": "655a58a72a6601292512670343087c2d75d859c1", "type": "github" }, "original": { @@ -1912,11 +1899,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1718703532, - "narHash": "sha256-kQ9mG450Lg5DRPYJYM1oj+gLqOBwr65e8Fp3+v5tNT4=", + "lastModified": 1720511126, + "narHash": "sha256-hRcOi72z4h1w3fb2gaN/2snbc9AfN94UxNKBRmhRnt0=", "owner": "nix-community", "repo": "nixvim", - "rev": "bf109a3e59845fd7806dfdd386edfa3ac1baa998", + "rev": "023dc1c93a17181502269609924950acaa9091d3", "type": "github" }, "original": { @@ -2020,11 +2007,11 @@ }, "nur": { "locked": { - "lastModified": 1718715610, - "narHash": "sha256-ZeBmuH1rHbsX5JTEoTCtXmSPZ0NlbkS3xET8U7smoYw=", + "lastModified": 1720521897, + "narHash": "sha256-k/lSErCNGvHj/vI+TXHLuQI9pmEnQBVcKbV3yB3I8NQ=", "owner": "nix-community", "repo": "nur", - "rev": "4b0d95155fbffbfa3ad088a52fe38e3b52ae21ae", + "rev": "4cb066aae41593df9901910e45f9dfd1af5aa743", "type": "github" }, "original": { @@ -2290,11 +2277,11 @@ ] }, "locked": { - "lastModified": 1719195554, - "narHash": "sha256-bFXHMjpYlEERexzXa1gLGJO/1l8dxaAtSNE56YALuTg=", + "lastModified": 1720491570, + "narHash": "sha256-PHS2BcQ9kxBpu9GKlDg3uAlrX/ahQOoAiVmwGl6BjD4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "577ee84c69ba89894ac622d71a678a14d746b2f7", + "rev": "b970af40fdc4bd80fd764796c5f97c15e2b564eb", "type": "github" }, "original": { @@ -2305,21 +2292,17 @@ }, "rust-overlay_7": { "inputs": { - "flake-utils": [ - "zjstatus", - "flake-utils" - ], "nixpkgs": [ "zjstatus", "nixpkgs" ] }, "locked": { - "lastModified": 1718072316, - "narHash": "sha256-p33h73iQ1HkLalCplV5MH0oP3HXRaH3zufnFqb5//ps=", + "lastModified": 1720232258, + "narHash": "sha256-eR5glZHS2bLpzUgTDhWGm04j+j5KMYKoDsY5DXAiuKQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bedc47af18fc41bb7d2edc2b212d59ca36253f59", + "rev": "05ccbe21233d4e9110fc6428d2c3d74b430c3c69", "type": "github" }, "original": { @@ -2656,11 +2639,11 @@ ] }, "locked": { - "lastModified": 1718522839, - "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", + "lastModified": 1719887753, + "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", + "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", "type": "github" }, "original": { @@ -2679,11 +2662,11 @@ "rust-overlay": "rust-overlay_7" }, "locked": { - "lastModified": 1718092736, - "narHash": "sha256-UO2+Lfgv0qBlOW1oddarZV5OEufm+Im5RMqbGdJHvGI=", + "lastModified": 1720291207, + "narHash": "sha256-0az2z890pvKAxn2LJaHxWPgpSvbx0DlNbBIZlYyP7Y4=", "owner": "dj95", "repo": "zjstatus", - "rev": "eed126b31e7a94d16bc4aa7ef5c2d81e45a28569", + "rev": "af66be8031cbccf484363fc3efe6c020cd602b1e", "type": "github" }, "original": { diff --git a/neovim/nvim.nix b/neovim/nvim.nix index 0845fd93..d8639cd0 100644 --- a/neovim/nvim.nix +++ b/neovim/nvim.nix @@ -110,7 +110,7 @@ in rec { treesitter = { enable = true; - indent = true; + settings.indent.enable = true; folding = true; grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars diff --git a/neovim/overlays.nix b/neovim/overlays.nix index 05838c3d..332adc2d 100644 --- a/neovim/overlays.nix +++ b/neovim/overlays.nix @@ -26,7 +26,7 @@ owner = "jonboh"; repo = "nvim-dap-rr"; rev = "master"; - sha256 = "sha256-JNztLTSyHmEmh3xT4WR0cpP25vjZ4A6aQbnU49U6+Ss"; + sha256 = "sha256-1WgES0gng74eNfTxJZksYoAFIYtuG3D/l/BEyt1o60w="; }; }; sqls-nvim = final.pkgs.vimUtils.buildVimPlugin {