From 8f0f5b9bbf61e03c34fe608062ef250f9faa652b Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Sun, 9 Oct 2022 19:09:47 -0700
Subject: [PATCH] Add multi-host configuration

based loosely on https://github.com/tom-on-the-internet/system-configuration
---
 configuration.nix                             | 160 ------------------
 flake.nix                                     |  37 +---
 home.nix                                      |  48 ------
 hosts/configuration.nix                       |  39 +++++
 hosts/default.nix                             |  53 ++++++
 hosts/desktop.nix                             |  36 ++++
 hosts/elnupad/default.nix                     |  28 +++
 .../elnupad/hardware-configuration.nix        |   0
 hosts/elnupad/home.nix                        |   3 +
 hosts/home.nix                                |  45 +++++
 hosts/virtualbox/default.nix                  |  12 ++
 hosts/virtualbox/hardware-configuration.nix   |  30 ++++
 hosts/virtualbox/home.nix                     |   3 +
 13 files changed, 254 insertions(+), 240 deletions(-)
 delete mode 100644 configuration.nix
 delete mode 100644 home.nix
 create mode 100644 hosts/configuration.nix
 create mode 100644 hosts/default.nix
 create mode 100644 hosts/desktop.nix
 create mode 100644 hosts/elnupad/default.nix
 rename hardware-configuration.nix => hosts/elnupad/hardware-configuration.nix (100%)
 create mode 100644 hosts/elnupad/home.nix
 create mode 100644 hosts/home.nix
 create mode 100644 hosts/virtualbox/default.nix
 create mode 100644 hosts/virtualbox/hardware-configuration.nix
 create mode 100644 hosts/virtualbox/home.nix

diff --git a/configuration.nix b/configuration.nix
deleted file mode 100644
index 310f202..0000000
--- a/configuration.nix
+++ /dev/null
@@ -1,160 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, ... }:
-
-let
-  user = "elnu";
-in
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      #<home-manager/nixos>
-    ];
-
-  # Automatically delete generations older than a week
-  nix.gc = {
-    automatic = true;
-    options = "--delete-generations 8d";
-  };
-
-  # Use the GRUB 2 boot loader.
-  boot.loader = {
-    efi = {
-      canTouchEfiVariables = true;
-      efiSysMountPoint = "/boot";
-    };
-    grub = {
-      efiSupport = true;
-      device = "nodev";
-      # 1024x768 is the closest supported resolution to X220's native 1366x768
-      # To see a list of supported GRUB resolutions, enter GRUB,
-      # press e, F2 to enter command mode, and then type videoinfo to see list
-      gfxmodeEfi = "1024x768";
-    };
-  };
-
-  networking.hostName = "elnupad"; # Define your hostname.
-  # Pick only one of the below networking options.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
-
-  # Set your time zone.
-  time.timeZone = "America/Los_Angeles";
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Select internationalisation properties.
-  # i18n.defaultLocale = "en_US.UTF-8";
-  # console = {
-  #   font = "Lat2-Terminus16";
-  #   keyMap = "us";
-  #   useXkbConfig = true; # use xkbOptions in tty.
-  # };
-
-  # Use X11 caps lock to escape remap in TTY
-  console.useXkbConfig = true;
-
-  # Enable the X11 windowing system.
-  services = {
-    xserver = {
-      enable = true;
-      libinput = {
-        enable = true;
-        touchpad = {
-          naturalScrolling = true;
-          tapping = true;
-        };
-      };
-      xkbOptions = "caps:escape";
-      displayManager = {
-      	lightdm.enable = true;
-        #sddm.enable = true;
-        defaultSession = "none+i3";
-      };
-      windowManager.i3 = {
-        enable = true;
-        package = pkgs.i3-gaps;
-      };
-    };
-  };
-
-  # Configure keymap in X11
-  # services.xserver.layout = "us";
-
-  # Enable CUPS to print documents.
-  # services.printing.enable = true;
-
-  # Enable sound.
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-  nixpkgs.config.pulseaudio = true;
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.${user} = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" "audio" "video" "optical" "storage" ];
-    initialPassword = "password";
-  };
-
-  nixpkgs.config.allowUnfree = true;
-
-  nix = {
-    package = pkgs.nixVersions.stable; # flakes
-    extraOptions = "experimental-features = nix-command flakes";
-  };
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    rustc
-    cargo
-  ];
-
-  fonts.fonts = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk
-    (nerdfonts.override { fonts = [ "FiraCode" ]; }) # required for icons
-  ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # Copy the NixOS configuration file and link it from the resulting system
-  # (/run/current-system/configuration.nix). This is useful in case you
-  # accidentally delete configuration.nix.
-  # system.copySystemConfiguration = true;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "22.05"; # Did you read the comment?
-
-}
-
diff --git a/flake.nix b/flake.nix
index 7abd768..840821b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "A very basic flake";
+  description = "Elnu's NixOS configuration";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -9,40 +9,13 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager }:
+  outputs = inputs@{ self, nixpkgs, home-manager }:
     let
       user = "elnu";
