Update systemmodules/homemodules paths to allow nixd to differentiate between the two
This commit is contained in:
@ -6,9 +6,9 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) ags;
|
||||
inherit (config.homemodules) ags;
|
||||
in {
|
||||
options.modules.ags = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.ags = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf ags.enable {
|
||||
programs.ags = {
|
||||
@ -68,7 +68,7 @@ in {
|
||||
# ".config/ags".source = config.lib.file.mkOutOfStoreSymlink "${config.paths.nixflake}/home/modules/ags/config";
|
||||
|
||||
# NOTE: Don't symlink to ~/.config/ags/colors.scss, since that is already used by configDir
|
||||
".config/_colors.scss".text = with config.modules.color.hex; ''
|
||||
".config/_colors.scss".text = with config.homemodules.color.hex; ''
|
||||
$dark-rosewater: #${dark.rosewater};
|
||||
$dark-flamingo: #${dark.flamingo};
|
||||
$dark-pink: #${dark.pink};
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
...
|
||||
}:
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.alacritty;
|
||||
cfg = config.homemodules.alacritty;
|
||||
in {
|
||||
options.modules.alacritty = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.alacritty = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.alacritty = {
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
}:
|
||||
with lib;
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.audio;
|
||||
cfgfp = config.modules.flatpak;
|
||||
cfg = config.homemodules.audio;
|
||||
cfgfp = config.homemodules.flatpak;
|
||||
in {
|
||||
imports = [
|
||||
../flatpak
|
||||
];
|
||||
|
||||
options.modules.audio = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.audio = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
|
||||
@ -12,13 +12,13 @@ with lib;
|
||||
with mylib.modules; let
|
||||
# This is the current state of the option that this module defines
|
||||
# We use it to determine if the config should be changed below
|
||||
cfg = config.modules.emacs;
|
||||
cfg = config.homemodules.emacs;
|
||||
in {
|
||||
imports = [];
|
||||
|
||||
# Options is a vector of options this module defines
|
||||
# This module defines only the "emacs" option and suboptions "enable" and "doom"
|
||||
options.modules.emacs = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.emacs = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
# Config is the merged set of all module configurations
|
||||
# Here we define what happens to the config if the module is active (but only if the module is active)
|
||||
|
||||
@ -13,9 +13,9 @@
|
||||
}:
|
||||
with lib;
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.email;
|
||||
cfg = config.homemodules.email;
|
||||
in {
|
||||
options.modules.email = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.email = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
# TODO: Add Maildir to nextcloud sync
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@ -12,9 +12,9 @@ with mylib.modules;
|
||||
# It is important that every flatpak interaction is handled through this module
|
||||
# to prevent that anything is removed by a module although it is required by another one
|
||||
let
|
||||
cfg = config.modules.flatpak;
|
||||
cfg = config.homemodules.flatpak;
|
||||
in {
|
||||
options.modules.flatpak = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.flatpak = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
}:
|
||||
with lib;
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.gaming;
|
||||
cfgfp = config.modules.flatpak;
|
||||
cfg = config.homemodules.gaming;
|
||||
cfgfp = config.homemodules.flatpak;
|
||||
in {
|
||||
imports = [
|
||||
# NOTE: I don't know if this is the right approach or if I should use config.modules.flatpak
|
||||
# NOTE: I don't know if this is the right approach or if I should use config.homemodules.flatpak
|
||||
../flatpak
|
||||
];
|
||||
|
||||
@ -19,7 +19,7 @@ in {
|
||||
# TODO: SteamTinkerLaunch option
|
||||
# TODO: Dolphin + SteamRomManager option
|
||||
|
||||
options.modules.gaming = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.gaming = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
|
||||
@ -10,9 +10,9 @@
|
||||
}:
|
||||
with lib;
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.helix;
|
||||
cfg = config.homemodules.helix;
|
||||
in {
|
||||
options.modules.helix = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.helix = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.sessionVariables = {
|
||||
|
||||
@ -9,9 +9,9 @@
|
||||
# TODO: Remove this module, put protonmail into the email module
|
||||
with lib;
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.misc;
|
||||
cfg = config.homemodules.misc;
|
||||
in {
|
||||
options.modules.misc = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.misc = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs;
|
||||
|
||||
@ -12,9 +12,9 @@
|
||||
}:
|
||||
with lib;
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.nextcloud;
|
||||
cfg = config.homemodules.nextcloud;
|
||||
in {
|
||||
options.modules.nextcloud = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.nextcloud = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
|
||||
@ -8,9 +8,9 @@
|
||||
}:
|
||||
with lib;
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.ranger;
|
||||
cfg = config.homemodules.ranger;
|
||||
in {
|
||||
options.modules.ranger = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.ranger = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs;
|
||||
|
||||
@ -9,9 +9,9 @@
|
||||
}:
|
||||
with lib;
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.vscode;
|
||||
cfg = config.homemodules.vscode;
|
||||
in {
|
||||
options.modules.vscode = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.vscode = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.vscode = {
|
||||
|
||||
Reference in New Issue
Block a user