From e24797c4c1597c921a7003d076a5dbafe2d43c99 Mon Sep 17 00:00:00 2001
From: wo2w <189177184+wo2wz@users.noreply.github.com>
Date: Sat, 14 Feb 2026 17:05:21 -0500
Subject: [PATCH] home-manager: use abbreviation for module

---
 hosts/Earthmover/default.nix                               | 2 +-
 hosts/Swordsmachine/default.nix                            | 2 +-
 modules/nixos/programs/desktop/niri/fuzzel.nix             | 2 +-
 modules/nixos/programs/desktop/niri/hypridle.nix           | 2 +-
 modules/nixos/programs/desktop/niri/hyprlock.nix           | 2 +-
 modules/nixos/programs/desktop/niri/mako.nix               | 2 +-
 modules/nixos/programs/desktop/niri/niri/binds.nix         | 2 +-
 modules/nixos/programs/desktop/niri/niri/default.nix       | 2 +-
 .../programs/desktop/niri/niri/window-rules/default.nix    | 2 +-
 .../desktop/niri/niri/window-rules/dual-monitor.nix        | 2 +-
 .../desktop/niri/niri/window-rules/single-monitor.nix      | 2 +-
 .../programs/desktop/niri/niri/workspaces/dual-monitor.nix | 2 +-
 .../desktop/niri/niri/workspaces/single-monitor.nix        | 2 +-
 modules/nixos/programs/desktop/niri/swaybg.nix             | 2 +-
 modules/nixos/programs/desktop/niri/waybar/default.nix     | 2 +-
 modules/nixos/programs/desktop/niri/yazi.nix               | 2 +-
 modules/nixos/system/home-manager.nix                      | 7 +++++--
 17 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/hosts/Earthmover/default.nix b/hosts/Earthmover/default.nix
index deb4884..829f26c 100755
--- a/hosts/Earthmover/default.nix
+++ b/hosts/Earthmover/default.nix
@@ -46,7 +46,7 @@
 
   environment.etc."Yubico/u2f_keys".text = "wo2w:5XpYBFyl+I7J2oecG9eUEhkEmYz9xc7Ne1ymjDBM6bwHbrlStj7u4f0aGn9AJUdCIDVp1VHSBGKj8YrLXXAZeg==,zOM9siNUxu7YTR1OFe2er263M2hLyYq1Ct1/7i/p4rimXzsH/fP5iVC4Etif1yxG/xrivKKyICeRvKr2BTv0DQ==,es256,+presence";
 
