this commit implements the setting of the gb layout on alyxs machines that have british keyboards whilst leaving mayas devices on us / alyx's that have us keyboards. it also implements the way to set display configurations per user, allowing alyx to have her display configuration and maya to have her own without conflict! as well as this, waybar configurations for each user are properly put in, terminal and terminal.css being alyx's and modern and modern.css being mayas. these are placeholder names, as i am not exactly sure what to name them
This commit is contained in:
parent
7b44141da2
commit
75bae99f01
6 changed files with 300 additions and 50 deletions
|
|
@ -2,10 +2,6 @@
|
|||
xdg.portal = {
|
||||
enable = true;
|
||||
config.niri = {
|
||||
default = [ "gnome" "gtk" ];
|
||||
"org.freedesktop.impl.portal.Access" = [ "gtk" ];
|
||||
"org.freedesktop.impl.portal.Notification" = [ "gtk" ];
|
||||
"org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
|
||||
"org.freedesktop.impl.portal.FileChooser" = [ "gtk" ];
|
||||
};
|
||||
extraPortals = with pkgs; [
|
||||
|
|
@ -26,7 +22,7 @@
|
|||
accel-profile = "flat";
|
||||
};
|
||||
prefer-no-csd = true;
|
||||
input.keyboard.xkb.layout = "gb";
|
||||
input.keyboard.xkb.layout = (if vars.user == "alyx" && !vars.isTough then "gb" else "us");
|
||||
input.focus-follows-mouse.enable = true;
|
||||
binds = with config.lib.niri.actions; lib.mkDefault {
|
||||
"Mod+Return".action = spawn "foot";
|
||||
|
|
@ -245,33 +241,49 @@
|
|||
# moving the mouse or pressing any other key.
|
||||
"Mod+Shift+P".action.power-off-monitors = {};
|
||||
};
|
||||
outputs.DP-1 = {
|
||||
mode = {
|
||||
height = 1080;
|
||||
refresh = 239.76;
|
||||
width = 1920;
|
||||
outputs = (if vars.user == "alyx" then {
|
||||
DP-1 = {
|
||||
mode = {
|
||||
height = 1080;
|
||||
refresh = 239.76;
|
||||
width = 1920;
|
||||
};
|
||||
position = {
|
||||
x = 2560;
|
||||
y = 0;
|
||||
};
|
||||
};
|
||||
position = {
|
||||
x = 2560;
|
||||
y = 0;
|
||||
DP-4 = {
|
||||
mode = {
|
||||
height = 1080;
|
||||
refresh = 75.0;
|
||||
width = 2560;
|
||||
};
|
||||
position = {
|
||||
x = 0;
|
||||
y = 0;
|
||||
};
|
||||
};
|
||||
};
|
||||
outputs.DP-4 = {
|
||||
mode = {
|
||||
height = 1080;
|
||||
refresh = 75.0;
|
||||
width = 2560;
|
||||
}
|
||||
else {
|
||||
DP-1 = {
|
||||
mode = {
|
||||
height = 1080;
|
||||
refresh = 239.76;
|
||||
width = 1920;
|
||||
};
|
||||
position = {
|
||||
x = 2560;
|
||||
y = 0;
|
||||
};
|
||||
};
|
||||
position = {
|
||||
x = 0;
|
||||
y = 0;
|
||||
};
|
||||
};
|
||||
});
|
||||
spawn-at-startup = [
|
||||
{command = ["waybar"];}
|
||||
{command = ["xwayland-satellite"];}
|
||||
{command = if !vars.isTough then ["swaybg" "-m" "fill" "-i" "/home/alyx/.config/nixos/assets/scenes.jpg"] else ["swaybg" "-m" "fill" "-i" "/home/alyx/.config/nixos/assets/scenes.jpg"];}
|
||||
{command = ["udiskie" "--appindicator"];}
|
||||
{command = [ "systemctl" "--user" "restart" "xdg-desktop-portal-gnome.service"];}
|
||||
];
|
||||
environment = {
|
||||
DISPLAY = ":0";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue