From 15372b7726b6bb713d6405951c039a21f9f30d86 Mon Sep 17 00:00:00 2001 From: punkfairie Date: Sat, 16 Nov 2024 22:34:40 -0800 Subject: [PATCH] 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 | 5 ++--- modules/home/appearance/base/default.nix | 13 ++++++------- modules/home/appearance/gtk/default.nix | 8 ++++---- modules/home/appearance/qt/default.nix | 9 ++++----- modules/home/base/base/default.nix | 5 ++--- modules/home/base/xdg/default.nix | 3 +-- modules/home/options/isDesktop/default.nix | 4 ++-- modules/home/options/my/default.nix | 7 +++---- modules/home/options/theme/default.nix | 5 ++--- modules/home/programs/amfora/default.nix | 11 +++++------ modules/home/programs/bat/default.nix | 9 ++++----- modules/home/programs/btop/default.nix | 9 ++++----- modules/home/programs/cava/default.nix | 10 +++++----- modules/home/programs/cheat/default.nix | 9 ++++----- modules/home/programs/curl/default.nix | 5 ++--- modules/home/programs/eza/default.nix | 5 ++--- modules/home/programs/figlet/default.nix | 5 ++--- modules/home/programs/fish/default.nix | 9 ++++----- modules/home/programs/fzf/default.nix | 9 ++++----- modules/home/programs/gh/default.nix | 4 ++-- modules/home/programs/git/aliases.nix | 2 +- modules/home/programs/git/default.nix | 7 +++---- modules/home/programs/glow/default.nix | 4 ++-- modules/home/programs/gpg/default.nix | 4 ++-- modules/home/programs/hyfetch/default.nix | 4 ++-- modules/home/programs/hyfetch/neofetch.nix | 2 +- modules/home/programs/journalctl/default.nix | 4 ++-- modules/home/programs/just/default.nix | 4 ++-- modules/home/programs/lazygit/default.nix | 4 ++-- modules/home/programs/less/default.nix | 4 ++-- modules/home/programs/man/default.nix | 4 ++-- modules/home/programs/ncmpcpp/default.nix | 4 ++-- modules/home/programs/neo/default.nix | 4 ++-- modules/home/programs/rbw/default.nix | 4 ++-- modules/home/programs/ripgrep/default.nix | 4 ++-- modules/home/programs/ssh/default.nix | 4 ++-- modules/home/programs/starship/default.nix | 9 ++++----- .../home/programs/starship/nerd-font-symbols.nix | 2 +- modules/home/programs/systemctl/default.nix | 4 ++-- modules/home/programs/tmux/default.nix | 9 ++++----- modules/home/programs/wezterm/default.nix | 9 ++++----- modules/home/programs/wget/default.nix | 4 ++-- modules/home/programs/zathura/default.nix | 9 ++++----- modules/home/programs/zoxide/default.nix | 4 ++-- modules/home/services/clipboard/default.nix | 4 ++-- modules/home/services/dunst/default.nix | 11 +++++------ modules/home/services/syncthing/default.nix | 4 ++-- modules/home/xorg/xsession/default.nix | 5 ++--- 48 files changed, 129 insertions(+), 152 deletions(-) diff --git a/homes/x86_64-linux/marley@nyx/default.nix b/homes/x86_64-linux/marley@nyx/default.nix index cf3551a..409dbf2 100644 --- a/homes/x86_64-linux/marley@nyx/default.nix +++ b/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 = { diff --git a/modules/home/appearance/base/default.nix b/modules/home/appearance/base/default.nix index 91af442..1be2cad 100644 --- a/modules/home/appearance/base/default.nix +++ b/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; - inherit (config.${namespace}) theme; + cfg = config.marleyos.appearance.base; + 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"; }; diff --git a/modules/home/appearance/gtk/default.nix b/modules/home/appearance/gtk/default.nix index 8fdc8d4..df58236 100644 --- a/modules/home/appearance/gtk/default.nix +++ b/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; - inherit (config.${namespace}) theme; + cfg = config.marleyos.appearance.gtk; + 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"; }; diff --git a/modules/home/appearance/qt/default.nix b/modules/home/appearance/qt/default.nix index 7f22f37..0060a99 100644 --- a/modules/home/appearance/qt/default.nix +++ b/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; - inherit (config.${namespace}) theme; + cfg = config.marleyos.appearance.qt; + 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"; }; diff --git a/modules/home/base/base/default.nix b/modules/home/base/base/default.nix index 7793893..faae9e6 100644 --- a/modules/home/base/base/default.nix +++ b/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"; diff --git a/modules/home/base/xdg/default.nix b/modules/home/base/xdg/default.nix index 156d780..55e0c55 100644 --- a/modules/home/base/xdg/default.nix +++ b/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 = { diff --git a/modules/home/options/isDesktop/default.nix b/modules/home/options/isDesktop/default.nix index 16fff65..60b5f93 100644 --- a/modules/home/options/isDesktop/default.nix +++ b/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."; diff --git a/modules/home/options/my/default.nix b/modules/home/options/my/default.nix index 3b2f2a3..9b280b3 100644 --- a/modules/home/options/my/default.nix +++ b/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."; } ]; diff --git a/modules/home/options/theme/default.nix b/modules/home/options/theme/default.nix index ba730f4..e3de78f 100644 --- a/modules/home/options/theme/default.nix +++ b/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; diff --git a/modules/home/programs/amfora/default.nix b/modules/home/programs/amfora/default.nix index d59f140..e2af653 100644 --- a/modules/home/programs/amfora/default.nix +++ b/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; - inherit (config.${namespace}) theme; + cfg = config.marleyos.programs.amfora; + 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] diff --git a/modules/home/programs/bat/default.nix b/modules/home/programs/bat/default.nix index e1d5a6f..07f4c79 100644 --- a/modules/home/programs/bat/default.nix +++ b/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; - inherit (config.${namespace}) theme; + cfg = config.marleyos.programs.bat; + 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"; diff --git a/modules/home/programs/btop/default.nix b/modules/home/programs/btop/default.nix index 2c66fd0..3ca8af9 100644 --- a/modules/home/programs/btop/default.nix +++ b/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; - inherit (config.${namespace}) theme; + cfg = config.marleyos.programs.btop; + 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; diff --git a/modules/home/programs/cava/default.nix b/modules/home/programs/cava/default.nix index bda2992..33f3135 100644 --- a/modules/home/programs/cava/default.nix +++ b/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; - inherit (config.${namespace}) theme; + cfg = config.marleyos.programs.cava; + 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? diff --git a/modules/home/programs/cheat/default.nix b/modules/home/programs/cheat/default.nix index 63a5c9c..adf0d46 100644 --- a/modules/home/programs/cheat/default.nix +++ b/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; - inherit (config.${namespace}) theme; + cfg = config.marleyos.programs.cheat; + 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"; diff --git a/modules/home/programs/curl/default.nix b/modules/home/programs/curl/default.nix index 9060631..702cf81 100644 --- a/modules/home/programs/curl/default.nix +++ b/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"; diff --git a/modules/home/programs/eza/default.nix b/modules/home/programs/eza/default.nix index 58bc458..70bd4a4 100644 --- a/modules/home/programs/eza/default.nix +++ b/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"; diff --git a/modules/home/programs/figlet/default.nix b/modules/home/programs/figlet/default.nix index fd3c098..ab96ddd 100644 --- a/modules/home/programs/figlet/default.nix +++ b/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"; diff --git a/modules/home/programs/fish/default.nix b/modules/home/programs/fish/default.nix index 8127e46..146db6c 100644 --- a/modules/home/programs/fish/default.nix +++ b/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; - inherit (config.${namespace}) theme; + cfg = config.marleyos.programs.fish; + 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; diff --git a/modules/home/programs/fzf/default.nix b/modules/home/programs/fzf/default.nix index 7ec137e..2383fe8 100644 --- a/modules/home/programs/fzf/default.nix +++ b/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; - inherit (config.${namespace}) theme; + cfg = config.marleyos.programs.fzf; + 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%" diff --git a/modules/home/programs/gh/default.nix b/modules/home/programs/gh/default.nix index 238ab40..060ebe8 100644 --- a/modules/home/programs/gh/default.nix +++ b/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"; diff --git a/modules/home/programs/git/aliases.nix b/modules/home/programs/git/aliases.nix index ebbd710..53ffed3 100644 --- a/modules/home/programs/git/aliases.nix +++ b/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 { diff --git a/modules/home/programs/git/default.nix b/modules/home/programs/git/default.nix index 292db17..28af6b4 100644 --- a/modules/home/programs/git/default.nix +++ b/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; diff --git a/modules/home/programs/glow/default.nix b/modules/home/programs/glow/default.nix index 34e681b..40d5fae 100644 --- a/modules/home/programs/glow/default.nix +++ b/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 { diff --git a/modules/home/programs/gpg/default.nix b/modules/home/programs/gpg/default.nix index 05003f3..b882cb8 100644 --- a/modules/home/programs/gpg/default.nix +++ b/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"; diff --git a/modules/home/programs/hyfetch/default.nix b/modules/home/programs/hyfetch/default.nix index 9c9cbcf..ce332aa 100644 --- a/modules/home/programs/hyfetch/default.nix +++ b/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"; diff --git a/modules/home/programs/hyfetch/neofetch.nix b/modules/home/programs/hyfetch/neofetch.nix index 48e59b8..cb569e8 100644 --- a/modules/home/programs/hyfetch/neofetch.nix +++ b/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 { diff --git a/modules/home/programs/journalctl/default.nix b/modules/home/programs/journalctl/default.nix index 3e48f90..691db0a 100644 --- a/modules/home/programs/journalctl/default.nix +++ b/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"; diff --git a/modules/home/programs/just/default.nix b/modules/home/programs/just/default.nix index 0376cb1..f208a5f 100644 --- a/modules/home/programs/just/default.nix +++ b/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"; diff --git a/modules/home/programs/lazygit/default.nix b/modules/home/programs/lazygit/default.nix index c5e769d..3e4698f 100644 --- a/modules/home/programs/lazygit/default.nix +++ b/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 diff --git a/modules/home/programs/less/default.nix b/modules/home/programs/less/default.nix index 438be2e..76abb11 100644 --- a/modules/home/programs/less/default.nix +++ b/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"; diff --git a/modules/home/programs/man/default.nix b/modules/home/programs/man/default.nix index ac7ff91..818cb0a 100644 --- a/modules/home/programs/man/default.nix +++ b/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"; diff --git a/modules/home/programs/ncmpcpp/default.nix b/modules/home/programs/ncmpcpp/default.nix index 9d22fd3..9f8e82f 100644 --- a/modules/home/programs/ncmpcpp/default.nix +++ b/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"; diff --git a/modules/home/programs/neo/default.nix b/modules/home/programs/neo/default.nix index 3c696e9..457a051 100644 --- a/modules/home/programs/neo/default.nix +++ b/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"; diff --git a/modules/home/programs/rbw/default.nix b/modules/home/programs/rbw/default.nix index 916db2e..d491971 100644 --- a/modules/home/programs/rbw/default.nix +++ b/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"; diff --git a/modules/home/programs/ripgrep/default.nix b/modules/home/programs/ripgrep/default.nix index e8416b5..163efdb 100644 --- a/modules/home/programs/ripgrep/default.nix +++ b/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"; diff --git a/modules/home/programs/ssh/default.nix b/modules/home/programs/ssh/default.nix index d39fdee..3092803 100644 --- a/modules/home/programs/ssh/default.nix +++ b/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"; diff --git a/modules/home/programs/starship/default.nix b/modules/home/programs/starship/default.nix index 9489b71..983e69c 100644 --- a/modules/home/programs/starship/default.nix +++ b/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; - inherit (config.${namespace}) theme; + cfg = config.marleyos.programs.starship; + 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 [ diff --git a/modules/home/programs/starship/nerd-font-symbols.nix b/modules/home/programs/starship/nerd-font-symbols.nix index 5f0b0e3..fc3c6cf 100644 --- a/modules/home/programs/starship/nerd-font-symbols.nix +++ b/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 { diff --git a/modules/home/programs/systemctl/default.nix b/modules/home/programs/systemctl/default.nix index 28c5a80..6953321 100644 --- a/modules/home/programs/systemctl/default.nix +++ b/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"; diff --git a/modules/home/programs/tmux/default.nix b/modules/home/programs/tmux/default.nix index 46fc279..6c79463 100644 --- a/modules/home/programs/tmux/default.nix +++ b/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; - inherit (config.${namespace}) theme; + cfg = config.marleyos.programs.tmux; + 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 '' diff --git a/modules/home/programs/wezterm/default.nix b/modules/home/programs/wezterm/default.nix index 264ea1a..4ca689b 100644 --- a/modules/home/programs/wezterm/default.nix +++ b/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; - inherit (config.${namespace}) theme; + cfg = config.marleyos.programs.wezterm; + 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({ { diff --git a/modules/home/programs/wget/default.nix b/modules/home/programs/wget/default.nix index 7891381..8dfb4ad 100644 --- a/modules/home/programs/wget/default.nix +++ b/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"; diff --git a/modules/home/programs/zathura/default.nix b/modules/home/programs/zathura/default.nix index bca3724..19643e6 100644 --- a/modules/home/programs/zathura/default.nix +++ b/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; - inherit (config.${namespace}) theme; + cfg = config.marleyos.programs.zathura; + 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; }; }; } diff --git a/modules/home/programs/zoxide/default.nix b/modules/home/programs/zoxide/default.nix index a602f68..c9e3598 100644 --- a/modules/home/programs/zoxide/default.nix +++ b/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"; diff --git a/modules/home/services/clipboard/default.nix b/modules/home/services/clipboard/default.nix index fbe63a4..071a9f8 100644 --- a/modules/home/services/clipboard/default.nix +++ b/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"; diff --git a/modules/home/services/dunst/default.nix b/modules/home/services/dunst/default.nix index 0213bad..bf9193e 100644 --- a/modules/home/services/dunst/default.nix +++ b/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; - inherit (config.${namespace}) theme; + cfg = config.marleyos.services.dunst; + 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 ### diff --git a/modules/home/services/syncthing/default.nix b/modules/home/services/syncthing/default.nix index 72f4982..0163552 100644 --- a/modules/home/services/syncthing/default.nix +++ b/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"; diff --git a/modules/home/xorg/xsession/default.nix b/modules/home/xorg/xsession/default.nix index 9492dc3..9665279 100644 --- a/modules/home/xorg/xsession/default.nix +++ b/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";