From 3d3ff7f0f1ae3efc5a0827efecccebc413b52145 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Tue, 18 Jun 2024 19:22:53 +0530 Subject: [PATCH] feat: Disable mpv and update --- common/gui.nix | 1 - common/home.nix | 6 +- flake.lock | 152 ++++++++++++++++++---------------------------- neovim/flake.lock | 30 ++++----- neovim/nvim.nix | 2 +- 5 files changed, 78 insertions(+), 113 deletions(-) diff --git a/common/gui.nix b/common/gui.nix index 05fe9ee5..b4bf3ef7 100644 --- a/common/gui.nix +++ b/common/gui.nix @@ -39,6 +39,5 @@ lib.attrsets.optionalAttrs device.hasGui { webcord-vencord spotify wl-clipboard - ]; } diff --git a/common/home.nix b/common/home.nix index 87e33fcc..2e2124f6 100644 --- a/common/home.nix +++ b/common/home.nix @@ -103,7 +103,7 @@ in { hasklig pfetch-rs hotedit - (mpv-unwrapped.wrapper {mpv = mpv-unwrapped.override {sixelSupport = true;};}) + # (mpv-unwrapped.wrapper {mpv = mpv-unwrapped.override {sixelSupport = true;};}) ] ++ lib.optionals device.isLinux [ rr @@ -199,8 +199,8 @@ in { }; shellAliases = { g = "git"; - kmpv = "mpv --vo-kitty-use-shm=yes --vo=kitty --really-quiet"; - smpv = "mpv --vo-sixel-buffered=yes --vo=sixel --profile=sw-fast"; + # kmpv = "mpv --vo-kitty-use-shm=yes --vo=kitty --really-quiet"; + # smpv = "mpv --vo-sixel-buffered=yes --vo=sixel --profile=sw-fast"; }; shellInit = '' set fish_greeting diff --git a/flake.lock b/flake.lock index 17d2d112..debd888d 100644 --- a/flake.lock +++ b/flake.lock @@ -243,11 +243,11 @@ ] }, "locked": { - "lastModified": 1718078026, - "narHash": "sha256-LbQabH6h86ZzTvDnaZHmMwedRZNB2jYtUQzmoqWQoJ8=", + "lastModified": 1718474113, + "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", "owner": "ipetkov", "repo": "crane", - "rev": "a3f0c63eed74a516298932b9b1627dd80b9c3892", + "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", "type": "github" }, "original": { @@ -899,24 +899,6 @@ "inputs": { "systems": "systems_15" }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_16": { - "inputs": { - "systems": "systems_16" - }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -931,9 +913,9 @@ "type": "github" } }, - "flake-utils_17": { + "flake-utils_16": { "inputs": { - "systems": "systems_17" + "systems": "systems_16" }, "locked": { "lastModified": 1710146030, @@ -1329,11 +1311,11 @@ ] }, "locked": { - "lastModified": 1718243258, - "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", + "lastModified": 1718716991, + "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", + "rev": "fab8e511d58f9c3f1cf8456abd685bfd381f7ebe", "type": "github" }, "original": { @@ -1372,11 +1354,11 @@ ] }, "locked": { - "lastModified": 1718141734, - "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", + "lastModified": 1718526747, + "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", + "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", "type": "github" }, "original": { @@ -1498,11 +1480,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1718218065, - "narHash": "sha256-fKC7Ryg3AYykDrS2ilS1VqA8/9B2m3yFZcshK+7tIEc=", + "lastModified": 1718626451, + "narHash": "sha256-KEM9FwTX4XvWzn/wKcbhS/xI7z3oU89XBfG8WnlHE88=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "7cb05fab896bd542c0ca4260d74d9d664cd7b56e", + "rev": "93dd69a5b683deb8ab7d6dbb91771a2487745e8c", "type": "github" }, "original": { @@ -1675,7 +1657,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-1vHlj6e0KQMFrdcyhj/cttA78rRrNKZBwC+vFIj3XSk=", + "narHash": "sha256-0PhtpeVprW4ZaiIBxwhvhazJkxyCuBx+sLSXJDsFAWs=", "path": "./neovim", "type": "path" }, @@ -1687,11 +1669,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1718407238, - "narHash": "sha256-eJ0qrdEWH7WRwLTBIXIOYB/DvBHvgvm6x4bBonkzXLQ=", + "lastModified": 1718665877, + "narHash": "sha256-mpPuCdjNI1seuQIWTxDn5dOx4akS4tTr0dBATz1gaTk=", "owner": "neovim", "repo": "neovim", - "rev": "199d852d9f8584217be38efb56b725aa3db62931", + "rev": "9d200c78a5e97720ba8a697c4cc0990fdafbc39f", "type": "github" }, "original": { @@ -1729,11 +1711,11 @@ ] }, "locked": { - "lastModified": 1718440858, - "narHash": "sha256-iMVwdob8F6P6Ib+pnhMZqyvYI10ZxmvA885jjnEaO54=", + "lastModified": 1718662658, + "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "58b905ea87674592aa84c37873e6c07bc3807aba", + "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", "type": "github" }, "original": { @@ -1750,11 +1732,11 @@ ] }, "locked": { - "lastModified": 1717976995, - "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=", + "lastModified": 1718662658, + "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "315aa649ba307704db0b16c92f097a08a65ec955", + "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", "type": "github" }, "original": { @@ -1768,11 +1750,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1718011381, - "narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=", + "lastModified": 1718507237, + "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "88ad3d7501e22b2401dd72734b032b7baa794434", + "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4", "type": "github" }, "original": { @@ -1996,11 +1978,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1717786204, - "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "lastModified": 1718318537, + "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", "type": "github" }, "original": { @@ -2012,11 +1994,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1718318537, - "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", + "lastModified": 1718530797, + "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", + "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "type": "github" }, "original": { @@ -2041,11 +2023,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1718376125, - "narHash": "sha256-NIJZxmY2CWsqJK/9BQCRSHfcCY9K6thjq/1XtJobxmU=", + "lastModified": 1718656037, + "narHash": "sha256-uW9V+SZEAKWRpzF9o8Dl373Mmss83E16+iR1psvVq5Y=", "owner": "nix-community", "repo": "nixvim", - "rev": "7a2a25af02be25987aa43cd681312f4b5ba12317", + "rev": "5755ff0958bdb511f9791545888084c0a2c5ad50", "type": "github" }, "original": { @@ -2068,11 +2050,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1718376125, - "narHash": "sha256-NIJZxmY2CWsqJK/9BQCRSHfcCY9K6thjq/1XtJobxmU=", + "lastModified": 1718703532, + "narHash": "sha256-kQ9mG450Lg5DRPYJYM1oj+gLqOBwr65e8Fp3+v5tNT4=", "owner": "nix-community", "repo": "nixvim", - "rev": "7a2a25af02be25987aa43cd681312f4b5ba12317", + "rev": "bf109a3e59845fd7806dfdd386edfa3ac1baa998", "type": "github" }, "original": { @@ -2094,11 +2076,11 @@ ] }, "locked": { - "lastModified": 1718424280, - "narHash": "sha256-Y1Bjk8e9KJQ+5gwxNcRSz4l6k0yDLQ28MZ9qoeEeCII=", + "lastModified": 1718687251, + "narHash": "sha256-sU8bbHd+qKW83Wt0QjXkzZcofZbaHQCPD1ED1wv3vEE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "450744cea2778415ff8c23553d37048d01df6c5b", + "rev": "71d3564befbbaecf4eaf1b648a4f38f6a98e0edc", "type": "github" }, "original": { @@ -2120,11 +2102,11 @@ "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1718381785, - "narHash": "sha256-tNaoDGUrlUAlspdIjgPfJAArjEX2CqD/XbcAXQ+zVb0=", + "lastModified": 1718633621, + "narHash": "sha256-Hlz0nKfekJZLrP2arjTqzdjcsA78WWVE7nnQGnel91k=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "7722375f07f3aa9bae4369ea6a87d9b2a79a6e96", + "rev": "36cf0e5db3ae181061c1a654db310e1b9352a27c", "type": "github" }, "original": { @@ -2176,11 +2158,11 @@ }, "nur": { "locked": { - "lastModified": 1718451878, - "narHash": "sha256-DOt6b0+N0ea3DYJ83phSGtkKwgJbN+NA4ozXoVv6k8g=", + "lastModified": 1718715610, + "narHash": "sha256-ZeBmuH1rHbsX5JTEoTCtXmSPZ0NlbkS3xET8U7smoYw=", "owner": "nix-community", "repo": "nur", - "rev": "a83029a20d97e0d4713255b7eba1736c38ec9c14", + "rev": "4b0d95155fbffbfa3ad088a52fe38e3b52ae21ae", "type": "github" }, "original": { @@ -2379,11 +2361,11 @@ ] }, "locked": { - "lastModified": 1717813066, - "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", + "lastModified": 1718504420, + "narHash": "sha256-F2HT/abCfr0CDpkvXwYCscJyD66XDTLMVfdrIMRp2ck=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", + "rev": "0043c3f92304823cc2c0a4354b0feaa61dfb4cd9", "type": "github" }, "original": { @@ -2421,17 +2403,16 @@ }, "rust-overlay_6": { "inputs": { - "flake-utils": "flake-utils_15", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1718417877, - "narHash": "sha256-s8QrTANEtY6UxzfkcBfoN93bgW9aCRIq54LPRVNu/4c=", + "lastModified": 1718681902, + "narHash": "sha256-E/T7Ge6ayEQe7FVKMJqDBoHyLhRhjc6u9CmU8MyYfy0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7c2d603cb67c974ef8c5cfee1150060dbb299e04", + "rev": "16c8ad83297c278eebe740dea5491c1708960dd1", "type": "github" }, "original": { @@ -2468,7 +2449,7 @@ "subflakes": { "inputs": { "csshacks": "csshacks", - "flake-utils": "flake-utils_16", + "flake-utils": "flake-utils_15", "nixpkgs": [ "nixpkgs" ] @@ -2604,21 +2585,6 @@ "type": "github" } }, - "systems_17": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -2823,11 +2789,11 @@ ] }, "locked": { - "lastModified": 1718139168, - "narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=", + "lastModified": 1718522839, + "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1", + "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", "type": "github" }, "original": { @@ -2839,7 +2805,7 @@ "zjstatus": { "inputs": { "crane": "crane_5", - "flake-utils": "flake-utils_17", + "flake-utils": "flake-utils_16", "nixpkgs": [ "nixpkgs" ], diff --git a/neovim/flake.lock b/neovim/flake.lock index 217e6f42..08769d5e 100644 --- a/neovim/flake.lock +++ b/neovim/flake.lock @@ -535,11 +535,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1718407238, - "narHash": "sha256-eJ0qrdEWH7WRwLTBIXIOYB/DvBHvgvm6x4bBonkzXLQ=", + "lastModified": 1718665877, + "narHash": "sha256-mpPuCdjNI1seuQIWTxDn5dOx4akS4tTr0dBATz1gaTk=", "owner": "neovim", "repo": "neovim", - "rev": "199d852d9f8584217be38efb56b725aa3db62931", + "rev": "9d200c78a5e97720ba8a697c4cc0990fdafbc39f", "type": "github" }, "original": { @@ -571,11 +571,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718318537, - "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", + "lastModified": 1718530797, + "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", + "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "type": "github" }, "original": { @@ -631,11 +631,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718376125, - "narHash": "sha256-NIJZxmY2CWsqJK/9BQCRSHfcCY9K6thjq/1XtJobxmU=", + "lastModified": 1718656037, + "narHash": "sha256-uW9V+SZEAKWRpzF9o8Dl373Mmss83E16+iR1psvVq5Y=", "owner": "nix-community", "repo": "nixvim", - "rev": "7a2a25af02be25987aa43cd681312f4b5ba12317", + "rev": "5755ff0958bdb511f9791545888084c0a2c5ad50", "type": "github" }, "original": { @@ -656,11 +656,11 @@ ] }, "locked": { - "lastModified": 1718424280, - "narHash": "sha256-Y1Bjk8e9KJQ+5gwxNcRSz4l6k0yDLQ28MZ9qoeEeCII=", + "lastModified": 1718687251, + "narHash": "sha256-sU8bbHd+qKW83Wt0QjXkzZcofZbaHQCPD1ED1wv3vEE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "450744cea2778415ff8c23553d37048d01df6c5b", + "rev": "71d3564befbbaecf4eaf1b648a4f38f6a98e0edc", "type": "github" }, "original": { @@ -681,11 +681,11 @@ "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1718381785, - "narHash": "sha256-tNaoDGUrlUAlspdIjgPfJAArjEX2CqD/XbcAXQ+zVb0=", + "lastModified": 1718633621, + "narHash": "sha256-Hlz0nKfekJZLrP2arjTqzdjcsA78WWVE7nnQGnel91k=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "7722375f07f3aa9bae4369ea6a87d9b2a79a6e96", + "rev": "36cf0e5db3ae181061c1a654db310e1b9352a27c", "type": "github" }, "original": { diff --git a/neovim/nvim.nix b/neovim/nvim.nix index 0d72f6bf..c5a4b49d 100644 --- a/neovim/nvim.nix +++ b/neovim/nvim.nix @@ -238,7 +238,7 @@ in rec { html.enable = true; ast-grep.enable = true; # pylyzer.enable = true; - # rust-analyzer.enable = true; + rust-analyzer.enable = false; }; onAttach = /*