diff --git a/hosts/murk/configuration.nix b/hosts/murk/configuration.nix index 2376c07..84c0a2f 100644 --- a/hosts/murk/configuration.nix +++ b/hosts/murk/configuration.nix @@ -1,5 +1,6 @@ { config, lib, pkgs, inputs, system, sources, modulesPath, ... }: let cfg = config.mods; + in { # Hardware imports = [ @@ -24,7 +25,6 @@ in { networking.hostName = "murk"; networking.hostId = "a2309090"; mods.home.file = ./home.nix; - nix.settings.trusted-users = [ "root" "muon" ]; # Modules mods.desktop.enable = true; @@ -44,53 +44,15 @@ in { }; # Hardware preferences - # environment.variables = { - # WINIT_HIDPI_FACTOR = "1"; - # WINIT_X11_SCALE_FACTOR = "1"; - # }; + environment.variables = { + WINIT_HIDPI_FACTOR = "1"; + WINIT_X11_SCALE_FACTOR = "1"; + }; ## Laptop powerManagement.enable = true; services.thermald.enable = true; services.tlp.enable = true; - services.xserver.dpi = lib.mkForce 180; - environment.variables = { - GDK_SCALE = "2"; - GDK_DPI_SCALE = "0.5"; - _JAVA_OPTIONS = "-Dsun.java2d.uiScale=2"; - }; - - ## Monitors - mods.monitors = { - primary = { - name = "eDP-1"; - config = { - enable = true; - mode = "2560x1600"; - position = "1264x1440"; - primary = true; - rate = "60.00"; - }; - }; - left = { - name = "DP-1-2"; - config = { - enable = true; - mode = "2560x1440"; - position = "0x0"; - rate = "60.00"; - }; - }; - right = { - name = "DP-1-1"; - config = { - enable = true; - mode = "2560x1440"; - position = "2560x0"; - rate = "60.00"; - }; - }; - }; ## Mouse services.libinput.mouse.accelProfile = "flat"; diff --git a/hosts/murk/hardware-configuration.nix b/hosts/murk/hardware-configuration.nix index 562ba28..e465f37 100644 --- a/hosts/murk/hardware-configuration.nix +++ b/hosts/murk/hardware-configuration.nix @@ -8,7 +8,7 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; diff --git a/hosts/murk/home.nix b/hosts/murk/home.nix index a46f5e3..e6bdc14 100644 --- a/hosts/murk/home.nix +++ b/hosts/murk/home.nix @@ -1,7 +1,14 @@ -{ pkgs, lib, config, osConfig, inputs, ... }: -let cfg = osConfig.mods; +{ + pkgs, + lib, + config, + osConfig, + inputs, + ... +}: let + cfg = osConfig.mods; in { - imports = [ inputs.impermanence.homeManagerModules.impermanence ]; + imports = [inputs.impermanence.homeManagerModules.impermanence]; # Modules mods.xdg.enable = true; @@ -23,27 +30,12 @@ in { docker fish - devenv ] # Non-free