diff --git a/modules/home-manager/zsh.nix b/modules/home-manager/zsh.nix index 72ed4facd..faec9fecd 100644 --- a/modules/home-manager/zsh.nix +++ b/modules/home-manager/zsh.nix @@ -59,5 +59,9 @@ lib.mkIf config.sane.home-manager.enable # common typos "cd.." = "cd .."; "cd../" = "cd ../"; + # convenient `cd`-isms + "nixpkgs" = "cd ~/dev/3rd/nixpkgs"; + "nixos" = "cd ~/nixos"; + "uninsane" = "cd ~/dev/uninsane"; }; } diff --git a/modules/packages.nix b/modules/packages.nix index 471375ad7..65d20abdb 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -4,6 +4,11 @@ with lib; with pkgs; let cfg = config.sane.packages; + + imagemagick = pkgs.imagemagick.override { + ghostscriptSupport = true; + }; + consolePkgs = [ backblaze-b2 cdrtools @@ -12,11 +17,13 @@ let efivar flashrom fwupd + ghostscript # TODO: imagemagick wrapper should add gs to PATH gnupg gocryptfs gopass gopass-jsonapi ifuse + imagemagick ipfs libimobiledevice libsecret # for managing user keyrings diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 63ef88ee5..cbcf7e59f 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -9,7 +9,7 @@ fetchpatch: [ # aerc: substitute awk in filters (fetchpatch { url = "https://github.com/NixOS/nixpkgs/pull/204322.diff"; - sha256 = "sha256-zzK8kcW34hcn331CtTqggUwH8YmrOu5+N8lfXSDfRls="; + sha256 = "sha256-ngetBsBMiIaz43T7a2taULp1pNK2YkVGGW48ViDjS6A="; }) # # kaiteki: init at 2022-09-03