Merge branch 'main' of github.com:wi11-holdsworth/dots

modules/home-manager/bundles/desktop.nix

@@ -5,12 +5,9 @@
 {
   imports = util.toImports ../features [
     # keep-sorted start
-    "aerc"
     "firefox"
     "kitty"
-    "mail"
     "obsidian"
-    "zellij"
     "zen-browser"
     # keep-sorted end
   ];

modules/home-manager/bundles/dev.nix

@@ -4,6 +4,9 @@
 }:
 {
   imports = util.toImports ../features [
+    # keep-sorted start
+    "direnv"
     "zed-editor"
+    # keep-sorted end
   ];
 }

modules/home-manager/default.nix

@@ -5,17 +5,19 @@
 {
   imports = util.toImports ./features [
     # keep-sorted start
+    "aerc"
     "agenix"
     "bat"
     "delta"
-    "direnv"
     "eza"
     "fish"
     "gh"
     "git"
     "lazygit"
+    "mail"
     "starship"
     "yazi"
+    "zellij"
     "zoxide"
     # keep-sorted end
   ];

modules/nixos/bundles/desktop.nix

@@ -19,6 +19,7 @@
     beeper
     calibre
     cameractrls-gtk3
+    jellyfin-desktop
     # https://github.com/NixOS/nixpkgs/issues/437865
     # jellyfin-media-player
     onlyoffice-desktopeditors

modules/nixos/default.nix

@@ -31,7 +31,7 @@
       circumflex # hacker news browsing
       cointop # crypto ticker
       ddgr # web search
-      dogdns # dns
+      doggo # dns
       dua # du
       duf # df
       epy # ebook reading