From e4da7e87fec9a186a280a8ccef2ddb6fa1175a69 Mon Sep 17 00:00:00 2001 From: zack Date: Sun, 24 Nov 2024 13:44:32 -0500 Subject: [PATCH] update nvim --- flake.lock | 88 +++++++++---------- flake.nix | 2 +- homes/x86_64-linux/zoey@earth/default.nix | 3 +- modules/home/apps/helpers/ags/default.nix | 1 - .../apps/tools/neovim/config/lazyvim.json | 3 +- .../tools/neovim/config/lua/plugins/core.lua | 10 +++ packages/zen-browser-unwrapped/default.nix | 10 +-- 7 files changed, 63 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index e7c1f09..0a59a0f 100644 --- a/flake.lock +++ b/flake.lock @@ -175,11 +175,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1732266182, - "narHash": "sha256-NuajQPP1ZVtviwC+Y3J42RV7V7TsCo+A+ux2aC9oW9s=", + "lastModified": 1732439500, + "narHash": "sha256-mo4VuOLi4CnWMoPIFIi1XgqaYNQ64xC4l0AqMaIrl7s=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2bbf361a5d58fd97f31bd871e334f0682b98c905", + "rev": "87de50e44afcc4d819f9c65e9ab46222bf15f742", "type": "github" }, "original": { @@ -847,11 +847,11 @@ ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1732453510, + "narHash": "sha256-mAOaLu++YRwOxCJ135Bhgf78WYhIKWHL2aGWCAoXoBg=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "bd58a1132e9b7f121f65313bc662ad6c8a05f878", "type": "github" }, "original": { @@ -927,11 +927,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1732291262, - "narHash": "sha256-EDTvzp9ExAljyfESZZN8UQM08bpYvI2hFTaXivp3frg=", + "lastModified": 1732460016, + "narHash": "sha256-Kb8TdW9fL/74kYr/Nfhe5EI3JEBn52+wyAxV1ZBGLV8=", "ref": "refs/heads/main", - "rev": "745a82ce8ab19d958e344f5925bb1dc8ea7d6a53", - "revCount": 5488, + "rev": "cc38e7e18fd762d5cdb34d06335223b7d7874106", + "revCount": 5494, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1179,11 +1179,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1731845570, - "narHash": "sha256-5reOtlm18XLnh3ezruPOg2wQO+MB7ztsFaIzSUAzeh8=", + "lastModified": 1732450403, + "narHash": "sha256-qYjJeHYUHDgfDsvMpIf9TRz0oAoMwvYP75XHObDjWIg=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "7a1d37b2b16f32536628df9cea6a2003d79a49f9", + "rev": "c817444fb8a3042c26be57d8640fb744bc1b516c", "type": "github" }, "original": { @@ -1237,11 +1237,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1732234033, - "narHash": "sha256-94yZ7eJiLvW+UknI5RZBCV6OMHtoSv1oWyOwKjTmS88=", + "lastModified": 1732406787, + "narHash": "sha256-5c1DQGdD0wZl+Ps05M4A7xWbb9b5KBdH3Z7td4UanYk=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "10e11c32a4f4f7c9d64f45413642ded11fc538b6", + "rev": "6f95702c4fc3ff51b4cd1a626e958fbad50bfc3a", "type": "github" }, "original": { @@ -1253,11 +1253,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1732229552, - "narHash": "sha256-7tA7IeOjx1wgDQnY7RxIhIuwcFeSZu4Yc3WtLh+22TE=", + "lastModified": 1732402479, + "narHash": "sha256-TR8ZCOq4v8ChQMZ0/WEq8Inr3pb7cAgvNpd9W2QqSSw=", "owner": "neovim", "repo": "neovim", - "rev": "ff75f345ab5fa57c6560db021e8eb099aff90472", + "rev": "d9b08c58c34ba6c8083f533d5f7a0fd21e262d00", "type": "github" }, "original": { @@ -1363,11 +1363,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1731805462, - "narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=", + "lastModified": 1732410305, + "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734", + "rev": "87b6978992e2eb605732fba842cad0a7e14b2047", "type": "github" }, "original": { @@ -1462,11 +1462,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "lastModified": 1732238832, + "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", + "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", "type": "github" }, "original": { @@ -1484,11 +1484,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1732289107, - "narHash": "sha256-Ht7NG7IfVTLIu7CWdPl06yrKL8sjsTB4w6BDqMf0w5M=", + "lastModified": 1732451775, + "narHash": "sha256-lp+R0hd3mH5hBtc833gONBuWqXPJGzJmGedIVxL2fpY=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "243bb282a21cdede947362dd93544640f765ab48", + "rev": "3187348afa891b3ee9c1f5c866930a89970148eb", "type": "github" }, "original": { @@ -1829,11 +1829,11 @@ "systems": "systems_13" }, "locked": { - "lastModified": 1729835932, - "narHash": "sha256-PPTo15rUsfY0sokY0YQJnTxAWF/oz2+SuQgK2pc0HC8=", + "lastModified": 1732423120, + "narHash": "sha256-zO+n90U2BZI92QW0Uav4ymk8tLbsUIQ0Xo2IGBfYKfw=", "ref": "refs/heads/main", - "rev": "8a737fbb37d096ac822bea361bf762542aef4983", - "revCount": 27, + "rev": "efd7999992f7884ab62ad9a90217e8f3fa7f92da", + "revCount": 28, "type": "git", "url": "https://git.zoeys.cloud/zoey/resume" }, @@ -1852,11 +1852,11 @@ "systems": "systems_14" }, "locked": { - "lastModified": 1732221455, - "narHash": "sha256-lzW3DCYMNd/BAbAPudxIQJGmxEnyWDg1rxHWuwF5wZY=", + "lastModified": 1732407683, + "narHash": "sha256-W/jr5vbQEkNKS2eZZBkOOm3SDFTAZeAE0mhEeDXng5A=", "owner": "raphamorim", "repo": "rio", - "rev": "1d598cac8da30d5e023e3421d2e8fc8c83006523", + "rev": "fddea5440feb459f8a053217395259b2b4df8166", "type": "github" }, "original": { @@ -1946,11 +1946,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1731724228, - "narHash": "sha256-3R48B+BVeZ8IWsXF7TdRm441RsdJt21yQ5ZgxuNTXYc=", + "lastModified": 1732328983, + "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f6c4c2a7b8969c2b172847b3ef474e0d3bd8bdce", + "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", "type": "github" }, "original": { @@ -1966,11 +1966,11 @@ ] }, "locked": { - "lastModified": 1732242723, - "narHash": "sha256-NWI8csIK0ujFlFuEXKnoc+7hWoCiEtINK9r48LUUMeU=", + "lastModified": 1732328983, + "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a229311fcb45b88a95fdfa5cecd8349c809a272a", + "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", "type": "github" }, "original": { @@ -2056,11 +2056,11 @@ ] }, "locked": { - "lastModified": 1732248994, - "narHash": "sha256-ZVX0BPZkyn8M9JD+62xml6ir6ejzdG5hwhiulDeym9M=", + "lastModified": 1732421741, + "narHash": "sha256-r3q4NYO3Z/OG3Oy5zHrEjAn+s5Bcgy569fUJUG9Ipuc=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "31e976ab41721e156ef44e0e7b6b0bd46c80dedd", + "rev": "8380d08050b6bd1f5c93de48e5ceef5b5105ecf6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 14f4177..6a55e52 100644 --- a/flake.nix +++ b/flake.nix @@ -135,7 +135,7 @@ inherit inputs; src = ./.; - overlays = [inputs.nixpkgs-wayland.overlay inputs.rust-overlay.overlays.default]; + overlays = [inputs.rust-overlay.overlays.default]; snowfall = { namespace = "custom"; diff --git a/homes/x86_64-linux/zoey@earth/default.nix b/homes/x86_64-linux/zoey@earth/default.nix index 77797e7..c309510 100644 --- a/homes/x86_64-linux/zoey@earth/default.nix +++ b/homes/x86_64-linux/zoey@earth/default.nix @@ -30,7 +30,7 @@ helpers = { anyrun.enable = true; - waybar.enable = true; + ags.enable = true; }; }; @@ -108,7 +108,6 @@ pkgs.nix-output-monitor pkgs.fastfetch - pkgs.libreoffice-qt6-fresh pkgs.signal-desktop pkgs.nh diff --git a/modules/home/apps/helpers/ags/default.nix b/modules/home/apps/helpers/ags/default.nix index f2f1e47..090d779 100644 --- a/modules/home/apps/helpers/ags/default.nix +++ b/modules/home/apps/helpers/ags/default.nix @@ -34,7 +34,6 @@ with lib.custom; let guiDeps = with pkgs; [ gnome.gnome-control-center - mission-center overskride wlogout ]; diff --git a/modules/home/apps/tools/neovim/config/lazyvim.json b/modules/home/apps/tools/neovim/config/lazyvim.json index db94d6b..4cfe9d1 100644 --- a/modules/home/apps/tools/neovim/config/lazyvim.json +++ b/modules/home/apps/tools/neovim/config/lazyvim.json @@ -26,7 +26,8 @@ "lazyvim.plugins.extras.util.dot", "lazyvim.plugins.extras.util.mini-hipatterns", "lazyvim.plugins.extras.coding.luasnip", - "lazyvim.plugins.extras.coding.blink" + "lazyvim.plugins.extras.coding.blink", + "lazyvim.plugins.extras.ai.supermaven" ], "news": { "NEWS.md": "6520" diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/core.lua b/modules/home/apps/tools/neovim/config/lua/plugins/core.lua index 9db96e5..7761efc 100644 --- a/modules/home/apps/tools/neovim/config/lua/plugins/core.lua +++ b/modules/home/apps/tools/neovim/config/lua/plugins/core.lua @@ -28,6 +28,16 @@ return { nerd_font_variant = "normal", }, }, + { + "karb94/neoscroll.nvim", + config = function() + require("neoscroll").setup({}) + end, + }, + { + "sphamba/smear-cursor.nvim", + opts = {}, + }, { "lukas-reineke/indent-blankline.nvim", main = "ibl", diff --git a/packages/zen-browser-unwrapped/default.nix b/packages/zen-browser-unwrapped/default.nix index 532c8de..f91aae7 100644 --- a/packages/zen-browser-unwrapped/default.nix +++ b/packages/zen-browser-unwrapped/default.nix @@ -170,13 +170,13 @@ in buildStdenv.mkDerivation (finalAttrs: { pname = "zen-browser-unwrapped"; - version = "1.0.1-a.19"; + version = "1.0.1-t.20"; src = fetchFromGitHub { owner = "zen-browser"; repo = "desktop"; - rev = "0e02cb14ecd72f5bc90a0e1093731409ab043578"; - hash = "sha256-+eehLsnQoWapkSKo3zWFxaz6N68BryK1XsmSk48zbbk="; + rev = "113a349b56e039a9a98e53a29f38b70c3a6a3ff6"; + hash = "sha256-XBncRNX28hiq953yr7j6seD/HLluzmqbtTncE6fDa30="; fetchSubmodules = true; }; @@ -186,10 +186,10 @@ in # The Firefox version is specified by `zen-browser` in the `surfer.json` file. # # We need to manually set the version here to avoid IFD. - firefoxVersion = "132.0.1"; + firefoxVersion = "132.0.2"; firefoxSrc = fetchurl { url = "mirror://mozilla/firefox/releases/${finalAttrs.firefoxVersion}/source/firefox-${finalAttrs.firefoxVersion}.source.tar.xz"; - hash = "sha256-XAMbVywdpyZnfi/5e2rVp+OyM4em/DljORy1YvgKXkg="; + hash = "sha256-Mp4XZPS04T8R3PH9ezxtj4DlEui37Vv2X75EdJwmEOk="; }; SURFER_COMPAT = generic;