diff --git a/hosts/ni/default.nix b/hosts/ni/default.nix index 6185dc73..656db2e7 100644 --- a/hosts/ni/default.nix +++ b/hosts/ni/default.nix @@ -71,7 +71,7 @@ multimedia-archive.enable = true; backup-archive.enable = true; }; - themes.themes.a-happy-gnome.enable = true; + workflows.workflows.a-happy-gnome.enable = true; programs.pop-launcher = { enable = true; diff --git a/modules/nixos/themes/README.adoc b/modules/nixos/themes/README.adoc deleted file mode 100644 index 0e53bb3e..00000000 --- a/modules/nixos/themes/README.adoc +++ /dev/null @@ -1,16 +0,0 @@ -= Themes -:toc: - -These are where my themes are defined and configured. -Basically, themes are mainly graphical sessions concerned with aesthetics. -It could also include system-wide workflows and configurations. - -This is where modules will define how you're going to interact with the computer whether you should use something ranging from a full-fledged desktop environment with bells and whistles to a minimalist desktop environment only composing of a window manager, a terminal, and a bar. - -The following list is the summary which can also serve as a guideline to developing a theme. - -* Due to the bigger scope and importance of this module, there is a limit where you can only enable one theme at a time. -You can disable this with `config.modules.themes.disableLimit` set to `true`. - -* Custom themes should be defined in `config.modules.themes.themes` attribute (e.g., `options.modules.themes.themes.a-happy-gnome`, `options.modules.themes.themes.simple-way`). -This makes up for a namespace entirely dedicated for setting themes. diff --git a/modules/nixos/workflows/README.adoc b/modules/nixos/workflows/README.adoc new file mode 100644 index 00000000..7d26bc2d --- /dev/null +++ b/modules/nixos/workflows/README.adoc @@ -0,0 +1,14 @@ += Workflows +:toc: + +These are where my workflows are defined and configured. +Basically, workflows are mainly graphical sessions concerned with aesthetics, this may include Unix rices and good 'ol reliable desktop configurations like my link:./a-happy-gnome[GNOME config]. +This is where modules will define how you're going to interact with the computer whether you should use something ranging from a full-fledged desktop environment with bells and whistles to a minimalist desktop environment only composing of a window manager, a terminal, and a bar. + +The following list is the summary which can also serve as a guideline to developing a workflow module. + +* Due to the bigger scope and importance of this module, there is a limit where you can only enable one theme at a time. +You can disable this with `config.workflows.disableLimit` set to `true`. + +* Custom themes should be defined in `config.workflows.workflows` attribute (e.g., `options.workflows.workflows.a-happy-gnome`, `options.workflows.workflows.simple-way`). +This makes up for a namespace entirely dedicated for setting themes. diff --git a/modules/nixos/themes/a-happy-gnome/README.adoc b/modules/nixos/workflows/a-happy-gnome/README.adoc similarity index 100% rename from modules/nixos/themes/a-happy-gnome/README.adoc rename to modules/nixos/workflows/a-happy-gnome/README.adoc diff --git a/modules/nixos/themes/a-happy-gnome/assets/a-happy-gnome-dirty.png b/modules/nixos/workflows/a-happy-gnome/assets/a-happy-gnome-dirty.png similarity index 100% rename from modules/nixos/themes/a-happy-gnome/assets/a-happy-gnome-dirty.png rename to modules/nixos/workflows/a-happy-gnome/assets/a-happy-gnome-dirty.png diff --git a/modules/nixos/themes/a-happy-gnome/config/dconf/10-desktop.conf b/modules/nixos/workflows/a-happy-gnome/config/dconf/10-desktop.conf similarity index 100% rename from modules/nixos/themes/a-happy-gnome/config/dconf/10-desktop.conf rename to modules/nixos/workflows/a-happy-gnome/config/dconf/10-desktop.conf diff --git a/modules/nixos/themes/a-happy-gnome/config/dconf/30-applications.conf b/modules/nixos/workflows/a-happy-gnome/config/dconf/30-applications.conf similarity index 100% rename from modules/nixos/themes/a-happy-gnome/config/dconf/30-applications.conf rename to modules/nixos/workflows/a-happy-gnome/config/dconf/30-applications.conf diff --git a/modules/nixos/themes/a-happy-gnome/config/dconf/30-keybindings.conf b/modules/nixos/workflows/a-happy-gnome/config/dconf/30-keybindings.conf similarity index 100% rename from modules/nixos/themes/a-happy-gnome/config/dconf/30-keybindings.conf rename to modules/nixos/workflows/a-happy-gnome/config/dconf/30-keybindings.conf diff --git a/modules/nixos/themes/a-happy-gnome/config/dconf/30-shell-extensions.conf b/modules/nixos/workflows/a-happy-gnome/config/dconf/30-shell-extensions.conf similarity index 100% rename from modules/nixos/themes/a-happy-gnome/config/dconf/30-shell-extensions.conf rename to modules/nixos/workflows/a-happy-gnome/config/dconf/30-shell-extensions.conf diff --git a/modules/nixos/themes/a-happy-gnome/default.nix b/modules/nixos/workflows/a-happy-gnome/default.nix similarity index 98% rename from modules/nixos/themes/a-happy-gnome/default.nix rename to modules/nixos/workflows/a-happy-gnome/default.nix index bd0b9dc4..047f2808 100644 --- a/modules/nixos/themes/a-happy-gnome/default.nix +++ b/modules/nixos/workflows/a-happy-gnome/default.nix @@ -2,7 +2,7 @@ let name = "a-happy-gnome"; - cfg = config.themes.themes.a-happy-gnome; + cfg = config.workflows.workflows.a-happy-gnome; enabledExtensions = pkgs.writeTextFile { name = "a-happy-gnome-extensions"; @@ -19,7 +19,7 @@ let ''; in { - options.themes.themes.a-happy-gnome = { + options.workflows.workflows.a-happy-gnome = { enable = lib.mkEnableOption "'A happy GNOME', foo-dogsquared's configuration of GNOME desktop environment"; shellExtensions = lib.mkOption { diff --git a/modules/nixos/themes/default.nix b/modules/nixos/workflows/default.nix similarity index 72% rename from modules/nixos/themes/default.nix rename to modules/nixos/workflows/default.nix index 59848304..3078bc34 100644 --- a/modules/nixos/themes/default.nix +++ b/modules/nixos/workflows/default.nix @@ -3,14 +3,15 @@ # You can also show your desktop being modularized like this. { config, options, lib, pkgs, ... }: -let cfg = config.themes; +let cfg = config.workflows; in { - options.themes.disableLimit = lib.mkOption { + options.workflows.disableLimit = lib.mkOption { type = lib.types.bool; default = false; description = '' - Whether to unlock the limit for themes. Since themes may overlap with - packages and configurations, this should be enabled at your own risk. + Whether to unlock the limit for workflows. Since workflows may overlap + with packages and configurations, this should be enabled at your own + risk. ''; }; @@ -20,7 +21,7 @@ in { config = { assertions = [{ assertion = - let enabledThemes = lib.countAttrs (_: theme: theme.enable) cfg.themes; + let enabledThemes = lib.countAttrs (_: theme: theme.enable) cfg.workflows; in cfg.disableLimit || (enabledThemes <= 1); message = "Can't have more than one theme enabled at any given time."; }]; diff --git a/modules/nixos/themes/knome/README.adoc b/modules/nixos/workflows/knome/README.adoc similarity index 100% rename from modules/nixos/themes/knome/README.adoc rename to modules/nixos/workflows/knome/README.adoc diff --git a/modules/nixos/themes/knome/assets/knome-dirty.png b/modules/nixos/workflows/knome/assets/knome-dirty.png similarity index 100% rename from modules/nixos/themes/knome/assets/knome-dirty.png rename to modules/nixos/workflows/knome/assets/knome-dirty.png diff --git a/modules/nixos/themes/knome/config/kde/baloofilerc b/modules/nixos/workflows/knome/config/kde/baloofilerc similarity index 100% rename from modules/nixos/themes/knome/config/kde/baloofilerc rename to modules/nixos/workflows/knome/config/kde/baloofilerc diff --git a/modules/nixos/themes/knome/config/kde/kded5rc b/modules/nixos/workflows/knome/config/kde/kded5rc similarity index 100% rename from modules/nixos/themes/knome/config/kde/kded5rc rename to modules/nixos/workflows/knome/config/kde/kded5rc diff --git a/modules/nixos/themes/knome/config/kde/kglobalshortcutsrc b/modules/nixos/workflows/knome/config/kde/kglobalshortcutsrc similarity index 100% rename from modules/nixos/themes/knome/config/kde/kglobalshortcutsrc rename to modules/nixos/workflows/knome/config/kde/kglobalshortcutsrc diff --git a/modules/nixos/themes/knome/config/kde/khotkeysrc b/modules/nixos/workflows/knome/config/kde/khotkeysrc similarity index 100% rename from modules/nixos/themes/knome/config/kde/khotkeysrc rename to modules/nixos/workflows/knome/config/kde/khotkeysrc diff --git a/modules/nixos/themes/knome/config/kde/klaunchrc b/modules/nixos/workflows/knome/config/kde/klaunchrc similarity index 100% rename from modules/nixos/themes/knome/config/kde/klaunchrc rename to modules/nixos/workflows/knome/config/kde/klaunchrc diff --git a/modules/nixos/themes/knome/config/kde/krunnerrc b/modules/nixos/workflows/knome/config/kde/krunnerrc similarity index 100% rename from modules/nixos/themes/knome/config/kde/krunnerrc rename to modules/nixos/workflows/knome/config/kde/krunnerrc diff --git a/modules/nixos/themes/knome/config/kde/plasma-org.kde.plasma.desktop-appletsrc b/modules/nixos/workflows/knome/config/kde/plasma-org.kde.plasma.desktop-appletsrc similarity index 100% rename from modules/nixos/themes/knome/config/kde/plasma-org.kde.plasma.desktop-appletsrc rename to modules/nixos/workflows/knome/config/kde/plasma-org.kde.plasma.desktop-appletsrc diff --git a/modules/nixos/themes/knome/config/kde/plasmanotifyrc b/modules/nixos/workflows/knome/config/kde/plasmanotifyrc similarity index 100% rename from modules/nixos/themes/knome/config/kde/plasmanotifyrc rename to modules/nixos/workflows/knome/config/kde/plasmanotifyrc diff --git a/modules/nixos/themes/knome/config/kde/plasmarc b/modules/nixos/workflows/knome/config/kde/plasmarc similarity index 100% rename from modules/nixos/themes/knome/config/kde/plasmarc rename to modules/nixos/workflows/knome/config/kde/plasmarc diff --git a/modules/nixos/themes/knome/default.nix b/modules/nixos/workflows/knome/default.nix similarity index 93% rename from modules/nixos/themes/knome/default.nix rename to modules/nixos/workflows/knome/default.nix index 9ceb4d31..e811af8f 100644 --- a/modules/nixos/themes/knome/default.nix +++ b/modules/nixos/workflows/knome/default.nix @@ -1,9 +1,9 @@ { config, options, lib, pkgs, ... }: let - cfg = config.themes.themes.knome; + cfg = config.workflows.workflows.knome; in { - options.themes.themes.knome.enable = lib.mkEnableOption "KNOME, an attempt to bring as much GNOME to KDE Plasma"; + options.workflows.workflows.knome.enable = lib.mkEnableOption "KNOME, an attempt to bring as much GNOME to KDE Plasma"; config = lib.mkIf cfg.enable { services.xserver = {