From 11a41563c879caf8f43e4773ef9bdf2ed263b3c2 Mon Sep 17 00:00:00 2001
From: DashieTM <fabio.lenherr@gmail.com>
Date: Sat, 10 May 2025 13:59:37 +0200
Subject: [PATCH] general: Remove all default dashie references

---
 base/xkb_layout.nix      | 46 ++++++++++++++++++++--------------------
 modules/programs/git.nix | 16 ++------------
 modules/programs/xkb.nix |  2 +-
 3 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/base/xkb_layout.nix b/base/xkb_layout.nix
index db4fa60..ce87b6e 100644
--- a/base/xkb_layout.nix
+++ b/base/xkb_layout.nix
@@ -1,23 +1,23 @@
-{
-  mkDashDefault,
-  pkgs,
-  ...
-}: let
-  layout = pkgs.writeText "dashie" ''
-    xkb_symbols "dashie"
-    {
-      include "us(basic)"
-      include "level3(ralt_switch)"
-      key <AC01> { [ a, A, adiaeresis, Adiaeresis ] };
-      key <AD09> { [ o, O, odiaeresis, Odiaeresis ] };
-      key <AD07> { [ u, U, udiaeresis, Udiaeresis ] };
-    };
-  '';
-in {
-  environment.systemPackages = mkDashDefault [pkgs.xorg.xkbcomp];
-  services.xserver.xkb.extraLayouts.dashie = {
-    description = "US layout with 'umlaut'";
-    languages = ["eng"];
-    symbolsFile = "${layout}";
-  };
-}
+{
+  mkDashDefault,
+  pkgs,
+  ...
+}: let
+  layout = pkgs.writeText "enIntUmlaut" ''
+    xkb_symbols "enIntUmlaut"
+    {
+      include "us(basic)"
+      include "level3(ralt_switch)"
+      key <AC01> { [ a, A, adiaeresis, Adiaeresis ] };
+      key <AD09> { [ o, O, odiaeresis, Odiaeresis ] };
+      key <AD07> { [ u, U, udiaeresis, Udiaeresis ] };
+    };
+  '';
+in {
+  environment.systemPackages = mkDashDefault [pkgs.xorg.xkbcomp];
+  services.xserver.xkb.extraLayouts.enIntUmlaut = {
+    description = "US layout with 'umlaut'";
+    languages = ["eng"];
+    symbolsFile = "${layout}";
+  };
+}
diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index 9189329..ed2719e 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -34,27 +34,15 @@
       description = "Additional git config";
     };
     sshConfig = lib.mkOption {
-      default = ''
+      default = "";
+      example = ''
         Host github.com
           ${
           if (config ? sops.secrets && config.sops.secrets ? hub.path)
           then "IdentityFile ${config.sops.secrets.hub.path}"
           else ""
         }
-        Host gitlab.com
-          ${
-          if (config ? sops.secrets && config.sops.secrets ? lab.path)
-          then "IdentityFile ${config.sops.secrets.lab.path}"
-          else ""
-        }
-        Host dashie.org
-          ${
-          if (config ? sops.secrets && config.sops.secrets ? dashie.path)
-          then "IdentityFile ${config.sops.secrets.dashie.path}"
-          else ""
-        }
       '';
-      example = "";
       type = lib.types.lines;
       description = "ssh configuration (keys for git)";
     };
diff --git a/modules/programs/xkb.nix b/modules/programs/xkb.nix
index 7ae8414..f78e5e2 100644
--- a/modules/programs/xkb.nix
+++ b/modules/programs/xkb.nix
@@ -6,7 +6,7 @@
 }: {
   options.mods.xkb = {
     layout = lib.mkOption {
-      default = "dashie";
+      default = "enIntUmlaut";
       example = "us";
       type = lib.types.str;
       description = "Your layout";