From f25e8b716e6a59b103b497cc7d82fd7bea1797e8 Mon Sep 17 00:00:00 2001 From: Gabe Venberg Date: Mon, 25 Mar 2024 16:40:33 -0500 Subject: [PATCH] added seperate vm profiles due to hardware.nix differences. --- flake.nix | 21 ++- .../configuration.nix | 2 +- .../hardware-configuration.nix | 0 hosts/{archlaptop => archlaptop-vm}/home.nix | 0 hosts/workstation-vm/configuration.nix | 137 ++++++++++++++++++ .../workstation-vm/hardware-configuration.nix | 38 +++++ hosts/workstation-vm/home.nix | 32 ++++ 7 files changed, 226 insertions(+), 4 deletions(-) rename hosts/{archlaptop => archlaptop-vm}/configuration.nix (98%) rename hosts/{archlaptop => archlaptop-vm}/hardware-configuration.nix (100%) rename hosts/{archlaptop => archlaptop-vm}/home.nix (100%) create mode 100644 hosts/workstation-vm/configuration.nix create mode 100644 hosts/workstation-vm/hardware-configuration.nix create mode 100644 hosts/workstation-vm/home.nix diff --git a/flake.nix b/flake.nix index 51d9419..240d144 100644 --- a/flake.nix +++ b/flake.nix @@ -33,17 +33,32 @@ # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { - archlaptop = nixpkgs.lib.nixosSystem { + archlaptop-vm = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; # > Our main nixos configuration file < modules = [ - ./hosts/archlaptop/configuration.nix + ./hosts/archlaptop-vm/configuration.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.gabe = import ./hosts/archlaptop/home.nix; + home-manager.users.gabe = import ./hosts/archlaptop-vm/home.nix; + home-manager.extraSpecialArgs = {inherit inputs outputs;}; + } + ]; + }; + workstation-vm = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = {inherit inputs outputs;}; + # > Our main nixos configuration file < + modules = [ + ./hosts/workstation-vm/configuration.nix + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.gabe = import ./hosts/workstation-vm/home.nix; home-manager.extraSpecialArgs = {inherit inputs outputs;}; } ]; diff --git a/hosts/archlaptop/configuration.nix b/hosts/archlaptop-vm/configuration.nix similarity index 98% rename from hosts/archlaptop/configuration.nix rename to hosts/archlaptop-vm/configuration.nix index 1f80ced..d86228e 100644 --- a/hosts/archlaptop/configuration.nix +++ b/hosts/archlaptop-vm/configuration.nix @@ -15,7 +15,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "archlaptop"; # Define your hostname. + networking.hostName = "archlaptop-vm"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # Configure network proxy if necessary diff --git a/hosts/archlaptop/hardware-configuration.nix b/hosts/archlaptop-vm/hardware-configuration.nix similarity index 100% rename from hosts/archlaptop/hardware-configuration.nix rename to hosts/archlaptop-vm/hardware-configuration.nix diff --git a/hosts/archlaptop/home.nix b/hosts/archlaptop-vm/home.nix similarity index 100% rename from hosts/archlaptop/home.nix rename to hosts/archlaptop-vm/home.nix diff --git a/hosts/workstation-vm/configuration.nix b/hosts/workstation-vm/configuration.nix new file mode 100644 index 0000000..b6c2f6f --- /dev/null +++ b/hosts/workstation-vm/configuration.nix @@ -0,0 +1,137 @@ +# 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, + ... +}: { + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "worskstation-vm"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable networking + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "America/Chicago"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + + nix = { + package = pkgs.nixFlakes; + extraOptions = '' + experimental-features = nix-command flakes + ''; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the Cinnamon Desktop Environment. + services.xserver.displayManager.lightdm.enable = true; + services.xserver.desktopManager.cinnamon.enable = true; + + # Configure keymap in X11 + services.xserver = { + xkb.layout = "us"; + xkb.variant = ""; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = 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.gabe = { + isNormalUser = true; + description = "Gabe Venberg"; + shell = pkgs.nushell; + extraGroups = ["networkmanager" "wheel"]; + packages = with pkgs; [ + firefox + # thunderbird + ]; + }; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + wget + ]; + + # 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; + + # 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 = "23.11"; # Did you read the comment? +} diff --git a/hosts/workstation-vm/hardware-configuration.nix b/hosts/workstation-vm/hardware-configuration.nix new file mode 100644 index 0000000..de85343 --- /dev/null +++ b/hosts/workstation-vm/hardware-configuration.nix @@ -0,0 +1,38 @@ +# 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-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/cf31610c-b936-48d3-979d-553424f1d6c7"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/27F6-CF8B"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/679dd57a-6a34-47f1-a0c8-cdf1e280c3fa"; } + ]; + + # 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/hosts/workstation-vm/home.nix b/hosts/workstation-vm/home.nix new file mode 100644 index 0000000..e63168b --- /dev/null +++ b/hosts/workstation-vm/home.nix @@ -0,0 +1,32 @@ +{ + inputs, + config, + pkgs, + lib, + ... +}: { + # machine specific options + host = { + enable-speech = true; + nvim = { + enable-lsp = true; + enable-treesitter = true; + }; + git = { + profile = { + name = "Gabe Venberg"; + email = "gabevenberg@gmail.com"; + }; + workProfile.enable = false; + }; + }; + + home.username = "gabe"; + home.homeDirectory = "/home/gabe"; + imports = [ + ../../modules/home-manager/terminal/terminal.nix + ../../modules/home-manager/home-manager.nix + ../../modules/home-manager/kittty/kitty.nix + inputs.nixvim.homeManagerModules.nixvim + ]; +}