Compare commits

..

4 commits

Author SHA1 Message Date
Evie Litherland-Smith 52621fb997 Remove most uses of fractional scaling
Only keep scaling for work 4K monitor.

Increase font sizes across the board for better usability.
2024-09-17 14:20:24 +01:00
Evie Litherland-Smith 51b81c2d3c Remove most uses of fractional scaling
Only keep scaling for work 4K monitor.

Increase font sizes across the board for better usability.
2024-09-17 14:20:11 +01:00
Evie Litherland-Smith 74c9d012c9 Base waybar font size on global popup sizes 2024-09-17 14:18:36 +01:00
Evie Litherland-Smith 5d98b1c431 Increase Mako notification box sizes 2024-09-17 14:13:57 +01:00
6 changed files with 15 additions and 26 deletions

View file

@ -4,7 +4,6 @@
home-manager.users.${username} = { home-manager.users.${username} = {
home.packages = [ pkgs.prusa-slicer ]; home.packages = [ pkgs.prusa-slicer ];
wayland.windowManager.sway.config = { wayland.windowManager.sway.config = {
output."eDP-1".scale = "1.25";
workspaceOutputAssign = [ workspaceOutputAssign = [
{ {
output = "eDP-1"; output = "eDP-1";
@ -21,7 +20,6 @@
outputs = [ outputs = [
{ {
criteria = "eDP-1"; criteria = "eDP-1";
scale = 1.25;
position = "0,0"; position = "0,0";
} }
]; ];

View file

@ -4,10 +4,7 @@
home-manager.users.${username} = { home-manager.users.${username} = {
imports = [ ./home/work.nix ]; imports = [ ./home/work.nix ];
wayland.windowManager.sway.config = { wayland.windowManager.sway.config = {
output = { output."Dell Inc. DELL P3223QE CCG8YN3".scale = "1.5";
"eDP-1".scale = "1.25";
"Dell Inc. DELL P3223QE CCG8YN3".scale = "1.5";
};
workspaceOutputAssign = [ workspaceOutputAssign = [
{ {
output = "eDP-1"; output = "eDP-1";
@ -19,15 +16,8 @@
enable = true; enable = true;
settings = settings =
let let
laptopScreen = { laptopScreen.criteria = "eDP-1";
criteria = "eDP-1"; monitor.criteria = "Dell Inc. DELL P3223QE CCG8YN3";
scale = 1.25;
# position = "2560,576";
};
monitor = {
criteria = "Dell Inc. DELL P3223QE CCG8YN3";
scale = 1.5;
};
in in
[ [
{ {
@ -35,7 +25,7 @@
name = "default"; name = "default";
outputs = [ outputs = [
{ {
inherit (laptopScreen) criteria scale; inherit (laptopScreen) criteria;
status = "enable"; status = "enable";
position = "0,0"; position = "0,0";
} }
@ -47,11 +37,11 @@
name = "docked"; name = "docked";
outputs = [ outputs = [
{ {
inherit (laptopScreen) criteria scale; inherit (laptopScreen) criteria;
status = "disable"; status = "disable";
} }
{ {
inherit (monitor) criteria scale; inherit (monitor) criteria;
status = "enable"; status = "enable";
position = "0,0"; position = "0,0";
} }

View file

@ -23,7 +23,7 @@
cartridges cartridges
prismlauncher prismlauncher
(writeShellScriptBin "steamscope" '' (writeShellScriptBin "steamscope" ''
gamescope -w 2560 -h 1440 -r 165 --adaptive-sync --force-grab-cursor --fullscreen -e -- steam -gamepadui gamescope -w 2560 -h 1440 -r 120 --adaptive-sync --force-grab-cursor --fullscreen -e -- steam -gamepadui
'') '')
]; ];
programs.obs-studio = { programs.obs-studio = {
@ -39,13 +39,12 @@
output = { output = {
"Microstep MSI G27CQ4 E2 Unknown" = { "Microstep MSI G27CQ4 E2 Unknown" = {
mode = "2560x1440@120Hz"; mode = "2560x1440@120Hz";
scale = "1.25";
position = "1920 0"; position = "1920 0";
adaptive_sync = "on"; adaptive_sync = "on";
}; };
"Acer Technologies ED270R TJMEE0043W01" = { "Acer Technologies ED270R TJMEE0043W01" = {
mode = "1920x1080@120Hz"; mode = "1920x1080@120Hz";
position = "0 140"; position = "0 360";
adaptive_sync = "off"; adaptive_sync = "off";
}; };
}; };

View file

@ -152,10 +152,10 @@
{ {
inherit monospace serif sansSerif; inherit monospace serif sansSerif;
sizes = { sizes = {
applications = 12; applications = 16;
desktop = 10; desktop = 14;
popups = 14; popups = 18;
terminal = 12; terminal = 16;
}; };
}; };
}; };

View file

@ -13,6 +13,8 @@
enable = true; enable = true;
anchor = "top-right"; anchor = "top-right";
font = "${fonts.monospace.name} ${toString fonts.sizes.popups}"; font = "${fonts.monospace.name} ${toString fonts.sizes.popups}";
width = 600;
height = 600;
layer = "top"; layer = "top";
markup = true; markup = true;
maxVisible = 10; maxVisible = 10;

View file

@ -280,7 +280,7 @@
'' ''
* { * {
all: unset; all: unset;
font-size: 1em; font-size: ${toString (fonts.sizes.popups + 2)}px;
font-family: ${fonts.monospace.name}; font-family: ${fonts.monospace.name};
} }