refactor(treewide): clean-up, flatten, rework module system
This commit is contained in:
		
							parent
							
								
									4ddf9d2b35
								
							
						
					
					
						commit
						5590c8a951
					
				
					 58 changed files with 397 additions and 635 deletions
				
			
		| 
						 | 
				
			
			@ -2,17 +2,8 @@
 | 
			
		|||
 | 
			
		||||
{
 | 
			
		||||
  imports = [
 | 
			
		||||
    ./obsidian
 | 
			
		||||
    ./zathura
 | 
			
		||||
    ./office
 | 
			
		||||
    ./notes
 | 
			
		||||
    ./pdf
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  options.ooknet.desktop.productivity = {
 | 
			
		||||
    obsidian = {
 | 
			
		||||
      enable = lib.mkEnableOption "enable obsidian home module";
 | 
			
		||||
    };
 | 
			
		||||
    zathura = {
 | 
			
		||||
      enable = lib.mkEnableOption "enable zathura home module";
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										5
									
								
								home/modules/desktop/productivity/notes/default.nix
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								home/modules/desktop/productivity/notes/default.nix
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,5 @@
 | 
			
		|||
{
 | 
			
		||||
  imports = [
 | 
			
		||||
    ./obsidian.nix
 | 
			
		||||
  ];
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -1,15 +1,14 @@
 | 
			
		|||
{ lib, config, pkgs, ... }:
 | 
			
		||||
 | 
			
		||||
let
 | 
			
		||||
  inherit (lib) mkIf mkEnableOption;
 | 
			
		||||
  inherit (lib) mkIf;
 | 
			
		||||
  cfg = config.ooknet.productivity.notes.obsidian;
 | 
			
		||||
  notes = config.ooknet.desktop.notes;
 | 
			
		||||
in
 | 
			
		||||
 | 
			
		||||
{
 | 
			
		||||
  options.ooknet.productivity.notes.obsidian.enable = mkEnableOption "";
 | 
			
		||||
  config = mkIf (cfg.enable || notes == "obsidian") {
 | 
			
		||||
    home.packages = [ pkgs.obsidian ];
 | 
			
		||||
    
 | 
			
		||||
    ooknet.binds.notes = mkIf (notes == "obsidian") "obsidian";
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,13 +1,6 @@
 | 
			
		|||
{ lib, config, pkgs, ... }:
 | 
			
		||||
 | 
			
		||||
let
 | 
			
		||||
  inherit (lib) mkIf mkEnableOption;
 | 
			
		||||
  cfg = config.ooknet.desktop.productivity.office;
 | 
			
		||||
in
 | 
			
		||||
 | 
			
		||||
# TODO: add openoffice
 | 
			
		||||
{
 | 
			
		||||
  options.ooknet.desktop.productivity.office.enable = mkEnableOption "enable office home module";
 | 
			
		||||
  config = mkIf cfg.enable {
 | 
			
		||||
    home.packages = [ pkgs.libreoffice ];
 | 
			
		||||
  };
 | 
			
		||||
  imports = [
 | 
			
		||||
    ./libreoffice.nix
 | 
			
		||||
  ];
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										13
									
								
								home/modules/desktop/productivity/office/libreoffice.nix
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								home/modules/desktop/productivity/office/libreoffice.nix
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,13 @@
 | 
			
		|||
{ lib, config, pkgs, ... }:
 | 
			
		||||
 | 
			
		||||
let
 | 
			
		||||
  inherit (lib) mkIf mkEnableOption;
 | 
			
		||||
  cfg = config.ooknet.desktop.productivity.office;
 | 
			
		||||
in
 | 
			
		||||
 | 
			
		||||
{
 | 
			
		||||
  options.ooknet.desktop.productivity.office.enable = mkEnableOption "enable office home module";
 | 
			
		||||
  config = mkIf cfg.enable {
 | 
			
		||||
    home.packages = [ pkgs.libreoffice ];
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										5
									
								
								home/modules/desktop/productivity/pdf/default.nix
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								home/modules/desktop/productivity/pdf/default.nix
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,5 @@
 | 
			
		|||
{
 | 
			
		||||
  imports = [
 | 
			
		||||
    ./zathura.nix
 | 
			
		||||
  ];
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -1,13 +1,15 @@
 | 
			
		|||
{ lib, config, ... }:
 | 
			
		||||
 | 
			
		||||
let
 | 
			
		||||
  cfg = config.ooknet.desktop.productivity.zathura;
 | 
			
		||||
  inherit (config.colorscheme) palette;
 | 
			
		||||
  fonts = config.ooknet.theme.fonts;
 | 
			
		||||
  inherit (lib) mkIf;
 | 
			
		||||
  cfg = config.ooknet.productivity.pdf.zathura;
 | 
			
		||||
  pdf = config.ooknet.desktop.pdf;
 | 
			
		||||
  fonts = config.ooknet.fonts;
 | 
			
		||||
in
 | 
			
		||||
 | 
			
		||||
{
 | 
			
		||||
  config = lib.mkIf cfg.enable {
 | 
			
		||||
  config = mkIf (cfg.enable || pdf == "zathura") {
 | 
			
		||||
    programs.zathura = {
 | 
			
		||||
      enable = true;
 | 
			
		||||
      options = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue