zenix: resolve warnings

home/default.nix

@@ -29,7 +29,7 @@
     mosh
     ripgrep
     usbutils
-    du-dust
+    dust
     htop
     btop
     libsixel

home/desktop/utils/waybar.nix

@@ -42,17 +42,12 @@
           on-click = "pwvucontrol";
         };
         mpris = {
-          format = "{player_icon} {title}";
-          format-paused = "⏸️ {player_icon} {title}";
-          player-icons = {
-            default = "▶️";
-            mpd = "🎵";
-            kdeconnect = "☎️";
-          };
+          format = "▶️ {title}";
+          format-paused = "⏸️ {title}";
         };
         battery = {
           format = "{icon} {capacity}%";
-          format-icons = ["🤏" "🪫" "🔋" "🔋"];
+          format-icons = ["🪫" "🔋" "🔋"];
           format-charging = "🔌 {capacity}%";
           states = {
             warning = 30;

home/modules/email.nix

@@ -35,9 +35,9 @@ in {
       }
     ];
 
-    programs.git = {
-      userName = config.home.userFullname;
-      userEmail = cfg.email;
+    programs.git.settings.user = {
+      name = config.home.userFullname;
+      email = cfg.email;
     };
 
     accounts.email.accounts.${cfg.email} = lib.mkIf cfg.terminal {

home/programs/gamer.nix

@@ -2,7 +2,7 @@
   home.packages = with pkgs; [
     # Games
     airshipper
-    minetest
+    luanti
     superTuxKart
     xonotic
 

home/programs/git.nix

@@ -6,11 +6,11 @@
 }: {
   programs.git = {
     enable = true;
-    extraConfig = {
+    settings = {
       rerere.enabled = true;
       rebase.updateRefs = true;
     };
-    aliases = {
+    settings.aliases = {
       ui = "!lazygit";
       graph = "log --oneline --all --graph";
       amend = "commit --amend --no-edit";
@@ -44,10 +44,8 @@
         git fetch origin $opts
       ''}/bin/bare-clone";
     };
-    difftastic = {
-      enable = true;
-    };
   };
+  programs.difftastic = {enable = true;};
 
   programs.lazygit = {
     enable = true;

home/programs/graphical.nix

@@ -28,7 +28,7 @@
 
     # other
     element-desktop
-    bitwarden
+    bitwarden-desktop
 
     inputs.zen-browser.packages.x86_64-linux.default
   ];

home/programs/personal/default.nix

@@ -38,7 +38,6 @@
     krita
     organicmaps
     anki
-    bookworm
     jellyfin-mpv-shim
   ];
 }

home/programs/work.nix

@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }: let
   modifier = config.windowManager.modifierKey;
@@ -13,7 +14,7 @@ in {
     email = "tristan.beedell@cryoserver.com";
     terminal = false;
   };
-  programs.git.extraConfig = {
+  programs.git.settings.extraConfig = {
     "includeIf \"gitdir:~/Documents/personal/\"" = {
       path = "~/Documents/personal/.gitconfig";
     };
@@ -43,13 +44,8 @@ in {
   home.sessionVariables = {
     CYPRESS_INSTALL_BINARY = 0;
     CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
-    MONGOMS_SYSTEM_BINARY = "${pkgs.callPackage ../../pkgs/mongodb.nix pkgs}/bin/mongod";
   };
 
-  gtk.gtk3.bookmarks = [
-    "file:///home/tristan/OneDrive/ OneDrive"
-  ];
-
   programs.vscode = {
     package = pkgs.vscode;
     profiles.default.extensions = with pkgs; [

home/programs/zsh.nix

@@ -7,7 +7,7 @@
   programs.starship.enable = true;
   programs.zsh = {
     enable = true;
-    dotDir = ".config/zsh";
+    dotDir = "${config.xdg.configHome}/zsh";
     history = {
       path = "${config.xdg.dataHome}/zsh/zsh_history";
     };

home/workstation.nix

@@ -28,7 +28,6 @@
     playerctl
     quickemu
     devenv
-    bottles
   ];
 
   services.udiskie = {