base/xkb_layout.nix

@@ -3,8 +3,8 @@
   pkgs,
   ...
 }: let
-  layout = pkgs.writeText "dashie" ''
+  layout = pkgs.writeText "enIntUmlaut" ''
-    xkb_symbols "dashie"
+    xkb_symbols "enIntUmlaut"
     {
       include "us(basic)"
       include "level3(ralt_switch)"
@@ -15,7 +15,7 @@
   '';
 in {
   environment.systemPackages = mkDashDefault [pkgs.xorg.xkbcomp];
-  services.xserver.xkb.extraLayouts.dashie = {
+  services.xserver.xkb.extraLayouts.enIntUmlaut = {
     description = "US layout with 'umlaut'";
     languages = ["eng"];
     symbolsFile = "${layout}";

modules/conf.nix

@@ -132,7 +132,7 @@
     };
 
     username = lib.mkOption {
-      default = "dashie";
+      default = "DashNix";
       example = "pingpang";
       type = lib.types.str;
       description = ''

modules/programs/default.nix

@@ -28,6 +28,7 @@
     ./mime.nix
     ./ncspot.nix
     ./nextcloud.nix
+    ./onedrive.nix
     ./oxi
     ./piper.nix
     ./plymouth.nix

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)";
     };

modules/programs/onedrive.nix

@@ -0,0 +1,23 @@
+{
+  lib,
+  config,
+  options,
+  ...
+}: {
+  options.mods = {
+    onedrive = {
+      enable = lib.mkOption {
+        default = false;
+        example = true;
+        type = lib.types.bool;
+        description = "Enable onedrive program and service";
+      };
+    };
+  };
+  config = lib.mkIf config.mods.onedrive.enable (
+    lib.optionalAttrs (options ? environment) {
+      services.onedrive.enable = true;
+      programs.onedrive.enable = true;
+    }
+  );
+}

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";