split nixos from darwin

required because they don't share all attributes
This commit is contained in:
Noah Masur 2022-12-21 17:07:58 -07:00
parent 7063bd5f7a
commit d021baa1bb
78 changed files with 22 additions and 21 deletions

View File

@ -34,7 +34,7 @@ in {
ipcalc # Make IP network calculations ipcalc # Make IP network calculations
(mkScript { (mkScript {
name = "ocr"; name = "ocr";
file = ../shell/bash/scripts/ocr.sh; file = ../modules/shell/bash/scripts/ocr.sh;
env = [ tesseract ]; env = [ tesseract ];
}) })
]; ];

View File

@ -7,6 +7,9 @@ nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { }; specialArgs = { };
modules = [ modules = [
./hardware-configuration.nix
../../modules
../../nixos
globals globals
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
@ -42,8 +45,5 @@ nixpkgs.lib.nixosSystem {
nixlang.enable = true; nixlang.enable = true;
dotfiles.enable = true; dotfiles.enable = true;
} }
./hardware-configuration.nix
../../modules
]; ];
} }

View File

@ -8,6 +8,7 @@ darwin.lib.darwinSystem {
specialArgs = { }; specialArgs = { };
modules = [ modules = [
../../modules ../../modules
../../darwin
(globals // { (globals // {
user = "Noah.Masur"; user = "Noah.Masur";
gitName = "Noah-Masur_1701"; gitName = "Noah-Masur_1701";
@ -26,7 +27,6 @@ darwin.lib.darwinSystem {
nixpkgs.overlays = [ firefox-darwin.overlay ] ++ overlays; nixpkgs.overlays = [ firefox-darwin.overlay ] ++ overlays;
# Set registry to flake packages, used for nix X commands # Set registry to flake packages, used for nix X commands
nix.registry.nixpkgs.flake = nixpkgs; nix.registry.nixpkgs.flake = nixpkgs;
mail.aerc.enable = true; mail.aerc.enable = true;
mail.himalaya.enable = true; mail.himalaya.enable = true;
kitty.enable = true; kitty.enable = true;

View File

@ -13,6 +13,7 @@ nixpkgs.lib.nixosSystem {
modules = [ modules = [
./hardware-configuration.nix ./hardware-configuration.nix
../../modules ../../modules
../../nixos
(removeAttrs globals [ "mail.server" ]) (removeAttrs globals [ "mail.server" ])
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {

View File

@ -11,6 +11,7 @@ nixpkgs.lib.nixosSystem {
wsl.nixosModules.wsl wsl.nixosModules.wsl
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
../../modules ../../modules
../../nixos
{ {
networking.hostName = "wsl"; networking.hostName = "wsl";
# Set registry to flake packages, used for nix X commands # Set registry to flake packages, used for nix X commands

View File

@ -3,7 +3,6 @@
imports = [ imports = [
./1password.nix ./1password.nix
./alacritty.nix ./alacritty.nix
./calibre.nix
./discord.nix ./discord.nix
./firefox.nix ./firefox.nix
./kitty.nix ./kitty.nix

View File

@ -1,20 +1,7 @@
{ config, lib, pkgs, ... }: { { config, lib, pkgs, ... }: {
imports = [ imports =
./applications [ ./applications ./mail ./neovim ./programming ./repositories ./shell ];
./darwin
./gaming
./graphical
./hardware
./mail
./neovim
./nixos
./programming
./repositories
./services
./shell
./wsl
];
options = { options = {
user = lib.mkOption { user = lib.mkOption {

13
nixos/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ ... }: {
imports = [
./applications
./gaming
./graphical
./hardware
./services
./system
./wsl
];
}