From dfb61b24a66069d0548e5ec9bf36d4749289949a Mon Sep 17 00:00:00 2001 From: muon Date: Tue, 5 Aug 2025 14:26:57 +0000 Subject: [PATCH 1/2] Setup monitor --- hosts/murk/configuration.nix | 47 ++++++++++++++++++++++++--- hosts/murk/hardware-configuration.nix | 2 +- hosts/murk/home.nix | 44 ++++++++++++++++++------- 3 files changed, 76 insertions(+), 17 deletions(-) diff --git a/hosts/murk/configuration.nix b/hosts/murk/configuration.nix index 84c0a2f..3088570 100644 --- a/hosts/murk/configuration.nix +++ b/hosts/murk/configuration.nix @@ -1,6 +1,5 @@ { config, lib, pkgs, inputs, system, sources, modulesPath, ... }: let cfg = config.mods; - in { # Hardware imports = [ @@ -44,15 +43,53 @@ 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 e465f37..562ba28 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" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; diff --git a/hosts/murk/home.nix b/hosts/murk/home.nix index e6bdc14..4171b70 100644 --- a/hosts/murk/home.nix +++ b/hosts/murk/home.nix @@ -1,14 +1,7 @@ -{ - 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; @@ -32,10 +25,24 @@ in { fish ] # Non-free Date: Tue, 5 Aug 2025 16:14:47 +0000 Subject: [PATCH 2/2] Add ruff --- hosts/murk/configuration.nix | 1 + hosts/murk/home.nix | 1 + modules/home/terminal/development.nix | 25 ++++++++++--------------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/hosts/murk/configuration.nix b/hosts/murk/configuration.nix index 3088570..2376c07 100644 --- a/hosts/murk/configuration.nix +++ b/hosts/murk/configuration.nix @@ -24,6 +24,7 @@ in { networking.hostName = "murk"; networking.hostId = "a2309090"; mods.home.file = ./home.nix; + nix.settings.trusted-users = [ "root" "muon" ]; # Modules mods.desktop.enable = true; diff --git a/hosts/murk/home.nix b/hosts/murk/home.nix index 4171b70..a46f5e3 100644 --- a/hosts/murk/home.nix +++ b/hosts/murk/home.nix @@ -23,6 +23,7 @@ in { docker fish + devenv ] # Non-free