Update a lot of options, simplify variables, replace options with tags
This commit is contained in:
parent
dbc0ab6dd3
commit
7667ef9a1b
147 changed files with 663 additions and 928 deletions
|
|
@ -8,7 +8,7 @@
|
|||
in {
|
||||
# Hotkeys
|
||||
modifier = "${primeMod}";
|
||||
keybindings = {
|
||||
keybindings = with config.vars.ws; {
|
||||
## Launchers
|
||||
|
||||
# Browser
|
||||
|
|
@ -78,50 +78,50 @@
|
|||
"${primeMod}+Shift+r" = ''reload'';
|
||||
|
||||
# Switch to workspaces
|
||||
"${primeMod}+grave" = ''workspace 0:${config.ws.w0}'';
|
||||
"${primeMod}+1" = ''workspace 1:${config.ws.w1}'';
|
||||
"${primeMod}+2" = ''workspace 2:${config.ws.w2}'';
|
||||
"${primeMod}+3" = ''workspace 3:${config.ws.w3}'';
|
||||
"${primeMod}+4" = ''workspace 4:${config.ws.w4}'';
|
||||
"${primeMod}+5" = ''workspace 5:${config.ws.w5}'';
|
||||
"${primeMod}+6" = ''workspace 6:${config.ws.w6}'';
|
||||
"${primeMod}+7" = ''workspace 7:${config.ws.w7}'';
|
||||
"${primeMod}+8" = ''workspace 8:${config.ws.w8}'';
|
||||
"${primeMod}+9" = ''workspace 9:${config.ws.w9}'';
|
||||
"${primeMod}+grave" = ''workspace 0:${w0}'';
|
||||
"${primeMod}+1" = ''workspace 1:${w1}'';
|
||||
"${primeMod}+2" = ''workspace 2:${w2}'';
|
||||
"${primeMod}+3" = ''workspace 3:${w3}'';
|
||||
"${primeMod}+4" = ''workspace 4:${w4}'';
|
||||
"${primeMod}+5" = ''workspace 5:${w5}'';
|
||||
"${primeMod}+6" = ''workspace 6:${w6}'';
|
||||
"${primeMod}+7" = ''workspace 7:${w7}'';
|
||||
"${primeMod}+8" = ''workspace 8:${w8}'';
|
||||
"${primeMod}+9" = ''workspace 9:${w9}'';
|
||||
|
||||
# Switch to alternate workspaces
|
||||
"${secMod}+F1" = ''workspace 11:${config.ws.w1a}'';
|
||||
"${secMod}+F2" = ''workspace 22:${config.ws.w2a}'';
|
||||
"${secMod}+F3" = ''workspace 33:${config.ws.w3a}'';
|
||||
"${secMod}+F4" = ''workspace 44:${config.ws.w4a}'';
|
||||
"${secMod}+F5" = ''workspace 55:${config.ws.w5a}'';
|
||||
"${secMod}+F6" = ''workspace 66:${config.ws.w6a}'';
|
||||
"${secMod}+F7" = ''workspace 77:${config.ws.w7a}'';
|
||||
"${secMod}+F8" = ''workspace 88:${config.ws.w8a}'';
|
||||
"${secMod}+F9" = ''workspace 99:${config.ws.w9a}'';
|
||||
"${secMod}+F1" = ''workspace 11:${w1a}'';
|
||||
"${secMod}+F2" = ''workspace 22:${w2a}'';
|
||||
"${secMod}+F3" = ''workspace 33:${w3a}'';
|
||||
"${secMod}+F4" = ''workspace 44:${w4a}'';
|
||||
"${secMod}+F5" = ''workspace 55:${w5a}'';
|
||||
"${secMod}+F6" = ''workspace 66:${w6a}'';
|
||||
"${secMod}+F7" = ''workspace 77:${w7a}'';
|
||||
"${secMod}+F8" = ''workspace 88:${w8a}'';
|
||||
"${secMod}+F9" = ''workspace 99:${w9a}'';
|
||||
|
||||
# Move window to and focus workspace
|
||||
"${primeMod}+Shift+grave" = ''move container to workspace 0:${config.ws.w0}; workspace 0:${config.ws.w0}'';
|
||||
"${primeMod}+Shift+1" = ''move container to workspace 1:${config.ws.w1}; workspace 1:${config.ws.w1}'';
|
||||
"${primeMod}+Shift+2" = ''move container to workspace 2:${config.ws.w2}; workspace 2:${config.ws.w2}'';
|
||||
"${primeMod}+Shift+3" = ''move container to workspace 3:${config.ws.w3}; workspace 3:${config.ws.w3}'';
|
||||
"${primeMod}+Shift+4" = ''move container to workspace 4:${config.ws.w4}; workspace 4:${config.ws.w4}'';
|
||||
"${primeMod}+Shift+5" = ''move container to workspace 5:${config.ws.w5}; workspace 5:${config.ws.w5}'';
|
||||
"${primeMod}+Shift+6" = ''move container to workspace 6:${config.ws.w6}; workspace 6:${config.ws.w6}'';
|
||||
"${primeMod}+Shift+7" = ''move container to workspace 7:${config.ws.w7}; workspace 7:${config.ws.w7}'';
|
||||
"${primeMod}+Shift+8" = ''move container to workspace 8:${config.ws.w8}; workspace 8:${config.ws.w8}'';
|
||||
"${primeMod}+Shift+9" = ''move container to workspace 9:${config.ws.w9}; workspace 9:${config.ws.w9}'';
|
||||
"${primeMod}+Shift+grave" = ''move container to workspace 0:${w0}; workspace 0:${w0}'';
|
||||
"${primeMod}+Shift+1" = ''move container to workspace 1:${w1}; workspace 1:${w1}'';
|
||||
"${primeMod}+Shift+2" = ''move container to workspace 2:${w2}; workspace 2:${w2}'';
|
||||
"${primeMod}+Shift+3" = ''move container to workspace 3:${w3}; workspace 3:${w3}'';
|
||||
"${primeMod}+Shift+4" = ''move container to workspace 4:${w4}; workspace 4:${w4}'';
|
||||
"${primeMod}+Shift+5" = ''move container to workspace 5:${w5}; workspace 5:${w5}'';
|
||||
"${primeMod}+Shift+6" = ''move container to workspace 6:${w6}; workspace 6:${w6}'';
|
||||
"${primeMod}+Shift+7" = ''move container to workspace 7:${w7}; workspace 7:${w7}'';
|
||||
"${primeMod}+Shift+8" = ''move container to workspace 8:${w8}; workspace 8:${w8}'';
|
||||
"${primeMod}+Shift+9" = ''move container to workspace 9:${w9}; workspace 9:${w9}'';
|
||||
|
||||
# Move window to and focus alternate workspace
|
||||
"${secMod}+Shift+F1" = ''move container to workspace 11:${config.ws.w1a}; workspace 11:${config.ws.w1a}'';
|
||||
"${secMod}+Shift+F2" = ''move container to workspace 22:${config.ws.w2a}; workspace 22:${config.ws.w2a}'';
|
||||
"${secMod}+Shift+F3" = ''move container to workspace 33:${config.ws.w3a}; workspace 33:${config.ws.w3a}'';
|
||||
"${secMod}+Shift+F4" = ''move container to workspace 44:${config.ws.w4a}; workspace 44:${config.ws.w4a}'';
|
||||
"${secMod}+Shift+F5" = ''move container to workspace 55:${config.ws.w5a}; workspace 55:${config.ws.w5a}'';
|
||||
"${secMod}+Shift+F6" = ''move container to workspace 66:${config.ws.w6a}; workspace 66:${config.ws.w6a}'';
|
||||
"${secMod}+Shift+F7" = ''move container to workspace 77:${config.ws.w7a}; workspace 77:${config.ws.w7a}'';
|
||||
"${secMod}+Shift+F8" = ''move container to workspace 88:${config.ws.w8a}; workspace 88:${config.ws.w8a}'';
|
||||
"${secMod}+Shift+F9" = ''move container to workspace 99:${config.ws.w9a}; workspace 99:${config.ws.w9a}'';
|
||||
"${secMod}+Shift+F1" = ''move container to workspace 11:${w1a}; workspace 11:${w1a}'';
|
||||
"${secMod}+Shift+F2" = ''move container to workspace 22:${w2a}; workspace 22:${w2a}'';
|
||||
"${secMod}+Shift+F3" = ''move container to workspace 33:${w3a}; workspace 33:${w3a}'';
|
||||
"${secMod}+Shift+F4" = ''move container to workspace 44:${w4a}; workspace 44:${w4a}'';
|
||||
"${secMod}+Shift+F5" = ''move container to workspace 55:${w5a}; workspace 55:${w5a}'';
|
||||
"${secMod}+Shift+F6" = ''move container to workspace 66:${w6a}; workspace 66:${w6a}'';
|
||||
"${secMod}+Shift+F7" = ''move container to workspace 77:${w7a}; workspace 77:${w7a}'';
|
||||
"${secMod}+Shift+F8" = ''move container to workspace 88:${w8a}; workspace 88:${w8a}'';
|
||||
"${secMod}+Shift+F9" = ''move container to workspace 99:${w9a}; workspace 99:${w9a}'';
|
||||
|
||||
# Change focused window
|
||||
"${primeMod}+h" = ''focus left'';
|
||||
|
|
|
|||
|
|
@ -2,47 +2,42 @@
|
|||
{
|
||||
# Monitors
|
||||
wayland.windowManager.sway.config = {
|
||||
workspaceOutputAssign = let
|
||||
workspaceOutputAssign = with config.vars.ws; with config.vars.displays; let
|
||||
workspaces1 = [
|
||||
"0:${config.ws.w0}"
|
||||
"1:${config.ws.w1}"
|
||||
"2:${config.ws.w2}"
|
||||
"3:${config.ws.w3}"
|
||||
"11:${config.ws.w1a}"
|
||||
"22:${config.ws.w2a}"
|
||||
"33:${config.ws.w3a}"
|
||||
"0:${w0}"
|
||||
"1:${w1}"
|
||||
"2:${w2}"
|
||||
"3:${w3}"
|
||||
"11:${w1a}"
|
||||
"22:${w2a}"
|
||||
"33:${w3a}"
|
||||
];
|
||||
workspaces2 = [
|
||||
"4:${config.ws.w4}"
|
||||
"5:${config.ws.w5}"
|
||||
"6:${config.ws.w6}"
|
||||
"44:${config.ws.w4a}"
|
||||
"55:${config.ws.w5a}"
|
||||
"4:${w4}"
|
||||
"5:${w5}"
|
||||
"6:${w6}"
|
||||
"44:${w4a}"
|
||||
"55:${w5a}"
|
||||
];
|
||||
workspaces3 = [
|
||||
"7:${config.ws.w7}"
|
||||
"8:${config.ws.w8}"
|
||||
"9:${config.ws.w9}"
|
||||
"77:${config.ws.w7a}"
|
||||
"88:${config.ws.w8a}"
|
||||
"7:${w7}"
|
||||
"8:${w8}"
|
||||
"9:${w9}"
|
||||
"77:${w7a}"
|
||||
"88:${w8a}"
|
||||
];
|
||||
workspaces4 = [
|
||||
"66:${config.ws.w6a}"
|
||||
"99:${config.ws.w9a}"
|
||||
"66:${w6a}"
|
||||
"99:${w9a}"
|
||||
];
|
||||
assign = output: workspaces: map (workspace: {
|
||||
inherit workspace;
|
||||
inherit output;
|
||||
}) workspaces;
|
||||
in
|
||||
(assign "${config.displays.tower1}" workspaces1) ++
|
||||
(assign "${config.displays.tower2}" workspaces2) ++
|
||||
(assign "${config.displays.tower3}" workspaces3) ++
|
||||
(assign "${config.displays.tower4}" workspaces4) ++
|
||||
|
||||
(assign "${config.displays.detritus1}" workspaces1) ++
|
||||
(assign "${config.displays.detritus1}" workspaces2) ++
|
||||
(assign "${config.displays.detritus2}" workspaces3) ++
|
||||
(assign "${config.displays.detritus2}" workspaces4);
|
||||
(assign "${tower1}" workspaces1) ++
|
||||
(assign "${tower2}" workspaces2) ++
|
||||
(assign "${tower3}" workspaces3) ++
|
||||
(assign "${tower4}" workspaces4);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ config, ... }:
|
||||
{
|
||||
wayland.windowManager.sway.config = {
|
||||
defaultWorkspace = "workspace 1:${config.ws.w1}";
|
||||
wayland.windowManager.sway.config = with config.vars.ws; {
|
||||
defaultWorkspace = "workspace 1:${w1}";
|
||||
|
||||
focus = {
|
||||
mouseWarping = "container";
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
# Give apps that don't have them borders
|
||||
{
|
||||
criteria = { con_mark = "giveborder"; };
|
||||
command = ''border pixel ${config.look.border.string}'';
|
||||
command = ''border pixel ${config.vars.border.string}'';
|
||||
}
|
||||
{
|
||||
criteria = { class = "steam"; };
|
||||
|
|
@ -56,22 +56,22 @@
|
|||
};
|
||||
assigns = {
|
||||
# Browser
|
||||
"1:${config.ws.w1}" = [{ app_id = "librewolf"; }];
|
||||
"1:${w1}" = [{ app_id = "librewolf"; }];
|
||||
|
||||
# Communication
|
||||
"7:${config.ws.w7}" = [
|
||||
"7:${w7}" = [
|
||||
{ app_id = "teams-for-linux"; }
|
||||
{ app_id = "vesktop"; }
|
||||
{ class = "vesktop"; }
|
||||
];
|
||||
"9:${config.ws.w9}" = [{ app_id = "thunderbird"; }];
|
||||
"9:${w9}" = [{ app_id = "thunderbird"; }];
|
||||
|
||||
# Etc
|
||||
"2:${config.ws.w2}" = [
|
||||
"2:${w2}" = [
|
||||
{ class = "steam"; }
|
||||
{ app_id = "heroic"; }
|
||||
];
|
||||
"44:${config.ws.w4a}" = [{ app_id = "com.obsproject.Studio"; }];
|
||||
"44:${w4a}" = [{ app_id = "com.obsproject.Studio"; }];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,49 +3,49 @@
|
|||
wayland.windowManager.sway.config = {
|
||||
colors = {
|
||||
focused = {
|
||||
border = "#${config.look.colors.prime}";
|
||||
background = "#${config.look.colors.prime}";
|
||||
border = "#${config.vars.colors.prime}";
|
||||
background = "#${config.vars.colors.prime}";
|
||||
text = "#FFFFFF";
|
||||
indicator = "#${config.look.colors.actSplit}";
|
||||
childBorder = "#${config.look.colors.prime}";
|
||||
indicator = "#${config.vars.colors.actSplit}";
|
||||
childBorder = "#${config.vars.colors.prime}";
|
||||
};
|
||||
focusedInactive = {
|
||||
border = "#${config.look.colors.accent}";
|
||||
background = "#${config.look.colors.accent}";
|
||||
text = "#${config.look.colors.text}";
|
||||
indicator = "#${config.look.colors.split}";
|
||||
childBorder = "#${config.look.colors.accent}";
|
||||
border = "#${config.vars.colors.accent}";
|
||||
background = "#${config.vars.colors.accent}";
|
||||
text = "#${config.vars.colors.text}";
|
||||
indicator = "#${config.vars.colors.split}";
|
||||
childBorder = "#${config.vars.colors.accent}";
|
||||
};
|
||||
unfocused = {
|
||||
border = "#${config.look.colors.dark}";
|
||||
background = "#${config.look.colors.dark}";
|
||||
text = "#${config.look.colors.text}";
|
||||
indicator = "#${config.look.colors.split}";
|
||||
childBorder = "#${config.look.colors.split}";
|
||||
border = "#${config.vars.colors.dark}";
|
||||
background = "#${config.vars.colors.dark}";
|
||||
text = "#${config.vars.colors.text}";
|
||||
indicator = "#${config.vars.colors.split}";
|
||||
childBorder = "#${config.vars.colors.split}";
|
||||
};
|
||||
urgent = {
|
||||
border = "#${config.look.colors.urgent}";
|
||||
background = "#${config.look.colors.urgent}";
|
||||
text = "#${config.look.colors.text}";
|
||||
indicator = "#${config.look.colors.urgent}";
|
||||
childBorder = "#${config.look.colors.urgent}";
|
||||
border = "#${config.vars.colors.urgent}";
|
||||
background = "#${config.vars.colors.urgent}";
|
||||
text = "#${config.vars.colors.text}";
|
||||
indicator = "#${config.vars.colors.urgent}";
|
||||
childBorder = "#${config.vars.colors.urgent}";
|
||||
};
|
||||
};
|
||||
|
||||
bars = [ ];
|
||||
|
||||
fonts = {
|
||||
names = [ config.look.fonts.main ];
|
||||
names = [ config.vars.fonts.main ];
|
||||
size = 10.5;
|
||||
};
|
||||
|
||||
window = {
|
||||
border = config.look.border.int;
|
||||
border = config.vars.border.int;
|
||||
hideEdgeBorders = "smart";
|
||||
};
|
||||
|
||||
floating = {
|
||||
border = config.look.border.int;
|
||||
border = config.vars.border.int;
|
||||
titlebar = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue