~

nixos/base.nix

@@ -0,0 +1,85 @@
+{ config, lib, pkgs, home-manager, ... }:
+{
+    imports = [
+        ./packages.nix
+        home-manager.nixosModules.home-manager
+    ];
+
+    nix.settings.experimental-features = ["nix-command" "flakes"];
+    nixpkgs.config.allowUnfree = true;
+
+    networking.networkmanager.enable = true;
+
+    programs = {
+        dconf.enable = true;
+        firefox.enable = true;
+        fish.enable = true;
+        gnupg.agent = {
+            enable = true;
+            enableSSHSupport = true;
+        };
+    };
+
+    services = {
+        # X11
+        xserver = {
+            enable = true;
+            xkb.layout = "us";
+            windowManager = {
+                openbox.enable = true;
+                twm.enable = true;
+            };
+            desktopManager = {
+                pantheon.enable = true;
+            };
+        };
+        displayManager = {
+            sddm = {
+                enable = true;
+                settings = {
+                    Autologin = {
+                        User = "rae";
+                        Session = "none+openbox";
+                    };
+                };
+            };
+        };
+        # desktopManager = {
+        #     plasma6.enable = true;
+        # };
+
+        # Touchpad support
+        libinput.enable = true;
+        # OpenSSH
+        openssh.enable = true;
+        # Sound
+        pipewire = {
+            enable = true;
+            pulse.enable = true;
+        };
+        # CUPS printing
+        printing.enable = true;
+    };
+
+    fonts = {
+        enableDefaultPackages = true;
+        packages = with pkgs; [
+            noto-fonts
+            noto-fonts-cjk-sans
+            noto-fonts-emoji
+            fira-code
+            gohufont
+        ];
+    };
+
+    users.users.rae = {
+        isNormalUser = true;
+        extraGroups = [ "wheel" ];
+        hashedPassword = "$y$j9T$YPq.Kl8rss1JmJ5Vg6cHE/$2kdfzCkkhaO.I4u714EQnS/ZFert5byisiRVxtC.9G2";
+        shell = pkgs.fish;
+    };
+
+    home-manager.users.rae = import ./home.nix;
+
+    system.copySystemConfiguration = true;
+}

nixos/flake.nix

@@ -0,0 +1,30 @@
+{
+    description = "rae's nixOS config flake";
+
+    inputs = {
+        nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+        home-manager = {
+            url = "github:nix-community/home-manager";
+            inputs.nixpkgs.follows = "nixpkgs";
+        };
+    };
+
+    outputs = inputs@{ self, nixpkgs, home-manager, ... }: {
+        nixosConfigurations = {
+            qemu = nixpkgs.lib.nixosSystem {
+                system = "x86_64-linux";
+                specialArgs = { inherit inputs; };
+                modules = [
+                    ./hosts/qemu/configuration.nix
+                    # home-manager.nixosModules.home-manager {
+                    #     home-manager = {
+                    #         useGlobalPkgs = true;
+                    #         useUserPackages = true;
+                    #         users.rae = import ./home.nix;
+                    #     };
+                    # }
+                ];
+            };
+        };
+    };
+}

nixos/home.nix

@@ -1,13 +1,5 @@
 { pkgs, ... }:
-let
-    home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz";
-in
 {
-    imports = [
-        "${home-manager}/nixos"
-    ];
-
-    home-manager.users.rae = {
     home = {
         stateVersion = "24.11";
         sessionVariables = {
@@ -151,5 +143,4 @@ in
         cursorTheme.name = "Posy's Cursor";
         theme.name = "io.elementary.stylesheet.blueberry";
     };
-    };
 }

nixos/hosts/qemu/configuration.nix

@@ -2,12 +2,10 @@
 {
     imports = [
         ./hardware-configuration.nix
+        ../../base.nix
         ../../home.nix
-        ../../packages.nix
     ];
 
-    nixpkgs.config.allowUnfree = true;
-
     boot.loader = {
         # efi.efiSysMountPoint = "/boot/efi";
         grub = {
@@ -18,10 +16,7 @@
         };
     };
 
-    networking = {
+    networking.hostName = "gayfurries";
-        hostName = "gayfurries";
-        networkmanager.enable = true;
-    };
 
     time.timeZone = "America/New_York";
     i18n.defaultLocale = "en_US.UTF-8";
@@ -31,99 +26,11 @@
         #  useXkbConfig = true; # use xkb.options in tty.
     };
 
-    programs = {
-        dconf.enable = true;
-        firefox.enable = true;
-        fish.enable = true;
-        gnupg.agent = {
-            enable = true;
-            enableSSHSupport = true;
-        };
-    };
-
-    services = {
-        # X11
-        xserver = {
-            enable = true;
-            xkb.layout = "us";
-            windowManager = {
-                openbox.enable = true;
-                twm.enable = true;
-            };
-            desktopManager = {
-                pantheon.enable = true;
-            };
-        };
-        displayManager = {
-            sddm = {
-                enable = true;
-                settings = {
-                    Autologin = {
-                        User = "rae";
-                        Session = "none+openbox";
-                    };
-                };
-            };
-        };
-        # desktopManager = {
-        #     plasma6.enable = true;
-        # };
-
-        # Touchpad support
-        libinput.enable = true;
-        # OpenSSH
-        openssh.enable = true;
-        # Sound
-        pipewire = {
-            enable = true;
-            pulse.enable = true;
-        };
-        # CUPS printing
-        printing.enable = true;
-    };
-
-    fonts = {
-        enableDefaultPackages = true;
-        packages = with pkgs; [
-            noto-fonts
-            noto-fonts-cjk-sans
-            noto-fonts-emoji
-            fira-code
-            gohufont
-        ];
-    };
-
-    users.users.rae = {
-        isNormalUser = true;
-        extraGroups = [ "wheel" ];
-        hashedPassword = "$y$j9T$YPq.Kl8rss1JmJ5Vg6cHE/$2kdfzCkkhaO.I4u714EQnS/ZFert5byisiRVxtC.9G2";
-        shell = pkgs.fish;
-    };
-
     # Open ports in the firewall.
     # networking.firewall.allowedTCPPorts = [ ... ];
     # networking.firewall.allowedUDPPorts = [ ... ];
     # Or disable the firewall altogether.
     # networking.firewall.enable = false;
 
-    system.copySystemConfiguration = true;
+    system.stateVersion = "24.11";
-
-    # This option defines the first version of NixOS you have installed on this particular machine,
-    # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
-    #
-    # Most users should NEVER change this value after the initial install, for any reason,
-    # even if you've upgraded your system to a new NixOS release.
-    #
-    # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
-    # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
-    # to actually do that.
-    #
-    # This value being lower than the current NixOS release does NOT mean your system is
-    # out of date, out of support, or vulnerable.
-    #
-    # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
-    # and migrated your data accordingly.
-    #
-    # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
-    system.stateVersion = "24.11"; # Did you read the comment?
 }