feat: ${namespace} -> marleyos

There was little point to doing this anyway as project-wide find &
replace is trivial.

homes/x86_64-linux/marley@nyx/default.nix

@@ -1,11 +1,10 @@
 {
   lib,
-  namespace,
   pkgs,
   ...
 }:
 let
-  inherit (lib.${namespace}) enabled;
+  inherit (lib.marleyos) enabled;
 in
 {
   home.keyboard.options = [ "apple:alupckeys" ];
@@ -20,7 +19,7 @@ in
     manix
   ];
 
-  ${namespace} = {
+  marleyos = {
     isDesktop = true;
 
     appearance = {

modules/home/appearance/base/default.nix

@@ -1,16 +1,15 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   ...
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule enabled;
+  inherit (lib.marleyos) mkEnableModule enabled;
 
-  cfg = config.${namespace}.appearance.base;
+  cfg = config.marleyos.appearance.base;
-  inherit (config.${namespace}) theme;
+  inherit (config.marleyos.theme) colors;
 in
 {
   options = mkEnableModule "appearance.base";
@@ -20,9 +19,9 @@ in
       maple-mono-NF
     ];
 
-    ${theme.colors.base}.pointerCursor = enabled;
+    "${colors.base}".pointerCursor = enabled;
 
-    ${namespace}.theme = {
+    marleyos.theme = {
       default = "dark";
 
       dark = {
@@ -36,7 +35,7 @@ in
       };
     };
 
-    ${namespace}.theme.icons = {
+    marleyos.theme.icons = {
       package = pkgs.kora-icon-theme;
       name = "kora";
     };

modules/home/appearance/gtk/default.nix

@@ -6,10 +6,10 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule enabled;
+  inherit (lib.marleyos) mkEnableModule enabled;
 
-  cfg = config.${namespace}.appearance.gtk;
+  cfg = config.marleyos.appearance.gtk;
-  inherit (config.${namespace}) theme;
+  inherit (config.marleyos.theme) colors;
 in
 {
   options = mkEnableModule "appearance.gtk";
@@ -18,7 +18,7 @@ in
     gtk = {
       enable = true;
 
-      "${theme.colors.theme}" = enabled;
+      "${colors.base}" = enabled;
 
       gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
     };

modules/home/appearance/qt/default.nix

@@ -1,22 +1,21 @@
 {
   lib,
   config,
-  namespace,
   inputs,
   ...
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.appearance.qt;
+  cfg = config.marleyos.appearance.qt;
-  inherit (config.${namespace}) theme;
+  inherit (config.marleyos.theme) colors;
 in
 {
   options = mkEnableModule "appearance.qt";
 
   config = mkIf cfg.enable {
-    xdg.configFile = mkIf (theme.colors.base == "rose-pine") {
+    xdg.configFile = mkIf (colors.base == "rose-pine") {
       "qt5ct/colors/rose-pine.conf" = {
         source = "${inputs.rose-pine-qt5ct}/rose-pine.conf";
       };

modules/home/base/base/default.nix

@@ -1,17 +1,16 @@
 {
   lib,
-  namespace,
   pkgs,
   ...
 }:
 let
-  inherit (lib.${namespace}) enabled;
+  inherit (lib.marleyos) enabled;
 in
 {
   # Anything in this folder should not include an enable/disable option. This is
   # the only folder that is always applied.
   config = {
-    ${namespace}.my = {
+    marleyos.my = {
       name = "marley";
       username = "punkfairie";
       fullName = "Marley Rae";

modules/home/base/xdg/default.nix

@@ -1,13 +1,12 @@
 {
   config,
-  namespace,
   lib,
   pkgs,
   ...
 }:
 let
   inherit (lib) mkMerge mkIf;
-  inherit (config.${namespace}) isDesktop;
+  inherit (config.marleyos) isDesktop;
 in
 {
   config = {

modules/home/options/isDesktop/default.nix

@@ -1,9 +1,9 @@
-{ lib, namespace, ... }:
+{ lib, ... }:
 let
   inherit (lib) mkOption types;
 in
 {
-  options.${namespace}.isDesktop = mkOption {
+  options.marleyos.isDesktop = mkOption {
     type = with types; bool;
     default = false;
     description = "Whether this machine is used as a graphical desktop.";

modules/home/options/my/default.nix

@@ -1,5 +1,4 @@
 {
-  namespace,
   lib,
   config,
   ...
@@ -13,7 +12,7 @@ let
     ;
 in
 {
-  options.${namespace}.my = rec {
+  options.marleyos.my = rec {
     name = mkOption {
       type = with types; str;
       default = config.snowfallorg.user.name or "marley";
@@ -53,13 +52,13 @@ in
 
   config =
     let
-      cfg = config.${namespace}.my;
+      cfg = config.marleyos.my;
     in
     {
       assertions = [
         {
           assertion = cfg.name != null;
-          message = "${namespace}.my.name must be set.";
+          message = "marleyos.my.name must be set.";
         }
       ];
 

modules/home/options/theme/default.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  namespace,
   config,
   pkgs,
   ...
@@ -14,7 +13,7 @@ let
     mkIf
     mkDefault
     ;
-  cfg = config.${namespace}.theme;
+  cfg = config.marleyos.theme;
 
   colorThemes = lib.types.enum [
     "rose-pine"
@@ -83,7 +82,7 @@ let
   };
 in
 {
-  options.${namespace}.theme = {
+  options.marleyos.theme = {
     colors = rec {
       default = mkOption {
         type = with types; str;

modules/home/programs/amfora/default.nix

@@ -1,23 +1,22 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   inputs,
   ...
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.amfora;
+  cfg = config.marleyos.programs.amfora;
-  inherit (config.${namespace}) theme;
+  inherit (config.marleyos.theme) colors;
 
   themeFiles = {
     rose-pine = "${inputs.rose-pine-amfora}/themes/rose-pine.toml";
   };
 
-  themeFile = themeFiles.${theme.colors.base};
+  themeFile = themeFiles."${colors.base}";
 in
 {
   options = mkEnableModule "programs.amfora";
@@ -55,7 +54,7 @@ in
         underline = true
         # }}}
 
-        highlight_style = "${theme.colors.base}"
+        highlight_style = "${colors.base}"
 
         # Defaults {{{
         [auth]

modules/home/programs/bat/default.nix

@@ -1,16 +1,15 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   ...
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule enabled;
+  inherit (lib.marleyos) mkEnableModule enabled;
 
-  cfg = config.${namespace}.programs.bat;
+  cfg = config.marleyos.programs.bat;
-  inherit (config.${namespace}) theme;
+  inherit (config.marleyos.theme) colors;
 in
 {
   options = mkEnableModule "programs.bat";
@@ -24,7 +23,7 @@ in
         batman
       ];
 
-      "${theme.colors.base}" = enabled;
+      "${colors.base}" = enabled;
 
       config = {
         style = "auto";

modules/home/programs/btop/default.nix

@@ -1,15 +1,14 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule enabled;
+  inherit (lib.marleyos) mkEnableModule enabled;
 
-  cfg = config.${namespace}.programs.btop;
+  cfg = config.marleyos.programs.btop;
-  inherit (config.${namespace}) theme;
+  inherit (config.marleyos.theme) colors;
 in
 {
   options = mkEnableModule "programs.btop";
@@ -18,7 +17,7 @@ in
     programs.btop = {
       enable = true;
 
-      "${theme.colors.base}" = enabled;
+      "${colors.base}" = enabled;
 
       settings = {
         theme_background = false;

modules/home/programs/cava/default.nix

@@ -1,15 +1,14 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
   inherit (lib) mkIf enabled;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.cava;
+  cfg = config.marleyos.programs.cava;
-  inherit (config.${namespace}) theme;
+  inherit (config.marleyos.theme) colors;
 in
 {
   options = mkEnableModule "programs.cava";
@@ -17,7 +16,8 @@ in
   config = mkIf cfg.enable {
     enable = true;
 
-    "${theme.colors.base}" = enabled;
+    # "${colors.base}" = enabled;
+    rose-pine.enable = true;
 
     # TODO: disable this when mpd is not enabled? Can that be detected on non
     # NixOS systems?

modules/home/programs/cheat/default.nix

@@ -1,16 +1,15 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   ...
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.cheat;
+  cfg = config.marleyos.programs.cheat;
-  inherit (config.${namespace}) theme;
+  inherit (config.marleyos.theme) colors;
 
   toYAML = (pkgs.formats.yaml { }).generate;
 in
@@ -24,7 +23,7 @@ in
 
     xdg.configFile."cheat/conf.yml".source = toYAML "conf.yml" {
       colorize = true;
-      style = "${theme.colors.base}";
+      style = "${colors.base}";
       formatter = "terminal256";
       pager = "less -FRX";
 

modules/home/programs/curl/default.nix

@@ -1,15 +1,14 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   ...
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.curl;
+  cfg = config.marleyos.programs.curl;
 in
 {
   options = mkEnableModule "programs.curl";

modules/home/programs/eza/default.nix

@@ -1,14 +1,13 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.eza;
+  cfg = config.marleyos.programs.eza;
 in
 {
   options = mkEnableModule "programs.eza";

modules/home/programs/figlet/default.nix

@@ -1,15 +1,14 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   ...
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.figlet;
+  cfg = config.marleyos.programs.figlet;
 in
 {
   options = mkEnableModule "programs.figlet";

modules/home/programs/fish/default.nix

@@ -1,16 +1,15 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   ...
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule enabled;
+  inherit (lib.marleyos) mkEnableModule enabled;
 
-  cfg = config.${namespace}.programs.fish;
+  cfg = config.marleyos.programs.fish;
-  inherit (config.${namespace}) theme;
+  inherit (config.marleyos.theme) colors;
 in
 {
   options = mkEnableModule "programs.fish";
@@ -35,7 +34,7 @@ in
     programs.fish = {
       enable = true;
 
-      ${theme.colors.name} = enabled;
+      "${colors.name}" = enabled;
 
       preferAbbrs = true;
 

modules/home/programs/fzf/default.nix

@@ -1,15 +1,14 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
   inherit (lib) mkIf enabled;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.fzf;
+  cfg = config.marleyos.programs.fzf;
-  inherit (config.${namespace}) theme;
+  inherit (config.marleyos.theme) colors;
 
   has-ripgrep = config.programs.ripgrep.enable;
   has-fd = config.programs.fd.enable;
@@ -26,7 +25,7 @@ in
     programs.fzf = {
       enable = true;
 
-      "${theme.colors.base}" = enabled;
+      "${colors.base}" = enabled;
 
       defaultOptions = [
         "--margin=10%,5%"

modules/home/programs/gh/default.nix

@@ -6,9 +6,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.gh;
+  cfg = config.marleyos.programs.gh;
 in
 {
   options = mkEnableModule "programs.gh";

modules/home/programs/git/aliases.nix

@@ -7,7 +7,7 @@
 let
   inherit (lib) mkIf;
 
-  cfg = config.${namespace}.programs.git;
+  cfg = config.marleyos.programs.git;
 in
 {
   config = mkIf cfg.enable {

modules/home/programs/git/default.nix

@@ -1,15 +1,14 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   ...
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.git;
+  cfg = config.marleyos.programs.git;
 in
 {
   options = mkEnableModule "programs.git";
@@ -73,7 +72,7 @@ in
       #   options = {
       #     navigate = true;
       #     # TODO: Add to rose-pine-nix
-      #     syntax-theme = "${theme.colors.base}";
+      #     syntax-theme = "${colors.base}";
       #     features = "mellow-barbet";
       #     true-color = "always";
       #     hyperlinks = true;

modules/home/programs/glow/default.nix

@@ -7,9 +7,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.glow;
+  cfg = config.marleyos.programs.glow;
   toYAML = (pkgs.formats.yaml { }).generate;
 in
 {

modules/home/programs/gpg/default.nix

@@ -6,9 +6,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.gpg;
+  cfg = config.marleyos.programs.gpg;
 in
 {
   options = mkEnableModule "programs.gpg";

modules/home/programs/hyfetch/default.nix

@@ -6,9 +6,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.hyfetch;
+  cfg = config.marleyos.programs.hyfetch;
 in
 {
   options = mkEnableModule "programs.hyfetch";

modules/home/programs/hyfetch/neofetch.nix

@@ -8,7 +8,7 @@
 let
   inherit (lib) mkIf;
 
-  cfg = config.${namespace}.programs.hyfetch;
+  cfg = config.marleyos.programs.hyfetch;
 in
 {
   config = mkIf cfg.enable {

modules/home/programs/journalctl/default.nix

@@ -6,9 +6,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.journalctl;
+  cfg = config.marleyos.programs.journalctl;
 in
 {
   options = mkEnableModule "programs.journalctl";

modules/home/programs/just/default.nix

@@ -7,9 +7,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.just;
+  cfg = config.marleyos.programs.just;
 in
 {
   options = mkEnableModule "programs.just";

modules/home/programs/lazygit/default.nix

@@ -6,9 +6,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.lazygit;
+  cfg = config.marleyos.programs.lazygit;
   has-delta = config.programs.git.delta.enable;
   has-difft = config.programs.git.difftastic.enable;
 in

modules/home/programs/less/default.nix

@@ -6,9 +6,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.less;
+  cfg = config.marleyos.programs.less;
 in
 {
   options = mkEnableModule "programs.less";

modules/home/programs/man/default.nix

@@ -6,9 +6,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.man;
+  cfg = config.marleyos.programs.man;
 in
 {
   options = mkEnableModule "programs.man";

modules/home/programs/ncmpcpp/default.nix

@@ -6,9 +6,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.ncmpcpp;
+  cfg = config.marleyos.programs.ncmpcpp;
 in
 {
   options = mkEnableModule "programs.ncmpcpp";

modules/home/programs/neo/default.nix

@@ -7,9 +7,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.neo;
+  cfg = config.marleyos.programs.neo;
 in
 {
   options = mkEnableModule "programs.neo";

modules/home/programs/rbw/default.nix

@@ -6,9 +6,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.rbw;
+  cfg = config.marleyos.programs.rbw;
 in
 {
   options = mkEnableModule "programs.rbw";

modules/home/programs/ripgrep/default.nix

@@ -6,9 +6,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.ripgrep;
+  cfg = config.marleyos.programs.ripgrep;
 in
 {
   options = mkEnableModule "programs.ripgrep";

modules/home/programs/ssh/default.nix

@@ -6,9 +6,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.ssh;
+  cfg = config.marleyos.programs.ssh;
 in
 {
   options = mkEnableModule "programs.ssh";

modules/home/programs/starship/default.nix

@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
@@ -11,10 +10,10 @@ let
     mkForce
     concatStrings
     ;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.starship;
+  cfg = config.marleyos.programs.starship;
-  inherit (config.${namespace}) theme;
+  inherit (config.marleyos.theme) colors;
 in
 {
   options = mkEnableModule "programs.starship";
@@ -27,7 +26,7 @@ in
     programs.starship = {
       enable = true;
 
-      "${theme.colors.base}" = enabled;
+      "${colors.base}" = enabled;
 
       settings = mkIf config.programs.starship.rose-pine.enabled {
         format = mkForce (concatStrings [

modules/home/programs/starship/nerd-font-symbols.nix

@@ -7,7 +7,7 @@
 let
   inherit (lib) mkIf mkForce;
 
-  cfg = config.${namespace}.programs.starship;
+  cfg = config.marleyos.programs.starship;
 in
 {
   config = mkIf cfg.enable {

modules/home/programs/systemctl/default.nix

@@ -6,9 +6,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.systemctl;
+  cfg = config.marleyos.programs.systemctl;
 in
 {
   options = mkEnableModule "programs.systemctl";

modules/home/programs/tmux/default.nix

@@ -1,16 +1,15 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   ...
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.tmux;
+  cfg = config.marleyos.programs.tmux;
-  inherit (config.${namespace}) theme;
+  inherit (config.marleyos.theme) colors;
 in
 {
   options = mkEnableModule "programs.tmux";
@@ -19,7 +18,7 @@ in
     programs.tmux = {
       enable = true;
 
-      rose-pine = mkIf (theme.colors.base == "rose-pine") {
+      rose-pine = mkIf (colors.base == "rose-pine") {
         enable = true;
         extraConfig = # tmux
           ''

modules/home/programs/wezterm/default.nix

@@ -1,16 +1,15 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   ...
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.wezterm;
+  cfg = config.marleyos.programs.wezterm;
-  inherit (config.${namespace}) theme;
+  inherit (config.marleyos.theme) colors;
 
   isGenericLinux = config.targets.genericLinux.enable;
 in
@@ -38,7 +37,7 @@ in
 
           config.enable_tab_bar = false
 
-          config.color_scheme = "${theme.colors.base}"
+          config.color_scheme = "${colors.base}"
 
           config.font = wezterm.font_with_fallback({
             {

modules/home/programs/wget/default.nix

@@ -7,9 +7,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.wget;
+  cfg = config.marleyos.programs.wget;
 in
 {
   options = mkEnableModule "programs.wget";

modules/home/programs/zathura/default.nix

@@ -1,15 +1,14 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
   inherit (lib) mkIf enabled;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.zathura;
+  cfg = config.marleyos.programs.zathura;
-  inherit (config.${namespace}) theme;
+  inherit (config.marleyos.theme) colors;
 in
 {
   options = mkEnableModule "programs.zathura";
@@ -18,7 +17,7 @@ in
     programs.zathura = {
       enable = true;
 
-      "${theme.colors.base}" = enabled;
+      "${colors.base}" = enabled;
     };
   };
 }

modules/home/programs/zoxide/default.nix

@@ -6,9 +6,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.programs.zoxide;
+  cfg = config.marleyos.programs.zoxide;
 in
 {
   options = mkEnableModule "programs.zoxide";

modules/home/services/clipboard/default.nix

@@ -7,9 +7,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.services.clipboard;
+  cfg = config.marleyos.services.clipboard;
 in
 {
   options = mkEnableModule "services.clipboard";

modules/home/services/dunst/default.nix

@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
@@ -11,12 +10,12 @@ let
     disabled
     mkMerge
     ;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.services.dunst;
+  cfg = config.marleyos.services.dunst;
-  inherit (config.${namespace}) theme;
+  inherit (config.marleyos.theme) colors;
 
-  isRosePine = theme.colors.base == "rose-pine";
+  isRosePine = colors.base == "rose-pine";
 in
 {
   options = mkEnableModule "services.dunst";
@@ -28,7 +27,7 @@ in
       # I don't want to use the rose-pine icons; also don't want to deal with
       # the drop-in weirdness.
       # TODO: Convert dunst.rose-pine to attr set to fix this.
-      "${theme.colors.base}" = if isRosePine then disabled else enabled;
+      "${colors.base}" = if isRosePine then disabled else enabled;
 
       settings = mkMerge [
         ### Rose Pine ###

modules/home/services/syncthing/default.nix

@@ -7,9 +7,9 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.services.syncthing;
+  cfg = config.marleyos.services.syncthing;
 in
 {
   options = mkEnableModule "services.syncthing";

modules/home/xorg/xsession/default.nix

@@ -1,14 +1,13 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule;
+  inherit (lib.marleyos) mkEnableModule;
 
-  cfg = config.${namespace}.xorg.xsession;
+  cfg = config.marleyos.xorg.xsession;
 in
 {
   options = mkEnableModule "xorg.xsession";