From a2a91ec43c99e76c4df585f7f207205e9fe6dadb Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 23 Mar 2024 19:33:09 +0100
Subject: [PATCH] =?UTF-8?q?l=C3=B8jasdfkasd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 users/pbsds/home/profiles/desktop.nix | 2 +-
 users/pbsds/home/profiles/shell.nix   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/users/pbsds/home/profiles/desktop.nix b/users/pbsds/home/profiles/desktop.nix
index 5182ed6..6a8b9b8 100644
--- a/users/pbsds/home/profiles/desktop.nix
+++ b/users/pbsds/home/profiles/desktop.nix
@@ -40,7 +40,7 @@
     #nheko
     #fluffychat
 
-    (pkgs.zxtune or null)
+    (pkgs.zxtune or unstable.zxtune or null)
 
     f3d
     firefox
diff --git a/users/pbsds/home/profiles/shell.nix b/users/pbsds/home/profiles/shell.nix
index 013a196..87592b8 100644
--- a/users/pbsds/home/profiles/shell.nix
+++ b/users/pbsds/home/profiles/shell.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 {
   # TODO: "bind -s 'set completion-ignore-case on'"
   programs.bash.enable = true;
@@ -82,7 +82,7 @@
   home.shellAliases.chgrp = "chgrp --preserve-root";
 
 
-  home.packages = with pkgs; [
+  home.packages = lib.filter (x: x != null) (with pkgs; [
     rsync
     bind.dnsutils # dig
     dogdns # dog
@@ -106,6 +106,7 @@
     fx
     yq # includes xmlq and tomlq
     fq # binary jq
+    (pkgs.jnv or unstable.jnv or null)
     htmlq
     just # justfile
     gum
@@ -115,6 +116,6 @@
     ncdu # Disk usage analyzer with an ncurses interface
     xplr # tui file explorer
     aha (pkgs.colorized-logs or unstable.colorized-logs)
-  ];
+  ]);
 
 }