home/bat/default.nix

@@ -3,8 +3,8 @@ let
   cfg = config.my.home.bat;
 in
 {
-  options.my.home.bat = with lib; {
-    enable = my.mkDisableOption "bat configuration";
+  options.my.home.bat = with lib.my; {
+    enable = mkDisableOption "bat configuration";
   };
 
   config.programs.bat = lib.mkIf cfg.enable {

home/documentation/default.nix

@@ -3,8 +3,8 @@ let
   cfg = config.my.home.documentation;
 in
 {
-  options.my.home.documentation = with lib; {
-    enable = my.mkDisableOption "documentation integration";
+  options.my.home.documentation = with lib.my; {
+    enable = mkDisableOption "documentation integration";
   };
 
   # Add documentation for user packages

home/git/default.nix

@@ -5,8 +5,8 @@ let
   inherit (lib.my) mkMailAddress;
 in
 {
-  options.my.home.git = with lib; {
-    enable = my.mkDisableOption "git configuration";
+  options.my.home.git = with lib.my; {
+    enable = mkDisableOption "git configuration";
   };
 
   config.home.packages = with pkgs; lib.mkIf cfg.enable [

home/htop/default.nix

@@ -3,8 +3,8 @@ let
   cfg = config.my.home.htop;
 in
 {
-  options.my.home.htop = with lib; {
-    enable = my.mkDisableOption "htop configuration";
+  options.my.home.htop = with lib.my; {
+    enable = mkDisableOption "htop configuration";
   };
 
   config.programs.htop = lib.mkIf cfg.enable {

home/jq/default.nix

@@ -3,8 +3,8 @@ let
   cfg = config.my.home.jq;
 in
 {
-  options.my.home.jq = with lib; {
-    enable = my.mkDisableOption "jq configuration";
+  options.my.home.jq = with lib.my; {
+    enable = mkDisableOption "jq configuration";
   };
 
   config.programs.jq = lib.mkIf cfg.enable {

home/nix-index/default.nix

@@ -3,8 +3,8 @@ let
   cfg = config.my.home.nix-index;
 in
 {
-  options.my.home.nix-index = with lib; {
-    enable = my.mkDisableOption "nix-index configuration";
+  options.my.home.nix-index = with lib.my; {
+    enable = mkDisableOption "nix-index configuration";
   };
 
   config.programs.nix-index = lib.mkIf cfg.enable {

home/pager/default.nix

@@ -3,8 +3,8 @@ let
   cfg = config.my.home.pager;
 in
 {
-  options.my.home.pager = with lib; {
-    enable = my.mkDisableOption "pager configuration";
+  options.my.home.pager = with lib.my; {
+    enable = mkDisableOption "pager configuration";
   };
 
 

home/ssh/default.nix

@@ -3,8 +3,8 @@ let
   cfg = config.my.home.ssh;
 in
 {
-  options.my.home.ssh = with lib; {
-    enable = my.mkDisableOption "ssh configuration";
+  options.my.home.ssh = with lib.my; {
+    enable = mkDisableOption "ssh configuration";
   };
 
   config.programs.ssh = lib.mkIf cfg.enable {

home/tmux/default.nix

@@ -7,10 +7,8 @@ let
   ];
 in
 {
-  options.my.home.tmux = with lib; {
-    enable = my.mkDisableOption "tmux terminal multiplexer";
-
-    enabledPassthrough = mkEnableOption "tmux DCS passthrough sequence";
+  options.my.home.tmux = with lib.my; {
+    enable = mkDisableOption "tmux terminal multiplexer";
   };
 
   config.programs.tmux = lib.mkIf cfg.enable {
@@ -65,13 +63,6 @@ in
 
       # Allow any application to send OSC52 escapes to set the clipboard
       set -s set-clipboard on
-
-      ${
-        lib.optionalString cfg.enabledPassthrough ''
-          # Allow any application to use the tmux DCS for passthrough
-          set -g allow-passthrough on
-        ''
-      }
     '';
   };
 }

home/vim/default.nix

@@ -18,8 +18,8 @@ let
     ];
 in
 {
-  options.my.home.vim = with lib; {
-    enable = my.mkDisableOption "vim configuration";
+  options.my.home.vim = with lib.my; {
+    enable = mkDisableOption "vim configuration";
   };
 
   config.programs.neovim = lib.mkIf cfg.enable {

home/xdg/default.nix

@@ -3,8 +3,8 @@ let
   cfg = config.my.home.xdg;
 in
 {
-  options.my.home.xdg = with lib; {
-    enable = my.mkDisableOption "XDG configuration";
+  options.my.home.xdg = with lib.my; {
+    enable = mkDisableOption "XDG configuration";
   };
 
   config.xdg = lib.mkIf cfg.enable {

modules/system/documentation/default.nix

@@ -3,20 +3,20 @@ let
   cfg = config.my.system.documentation;
 in
 {
-  options.my.system.documentation = with lib; {
-    enable = my.mkDisableOption "Documentation integration";
+  options.my.system.documentation = with lib.my; {
+    enable = mkDisableOption "Documentation integration";
 
-    dev.enable = my.mkDisableOption "Documentation aimed at developers";
+    dev.enable = mkDisableOption "Documentation aimed at developers";
 
-    info.enable = my.mkDisableOption "Documentation aimed at developers";
+    info.enable = mkDisableOption "Documentation aimed at developers";
 
     man = {
-      enable = my.mkDisableOption "Documentation aimed at developers";
+      enable = mkDisableOption "Documentation aimed at developers";
 
-      linux = my.mkDisableOption "Linux man pages (section 2 & 3)";
+      linux = mkDisableOption "Linux man pages (section 2 & 3)";
     };
 
-    nixos.enable = my.mkDisableOption "NixOS documentation";
+    nixos.enable = mkDisableOption "NixOS documentation";
   };
 
   config = lib.mkIf cfg.enable {