-      system = "x86_64-linux";
-      pkgs = import nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-      };
-      lib = nixpkgs.lib;
     in {
-      nixosConfigurations = {
-        elnu = lib.nixosSystem {
-          inherit system;
-          modules = [
-            ./configuration.nix
-            home-manager.nixosModules.home-manager {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.users.${user} = {
-                imports = [
-                  ./home.nix
-                  ./vim.nix
-                  ./wallpaper.nix
-                  ./picom.nix
-                  ./i3.nix
-                  ./polybar
-                  ./rofi
-                  ./git.nix
-                  ./terminal.nix
-                ];
-              };
-            }
-          ];
-        };
+      nixosConfigurations = import ./hosts {
+        inherit (nixpkgs) lib;
+        inherit inputs nixpkgs home-manager user;
       };
     };
 }
diff --git a/home.nix b/home.nix
deleted file mode 100644
index 60b8a9c..0000000
--- a/home.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  user = "elnu";
-in
-{
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-
-  home = {
-    # Home Manager needs a bit of information about you and the
-    # paths it should manage.
-    username = "${user}";
-    homeDirectory = "/home/${user}";
-
-    # This value determines the Home Manager release that your
-    # configuration is compatible with. This helps avoid breakage
-    # when a new Home Manager release introduces backwards
-    # incompatible changes.
-    #
-    # You can update Home Manager without changing this value. See
-    # the Home Manager release notes for a list of state version
-    # changes in each release.
-    stateVersion = "22.05";
-
-    packages = with pkgs; [
-      # Command line utilities
-      wget
-      neofetch
-      ranger
-      trash-cli # aliased to rm in .bashrc
-
-      # GUI applications
-      firefox
-      discord
-    ];
-
-    file = {
-      ".bashrc" = {
-        source = ./.bashrc;
-      };
-    };
-
-    sessionVariables = {
-      EDITOR = "vim";
-    };
-  };
-}
diff --git a/hosts/configuration.nix b/hosts/configuration.nix
new file mode 100644
index 0000000..85687e8
--- /dev/null
+++ b/hosts/configuration.nix
@@ -0,0 +1,39 @@
+{ config, pkgs, user, inputs, ... }:
+
+{
+  # Automatically delete generations older than a week
+  nix.gc = {
+    automatic = true;
+    options = "--delete-generations 8d";
+  };
+
+  networking.networkmanager.enable = true;
+
+  time.timeZone = "America/Los_Angeles";
+
+  users.users.${user} = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" "audio" "video" "optical" "storage" ];
+    initialPassword = "password";
+  };
+
+  nixpkgs.config.allowUnfree = true;
+
+  nix = {
+    package = pkgs.nixVersions.stable; # flakes
+    extraOptions = "experimental-features = nix-command flakes";
+  };
+
+  environment.systemPackages = with pkgs; [
+    rustc
+    cargo
+  ];
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "22.05"; # Did you read the comment?
+}
diff --git a/hosts/default.nix b/hosts/default.nix
new file mode 100644
index 0000000..43443d0
--- /dev/null
+++ b/hosts/default.nix
@@ -0,0 +1,53 @@
+{ lib, inputs, nixpkgs, home-manager, user, ... }:
+
+let
+  system = "x86_64-linux";
+  pkgs = import nixpkgs {
+    inherit system;
+    config.allowUnfree = true;
+  };
+  lib = nixpkgs.lib;
+in
+{
+  elnupad = lib.nixosSystem {
+    inherit system;
+    specialArgs = { inherit user; };
+    modules = [
+      ./elnupad
+      ./configuration.nix
+      ./desktop.nix
+      home-manager.nixosModules.home-manager {
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+        home-manager.extraSpecialArgs = { inherit user; };
+        home-manager.users.${user} = {
+          imports = [
+            (import ./home.nix)
+            (import ./elnupad/home.nix)
+          ];
+        };
+      }
+    ];
+  };
+
+  virtualbox = lib.nixosSystem {
+    inherit system;
+    specialArgs = { inherit user; };
+    modules = [
+      ./virtualbox
+      ./configuration.nix
+      ./desktop.nix
+      home-manager.nixosModules.home-manager {
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+        home-manager.extraSpecialArgs = { inherit user; };
+        home-manager.users.${user} = {
+          imports = [
+            (import ./home.nix)
+            (import ./virtualbox/home.nix)
+          ];
+        };
+      }
+    ];
+  };
+}
diff --git a/hosts/desktop.nix b/hosts/desktop.nix
new file mode 100644
index 0000000..41c5720
--- /dev/null
+++ b/hosts/desktop.nix
@@ -0,0 +1,36 @@
+{ config, pkgs, ... }:
+
+{
+  services = {
+    xserver = {
+      enable = true;
+      libinput = {
+        enable = true;
+        touchpad = {
+          naturalScrolling = true;
+          tapping = true;
+        };
+      };
+      xkbOptions = "caps:escape";
+      displayManager = {
+      	lightdm.enable = true;
+        #sddm.enable = true;
+        defaultSession = "none+i3";
+      };
+      windowManager.i3 = {
+        enable = true;
+        package = pkgs.i3-gaps;
+      };
+    };
+  };
+
+  sound.enable = true;
+  hardware.pulseaudio.enable = true;
+  nixpkgs.config.pulseaudio = true;
+
+  fonts.fonts = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk
+    (nerdfonts.override { fonts = [ "FiraCode" ]; }) # required for icons
+  ];
+}
diff --git a/hosts/elnupad/default.nix b/hosts/elnupad/default.nix
new file mode 100644
index 0000000..f15f5dd
--- /dev/null
+++ b/hosts/elnupad/default.nix
@@ -0,0 +1,28 @@
+{ ... }:
+
+{
+  imports = [ (import ./hardware-configuration.nix) ];
+
+  boot.loader = {
+    efi = {
+      canTouchEfiVariables = true;
+      efiSysMountPoint = "/boot";
+    };
+    grub = {
+      efiSupport = true;
+      device = "nodev";
+      # 1024x768 is the closest supported resolution to X220's native 1366x768
+      # To see a list of supported GRUB resolutions, enter GRUB,
+      # press e, F2 to enter command mode, and then type videoinfo to see list
+      gfxmodeEfi = "1024x768";
+    };
+  };
+
+  networking.hostName = "elnupad";
+
+  time.timeZone = "America/Los_Angeles";
+
+  # Use X11 caps lock to escape remap in TTY
+  console.useXkbConfig = true;
+  services.xserver.xkbOptions = "caps:escape";
+}
diff --git a/hardware-configuration.nix b/hosts/elnupad/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to hosts/elnupad/hardware-configuration.nix
diff --git a/hosts/elnupad/home.nix b/hosts/elnupad/home.nix
new file mode 100644
index 0000000..f02f359
--- /dev/null
+++ b/hosts/elnupad/home.nix
@@ -0,0 +1,3 @@
+{ pkgs, ... }: {
+
+}
diff --git a/hosts/home.nix b/hosts/home.nix
new file mode 100644
index 0000000..1584b03
--- /dev/null
+++ b/hosts/home.nix
@@ -0,0 +1,45 @@
+{ config, pkgs, user, ... }:
+
+{
+  imports = [
+    ../vim.nix
+    ../wallpaper.nix
+    ../picom.nix
+    ../i3.nix
+    ../polybar
+    ../rofi
+    ../git.nix
+    ../terminal.nix
+  ];
+
+  programs.home-manager.enable = true;
+
+  home = {
+    username = "${user}";
+    homeDirectory = "/home/${user}";
+
+    stateVersion = "22.05";
+
+    packages = with pkgs; [
+      # Command line utilities
+      wget
+      neofetch
+      ranger
+      trash-cli # aliased to rm in .bashrc
+
+      # GUI applications
+      firefox
+      discord
+    ];
+
+    file = {
+      ".bashrc" = {
+        source = ../.bashrc;
+      };
+    };
+
+    sessionVariables = {
+      EDITOR = "vim";
+    };
+  };
+}
diff --git a/hosts/virtualbox/default.nix b/hosts/virtualbox/default.nix
new file mode 100644
index 0000000..fe42261
--- /dev/null
+++ b/hosts/virtualbox/default.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [ ./hardware-configuration.nix ];
+
+  boot.loader.grub = {
+    enable = true;
+    device = "/dev/sda";
+  };
+
+  networking.hostName = "virtualbox";
+}
diff --git a/hosts/virtualbox/hardware-configuration.nix b/hosts/virtualbox/hardware-configuration.nix
new file mode 100644
index 0000000..1e7f42f
--- /dev/null
+++ b/hosts/virtualbox/hardware-configuration.nix
@@ -0,0 +1,30 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [ ];
+
+  boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-label/nixos";
+      fsType = "ext4";
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s3.useDHCP = lib.mkDefault true;
+
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  virtualisation.virtualbox.guest.enable = true;
+}
diff --git a/hosts/virtualbox/home.nix b/hosts/virtualbox/home.nix
new file mode 100644
index 0000000..f02f359
--- /dev/null
+++ b/hosts/virtualbox/home.nix
@@ -0,0 +1,3 @@
+{ pkgs, ... }: {
+
+}