diff --git a/flake.nix b/flake.nix index 60a9e32..f04dbc6 100755 --- a/flake.nix +++ b/flake.nix @@ -89,14 +89,14 @@ bright = (0.5); alter = let f = rice.lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; }; ccolor = builtins.mapAttrs alter { - black = "#111111"; - white = "#dddddd"; - blue = "#1111dd"; - cyan = "#11dddd"; - green = "#11dd11"; - magenta = "#dd11dd"; - red = "#dd1111"; - yellow = "#dddd11"; + black = "#001100"; # "#111111"; + white = "#00dd00"; # "#dddddd"; + blue = "#003300"; # "#1111dd"; + cyan = "#00dd55"; # "#11dddd"; + green = "#11dd11"; # "#11dd11"; + magenta = "#005500"; # "#dd11dd"; + red = "#00aa00"; # "#dd1111"; + yellow = "#006633"; # "#dddd11"; }; xcolor = with ccolor; { background = black.dark; diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index 0db2de3..7230ca0 100755 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -37,6 +37,14 @@ let scale = "1.0"; }; }; + ace = { + main = { + name = "HDMI-A-1"; + resolution = "3840x2160"; + position = "0x0"; + scale = "1.0"; + }; + }; }; in lib.mkIf (user != "tv") @@ -70,17 +78,19 @@ lib.mkIf (user != "tv") if host == "NxXPS" then [ "${monitors.xps.main.name}, ${monitors.xps.main.resolution}, ${monitors.xps.main.position}, ${monitors.xps.main.scale}" "${monitors.xps.second.name}, ${monitors.xps.second.resolution}, ${monitors.xps.second.position}, ${monitors.xps.second.scale}" - ] else [ + ] else if host == "NxNORTH" then [ "${monitors.north.main.name}, ${monitors.north.main.resolution}, ${monitors.north.main.position}, ${monitors.north.main.scale}" "${monitors.north.left.name}, ${monitors.north.left.resolution}, ${monitors.north.left.position}, ${monitors.north.left.scale}" "${monitors.north.right.name}, ${monitors.north.right.resolution}, ${monitors.north.right.position}, ${monitors.north.right.scale}" + ] else [ + "${monitors.ace.main.name}, ${monitors.ace.main.resolution}, ${monitors.ace.main.position}, ${monitors.ace.main.scale}" ]; workspace = let - d1 = if host == "NxXPS" then monitors.xps.main.name else monitors.north.main.name; - d2 = if host == "NxXPS" then monitors.xps.second.name else monitors.north.left.name; - d3 = if host == "NxXPS" then monitors.xps.main.name else monitors.north.right.name; + d1 = if host == "NxXPS" then monitors.xps.main.name else if host == "NxNORTH" then monitors.north.main.name else monitors.ace.main; + d2 = if host == "NxXPS" then monitors.xps.second.name else if host == "NxNORTH" then monitors.north.left.name else monitors.ace.main; + d3 = if host == "NxXPS" then monitors.xps.main.name else if host == "NxNORTH" then monitors.north.right.name else monitors.ace.main; compact = "gapsin:0, gapsout:0, bordersize:1, rounding:false"; in [