-  home-manager.users.wo2w = {
+  hm = {
     imports = [
       ../../modules/home
     ];
diff --git a/hosts/Swordsmachine/default.nix b/hosts/Swordsmachine/default.nix
index bbe46ba..9b43190 100755
--- a/hosts/Swordsmachine/default.nix
+++ b/hosts/Swordsmachine/default.nix
@@ -49,7 +49,7 @@
   # necessary to make the camera not look like the sun
   environment.systemPackages = [ pkgs.cameractrls ];
 
-  home-manager.users.wo2w = {
+  hm = {
     imports = [
       ../../modules/home
     ];
diff --git a/modules/nixos/programs/desktop/niri/fuzzel.nix b/modules/nixos/programs/desktop/niri/fuzzel.nix
index 8fbf9ed..390daf3 100644
--- a/modules/nixos/programs/desktop/niri/fuzzel.nix
+++ b/modules/nixos/programs/desktop/niri/fuzzel.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
 {
-  home-manager.users.wo2w.programs.fuzzel = {
+  hm.programs.fuzzel = {
     enable = true;
     settings =
     let
diff --git a/modules/nixos/programs/desktop/niri/hypridle.nix b/modules/nixos/programs/desktop/niri/hypridle.nix
index 972b1d3..907d8f1 100644
--- a/modules/nixos/programs/desktop/niri/hypridle.nix
+++ b/modules/nixos/programs/desktop/niri/hypridle.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 
 {
-  home-manager.users.wo2w.services.hypridle = {
+  hm.services.hypridle = {
     enable = true;
     settings = {
       general = {
diff --git a/modules/nixos/programs/desktop/niri/hyprlock.nix b/modules/nixos/programs/desktop/niri/hyprlock.nix
index 3b32eab..dc6029d 100644
--- a/modules/nixos/programs/desktop/niri/hyprlock.nix
+++ b/modules/nixos/programs/desktop/niri/hyprlock.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }:
 
 {
-  home-manager.users.wo2w.programs.hyprlock = {
+  hm.programs.hyprlock = {
     enable = true;
     settings = 
     let
diff --git a/modules/nixos/programs/desktop/niri/mako.nix b/modules/nixos/programs/desktop/niri/mako.nix
index c052eab..63ff1a2 100644
--- a/modules/nixos/programs/desktop/niri/mako.nix
+++ b/modules/nixos/programs/desktop/niri/mako.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 
 {
-  home-manager.users.wo2w.services.mako = {
+  hm.services.mako = {
     enable = true;
     settings = 
     let
diff --git a/modules/nixos/programs/desktop/niri/niri/binds.nix b/modules/nixos/programs/desktop/niri/niri/binds.nix
index 5a8ab86..cae29cc 100644
--- a/modules/nixos/programs/desktop/niri/niri/binds.nix
+++ b/modules/nixos/programs/desktop/niri/niri/binds.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 
 {
-  home-manager.users.wo2w.programs.niri.settings.binds = {
+  hm.programs.niri.settings.binds = {
     # custom binds
     "Mod+Space".action.spawn = "fuzzel";
     "Mod+T".action.spawn = "kitty";
diff --git a/modules/nixos/programs/desktop/niri/niri/default.nix b/modules/nixos/programs/desktop/niri/niri/default.nix
index 0b5dd50..2671c45 100644
--- a/modules/nixos/programs/desktop/niri/niri/default.nix
+++ b/modules/nixos/programs/desktop/niri/niri/default.nix
@@ -26,7 +26,7 @@
 
   services.gnome.gnome-keyring.enable = lib.mkForce false;
 
-  home-manager.users.wo2w = {
+  hm = {
     services.gnome-keyring.enable = true;
 
     programs.niri.settings = {
diff --git a/modules/nixos/programs/desktop/niri/niri/window-rules/default.nix b/modules/nixos/programs/desktop/niri/niri/window-rules/default.nix
index 7177e49..6233567 100644
--- a/modules/nixos/programs/desktop/niri/niri/window-rules/default.nix
+++ b/modules/nixos/programs/desktop/niri/niri/window-rules/default.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 
 {
-  home-manager.users.wo2w.programs.niri.settings.window-rules = [
+  hm.programs.niri.settings.window-rules = [
     # block sensitive applications from capture
     {
       matches = [{ app-id = "^org.kde.polkit-kde-authentication-agent-1$"; }];
diff --git a/modules/nixos/programs/desktop/niri/niri/window-rules/dual-monitor.nix b/modules/nixos/programs/desktop/niri/niri/window-rules/dual-monitor.nix
index 3804ae4..e089943 100644
--- a/modules/nixos/programs/desktop/niri/niri/window-rules/dual-monitor.nix
+++ b/modules/nixos/programs/desktop/niri/niri/window-rules/dual-monitor.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 
 {
-  home-manager.users.wo2w.programs.niri.settings.window-rules = [
+  hm.programs.niri.settings.window-rules = [
     {
       matches = [{ app-id = "vesktop"; }];
       open-on-workspace = "vesktop";
diff --git a/modules/nixos/programs/desktop/niri/niri/window-rules/single-monitor.nix b/modules/nixos/programs/desktop/niri/niri/window-rules/single-monitor.nix
index 119c609..44b4d97 100644
--- a/modules/nixos/programs/desktop/niri/niri/window-rules/single-monitor.nix
+++ b/modules/nixos/programs/desktop/niri/niri/window-rules/single-monitor.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 
 {
-  home-manager.users.wo2w.programs.niri.settings.window-rules = [
+  hm.programs.niri.settings.window-rules = [
     {
       matches = [{ app-id = "vesktop"; }];
       open-on-workspace = "fullscreen";
diff --git a/modules/nixos/programs/desktop/niri/niri/workspaces/dual-monitor.nix b/modules/nixos/programs/desktop/niri/niri/workspaces/dual-monitor.nix
index 1d8cf4b..02cae57 100644
--- a/modules/nixos/programs/desktop/niri/niri/workspaces/dual-monitor.nix
+++ b/modules/nixos/programs/desktop/niri/niri/workspaces/dual-monitor.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 
 {
-  home-manager.users.wo2w.programs.niri.settings.workspaces = {
+  hm.programs.niri.settings.workspaces = {
     "01-DP-1-code" = {
       name = "code";
       open-on-output = "DP-1";
diff --git a/modules/nixos/programs/desktop/niri/niri/workspaces/single-monitor.nix b/modules/nixos/programs/desktop/niri/niri/workspaces/single-monitor.nix
index f807335..fd02ed0 100644
--- a/modules/nixos/programs/desktop/niri/niri/workspaces/single-monitor.nix
+++ b/modules/nixos/programs/desktop/niri/niri/workspaces/single-monitor.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 
 {
-  home-manager.users.wo2w.programs.niri.settings.workspaces = {
+  hm.programs.niri.settings.workspaces = {
     "01-code".name = "code";
     "02-fullscreen".name = "fullscreen";
     "03-gaming".name = "gaming";
diff --git a/modules/nixos/programs/desktop/niri/swaybg.nix b/modules/nixos/programs/desktop/niri/swaybg.nix
index abbee54..d73407f 100644
--- a/modules/nixos/programs/desktop/niri/swaybg.nix
+++ b/modules/nixos/programs/desktop/niri/swaybg.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
 {
-  home-manager.users.wo2w = {
+  hm = {
     home.packages = [ pkgs.swaybg ];
 
     systemd.user.services.swaybg = {
diff --git a/modules/nixos/programs/desktop/niri/waybar/default.nix b/modules/nixos/programs/desktop/niri/waybar/default.nix
index 4aef04f..06298f9 100644
--- a/modules/nixos/programs/desktop/niri/waybar/default.nix
+++ b/modules/nixos/programs/desktop/niri/waybar/default.nix
@@ -3,7 +3,7 @@
 {
   fonts.packages = [ pkgs.font-awesome ];
 
-  home-manager.users.wo2w.programs.waybar = {
+  hm.programs.waybar = {
     enable = true;
     systemd.enable = true;
 
diff --git a/modules/nixos/programs/desktop/niri/yazi.nix b/modules/nixos/programs/desktop/niri/yazi.nix
index 826ea81..86464ef 100644
--- a/modules/nixos/programs/desktop/niri/yazi.nix
+++ b/modules/nixos/programs/desktop/niri/yazi.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 
 {
-  home-manager.users.wo2w.programs.yazi = {
+  hm.programs.yazi = {
     enable = true;
     enableBashIntegration = true;
   };
diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix
index 8d8fd67..2f19adb 100755
--- a/modules/nixos/system/home-manager.nix
+++ b/modules/nixos/system/home-manager.nix
@@ -1,7 +1,10 @@
-{ inputs, config, ... }:
+{ inputs, config, lib, ... }:
 
 {
-  imports = [ inputs.home-manager.nixosModules.home-manager ];
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+    (lib.mkAliasOptionModule [ "hm" ] [ "home-manager" "users" "wo2w" ])
+  ];
   
   home-manager = {
     useGlobalPkgs = true;