From 78a5e913cfa99bb18a0d49de115d994029673f90 Mon Sep 17 00:00:00 2001
From: chaos <chaos@owo.monster>
Date: Thu, 28 Sep 2023 19:22:33 +0100
Subject: [PATCH] add git-diff to path and some small tidying

---
 home/dev/all/git.nix                          | 19 +++++++++---
 home/gui/environments/gnome/default.nix       | 29 +++++++++++++------
 hosts/nixos.nix                               |  4 +--
 .../{rclone-serve.nix => rcloneServe.nix}     |  0
 .../nixos/{rclone-sync.nix => rcloneSync.nix} |  0
 presets/nixos/containerBase.nix               |  4 +--
 6 files changed, 39 insertions(+), 17 deletions(-)
 rename modules/nixos/{rclone-serve.nix => rcloneServe.nix} (100%)
 rename modules/nixos/{rclone-sync.nix => rcloneSync.nix} (100%)

diff --git a/home/dev/all/git.nix b/home/dev/all/git.nix
index 8c2ce9e..71a24d7 100644
--- a/home/dev/all/git.nix
+++ b/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";
-    extraConfig = {credential = {helper = "store";};};
+    userEmail = "chaos@owo.monster";
+    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
+    ''))
+  ];
 }
diff --git a/home/gui/environments/gnome/default.nix b/home/gui/environments/gnome/default.nix
index 5302f69..c0bba8c 100644
--- a/home/gui/environments/gnome/default.nix
+++ b/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" = {
-    #  binding = "<Alt>d";
-    #  command = "rofi -show run";
-    #  name = "rofi";
-    #};
+    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/rofi" = mkIf (!isWayland) {
+      binding = "<Alt>d";
+      command = "rofi -show run";
+      name = "rofi";
+    };
     "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/kitty" = {
       binding = "<Alt>Return";
       command = "kitty";
diff --git a/hosts/nixos.nix b/hosts/nixos.nix
index 81c3735..afd28f4 100644
--- a/hosts/nixos.nix
+++ b/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.rclone-sync
+    tree.modules.nixos.rcloneServe
+    tree.modules.nixos.rcloneSync
     tree.modules.nixos.secrets
   ];
 
diff --git a/modules/nixos/rclone-serve.nix b/modules/nixos/rcloneServe.nix
similarity index 100%
rename from modules/nixos/rclone-serve.nix
rename to modules/nixos/rcloneServe.nix
diff --git a/modules/nixos/rclone-sync.nix b/modules/nixos/rcloneSync.nix
similarity index 100%
rename from modules/nixos/rclone-sync.nix
rename to modules/nixos/rcloneSync.nix
diff --git a/presets/nixos/containerBase.nix b/presets/nixos/containerBase.nix
index 34ce7f4..535b323 100644
--- a/presets/nixos/containerBase.nix
+++ b/presets/nixos/containerBase.nix
@@ -8,8 +8,8 @@
       profiles.base
       users.root
 
-      modules.nixos.rclone-serve
-      modules.nixos.rclone-sync
+      modules.nixos.rcloneServe
+      modules.nixos.rcloneSync
       modules.nixos.secrets
     ])
     ++ [