From b28b94ae17c2370a89f07018eac9e2bf3edba6a5 Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Sun, 15 Sep 2024 11:23:39 -0400 Subject: [PATCH] Some updates to flakes --- hosts/Parzival-Mobile/default.nix | 14 ++++++++++++ hosts/remote/default.nix | 24 -------------------- hosts/remote/hardware-configuration.nix | 29 ------------------------- {hosts/vmware => modules}/boot.nix | 0 modules/default.nix | 1 + 5 files changed, 15 insertions(+), 53 deletions(-) create mode 100644 hosts/Parzival-Mobile/default.nix delete mode 100644 hosts/remote/default.nix delete mode 100644 hosts/remote/hardware-configuration.nix rename {hosts/vmware => modules}/boot.nix (100%) diff --git a/hosts/Parzival-Mobile/default.nix b/hosts/Parzival-Mobile/default.nix new file mode 100644 index 0000000..62a27d8 --- /dev/null +++ b/hosts/Parzival-Mobile/default.nix @@ -0,0 +1,14 @@ +{ pkgs, + ... +}:{ + imports = [ + ./hardware-configuration.nix + ../../modules + ]; + networking.hostName = "Parzival-Mobile"; + environment.systemPackages = [ + pkgs.git + pkgs.vim + pkgs.wget + ]; +} diff --git a/hosts/remote/default.nix b/hosts/remote/default.nix deleted file mode 100644 index 8634862..0000000 --- a/hosts/remote/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs, - ... -}:{ - imports = [ - ./hardware-configuration.nix - ../../modules - ]; - networking.hostName = "nixos-remote"; - environment.systemPackages = [ - pkgs.git - pkgs.vim - pkgs.wget - ]; - - boot.loader.grub.device = "/dev/xvda"; - boot.loader.grub.efiSupport = true; - boot.loader.grub.efiInstallAsRemovable = true; - boot.loader.timeout = 1; - boot.loader.grub.extraConfig = '' - serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1 - terminal_output console serial - terminal_input console serial - ''; -} diff --git a/hosts/remote/hardware-configuration.nix b/hosts/remote/hardware-configuration.nix deleted file mode 100644 index fcb587c..0000000 --- a/hosts/remote/hardware-configuration.nix +++ /dev/null @@ -1,29 +0,0 @@ -# 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 = [ "nvme" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/f222513b-ded1-49fa-b591-20ce86a2fe7f"; - 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..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.ens5.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} diff --git a/hosts/vmware/boot.nix b/modules/boot.nix similarity index 100% rename from hosts/vmware/boot.nix rename to modules/boot.nix diff --git a/modules/default.nix b/modules/default.nix index b9b0839..412e6c1 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,4 +1,5 @@ { imports = [ + ./boot.nix ]; }