flake: start transitioning away from with

hosts/hermit/programs.nix

@@ -1,88 +1,91 @@
 {pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    alsa-utils
-    anki
-    asciinema
-    cachix
-    calc
-    # calibre
-    cbonsai
-    cmus
-    difftastic
-    element
-    element-desktop
-    emacs30-pgtk
-    # evince
-    eza
-    firefox
-    fftw
-    gcc
-    grc
-    gparted
-    git
-    halloy
-    helvum
-    httpie
-    hyperfine
-    imagemagick
-    img2pdf
-    impala
-    imv
-    inetutils
-    jujutsu
-    just
-    jrnl
-    keepassxc
-    lazygit
-    libtool
-    librewolf
-    links2
-    linuxHeaders
-    moc
-    mpv
-    ncmpcpp
-    neofetch
-    networkmanagerapplet
-    nextcloud-client
-    nicotine-plus
-    nil
-    nitch
-    swww
-    microfetch
-    nmap
-    pamixer
-    pavucontrol
-    pdfarranger
-    pfetch
-    pidgin
-    playerctl
-    polkit
-    pulsemixer
-    python3
-    ripgrep
-    rmpc
-    signal-desktop
-    sioyek
-    smartmontools
-    taskwarrior3
-    taskwarrior-tui
-    telegram-desktop
-    texliveFull
-    tldr
-    thunderbird
-    tor-browser
-    trash-cli
-    typst
-    ungoogled-chromium
-    util-linux
-    v4l-utils
-    vesktop
-    vlc
-    weechat
-    wireguard-tools
-    xournalpp
-    zapzap
-    zip
-    zoxide
-  ];
+  environment.systemPackages = builtins.attrValues {
+    inherit
+      (pkgs)
+      alsa-utils
+      anki
+      asciinema
+      cachix
+      calc
+      # calibre
+      cbonsai
+      cmus
+      difftastic
+      element
+      element-desktop
+      emacs30-pgtk
+      # evince
+      eza
+      firefox
+      fftw
+      gcc
+      grc
+      gparted
+      git
+      halloy
+      helvum
+      httpie
+      hyperfine
+      imagemagick
+      img2pdf
+      impala
+      imv
+      inetutils
+      jujutsu
+      just
+      jrnl
+      keepassxc
+      lazygit
+      libtool
+      librewolf
+      links2
+      linuxHeaders
+      moc
+      mpv
+      ncmpcpp
+      neofetch
+      networkmanagerapplet
+      nextcloud-client
+      nicotine-plus
+      nil
+      nitch
+      swww
+      microfetch
+      nmap
+      pamixer
+      pavucontrol
+      pdfarranger
+      pfetch
+      pidgin
+      playerctl
+      polkit
+      pulsemixer
+      python3
+      ripgrep
+      rmpc
+      signal-desktop
+      sioyek
+      smartmontools
+      taskwarrior3
+      taskwarrior-tui
+      telegram-desktop
+      texliveFull
+      tldr
+      thunderbird
+      tor-browser
+      trash-cli
+      typst
+      ungoogled-chromium
+      util-linux
+      v4l-utils
+      vesktop
+      vlc
+      weechat
+      wireguard-tools
+      xournalpp
+      zapzap
+      zip
+      zoxide
+      ;
+  };
 }

hosts/temperance/programs.nix

@@ -1,71 +1,74 @@
 {pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    alsa-utils
-    anki
-    asciinema
-    beets
-    cachix
-    calc
-    difftastic
-    dnsutils
-    element-desktop
-    evince
-    gcc
-    gnumake
-    halloy
-    helvum
-    httpie
-    imagemagick
-    imhex
-    img2pdf
-    impala
-    imv
-    inetutils
-    joplin-desktop
-    jujutsu
-    julia
-    just
-    keepassxc
-    lazygit
-    librewolf
-    libtool
-    logiops
-    mpv
-    nextcloud-client
-    nheko
-    nicotine-plus
-    swww
-    pandoc
-    pavucontrol
-    pdfarranger
-    picard
-    polkit
-    pulsemixer
-    python3
-    pwvucontrol
-    qbittorrent
-    r2modman
-    radare2
-    ripgrep
-    rmpc
-    signal-desktop
-    strawberry
-    telegram-desktop
-    texliveFull
-    thunderbird
-    tor-browser
-    trash-cli
-    tutanota-desktop
-    typst
-    walker
-    wayneko
-    wineWowPackages.waylandFull
-    wireguard-tools
-    xdg-utils
-    xournalpp
-    zapzap
-    zathura
-    zotero
-    zoxide
-  ];
+  environment.systemPackages = builtins.attrValues {
+    inherit
+      (pkgs)
+      alsa-utils
+      anki
+      asciinema
+      beets
+      cachix
+      calc
+      cinny-desktop
+      difftastic
+      dnsutils
+      element-desktop
+      evince
+      gcc
+      gnumake
+      halloy
+      helvum
+      httpie
+      imagemagick
+      imhex
+      img2pdf
+      impala
+      imv
+      inetutils
+      joplin-desktop
+      jujutsu
+      julia
+      just
+      keepassxc
+      lazygit
+      librewolf
+      libtool
+      logiops
+      mpv
+      nextcloud-client
+      nheko
+      nicotine-plus
+      swww
+      pandoc
+      pavucontrol
+      pdfarranger
+      picard
+      polkit
+      pulsemixer
+      python3
+      pwvucontrol
+      qbittorrent
+      r2modman
+      radare2
+      ripgrep
+      rmpc
+      signal-desktop
+      strawberry
+      telegram-desktop
+      texliveFull
+      thunderbird
+      tor-browser
+      trash-cli
+      tutanota-desktop
+      typst
+      walker
+      wayneko
+      wireguard-tools
+      xdg-utils
+      xournalpp
+      zapzap
+      zathura
+      zotero
+      zoxide
+      ;
+  };
 }