Group into blocks where applicable

Signed-off-by: Tristan Druyen <tristan@vault81.de>
This commit is contained in:
Tristan D. 2023-09-14 17:56:00 +02:00
parent 6dfcf40d80
commit fc9059746c
Signed by: tristan
SSH key fingerprint: SHA256:U7y6eMb7CQDaTHv9XoX6/BaQnPqyxxKc+Xnfcefi6rY
4 changed files with 77 additions and 69 deletions

View file

@ -7,7 +7,7 @@
...
}: {
imports = [
./hardware-configuration.nix
./hardware.nix
];
nix = {
@ -40,7 +40,7 @@
mplus-outline-fonts.githubRelease
dina-font
proggyfonts
(nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; })
(nerdfonts.override {fonts = ["FiraCode" "DroidSansMono"];})
];
networking.hostName = "nixos-pulse";
@ -62,14 +62,13 @@
LC_TIME = "de_DE.UTF-8";
};
services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
services.xserver = {
enable = true;
layout = "us";
xkbVariant = "";
displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true;
};
services.printing.enable = true;
@ -96,7 +95,7 @@
};
# Enable automatic login for the user.
services.xserver.displayManager.defaultSession ="plasmawayland";
services.xserver.displayManager.defaultSession = "plasmawayland";
services.xserver.displayManager.autoLogin.enable = true;
services.xserver.displayManager.autoLogin.user = "tristand";
@ -109,13 +108,12 @@
environment.systemPackages = with pkgs; [
curl
emacs
fish
git
neovim
ripgrep
vim
virt-manager
wl-clipboard
wget
];

View file

@ -28,7 +28,7 @@
nixpkgs,
tuxedo-nixos,
nix-doom-emacs,
emacs-overlay
emacs-overlay,
}: {
nixosConfigurations = {
nixos-pulse = nixpkgs.lib.nixosSystem {

View file

@ -1,58 +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 = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "uas" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-amd" "amdgpu"];
boot.extraModulePackages = [];
services.xserver.videoDrivers = ["amdgpu"];
fileSystems."/" = {
device = "/dev/disk/by-uuid/6ae6ea01-72d5-4cee-a512-7aab551577a0";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-0ebc7402-5f50-4549-a407-b1f859285102".device = "/dev/disk/by-uuid/0ebc7402-5f50-4549-a407-b1f859285102";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/B471-B193";
fsType = "vfat";
};
swapDevices = [
{device = "/dev/disk/by-uuid/5b3a6fa6-bdec-4bfb-914d-48d870776a53";}
];
# 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.enp1s0.useDHCP = lib.mkDefault true;
networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.opengl.driSupport = true;
hardware.opengl.driSupport32Bit = true;
hardware.opengl.extraPackages = with pkgs; [
rocm-opencl-icd
rocm-opencl-runtime
];
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.hip}"
];
}

68
hardware.nix Normal file
View file

@ -0,0 +1,68 @@
# 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" "uas" "sd_mod"];
kernelModules = [];
luks.devices."luks-0ebc7402-5f50-4549-a407-b1f859285102".device = "/dev/disk/by-uuid/0ebc7402-5f50-4549-a407-b1f859285102";
};
kernelModules = ["kvm-amd" "amdgpu"];
extraModulePackages = [];
};
services.xserver.videoDrivers = ["amdgpu"];
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/6ae6ea01-72d5-4cee-a512-7aab551577a0";
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-uuid/B471-B193";
fsType = "vfat";
};
};
swapDevices = [
{device = "/dev/disk/by-uuid/5b3a6fa6-bdec-4bfb-914d-48d870776a53";}
];
networking = {
useDHCP = lib.mkDefault true;
interfaces.enp1s0.useDHCP = lib.mkDefault true;
interfaces.wlp3s0.useDHCP = lib.mkDefault true;
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware = {
opengl = {
driSupport = true;
driSupport32Bit = true;
extraPackages = with pkgs; [
rocm-opencl-icd
rocm-opencl-runtime
];
};
cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
};
systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.hip}"
];
}