diff --git a/flake.lock b/flake.lock index a0adcfb..f1a052d 100644 --- a/flake.lock +++ b/flake.lock @@ -252,11 +252,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1687029136, - "narHash": "sha256-q8vxnMOb0ccT5Hb7M5V1uNJud8l1wDC0HBsg+EFlNFY=", + "lastModified": 1687155026, + "narHash": "sha256-SD/QCZKJKWcfHyDauqqJDFUwxUZSzuetXYmAMZnEl88=", "ref": "refs/heads/main", - "rev": "007bb2f940951a729202e239de7755a5914d44ae", - "revCount": 9, + "rev": "a3aa29e82697bd2f0bece84192e0b474e6526cea", + "revCount": 10, "type": "git", "url": "ssh://git@git.tempest.dev/ashe/nixos-config-private" }, diff --git a/hosts/hemera/configuration.nix b/hosts/hemera/configuration.nix index 00fc4d0..d5382eb 100644 --- a/hosts/hemera/configuration.nix +++ b/hosts/hemera/configuration.nix @@ -10,6 +10,14 @@ nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.sandbox = "relaxed"; + # Allow unfree + nixpkgs.config.allowUnfree = true; + + # Nvidia drivers + services.xserver.videoDrivers = [ "nvidia" ]; + hardware.opengl.enable = true; + hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; + # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -20,10 +28,58 @@ 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"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + + # Configure keymap in X11 + services.xserver = { + layout = "us"; + xkbVariant = ""; + }; + + # 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; + }; + users.users.rose = { isNormalUser = true; - extraGroups = [ "wheel" ]; + description = "Ashelyn Rose"; + extraGroups = [ "networkmanager" "wheel" ]; packages = with pkgs; [ + _1password-gui + firefox zsh ]; }; diff --git a/hosts/hemera/hardware-configuration.nix b/hosts/hemera/hardware-configuration.nix index 7a6c490..31b7db7 100644 --- a/hosts/hemera/hardware-configuration.nix +++ b/hosts/hemera/hardware-configuration.nix @@ -4,20 +4,22 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = [ ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-label/NIXROOT"; + { device = "/dev/disk/by-uuid/f3299052-38cc-41c5-9f27-ae3e9cfd1b21"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-label/NIXBOOT"; + { device = "/dev/disk/by-uuid/F28A-7EB7"; fsType = "vfat"; }; @@ -28,8 +30,10 @@ # 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.eth0.useDHCP = lib.mkDefault true; + # networking.interfaces.eno2.useDHCP = lib.mkDefault true; + # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - virtualisation.hypervGuest.enable = true; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }