From 05f5576e1fa705b6516a03015f402da0b396bd95 Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Sat, 24 May 2025 12:24:23 +0100 Subject: [PATCH] Update Signed-off-by: Nikolaos Karaolidis --- flake.lock | 24 ++++++++-------- hosts/himalia/hardware/default.nix | 1 + hosts/himalia/hardware/display.nix | 44 +++++++++++++++--------------- submodules/home-manager | 2 +- submodules/nixpkgs | 2 +- 5 files changed, 37 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index b048db2..496290c 100644 --- a/flake.lock +++ b/flake.lock @@ -115,11 +115,11 @@ ] }, "locked": { - "lastModified": 1747835923, - "narHash": "sha256-O0bb2BKkS9wpetbcmtglXNP5bR4Ajr6FuWy8p8swzEU=", + "lastModified": 1748085832, + "narHash": "sha256-C3xlB1sX1y2IVINi+5C39c7R4jjvEcxGZ3F+vMLGid4=", "owner": "karaolidis", "repo": "home-manager", - "rev": "528ab8401e35f28a1d23e17f0b77907c75c41933", + "rev": "ad821e4ee259bf9c0f6b1df4c34deee1815f00b2", "type": "github" }, "original": { @@ -131,11 +131,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747768041, - "narHash": "sha256-skXZQa351fQzshcbmxyqWVCeLSqOZrdC6itfgsMvDpE=", + "lastModified": 1748085459, + "narHash": "sha256-kCrxWagdI86dzm/9Pe7Uu802QN0BYGJKU0nt/dg8mEY=", "owner": "karaolidis", "repo": "nixpkgs", - "rev": "51b40f904f855257df397798692a8cc9936a61a6", + "rev": "a78d0ab901acf10c7f2f012408d076a3735dafe1", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1747835559, - "narHash": "sha256-fHgqgm0IFvt2TMn87fKHU6BtIlujiLrWsvu1fnlWapU=", + "lastModified": 1748082384, + "narHash": "sha256-9xz59HYSe3p72s/mImv41sfE9AmXh7FzlqX8sfYSqZ4=", "owner": "nix-community", "repo": "NUR", - "rev": "26c6ab1b3f709f2796335951921d2ad0df069e1b", + "rev": "c34543746275e849c494be5b222ad093e32b65f2", "type": "github" }, "original": { @@ -270,11 +270,11 @@ ] }, "locked": { - "lastModified": 1747469671, - "narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=", + "lastModified": 1747912973, + "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb", + "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", "type": "github" }, "original": { diff --git a/hosts/himalia/hardware/default.nix b/hosts/himalia/hardware/default.nix index baea9b5..2e8a850 100644 --- a/hosts/himalia/hardware/default.nix +++ b/hosts/himalia/hardware/default.nix @@ -53,6 +53,7 @@ }; boot = { + kernelParams = [ "pci=noaer" ]; kernelModules = [ "kvm-intel" ]; initrd.kernelModules = [ "i915" diff --git a/hosts/himalia/hardware/display.nix b/hosts/himalia/hardware/display.nix index 952657f..6e3a765 100644 --- a/hosts/himalia/hardware/display.nix +++ b/hosts/himalia/hardware/display.nix @@ -8,31 +8,31 @@ { wayland.windowManager.hyprland.settings = { monitor = [ - "desc:Samsung Display Corp. ATNA60DL01-0, 2560x1600@240, 0x0, 1.25" - "desc:LG Electronics LG ULTRAWIDE, 5120x1440@144, -1536x-1440, 1" + "eDP-1, 2560x1600@240, 0x0, 1.25" + "HDMI-A-2, 5120x1440@144, -1536x-1440, 1" ]; workspace = [ - "1, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" - "2, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" - "3, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" - "4, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" - "5, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" - "6, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" - "7, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" - "8, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" - "9, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" - "10, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" - "11, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" - "12, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" - "13, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" - "14, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" - "15, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" - "16, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" - "17, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" - "18, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" - "19, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" - "20, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" + "1, monitor:eDP-1, layoutopt:orientation:left" + "2, monitor:eDP-1, layoutopt:orientation:left" + "3, monitor:eDP-1, layoutopt:orientation:left" + "4, monitor:eDP-1, layoutopt:orientation:left" + "5, monitor:eDP-1, layoutopt:orientation:left" + "6, monitor:eDP-1, layoutopt:orientation:left" + "7, monitor:eDP-1, layoutopt:orientation:left" + "8, monitor:eDP-1, layoutopt:orientation:left" + "9, monitor:eDP-1, layoutopt:orientation:left" + "10, monitor:eDP-1, layoutopt:orientation:left" + "11, monitor:HDMI-A-2, layoutopt:orientation:center" + "12, monitor:HDMI-A-2, layoutopt:orientation:center" + "13, monitor:HDMI-A-2, layoutopt:orientation:center" + "14, monitor:HDMI-A-2, layoutopt:orientation:center" + "15, monitor:HDMI-A-2, layoutopt:orientation:center" + "16, monitor:HDMI-A-2, layoutopt:orientation:center" + "17, monitor:HDMI-A-2, layoutopt:orientation:center" + "18, monitor:HDMI-A-2, layoutopt:orientation:center" + "19, monitor:HDMI-A-2, layoutopt:orientation:center" + "20, monitor:HDMI-A-2, layoutopt:orientation:center" ]; }; diff --git a/submodules/home-manager b/submodules/home-manager index 528ab84..ad821e4 160000 --- a/submodules/home-manager +++ b/submodules/home-manager @@ -1 +1 @@ -Subproject commit 528ab8401e35f28a1d23e17f0b77907c75c41933 +Subproject commit ad821e4ee259bf9c0f6b1df4c34deee1815f00b2 diff --git a/submodules/nixpkgs b/submodules/nixpkgs index 51b40f9..a78d0ab 160000 --- a/submodules/nixpkgs +++ b/submodules/nixpkgs @@ -1 +1 @@ -Subproject commit 51b40f904f855257df397798692a8cc9936a61a6 +Subproject commit a78d0ab901acf10c7f2f012408d076a3735dafe1