From 16437c9f627b9450e5c944ca8e3facaea2e3949b Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Thu, 26 Jun 2025 23:29:56 -0400 Subject: [PATCH] fixing rbw and some other jazz --- flake.lock | 24 ++++++++++++------------ hosts/eddie/configuration.nix | 4 ++++ modules/home/desktop.nix | 1 + modules/home/email.nix | 4 ++-- modules/home/shell-conf.nix | 2 +- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index ea8207f..8d2ac47 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1750960699, - "narHash": "sha256-I9VUrk/O7to/6hQLIAYG3BRRjONnw4F2iGIHkLqGNKc=", + "lastModified": 1750991368, + "narHash": "sha256-qun2GQjVWgkUZndX+jrf4JbiorC8Akx8ZKr+a814Epk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4c310087af2403d31fc5ca355e890345c5a52503", + "rev": "3c987c332e45cd23b2873f9c875b00bc17e29543", "type": "github" }, "original": { @@ -415,11 +415,11 @@ ] }, "locked": { - "lastModified": 1750798083, - "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=", + "lastModified": 1750973805, + "narHash": "sha256-BZXgag7I0rnL/HMHAsBz3tQrfKAibpY2vovexl2lS+Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82", + "rev": "080e8b48b0318b38143d5865de9334f46d51fce3", "type": "github" }, "original": { @@ -1567,11 +1567,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1750662648, - "narHash": "sha256-KfWjYDqJf2jNmYAnmV7EQHweMObEBreUc2G7/LpvvC0=", + "lastModified": 1750966545, + "narHash": "sha256-iRSg4Nd8RUTTxzsRQBTO67VQlUQ7HrPaSz/JxlIhADY=", "owner": "Alexays", "repo": "Waybar", - "rev": "0fcda9afa519eb84deda68c051f7938a6c6bdbce", + "rev": "c336bc5466c858ac41dc9afd84f04a5ffec9e292", "type": "github" }, "original": { @@ -1713,11 +1713,11 @@ ] }, "locked": { - "lastModified": 1750907909, - "narHash": "sha256-2WzRZLFUlu13iRGsP+tsaJhCOUESmL8gKtT7zY14TzE=", + "lastModified": 1750979960, + "narHash": "sha256-ODzTyHMk+ZWotuk+FQCSDMIxoY/l7aLHyXoEg+HqYCI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ac0fcd7e963dce814b69cbedc4d510a95094cc15", + "rev": "ba65621f10400885d94604a3fd9af378000bfb35", "type": "github" }, "original": { diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index e9ae6eb..5630491 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -65,6 +65,10 @@ }); }) + (final: prev: { + rbw = pkgs-local.rbw-latest; + }) + # adds newer bitwig version package. i'm sure this is a hack, but it works. (final: prev: { bitwig-studio5-3 = pkgs-local.bitwig-studio.bitwig-bubblewrap.override { diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index aa5f7a8..be68ef1 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -144,6 +144,7 @@ gnome-online-accounts-gtk gnome-calculator gnome-calendar + gnome-keyring evolution wordbook diff --git a/modules/home/email.nix b/modules/home/email.nix index 2e7348a..e2735c4 100644 --- a/modules/home/email.nix +++ b/modules/home/email.nix @@ -1,6 +1,6 @@ { pkgs-local, pkgs-stable, pkgs, ... }: let - pwdcmd = "${pkgs-local.rbw-latest}/bin/rbw"; + pwdcmd = "${pkgs.rbw}/bin/rbw"; in { accounts.email = { @@ -54,7 +54,7 @@ in services.imapnotify = { enable = true; package = pkgs.goimapnotify; - path = [ pkgs.mu pkgs.isync pkgs.goimapnotify pkgs-local.rbw-latest ]; + path = [ pkgs.mu pkgs.isync pkgs.goimapnotify pkgs.rbw ]; }; programs = { diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix index 05e5bf7..c0b4d7f 100644 --- a/modules/home/shell-conf.nix +++ b/modules/home/shell-conf.nix @@ -192,7 +192,7 @@ jq.enable = true; rbw = { enable = true; - package = pkgs-local.rbw-latest; + package = pkgs.rbw; }; };