From 74bbc85aeb4dcece5ff6f95cbeba118848513d25 Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Fri, 13 Feb 2026 20:22:32 -0800 Subject: [PATCH] Move laptop-specific config out of defaults --- .../x86_64-linux/alejandro@carbon/default.nix | 30 +++++++++++++++++-- .../home/windowManagers/hyprland/default.nix | 15 ---------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/homes/x86_64-linux/alejandro@carbon/default.nix b/homes/x86_64-linux/alejandro@carbon/default.nix index ff94de1..2f502d4 100644 --- a/homes/x86_64-linux/alejandro@carbon/default.nix +++ b/homes/x86_64-linux/alejandro@carbon/default.nix @@ -1,8 +1,34 @@ -{ lib, ... }: +{ lib, pkgs, ... }: +let + + internal_display_settings = "eDP-1,preferred,auto,1.6"; + clamshell_script = pkgs.writeShellScriptBin "clamshell" '' + if ${pkgs.hyprland}/bin/hyprctl monitors | ${pkgs.ripgrep}/bin/rg -q '\sDP-'; then + echo "Detected external monitor..." + if [[ "$1" == "open" ]]; then + ${pkgs.hyprland}/bin/hyprctl keyword monitor ${internal_display_settings} + else + ${pkgs.hyprland}/bin/hyprctl keyword monitor "eDP-1,disable" + fi + fi + ''; +in { aa.isHeadless = false; aa.windowManagers.sway.clamshell.enable = true; aa.programs.opencode.enable = true; - aa.windowManagers.hyprland.enable = true; + aa.windowManagers.hyprland = { + enable = true; + monitor = [ + "eDP-1,preferred,auto,1.6" + "desc:Dell Inc. DELL U4025QW BH2F734,3440x1440,auto,1" + ",preferred,auto,1" + ]; + }; aa.windowManagers.sway.enable = lib.mkForce false; + + wayland.windowManager.hyprland.settings.bindl = [ + ", switch:off:Lid Switch, exec, ${clamshell_script}/bin/clamshell open" + ", switch:on:Lid Switch, exec, ${clamshell_script}/bin/clamshell close" + ]; } diff --git a/modules/home/windowManagers/hyprland/default.nix b/modules/home/windowManagers/hyprland/default.nix index 89256f8..5919489 100644 --- a/modules/home/windowManagers/hyprland/default.nix +++ b/modules/home/windowManagers/hyprland/default.nix @@ -24,18 +24,6 @@ let emoji_picker = "${pkgs.bemoji}/bin/bemoji -t"; terminal = "${pkgs.kitty}/bin/kitty"; - internal_display_settings = "eDP-1,preferred,auto,1.6"; - clamshell_script = pkgs.writeShellScriptBin "clamshell" '' - if ${pkgs.hyprland}/bin/hyprctl monitors | ${pkgs.ripgrep}/bin/rg -q '\sDP-'; then - echo "Detected external monitor..." - if [[ "$1" == "open" ]]; then - ${pkgs.hyprland}/bin/hyprctl keyword monitor ${internal_display_settings} - else - ${pkgs.hyprland}/bin/hyprctl keyword monitor "eDP-1,disable" - fi - fi - ''; - generate_grim_command = target: '' exec mkdir -p ~/screenshots \ && ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" \ @@ -58,7 +46,6 @@ in monitor = mkOption { type = types.listOf types.str; default = [ - "eDP-1,preferred,auto,1.6" ",preferred,auto,1" ]; description = '' @@ -253,8 +240,6 @@ in ", XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause" ", XF86MonBrightnessDown, exec, ${pkgs.light}/bin/light -U 5" ", XF86MonBrightnessUp, exec, ${pkgs.light}/bin/light -A 5" - ", switch:off:Lid Switch, exec, ${clamshell_script}/bin/clamshell open" - ", switch:on:Lid Switch, exec, ${clamshell_script}/bin/clamshell close" ]; }; };