diff --git a/modules/workstation/default.nix b/modules/workstation/default.nix
index 99e9a01..7f3331b 100644
--- a/modules/workstation/default.nix
+++ b/modules/workstation/default.nix
@@ -6,7 +6,6 @@
   sopsHmModule,
   ...
 }:
-with lib;
 {
 
   imports = [
@@ -39,17 +38,15 @@ with lib;
             keymap = config.console.keyMap;
             isNvidiaGpu = (config.my.hardware.gpu == "nvidia");
           };
-          home-manager.users = builtins.mapAttrs (
-            name: value:
-            {
-              home.username = name;
-              home.homeDirectory = "/home/${name}";
-              home.stateVersion = machineProps.stateVersion;
-              programs.home-manager.enable = true;
-              programs.fish.enable = value.shell == pkgs.fish;
-            }
-            // value.hmConfig
-          ) config.my.users;
+          home-manager.users = builtins.mapAttrs (name: value: {
+            imports = [ value.hmConfig ];
+
+            home.username = name;
+            home.homeDirectory = "/home/${name}";
+            home.stateVersion = machineProps.stateVersion;
+            programs.home-manager.enable = true;
+            programs.fish.enable = value.shell == pkgs.fish;
+          }) config.my.users;
         }
       else
         { }
diff --git a/modules/workstation/home-manager/fish.nix b/modules/workstation/home-manager/fish.nix
index 40f0629..1a53069 100644
--- a/modules/workstation/home-manager/fish.nix
+++ b/modules/workstation/home-manager/fish.nix
@@ -1,10 +1,9 @@
 {
-  lib,
   pkgs,
   config,
+  lib,
   ...
 }:
-with lib;
 let
   swayLaunchScript =
     if config.my.desktop.sway.enable then
@@ -17,7 +16,7 @@ let
       "";
 in
 {
-  config.programs.fish = mkIf config.programs.fish.enable {
+  programs.fish = lib.mkIf config.programs.fish.enable {
     plugins = [
       {
         name = "bobthefish";