From 12e2bb75215f9c3bc479edee50751f88b9e130f7 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 9 May 2025 15:01:51 +0200 Subject: [PATCH] chore: update flake.lock and adjust configurations - Updated flake.lock dependencies to latest commits and versions. - Disabled Neovim in cli-apps for aarch64-darwin user config. - Commented out unused and redundant settings in overlays and Neovim module. --- flake.lock | 44 +++++++++++----------- homes/aarch64-darwin/harald@m4/default.nix | 2 +- modules/home/cli-apps/neovim/default.nix | 11 +++--- overlays/unstable/default.nix | 10 +++-- 4 files changed, 34 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 3d8d015..c5a0732 100644 --- a/flake.lock +++ b/flake.lock @@ -19,16 +19,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1740943974, - "narHash": "sha256-2lRLfb6qwoUAsX/XtYmt/ETxtGid6/VaBeFiRsoVMtU=", + "lastModified": 1745912035, + "narHash": "sha256-qwLrR5iOcQMlwS0yrkcd0NRQvrmAXPOaiL6vxxzyIVA=", "owner": "Homebrew", "repo": "brew", - "rev": "64efed206deeb9c2304d9e5b5910dcbf0a509c15", + "rev": "3332d3331b56e0aff675d3816d8ebfe564075299", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.4.23", + "ref": "4.5.0", "repo": "brew", "type": "github" } @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1742506150, - "narHash": "sha256-Yk/7pIspgG6/7WYGNrwDmAgh96g2bQ5v/dD13kjEcSE=", + "lastModified": 1746097297, + "narHash": "sha256-5p+V4mfNhVqDBsGdxIEQzigJh34Nwdhb/6pN+tQ8Vio=", "owner": "k3d3", "repo": "claude-desktop-linux-flake", - "rev": "ae324d0bfda981b23df75ae41c9665aeba737729", + "rev": "83401cf9c8a45458ba102dc9753a51be405162b9", "type": "github" }, "original": { @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1741126078, - "narHash": "sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU=", + "lastModified": 1743127615, + "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c172f50b55b087f8e7801631de977461603bb976", + "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", "type": "github" }, "original": { @@ -696,11 +696,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1741032878, - "narHash": "sha256-s9YOBz8vAxPlI4wORma3D7km8wZOEe/7Hg/u3brmwUQ=", + "lastModified": 1746464788, + "narHash": "sha256-57lVFGLEGoKXQVSaQQQC+DFDYagUIG4rtEbc4S1nvH8=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "a82c55b07f670a01da5a72b7a07fe41c256a4380", + "rev": "20e4702906fb0a8de16902621689cafef445a35d", "type": "github" }, "original": { @@ -783,11 +783,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1746328495, + "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "type": "github" }, "original": { @@ -799,11 +799,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1743576891, - "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=", + "lastModified": 1746557022, + "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44a69ed688786e98a101f02b712c313f1ade37ab", + "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "type": "github" }, "original": { @@ -2818,11 +2818,11 @@ }, "unstable": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1746663147, + "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "type": "github" }, "original": { diff --git a/homes/aarch64-darwin/harald@m4/default.nix b/homes/aarch64-darwin/harald@m4/default.nix index f541f07..32cb170 100644 --- a/homes/aarch64-darwin/harald@m4/default.nix +++ b/homes/aarch64-darwin/harald@m4/default.nix @@ -25,7 +25,7 @@ cli-apps = { bash.enable = true; fish.enable = true; - neovim.enable = true; + neovim.enable = false; bat.enable = true; starship.enable = true; #home-manager.enable = true; diff --git a/modules/home/cli-apps/neovim/default.nix b/modules/home/cli-apps/neovim/default.nix index 82aa0d5..9805dba 100644 --- a/modules/home/cli-apps/neovim/default.nix +++ b/modules/home/cli-apps/neovim/default.nix @@ -1,8 +1,7 @@ -{ - lib, - config, - pkgs, - ... +{ lib +, config +, pkgs +, ... }: let @@ -184,7 +183,7 @@ in }; vim.ui = { - fastaction.enable = true; + #fastaction.enable = true; borders.enable = true; noice.enable = true; colorizer.enable = true; diff --git a/overlays/unstable/default.nix b/overlays/unstable/default.nix index d69d40f..c89e23a 100644 --- a/overlays/unstable/default.nix +++ b/overlays/unstable/default.nix @@ -6,11 +6,13 @@ final: prev: { open-webui aider-chat vscode + goose-cli + nodejs_20 ; - goose-cli = channels.unstable.callPackage ./goose.nix { }; + # goose-cli = channels.unstable.callPackage ./goose.nix { }; claude-code = channels.unstable.callPackage ./claude-code/package.nix { }; - vscode-extensions = channels.unstable.vscode-extensions // { - rooveterinaryinc = { roo-cline = channels.unstable.callPackage ./roo-code.nix { }; }; - }; + # vscode-extensions = channels.unstable.vscode-extensions // { + # rooveterinaryinc = { roo-cline = channels.unstable.callPackage ./roo-code.nix { }; }; + # }; }