diff --git a/hosts/vulpecula/configuration.nix b/hosts/vulpecula/configuration.nix index 537c5ca..a1385d9 100644 --- a/hosts/vulpecula/configuration.nix +++ b/hosts/vulpecula/configuration.nix @@ -1,44 +1,59 @@ -{ - pkgs, - lib, - inputs, - ... -}: let - sshKeys = import ../../crypto/ssh-keys.nix; -in { +# { +# pkgs, +# lib, +# inputs, +# ... +# }: let +# sshKeys = import ../../crypto/ssh-keys.nix; +# in { +# imports = [ +# ./hardware-configuration.nix +# ../../common/base.nix +# ]; + +# networking = { +# hostName = "vulpecula"; + +# firewall = { +# allowedTCPPorts = [ +# # 2342 +# # 8080 # ? +# # 9000 +# # 9002 +# ]; +# }; +# }; + +# # nix.settings.trusted-users = ["root" "@wheel"]; # TODO + +# users.users.tasia = { +# isNormalUser = true; +# description = "Tasia"; +# extraGroups = ["networkmanager" "wheel"]; +# initialPassword = "correcthorsebatterystaple"; +# openssh.authorizedKeys.keys = [ +# sshKeys.tasia.yaseen +# ]; +# }; + +# environment.systemPackages = with pkgs; [ +# ]; + +# # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion +# system.stateVersion = "24.05"; +# } +{ ... }: { imports = [ ./hardware-configuration.nix - ../../common/base.nix + + ]; - networking = { - hostName = "vulpecula"; - - firewall = { - allowedTCPPorts = [ - # 2342 - # 8080 # ? - # 9000 - # 9002 - ]; - }; - }; - - # nix.settings.trusted-users = ["root" "@wheel"]; # TODO - - users.users.tasia = { - isNormalUser = true; - description = "Tasia"; - extraGroups = ["networkmanager" "wheel"]; - initialPassword = "correcthorsebatterystaple"; - openssh.authorizedKeys.keys = [ - sshKeys.tasia.yaseen - ]; - }; - - environment.systemPackages = with pkgs; [ - ]; - - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + boot.tmp.cleanOnBoot = true; + zramSwap.enable = true; + networking.hostName = "vulpecula"; + networking.domain = ""; + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = [''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILLyDLtqUhEQwIsPx0XgQ9OJb2+XxL+2ra4goNJEgwf0 tasia@yaseen'' ]; system.stateVersion = "24.05"; } diff --git a/hosts/vulpecula/hardware-configuration.nix b/hosts/vulpecula/hardware-configuration.nix index de7c652..72a0081 100644 --- a/hosts/vulpecula/hardware-configuration.nix +++ b/hosts/vulpecula/hardware-configuration.nix @@ -8,19 +8,19 @@ [ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" "virtio_pci" "virtio_scsi" "sd_mod" ]; + boot.initrd.kernelModules = [ "nvme" ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/d20e3fab-fca2-4656-90a6-01d7af7f928b"; + { device = "/dev/disk/by-uuid/c56e47f8-ae8e-4ffa-b721-7257295a90a6"; fsType = "ext4"; }; - fileSystems."/mnt" = - { device = "/dev/disk/by-uuid/f50b489b-d2fb-48f8-a8d8-c687339ed3f2"; - fsType = "ext4"; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/c69a328c-0416-48f5-ad1e-cd03e45fe1ab"; + fsType = "vfat"; }; swapDevices = [ ]; @@ -33,5 +33,5 @@ # networking.interfaces.ens18.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} - + boot.loader.grub.device = "/dev/sda"; +} \ No newline at end of file