From 0658d5e91cad23d618cf0f3becb08432f292afd4 Mon Sep 17 00:00:00 2001
From: zackartz <zackmyers@lavabit.com>
Date: Wed, 17 Apr 2024 23:42:35 -0400
Subject: [PATCH] 403 current  2024-04-17 23:42:34  24.05.20240416.5672bc9 
 6.8.4-zen1                          nvidiaProduction nvidiaStable
 nvidiaVulkanBeta

---
 flake.lock                    |  8 ++++----
 flake.nix                     |  6 +++---
 hosts/common/default.nix      |  2 --
 hosts/earth/configuration.nix |  3 ++-
 hosts/live/configuration.nix  | 25 +++++++++++++++++++++++--
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index a251dde..cb93cd8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -479,16 +479,16 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1713368829,
-        "narHash": "sha256-EreStuOxwalGOy5seV5PGc3zDT1Ppqj/4Q3ByAOGMnY=",
+        "lastModified": 1713248628,
+        "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "203fac824e2fdfed2e3a832b8123d9a64ee58b43",
+        "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable-small",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index a6eb840..9062f91 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,7 +11,7 @@
   };
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -83,8 +83,8 @@
       system = "x86_64-linux";
       specialArgs = {inherit inputs;};
       modules = [
-        "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix"
-        "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
+        # "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix"
+        "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
         ./hosts/live/configuration.nix
         inputs.home-manager.nixosModules.default
       ];
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index b6c7036..9ed3992 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -21,8 +21,6 @@
       })
   ];
 
-  boot.kernelPackages = pkgs.linuxPackages_zen;
-
   networking.nameservers = ["1.1.1.1" "1.0.0.1"];
 
   virtualisation.vmVariant = {
diff --git a/hosts/earth/configuration.nix b/hosts/earth/configuration.nix
index 29f9754..932d089 100644
--- a/hosts/earth/configuration.nix
+++ b/hosts/earth/configuration.nix
@@ -51,6 +51,7 @@
   networking.networkmanager.enable = true;
   networking.networkmanager.unmanaged = ["enp6s0"];
 
+  boot.kernelPackages = pkgs.linuxPackages_zen;
   boot.supportedFilesystems = ["ntfs"];
 
   # Load nvidia driver for Xorg and Wayland
@@ -102,7 +103,7 @@
     # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
     # Only available from driver 515.43.04+
     # Currently alpha-quality/buggy, so false is currently the recommended setting.
-    open = false;
+    open = true;
 
     # Enable the Nvidia settings menu,
     # accessible via `nvidia-settings`.
diff --git a/hosts/live/configuration.nix b/hosts/live/configuration.nix
index 8927c4e..fc5ac5a 100644
--- a/hosts/live/configuration.nix
+++ b/hosts/live/configuration.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   lib,
+  inputs,
   ...
 }: {
   imports = [
@@ -13,12 +14,14 @@
   };
 
   services = {
-    qemuGuest.enable = true;
+    # qemuGuest.enable = true;
     openssh.settings.PermitRootLogin = lib.mkForce "yes";
   };
 
   boot = {
     supportedFilesystems = lib.mkForce ["btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs"];
+    kernelPackages = pkgs.linuxPackages;
+    extraModulePackages = with config.boot.kernelPackages; [rtl8812au];
   };
 
   networking = {
@@ -36,8 +39,26 @@
     };
   };
 
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.nixos = {
+    isNormalUser = true;
+    description = "nixos";
+    extraGroups = ["networkmanager" "wheel" "docker" "libvirtd" "plugdev"];
+    shell = pkgs.zsh;
+    packages = with pkgs; [
+      firefox
+      kate
+      rio
+      telegram-desktop
+      kitty
+      mailspring
+      #  thunderbird
+    ];
+  };
+
+  home-manager.extraSpecialArgs = {inherit inputs;};
   home-manager.users.nixos = {
-    # imports = [../../modules/home-manager/default.nix];
+    imports = [../../modules/home-manager/default.nix];
     _module.args.theme = import ../../core/theme.nix;
 
     home.stateVersion = "23.11"; # Please read the comment before changing it.