sorta refactor

modules/home/desktop/dms/default.nix

@@ -1,25 +1,13 @@
 {
-  config,
-  inputs,
-  lib,
-  perSystem,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.desktop.dms;
-  # inherit (config.lib.stylix) colors;
-in {
-  imports = with inputs; [
-    dms.homeModules.dankMaterialShell.default
-    dms.homeModules.dankMaterialShell.niri
+  imports = [
+    ./dconf.nix
+    ./mimeapps.nix
+    ./packages.nix
+    ./programs
+    # ./programs/niri.nix
+    # ./programs/satty.nix
+    # ./programs/wl-kbptr.nix
+    ./services.nix
+    ./stylix.nix
   ];
-  options = {
-    desktop.dms.enable =
-      mkEnableOption "enable DankMaterialShell";
-  };
-  config = let
-    importWithArgs = file: import file {inherit config inputs lib perSystem pkgs importWithArgs;};
-  in
-    mkIf cfg.enable (importWithArgs ./config);
 }

modules/home/desktop/dms/module.nix

@@ -7,17 +7,10 @@ lib.mkMerge [
   (import ./dconf.nix)
   (importWithArgs ./mimeapps.nix)
   (importWithArgs ./packages.nix)
+  (import ./programs/dms.nix)
   (importWithArgs ./programs/niri.nix)
   (import ./programs/satty.nix)
   (importWithArgs ./programs/wl-kbptr.nix)
   (importWithArgs ./services.nix)
   (importWithArgs ./stylix.nix)
-  {
-    programs.dankMaterialShell = {
-      enable = true;
-      systemd.enable = true;
-      niri.enableKeybinds = false; # Automatic keybinding configuration
-      # niri.enableSpawn = true; # Auto-start DMS with niri
-    };
-  }
 ]

modules/home/desktop/dms/programs/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ./dms.nix
     ./niri.nix
     ./satty.nix
     ./wl-kbptr.nix

modules/home/desktop/dms/programs/dms.nix

@@ -0,0 +1,8 @@
+{
+  programs.dankMaterialShell = {
+    enable = true;
+    systemd.enable = true;
+    niri.enableKeybinds = false; # Automatic keybinding configuration
+    # niri.enableSpawn = true; # Auto-start DMS with niri
+  };
+}

modules/home/desktop/dms/programs/niri.nix

@@ -3,6 +3,7 @@
   lib,
   pkgs,
   perSystem,
+  osConfig,
   ...
 }:
 with lib; let
@@ -53,7 +54,14 @@ in {
       keyboard = {
         xkb = {
           layout = "us,ua";
-          variant = "colemak_dh_ortho,";
+          variant =
+            "colemak_dh"
+            + (
+              if osConfig.module.host.name == "dunamis"
+              then "_ortho"
+              else ""
+            )
+            + ",";
         };
         repeat-delay = 200;
         repeat-rate = 50;

modules/home/desktop/dms/services.nix

@@ -9,7 +9,7 @@
       enable = true;
       components = ["secrets"];
     };
-    kanshi = import ../../niri/services/kanshi;
+    kanshi = import ../niri/services/kanshi;
     udiskie = {
       enable = true;
       automount = false;