diff --git a/flake.nix b/flake.nix index f3a8d35..6088f89 100644 --- a/flake.nix +++ b/flake.nix @@ -10,12 +10,12 @@ system = "x86_64-linux"; in { nixosConfigurations = { - nixos-vm = nixpkgs.lib.nixosSystem { + nixos-vm2 = nixpkgs.lib.nixosSystem { inherit system; specialArgs = { inherit inputs; }; modules = [ - import ./machines/nixos-vm/configuration.nix + ./hosts/nixos-vm2/configuration.nix ]; }; }; diff --git a/machines/nixos-vm/configuration.nix b/hosts/nixos-vm1/configuration.nix similarity index 100% rename from machines/nixos-vm/configuration.nix rename to hosts/nixos-vm1/configuration.nix diff --git a/machines/nixos-vm/hardware-configuration.nix b/hosts/nixos-vm1/hardware-configuration.nix similarity index 100% rename from machines/nixos-vm/hardware-configuration.nix rename to hosts/nixos-vm1/hardware-configuration.nix diff --git a/hosts/nixos-vm2/configuration.nix b/hosts/nixos-vm2/configuration.nix new file mode 100644 index 0000000..c37f1f0 --- /dev/null +++ b/hosts/nixos-vm2/configuration.nix @@ -0,0 +1,48 @@ +{ config, lib, pkgs, inputs, ... }: + +{ + nix.settings = { + experimental-features = "nix-command flakes"; + }; + + imports = + [ + "${inputs.self}/modules" + ./hardware-configuration.nix + ]; + + programs.hyprland.enable = true; + + boot.loader.grub.enable = true; + boot.loader.grub.device = "/dev/vda"; + networking.hostName = "poslop-nixvm2"; + networking.networkmanager.enable = true; + + time.timeZone = "America/Chicago"; + + services.printing.enable = true; + + services.pipewire = { + enable = true; + pulse.enable = true; + }; + + users.users.poslop = { + isNormalUser = true; + extraGroups = [ "wheel" ]; + packages = with pkgs; [ + tree + ]; + }; + + environment.systemPackages = with pkgs; [ + vim + wget + git + curl + zsh + ]; + + system.stateVersion = "24.11"; +} + diff --git a/hosts/nixos-vm2/hardware-configuration.nix b/hosts/nixos-vm2/hardware-configuration.nix new file mode 100644 index 0000000..7ab2977 --- /dev/null +++ b/hosts/nixos-vm2/hardware-configuration.nix @@ -0,0 +1,33 @@ +# 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 = + [ (modulesPath + "/profiles/qemu-guest.nix") + ]; + + boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/b8c66f3c-759d-4d4f-9d1a-3f2e04d91e23"; + fsType = "ext4"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/b7d73851-7f85-44fa-b62a-e35deb0ea98a"; } + ]; + + # 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..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} diff --git a/modules/default.nix b/modules/default.nix new file mode 100644 index 0000000..5c8d960 --- /dev/null +++ b/modules/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./desktop + ]; +} diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix new file mode 100644 index 0000000..3fbd598 --- /dev/null +++ b/modules/desktop/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./hyprland + ]; +} diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix new file mode 100644 index 0000000..96e5300 --- /dev/null +++ b/modules/desktop/hyprland/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./hyprland.nix + ]; +} diff --git a/modules/desktop/hyprland/hyprland.nix b/modules/desktop/hyprland/hyprland.nix new file mode 100644 index 0000000..98dfe35 --- /dev/null +++ b/modules/desktop/hyprland/hyprland.nix @@ -0,0 +1,3 @@ +{ + programs.hyprland.enable = true; +}