From 717db84ee1f2aa30c5bd566f315c0e8dfb3d838a Mon Sep 17 00:00:00 2001 From: notohh Date: Mon, 15 May 2023 05:39:33 -0400 Subject: [PATCH] hime: update --- hosts/hime/default.nix | 6 +-- hosts/hime/hardware-configuration.nix | 57 +++++++++++---------------- hosts/hime/home.nix | 5 ++- 3 files changed, 30 insertions(+), 38 deletions(-) diff --git a/hosts/hime/default.nix b/hosts/hime/default.nix index 99c2af5..5d589cf 100644 --- a/hosts/hime/default.nix +++ b/hosts/hime/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{pkgs, lib, ...}: { imports = [ ./hardware-configuration.nix ../../modules @@ -24,9 +24,9 @@ users = { defaultUserShell = pkgs.nushell; - users.oh = { + users.notoh = lib.mkForce { isNormalUser = true; - description = "oh"; + description = "notoh"; extraGroups = ["networkmanager" "wheel" "docker"]; }; }; diff --git a/hosts/hime/hardware-configuration.nix b/hosts/hime/hardware-configuration.nix index fc4a510..48a4632 100644 --- a/hosts/hime/hardware-configuration.nix +++ b/hosts/hime/hardware-configuration.nix @@ -1,42 +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, ... }: + { - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ]; + imports = + [ (modulesPath + "/profiles/qemu-guest.nix") + ]; - boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = []; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/154e6059-35f9-49bb-b049-085b325ac997"; - fsType = "ext4"; - }; - fileSystems."/home/oh/nas" = { - device = "192.168.1.71:/volume1/hime"; - fsType = "nfs"; - }; - fileSystems."/home/oh/docker/nextcloud" = { - device = "192.168.1.71:/volume1/nextcloud"; - fsType = "nfs"; - }; - fileSystems."/home/oh/docker/stash/data" = { - device = "192.168.1.71:/volume1/stash"; - fsType = "nfs"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/f5a0738c-d027-4ffb-82ec-9901ca6b310b"; + fsType = "ext4"; + }; - swapDevices = [ - {device = "/dev/disk/by-uuid/15978bb3-da9b-4ec2-bd35-1716dd97812b";} - ]; + swapDevices = + [ { device = "/dev/disk/by-uuid/f28bad28-ae14-4aa7-85c5-47abe46bae56"; } + ]; + # 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.ens18.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/hime/home.nix b/hosts/hime/home.nix index 5636d6b..287c42a 100644 --- a/hosts/hime/home.nix +++ b/hosts/hime/home.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, ... }: { imports = [ @@ -10,8 +11,8 @@ programs.home-manager.enable = true; home = { - username = "oh"; - homeDirectory = "/home/oh"; + username = lib.mkDefault "notoh"; + homeDirectory = lib.mkDefault "/home/notoh"; stateVersion = "23.05"; }; }