pain and suffering

This commit is contained in:
2026-01-06 19:56:41 +00:00
parent 47cd19b701
commit f7e26a9793
14 changed files with 891 additions and 122 deletions

View File

@@ -9,8 +9,10 @@
}:
let
hypr-package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
hypr-portal = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
hypr-split = inputs.hyprland-hyprsplit.packages.${pkgs.stdenv.hostPlatform.system}.split-monitor-workspaces;
hypr-portal =
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
hypr-split =
inputs.hyprland-hyprsplit.packages.${pkgs.stdenv.hostPlatform.system}.split-monitor-workspaces;
#hyprscrolling = inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprscrolling;
mod = "Alt";
terminal = "footclient";
@@ -18,7 +20,7 @@ let
#runner = "${lib.getExe caelestia-cli} shell drawers toggle launcher";
runner = "vicinae toggle";
# runner = "anyrun";
browser = "firefox";
browser = "brave";
editor = "emacsclient -c";
in
{
@@ -36,50 +38,49 @@ in
##########################################################################
# Monitors
##########################################################################
source = "./dms/outputs.conf";
#source = "./dms/outputs.conf";
# See https://wiki.hyprland.org/Configuring/Monitors/
#monitor = lib.mkMerge [
# #(lib.mkIf (systemName == "laptop") [ "eDP-1,1920x1080@59.99700,0x0,1" ])
# (lib.mkIf (systemName == "pc") [
# "HDMI-A-2, disable"
# ])
#];
monitor = lib.mkMerge [
#(lib.mkIf (systemName == "laptop") [ "eDP-1,1920x1080@59.99700,0x0,1" ])
(lib.mkIf (systemName == "pc") [
"HDMI-A-2, disable"
])
];
#monitorv2 =
# [ ]
# ++ lib.optional (systemName == "laptop") {
# output = "eDP-1";
# mode = "1920x1080@59.99700";
# scale = 1;
# position = "0x0";
# }
# ++ lib.optional (systemName == "pc") {
# output = "DP-1";
# mode = "2560x1440@239.97";
# position = "2560x0"; # "1440x750"; # Corrected from 2569x0 for seamless alignment
# scale = 1;
# #supports_wide_color = 1;
# bitdepth = 10;
# cm = "hdr";
# supports_hdr = true;
# supports_wide_color = true;
# sdr_min_luminance = 0; # For true black on OLED
# sdr_max_luminance = 275; # Matches typical SDR brightness
# min_luminance = 0;
# max_luminance = 1000; # HDR peak
# max_avg_luminance = 400; # Average frame luminance
# sdrbrightness = 1.2; # Slight boost to avoid washed out look
# sdrsaturation = 1.0;
# #transform = 2; # Uncomment if needed
# }
# ++ lib.optional (systemName == "pc") {
# output = "DP-2";
# mode = "2560x1440@144";
# scale = 1;
# position = "0x0";
# transform = 0;
# };
monitorv2 =
[ ]
++ lib.optional (systemName == "laptop") {
output = "eDP-1";
mode = "1920x1080@59.99700";
scale = 1;
position = "0x0";
}
++ lib.optional (systemName == "pc") {
output = "DP-1";
mode = "2560x1440@239.97";
position = "2560x0"; # "1440x750"; # Corrected from 2569x0 for seamless alignment
scale = 1;
#supports_wide_color = 1;
bitdepth = 10;
cm = "wide";
supports_hdr = true;
supports_wide_color = true;
sdr_min_luminance = 0; # For true black on OLED
sdr_max_luminance = 275; # Matches typical SDR brightness
min_luminance = 0;
max_luminance = 1000; # HDR peak
max_avg_luminance = 400; # Average frame luminance
sdrbrightness = 1.2; # Slight boost to avoid washed out look
sdrsaturation = 1.0;
}
++ lib.optional (systemName == "pc") {
output = "DP-2";
mode = "2560x1440@144";
scale = 1;
position = "0x0";
transform = 0;
};
##########################################################################
# Autostart
@@ -90,7 +91,9 @@ in
exec-once = [
# "waybar"
# "quickshell"
"${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
#"${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
"${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1"
"${pkgs.kdePackages.kwallet-pam}/libexec/pam_kwallet_init"
"fcitx5 -d"
"foot -s"
"systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS WAYLAND_DISPLAY XDG_SESSION_TYPE XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP QT_QPA_PLATFORMTHEME GTK_THEME"
@@ -294,7 +297,6 @@ in
# ",Print, exec, grim -g \"$(slurp)\" - | swappy -f -"
",Print, exec, dms screenshot"
"${mod}, f1, exec, dms ipc call keybinds toggle hyprland"
# Dwindle
"${mod}, P, pseudo, "