tree-wide change. seperated config from 'real' modles.
This commit is contained in:
		
							parent
							
								
									3eee4e105d
								
							
						
					
					
						commit
						a0c1ad0beb
					
				
					 59 changed files with 377 additions and 424 deletions
				
			
		| 
						 | 
				
			
			@ -11,12 +11,11 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
    inputs.home-manager.nixosModules.home-manager
 | 
			
		||||
    ./hardware-configuration.nix
 | 
			
		||||
    ../../roles/nixos/graphical-vm.nix
 | 
			
		||||
    ../../modules/hostopts.nix
 | 
			
		||||
    ../../modules/nixos/common.nix
 | 
			
		||||
    ../../modules/nixos/printing.nix
 | 
			
		||||
    ../../modules/both/sound.nix
 | 
			
		||||
    ../../modules/nixos/networking.nix
 | 
			
		||||
    ../../modules/both/i3
 | 
			
		||||
    ../../configs/nixos/common.nix
 | 
			
		||||
    ../../configs/nixos/printing.nix
 | 
			
		||||
    ../../configs/nixos/sound.nix
 | 
			
		||||
    ../../configs/nixos/networking.nix
 | 
			
		||||
    ../../configs/nixos/i3
 | 
			
		||||
    ({
 | 
			
		||||
      config,
 | 
			
		||||
      pkgs,
 | 
			
		||||
| 
						 | 
				
			
			@ -71,8 +70,8 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
        };
 | 
			
		||||
        imports = [
 | 
			
		||||
          ../../roles/home-manager/terminal.nix
 | 
			
		||||
          ../../modules/home-manager/common.nix
 | 
			
		||||
          ../../modules/home-manager/email.nix
 | 
			
		||||
          ../../configs/home-manager/common.nix
 | 
			
		||||
          ../../configs/home-manager/email.nix
 | 
			
		||||
          inputs.nixvim.homeManagerModules.nixvim
 | 
			
		||||
        ];
 | 
			
		||||
      };
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -32,10 +32,10 @@ inputs.home-manager.lib.homeManagerConfiguration {
 | 
			
		|||
      imports = [
 | 
			
		||||
        ../roles/home-manager/terminal.nix
 | 
			
		||||
        ../roles/home-manager/music.nix
 | 
			
		||||
        ../modules/home-manager/common.nix
 | 
			
		||||
        ../modules/home-manager/syncthing.nix
 | 
			
		||||
        ../modules/home-manager/email.nix
 | 
			
		||||
        ../modules/home-manager/terminal/voice.nix
 | 
			
		||||
        ../configs/home-manager/common.nix
 | 
			
		||||
        ../configs/home-manager/syncthing.nix
 | 
			
		||||
        ../configs/home-manager/email.nix
 | 
			
		||||
        ../configs/home-manager/terminal/voice.nix
 | 
			
		||||
      ];
 | 
			
		||||
    })
 | 
			
		||||
    inputs.nixvim.homeManagerModules.nixvim
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -37,8 +37,8 @@ inputs.home-manager.lib.homeManagerConfiguration {
 | 
			
		|||
      home.homeDirectory = /home/gabe;
 | 
			
		||||
      imports = [
 | 
			
		||||
        ../roles/home-manager/terminal.nix
 | 
			
		||||
        ../modules/home-manager/common.nix
 | 
			
		||||
        ../modules/home-manager/syncthing.nix
 | 
			
		||||
        ../configs/home-manager/common.nix
 | 
			
		||||
        ../configs/home-manager/syncthing.nix
 | 
			
		||||
      ];
 | 
			
		||||
    })
 | 
			
		||||
  ];
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,13 +14,12 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
    inputs.home-manager.nixosModules.home-manager
 | 
			
		||||
    ./hardware-configuration.nix
 | 
			
		||||
    ../../roles/nixos/graphical-vm.nix
 | 
			
		||||
    ../../modules/hostopts.nix
 | 
			
		||||
    ../../modules/nixos/common.nix
 | 
			
		||||
    ../../modules/nixos/printing.nix
 | 
			
		||||
    ../../modules/both/sound.nix
 | 
			
		||||
    ../../modules/nixos/networking.nix
 | 
			
		||||
    ../../modules/nixos/nfsv2.nix
 | 
			
		||||
    ../../modules/both/i3
 | 
			
		||||
    ../../configs/nixos/printing.nix
 | 
			
		||||
    ../../configs/nixos/sound.nix
 | 
			
		||||
    ../../configs/nixos/networking.nix
 | 
			
		||||
    ../../configs/nixos/nfsv2.nix
 | 
			
		||||
    ../../configs/nixos/i3
 | 
			
		||||
    ../../configs/nixos/common.nix
 | 
			
		||||
    ({
 | 
			
		||||
      config,
 | 
			
		||||
      pkgs,
 | 
			
		||||
| 
						 | 
				
			
			@ -76,7 +75,7 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
        };
 | 
			
		||||
        imports = [
 | 
			
		||||
          ../../roles/home-manager/terminal.nix
 | 
			
		||||
          ../../modules/home-manager/common.nix
 | 
			
		||||
          ../../configs/home-manager/common.nix
 | 
			
		||||
          inputs.nixvim.homeManagerModules.nixvim
 | 
			
		||||
        ];
 | 
			
		||||
      };
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,8 +9,7 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
  modules = [
 | 
			
		||||
    inputs.home-manager.nixosModules.home-manager
 | 
			
		||||
    inputs.nixos-wsl.nixosModules.default
 | 
			
		||||
    ../modules/hostopts.nix
 | 
			
		||||
    ../modules/nixos/common.nix
 | 
			
		||||
    ../configs/nixos/common.nix
 | 
			
		||||
    ({
 | 
			
		||||
      config,
 | 
			
		||||
      pkgs,
 | 
			
		||||
| 
						 | 
				
			
			@ -56,7 +55,7 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
        };
 | 
			
		||||
        imports = [
 | 
			
		||||
          ../roles/home-manager/terminal.nix
 | 
			
		||||
          ../modules/home-manager/common.nix
 | 
			
		||||
          ../configs/home-manager/common.nix
 | 
			
		||||
          inputs.nixvim.homeManagerModules.nixvim
 | 
			
		||||
        ];
 | 
			
		||||
      };
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue