add git-diff to path and some small tidying

home/dev/all/git.nix

@@ -1,10 +1,21 @@
-{pkgs, ...}: {
+{pkgs, ...}: let
+  gitPackage = pkgs.gitAndTools.gitFull;
+in {
   programs.git = {
     enable = true;
     lfs.enable = true;
-    package = pkgs.gitAndTools.gitFull;
+    package = gitPackage;
     userName = "chaos";
-    userEmail = "chaoticryptidz@owo.monster";
+    userEmail = "chaos@owo.monster";
-    extraConfig = {credential = {helper = "store";};};
+    extraConfig = {credential.helper = "store";};
   };
+
+  home.packages = [
+    (pkgs.runCommand "git-extras" {} (let
+      gitLibExec = "${gitPackage}/libexec/git-core";
+    in ''
+      mkdir -p $out/bin
+      ln -s ${gitLibExec}/git-diff $out/bin/git-diff
+    ''))
+  ];
 }

home/gui/environments/gnome/default.nix

@@ -3,8 +3,12 @@
   nixosConfig,
   pkgs,
   inputs,
+  lib,
   ...
 }: let
+  inherit (lib.lists) optional;
+  inherit (lib.modules) mkIf;
+
   homeManagerLib = inputs.home-manager.lib.hm;
 
   fontSizesAll = {
@@ -18,10 +22,16 @@
     if fontSizesAll ? nixosConfig.networking.hostName
     then fontSizesAll.${nixosConfig.networking.hostName}
     else fontSizesAll.default;
-in {
-  imports = with tree; [home.gui.base home.apps.kitty];
 
-  home.packages = with pkgs; [dconf2nix gnome.dconf-editor xclip];
+  isWayland = nixosConfig.services.xserver.displayManager.gdm.wayland;
+in {
+  imports = with tree; [home.gui.base home.apps.kitty] ++ (optional isWayland home.apps.rofi);
+
+  home.packages = with pkgs; [
+    dconf2nix
+    gnome.dconf-editor
+    xclip
+  ];
 
   home.sessionVariables = {
     SAL_USE_VCLPLUGIN = "gtk3"; # GTK3 on LibreOffice
@@ -126,17 +136,18 @@ in {
       area-screenshot-clip = ["<Shift>Print"];
       screenshot = [];
       screenshot-clip = ["Print"];
+      search = mkIf isWayland ["<Alt>d"];
       custom-keybindings = [
         # Rofi & Kitty
-        #"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/rofi/"
+        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/rofi/"
         "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/kitty/"
       ];
     };
-    #"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/rofi" = {
+    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/rofi" = mkIf (!isWayland) {
-    #  binding = "<Alt>d";
+      binding = "<Alt>d";
-    #  command = "rofi -show run";
+      command = "rofi -show run";
-    #  name = "rofi";
+      name = "rofi";
-    #};
+    };
     "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/kitty" = {
       binding = "<Alt>Return";
       command = "kitty";

hosts/nixos.nix

@@ -33,8 +33,8 @@
     inputs.gitlab_artifacts_sync.nixosModules.default
     inputs.piped-flake.nixosModules.default
 
-    tree.modules.nixos.rclone-serve
+    tree.modules.nixos.rcloneServe
-    tree.modules.nixos.rclone-sync
+    tree.modules.nixos.rcloneSync
     tree.modules.nixos.secrets
   ];
 

presets/nixos/containerBase.nix

@@ -8,8 +8,8 @@
       profiles.base
       users.root
 
-      modules.nixos.rclone-serve
+      modules.nixos.rcloneServe
-      modules.nixos.rclone-sync
+      modules.nixos.rcloneSync
       modules.nixos.secrets
     ])
     ++ [