merged modularity from main branch

This commit is contained in:
Bryan Ramos 2024-02-28 21:08:14 -05:00
commit b126c84401
Signed by: bryan
GPG key ID: 6ABDCD144D6643C8
20 changed files with 70 additions and 78 deletions

View file

@ -1,15 +1,3 @@
{ lib, config, ... }:
with lib;
let
cfg = config.modules.gui;
in
{ options.modules.gui = { enable = mkEnableOption "gui"; };
{
imports = [ ./desktopEnvironments ];
config = mkIf cfg.enable {
modules = {
sway.enable = true;
};
};
}

View file

@ -2,10 +2,10 @@
with lib;
let
cfg = config.modules.gui.alacritty;
cfg = config.modules.user.gui.alacritty;
in
{ options.modules.gui.alacritty = { enable = mkEnableOption "gui.alacritty"; };
{ options.modules.user.gui.alacritty = { enable = mkEnableOption "user.gui.alacritty"; };
config = mkIf cfg.enable {
programs.alacritty = {
enable = true;

View file

@ -2,10 +2,10 @@
with lib;
let
cfg = config.modules.gui.browsers;
cfg = config.modules.user.gui.browsers;
in
{ options.modules.gui.browsers = { enable = mkEnableOption "gui.browsers"; };
{ options.modules.user.gui.browsers = { enable = mkEnableOption "user.gui.browsers"; };
config = mkIf cfg.enable {
programs.firefox.enable = true;

View file

@ -2,10 +2,10 @@
with lib;
let
cfg = config.modules.gui.corn;
cfg = config.modules.user.gui.corn;
in
{ options.modules.gui.corn = { enable = mkEnableOption "gui.corn"; };
{ options.modules.user.gui.corn = { enable = mkEnableOption "user.gui.corn"; };
config = mkIf cfg.enable {
home.packages = with pkgs; [
trezor-suite

View file

@ -2,10 +2,10 @@
with lib;
let
cfg = config.modules.gui.fun;
cfg = config.modules.user.gui.fun;
in
{ options.modules.gui.fun = { enable = mkEnableOption "gui.fun"; };
{ options.modules.user.gui.fun = { enable = mkEnableOption "user.gui.fun"; };
config = mkIf cfg.enable {
programs.obs-studio = {
enable = true;

View file

@ -2,10 +2,10 @@
with lib;
let
cfg = config.modules.gui.neovim;
cfg = config.modules.user.gui.neovim;
in
{ options.modules.gui.neovim = { enable = mkEnableOption "gui.neovim"; };
{ options.modules.user.gui.neovim = { enable = mkEnableOption "user.gui.neovim"; };
config = mkIf cfg.enable {
programs.neovim = {
enable = true;

View file

@ -2,10 +2,10 @@
with lib;
let
cfg = config.modules.gui.utils;
cfg = config.modules.user.gui.utils;
in
{ options.modules.gui.utils = { enable = mkEnableOption "gui.utils"; };
{ options.modules.user.gui.utils = { enable = mkEnableOption "user.gui.utils"; };
config = mkIf cfg.enable {
programs.btop.enable = true;
home.packages = with pkgs; [

View file

@ -2,10 +2,10 @@
with lib;
let
cfg = config.modules.gui.writing;
cfg = config.modules.user.gui.writing;
in
{ options.modules.gui.writing = { enable = mkEnableOption "gui.writing"; };
{ options.modules.user.gui.writing = { enable = mkEnableOption "user.gui.writing"; };
config = mkIf cfg.enable {
home.packages = with pkgs; [
mdbook

View file

@ -2,11 +2,11 @@
with lib;
let
cfg = config.modules.sway;
cfg = config.modules.user.gui.sway;
in
{ options.modules.sway = { enable = mkEnableOption "sway"; };
imports = [ ../modules ];
{ options.modules.user.gui.sway = { enable = mkEnableOption "user.gui.sway"; };
imports = [ ../../modules ];
config = mkIf cfg.enable {
wayland.windowManager.sway = import ./config/sway.nix { inherit pkgs config lib; };
programs.rofi = import ./config/rofi.nix { inherit pkgs config lib; };