Compare commits

..

No commits in common. "52621fb997b99fa03d8ae98b00e5afd2e9abb7b8" and "38685897eb6f7d420063f3f8ea4a8de0872e56fc" have entirely different histories.

6 changed files with 26 additions and 15 deletions

View file

@ -4,6 +4,7 @@
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";
@ -20,6 +21,7 @@
outputs = [ outputs = [
{ {
criteria = "eDP-1"; criteria = "eDP-1";
scale = 1.25;
position = "0,0"; position = "0,0";
} }
]; ];

View file

@ -4,7 +4,10 @@
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."Dell Inc. DELL P3223QE CCG8YN3".scale = "1.5"; output = {
"eDP-1".scale = "1.25";
"Dell Inc. DELL P3223QE CCG8YN3".scale = "1.5";
};
workspaceOutputAssign = [ workspaceOutputAssign = [
{ {
output = "eDP-1"; output = "eDP-1";
@ -16,8 +19,15 @@
enable = true; enable = true;
settings = settings =
let let
laptopScreen.criteria = "eDP-1"; laptopScreen = {
monitor.criteria = "Dell Inc. DELL P3223QE CCG8YN3"; criteria = "eDP-1";
scale = 1.25;
# position = "2560,576";
};
monitor = {
criteria = "Dell Inc. DELL P3223QE CCG8YN3";
scale = 1.5;
};
in in
[ [
{ {
@ -25,7 +35,7 @@
name = "default"; name = "default";
outputs = [ outputs = [
{ {
inherit (laptopScreen) criteria; inherit (laptopScreen) criteria scale;
status = "enable"; status = "enable";
position = "0,0"; position = "0,0";
} }
@ -37,11 +47,11 @@
name = "docked"; name = "docked";
outputs = [ outputs = [
{ {
inherit (laptopScreen) criteria; inherit (laptopScreen) criteria scale;
status = "disable"; status = "disable";
} }
{ {
inherit (monitor) criteria; inherit (monitor) criteria scale;
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 120 --adaptive-sync --force-grab-cursor --fullscreen -e -- steam -gamepadui gamescope -w 2560 -h 1440 -r 165 --adaptive-sync --force-grab-cursor --fullscreen -e -- steam -gamepadui
'') '')
]; ];
programs.obs-studio = { programs.obs-studio = {
@ -39,12 +39,13 @@
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 360"; position = "0 140";
adaptive_sync = "off"; adaptive_sync = "off";
}; };
}; };

View file

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

View file

@ -13,8 +13,6 @@
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: ${toString (fonts.sizes.popups + 2)}px; font-size: 1em;
font-family: ${fonts.monospace.name}; font-family: ${fonts.monospace.name};
} }