moritz/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/nixos' into nixos-work

Browse source
This commit is contained in:
Moritz Böhme 2024-07-02 09:27:52 +02:00
commit 8fcd5b075a
16 changed files with 369 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

17
hosts/nixos-desktop/default.nix
View file

@ -21,23 +21,15 @@
impermanence.enable = true;
webis.enable = true;
};
# programs.river = {
# enable = true;
# nvidiaSupport = true;
# };
programs.hyprland.enable = true;
programs.hyprland.nvidiaSupport = true;
programs.hyprland.keyboardLayouts = [ "us" "de" ];
programs.exercism.enable = true;
services.wallpaper.enable = true;
};
home-manager.users.moritz.services.kanshi.profiles = {
default = {
outputs = [
{ criteria = "HDMI-A-1"; mode = "3840x2160@60"; scale = 1.2; }
];
};
};
virtualisation.containers.cdi.dynamic.nvidia.enable = true;
home-manager.users.moritz.home.packages = with pkgs; [
anki
stable.calibre # NOTE: breaks often in unstable
@ -49,7 +41,6 @@
opengl = {
enable = true;
driSupport32Bit = true;
driSupport = true;
};
# sensors
@ -76,7 +67,7 @@
defaultGateway = "192.168.0.1";
nameservers = [ "192.168.0.4" ];
useDHCP = false;
interfaces.enp42s0 = {
interfaces.enp6s0 = {
ipv4.addresses = [
{
address = "192.168.0.14";

36
hosts/nixos-desktop/hardware-configuration.nix
View file

@ -1,23 +1,27 @@
# 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
, modulesPath
, ...
}: {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = {
initrd = {
availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
kernelModules = [ ];
};
kernelModules = [ "kvm-amd" ];
extraModulePackages = [ ];
};
{ config, lib, pkgs, modulesPath, ... }:
hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
{
imports =
[
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
# 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.enp6s0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp7s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}