aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nixos/pc/configuration.nix25
-rw-r--r--nixos/pc/hardware-configuration.nix50
2 files changed, 63 insertions, 12 deletions
diff --git a/nixos/pc/configuration.nix b/nixos/pc/configuration.nix
index 3b9d327..5d15f41 100644
--- a/nixos/pc/configuration.nix
+++ b/nixos/pc/configuration.nix
@@ -1,20 +1,21 @@
-{ inputs, outputs, pkgs, ... }: {
+{ inputs, outputs, lib, config, pkgs, ... }: {
imports = [
../general.nix
- inputs.home-manager.nixosModules.home-manager
- ];
+ ./hardware-configuration.nix
+ ../nixosModules/printing.nix
+ ];
time.timeZone = "Asia/Yekaterinburg";
networking.hostName = "ltrr";
- # Printing
- services = {
- printing.enable = true;
- printing.drivers = [ pkgs.hplipWithPlugin ];
- avahi = {
- enable = true;
- nssmdns = true;
- openFirewall = true;
- };
+ printing.enable = true;
+
+ services.xserver = {
+ enable = true;
+ displayManager.startx.enable = true;
};
+
+ services.openssh.enable = true;
}
+
+
diff --git a/nixos/pc/hardware-configuration.nix b/nixos/pc/hardware-configuration.nix
new file mode 100644
index 0000000..f040bcb
--- /dev/null
+++ b/nixos/pc/hardware-configuration.nix
@@ -0,0 +1,50 @@
+# 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 + "/installer/scan/not-detected.nix")
+ ];
+
+ boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ata_piix" "usbhid" "usb_storage" "sd_mod" ];
+ boot.initrd.kernelModules = [ ];
+ boot.kernelModules = [ ];
+ boot.extraModulePackages = [ ];
+
+ fileSystems."/" =
+ { device = "/dev/disk/by-uuid/2560c5f6-6891-49b1-bc2d-6129b588da28";
+ fsType = "ext4";
+ };
+
+ fileSystems."/boot" =
+ { device = "/dev/disk/by-uuid/39A8-FADA";
+ fsType = "vfat";
+ };
+
+ swapDevices =
+ [ { device = "/dev/disk/by-uuid/73feafe1-b069-41b0-b004-2f84dbbc3b51"; }
+ ];
+
+ # 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.<interface>.useDHCP`.
+ networking.useDHCP = lib.mkDefault true;
+ # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
+
+ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+ hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+ hardware.graphics = {
+ enable = true;
+ enable32Bit = true;
+ };
+
+ # nvidia drivers
+ services.xserver.videoDrivers = [ "nvidia" ];
+ hardware.nvidia = {
+ modesetting.enable = true;
+ nvidiaSettings = true;
+ };
+}