diff --git a/dotfiles/dot_vst3/yabridge.toml b/dotfiles/dot_vst3/yabridge.toml index e69de29..77f8fca 100644 --- a/dotfiles/dot_vst3/yabridge.toml +++ b/dotfiles/dot_vst3/yabridge.toml @@ -0,0 +1,2 @@ +["FabFilter*.vst3"] +group = "fabfilter" diff --git a/flake.lock b/flake.lock index de3adf0..bffe50a 100644 --- a/flake.lock +++ b/flake.lock @@ -134,11 +134,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1736092609, - "narHash": "sha256-AyQh4Odsb2yVZb0nqoijs0vU3N3bBBEzwGi3pukObOo=", + "lastModified": 1736172756, + "narHash": "sha256-4pvJVPSqr8QCOOw+UaNJwBZJvnImRbklYm/AvFIwzNc=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "f4a9b65f788ac437649fea95a905bc9e92c0e668", + "rev": "d0b06bd55fe9ed11f2fa012b295260d0ebb8cf00", "type": "github" }, "original": { @@ -212,11 +212,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1736066484, - "narHash": "sha256-uTstP36WaFrw+TEHb8nLF14hFPzQBOhmIxzioHCDaL8=", + "lastModified": 1736089250, + "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", "owner": "nix-community", "repo": "home-manager", - "rev": "5ad12b6ea06b84e48f6b677957c74f32d47bdee0", + "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", "type": "github" }, "original": { @@ -366,11 +366,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index 0ff524f..8dd6b60 100644 --- a/home/home.nix +++ b/home/home.nix @@ -113,6 +113,7 @@ python311Packages.babel python311Packages.requests ruff + (sbcl.withPackages (ps: with ps; [ # asdf_3_3 cffi @@ -120,6 +121,7 @@ alexandria serapeum ])) + ccl racket gdu @@ -305,8 +307,6 @@ rawtherapee inkscape gimp - epson-escpr - epson-escpr2 epsonscan2 kicad turbocase @@ -516,7 +516,7 @@ ]; repositories = [ { - "path" = "ssh://oyi3ydnz@oyi3ydnz.repo.borgbase.com/./repo"; + "path" = "${config.sops.defaultSymlinkPath}/borg_url"; "label" = "eddie on borgbase"; } ]; diff --git a/home/secrets.yaml b/home/secrets.yaml index 285ebda..447bca7 100644 --- a/home/secrets.yaml +++ b/home/secrets.yaml @@ -2,6 +2,7 @@ bw_client_id: ENC[AES256_GCM,data:7ssBRUFfYW7CNsDwntS6S+2p68DpSaivUFAXY1GaTUuxOc bw_api_key: ENC[AES256_GCM,data:Dwb++djM0lrkkmfVDNq46uhMxjbj1grmDwykk2v4,iv:JPy6fOwaMAL31tk/yU6n9CMKhXV1WrGNV9dgOVIdbS4=,tag:v/IIZ9qCaCoimrxdNRsrWw==,type:str] ssh_key: ENC[AES256_GCM,data:gp/UO2dV5AFAj2AQ7MgWrBoi/jXWprPhNsuIfF7wrHilFDyWO9YCaG2waBfon6YltWRVoow6LRQs9JnoGkRsF79LDpIBRSMQmi2SEUpY0uLvZB0MUBkblqYiaAqNfoDL5JSsI7ePyEpSB6a3f1Rq5oVD6BSzqgl2gocV7/GlgiqBQ7ah/x90QLlfJjQ2NPFGCxXCxoPbpvlA9jvTzMVgxc6ziI3eH41Mg8iRw8K9WtSE+rvCrH1juY/d5aj1nc4b+r257kseuH7oU5di+10cJ7IMuvDEsBrMrCHpc9rETAEqtwXXmSXSxtOx1B9KnT+3KbvlTkOOgn4/jGb+CrVD0Ku61F82aP5sIiX47qiR6s+eyggHcDib8KwL4IbpKqJWKbybelrDz14JSm4yHWTOFwOwX7baNPc2l4awZ/7VnEtX2+GVxZA5jBQFqv2zeevPW8nURZt0ANAmN+gb2ebe8dKb7IL3KPYTht3AWxsovVuXClmLKW/zIWH48sbuGkqZXqOJqQewBb71frOmmAGC,iv:34riu5Fa+r2DG5kIEEPiQnOFZ1sUk0tqbVZZw0AA3QY=,tag:nyZkcBT2fz44J2MBptB0lA==,type:str] ssh_key_pub: ENC[AES256_GCM,data:MbEqSFSH52Ac1EgX66DohzlTa3CRellfgmGBolCuPIKn/0T7IN2+8iHpKB45/9VqzaWn6E4wPKGzKCP69/ne2+h4FPxWZv8OXGfvCvApWz6xkSRXL04mud3bJId3,iv:HxEA9fHRwSPdZ6QPIPjk6CDCcEiouoz2KED0MSW01Bk=,tag:e8GWCQfoFiT+2+KNPYdBpg==,type:str] +borg_url: ENC[AES256_GCM,data:Ha/C+EInoNv6Wy/t7IRWmAlVsgEg/sh+LhM/8GmrvQsqfs/KO86i3QD66H0A+gN9,iv:/k8CIgdPg+Z5alVj4RnRypU8S1E/B/nLAlkhzMX1+uU=,tag:/Y6mUq00lRryUairXQMWwQ==,type:str] sops: kms: [] gcp_kms: [] @@ -17,8 +18,8 @@ sops: RTk5RGdrZ3dGaXJIait5VG45bTFpQVkKFvq2714fyXnUlQ2ovZGVl55Wq9m/uvpC Q7k9SEOdSMNqioG5TR7yhGS+cCbcO+zV7WXxKB+mpwUmhkc13H0w5A== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-01T19:15:16Z" - mac: ENC[AES256_GCM,data:Y3mWWfrh5IdIuT5drLGjy3MGNA8mUo7cmUz1DBZpcj7UL/3A1Hj7z4oBWOFKWMQ8soXSEmEmFoTcjISblky//PpgSeW8Jh6b3Ag7R6PEpcF1tZNDRh+wkjInzetjzc4flQxogVnSTWNlgdfQKd9Xsg0MJPw4bCFKGnDi+lGaWsQ=,iv:QDNeQ8r81oQygXV5v8WmOz0RKSph9UGOetOJhbwzV8I=,tag:S57/T53KM8QHInZtuRX/fw==,type:str] + lastmodified: "2025-01-06T20:09:39Z" + mac: ENC[AES256_GCM,data:lZB6blCUm/QXMbK05z65vIxbVm3diXaNXKmGc8c2as8MqEcFwP5twB9GlX/Kpn/3aEFvH5FpavOfUzId5eOVVZJnZYIuTELqXpNGWUD6dMbCmIL0sfOsp49rgmKr+mkoi7kfhM7dMCoximBS2ubLOVIyPAHmrnKI1St/cs/J+PE=,iv:xCerqV4zPVj6LRnWQwNUWTz9F0tJRAF+0b9QcNbHwJ4=,tag:6ew+Loe4iiqMgM2SrhIVpQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.2 diff --git a/packages/rbw/rbw.nix b/packages/rbw/rbw.nix index 4db3832..752c478 100644 --- a/packages/rbw/rbw.nix +++ b/packages/rbw/rbw.nix @@ -6,12 +6,20 @@ openssl, pkg-config, installShellFiles, - darwin, bash, - # rbw-fzf + withFzf ? false, fzf, - perl + perl, + + # rbw-rofi + withRofi ? false, + rofi, + xclip, + + # pass-import + withPass ? false, + pass, }: rustPlatform.buildRustPackage rec { @@ -29,8 +37,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - [ bash ]; # for git-credential-rbw + buildInputs = [ bash ]; # for git-credential-rbw preConfigure = lib.optionalString stdenv.hostPlatform.isLinux '' export OPENSSL_INCLUDE_DIR="${openssl.dev}/include" @@ -40,16 +47,30 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -Dm755 -t $out/bin bin/git-credential-rbw - install -Dm755 -t $out/bin bin/rbw-fzf - substituteInPlace $out/bin/rbw-fzf \ - --replace fzf ${fzf}/bin/fzf \ - --replace perl ${perl}/bin/perl + install -Dm755 -t $out/bin bin/rbw-pinentry-keyring '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd rbw \ --bash <($out/bin/rbw gen-completions bash) \ --fish <($out/bin/rbw gen-completions fish) \ --zsh <($out/bin/rbw gen-completions zsh) + '' + + lib.optionalString withFzf '' + install -Dm755 -t $out/bin bin/rbw-fzf + substituteInPlace $out/bin/rbw-fzf \ + --replace fzf ${fzf}/bin/fzf \ + --replace perl ${perl}/bin/perl + '' + + lib.optionalString withRofi '' + install -Dm755 -t $out/bin bin/rbw-rofi + substituteInPlace $out/bin/rbw-rofi \ + --replace rofi ${rofi}/bin/rofi \ + --replace xclip ${xclip}/bin/xclip + '' + + lib.optionalString withPass '' + install -Dm755 -t $out/bin bin/pass-import + substituteInPlace $out/bin/pass-import \ + --replace pass ${pass}/bin/pass ''; meta = with lib; { @@ -57,6 +78,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://crates.io/crates/rbw"; changelog = "https://git.tozt.net/rbw/plain/CHANGELOG.md?id=${version}"; license = licenses.mit; + maintainers = with maintainers; [ albakham ]; mainProgram = "rbw"; }; } diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index 5da1351..aa0f56d 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -170,7 +170,6 @@ networkmanager = { enable = true; wifi.powersave = true; - # connectionConfig = "connection.mdns=2"; }; }; @@ -210,7 +209,13 @@ variant = ""; }; - services.printing.enable = true; + services.printing = { + enable = true; + drivers = [ + pkgs.epson-escpr + pkgs.epson-escpr2 + ]; + }; services.tailscale.enable = true; services.envfs.enable = true;