Bun/nixos-config
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update a lot of options, simplify variables, replace options with tags

Browse source
This commit is contained in:
Bun 2025-06-04 16:12:08 -04:00
parent dbc0ab6dd3
commit 7667ef9a1b
147 changed files with 663 additions and 928 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/home/wms/programs/kanshi/default.nix
View file

@ -2,11 +2,11 @@
{
services.kanshi = {
enable = config.home.desktop.enable;
settings = [
settings = with config.vars.displays; [
# Outputs
{
output = {
criteria = config.displays.tower1;
criteria = tower1;
adaptiveSync = true;
mode = "1920x1080@143.979996Hz";
};
@ -18,20 +18,20 @@
name = "tower-tv";
outputs = [
{
criteria = config.displays.tower1;
criteria = tower1;
position = "3840,405";
}
{
criteria = config.displays.tower2;
criteria = tower2;
position = "1920,405";
}
{
criteria = config.displays.tower3;
criteria = tower3;
position = "5760,0";
transform = "90";
}
{
criteria = config.displays.tower4;
criteria = tower4;
position = "0,405";
}
];
@ -42,15 +42,15 @@
name = "tower";
outputs = [
{
criteria = config.displays.tower1;
criteria = tower1;
position = "1920,405";
}
{
criteria = config.displays.tower2;
criteria = tower2;
position = "0,405";
}
{
criteria = config.displays.tower3;
criteria = tower3;
position = "3840,0";
transform = "90";
}
@ -63,11 +63,11 @@
name = "detritus";
outputs = [
{
criteria = config.displays.detritus1;
criteria = detritus1;
position = "0,0";
}
{
criteria = config.displays.detritus2;
criteria = detritus2;
position = "1920,0";
scale = 0.85;
}

8
modules/home/wms/programs/mako/default.nix
View file

@ -4,10 +4,10 @@
enable = config.home.desktop.enable;
settings = {
# Theme
background-color = "#${config.look.colors.dark}D9";
border-color = "#${config.look.colors.accent}";
border-size = config.look.border.int;
font = "${config.look.fonts.main} 12";
background-color = "#${config.vars.colors.dark}D9";
border-color = "#${config.vars.colors.accent}";
border-size = config.vars.border.int;
font = "${config.vars.fonts.main} 12";
margin = 0;
max-icon-size = 40;
outer-margin = 10;

28
modules/home/wms/programs/rofi/default.nix
View file

@ -7,7 +7,7 @@
enable = true;
package = pkgs.rofi-wayland;
terminal = "foot";
font = "${config.look.fonts.main} 14";
font = "${config.vars.fonts.main} 14";
theme = let
inherit (config.lib.formats.rasi) mkLiteral;
in {
@ -18,24 +18,24 @@
red = mkLiteral "#DC322F";
background-color = mkLiteral "#00000000";
separatorcolor = mkLiteral "#00000000";
normal-foreground = mkLiteral "#${config.look.colors.text}";
normal-background = mkLiteral "#${config.look.colors.dark}1A";
urgent-foreground = mkLiteral "#${config.look.colors.urgent}";
active-foreground = mkLiteral "#${config.look.colors.split}";
selected-active-foreground = mkLiteral "#${config.look.colors.prime}";
background = mkLiteral "#${config.look.colors.dark}D9";
bordercolor = mkLiteral "#${config.look.colors.prime}";
normal-foreground = mkLiteral "#${config.vars.colors.text}";
normal-background = mkLiteral "#${config.vars.colors.dark}1A";
urgent-foreground = mkLiteral "#${config.vars.colors.urgent}";
active-foreground = mkLiteral "#${config.vars.colors.split}";
selected-active-foreground = mkLiteral "#${config.vars.colors.prime}";
background = mkLiteral "#${config.vars.colors.dark}D9";
bordercolor = mkLiteral "#${config.vars.colors.prime}";
selected-normal-foreground = mkLiteral "#FFFFFF";
selected-normal-background = mkLiteral "#${config.look.colors.prime}80";
border-color = mkLiteral "#${config.look.colors.prime}";
urgent-background = mkLiteral "#${config.look.colors.accent}26";
active-background = mkLiteral "#${config.look.colors.accent}26";
selected-active-background = mkLiteral "#${config.look.colors.split}54";
selected-normal-background = mkLiteral "#${config.vars.colors.prime}80";
border-color = mkLiteral "#${config.vars.colors.prime}";
urgent-background = mkLiteral "#${config.vars.colors.accent}26";
active-background = mkLiteral "#${config.vars.colors.accent}26";
selected-active-background = mkLiteral "#${config.vars.colors.split}54";
};
"#window" = {
background-color = mkLiteral "@background";
width = 500;
border = mkLiteral "${config.look.border.string}";
border = mkLiteral "${config.vars.border.string}";
padding = 5;
};
"#message" = {

8
modules/home/wms/programs/swaylock/default.nix
View file

@ -1,8 +1,8 @@
{ config, pkgs, ... }:
let
default = "#${config.look.colors.prime}FF";
wrong = "#${config.look.colors.split}FF";
verifying = "#${config.look.colors.accent}FF";
default = "#${config.vars.colors.prime}FF";
wrong = "#${config.vars.colors.split}FF";
verifying = "#${config.vars.colors.accent}FF";
blank = "#00000000";
clear = "#FFFFFF22";
text = "#FFFFFFFF";
@ -13,7 +13,7 @@ in {
settings = {
clock = true;
image = ".wallpapers/lock.png";
font = config.look.fonts.main;
font = config.vars.fonts.main;
font-size = 30;
timestr = "%I:%M%p";
datestr = "%a %b %d %Y";

4
modules/home/wms/programs/wallpapers/wpaperd/default.nix
View file

@ -5,8 +5,8 @@
settings = {
default.mode = "center";
any.path = ".wallpapers/1.png";
"${config.displays.tower2}".path = ".wallpapers/2.png";
"${config.displays.tower3}".path = ".wallpapers/3.png";
"${config.vars.displays.tower2}".path = ".wallpapers/2.png";
"${config.vars.displays.tower3}".path = ".wallpapers/3.png";
};
};
}

25
modules/home/wms/programs/waybar/default.nix
View file

@ -236,9 +236,9 @@
position = "top";
layer = "top";
output = [
"!${config.displays.tower2}"
"!${config.displays.tower3}"
"!${config.displays.detritus2}"
"!${config.vars.displays.tower2}"
"!${config.vars.displays.tower3}"
"!${config.vars.displays.detritus2}"
"*"
];
modules-left = [
@ -271,9 +271,9 @@
position = "top";
layer = "top";
output = [
config.displays.tower2
config.displays.tower3
config.displays.detritus2
config.vars.displays.tower2
config.vars.displays.tower3
config.vars.displays.detritus2
];
modules-left = [
"sway/workspaces"
@ -294,12 +294,11 @@
border: 0;
border-radius: 0;
min-height: 0;
font-family: ${config.look.fonts.main};
font-size: 15.5px;
color: #${config.look.colors.text};
color: #${config.vars.colors.text};
}
#waybar { background: #${config.look.colors.dark}; }
#waybar { background: #${config.vars.colors.dark}; }
#network { padding: 0 6px 0 4px; }
#gamemode, #scratchpad, #privacy, #tray, #bluetooth { margin: 0 2px 0 2px; }
#pulseaudio, #mpris, #custom-notifs, #idle_inhibitor, #custom-weather, #cpu, #memory, #custom-vram, #backlight, #battery, #clock { margin: 0 2px 0 4px; }
@ -312,15 +311,15 @@
min-width: 20px;
}
#workspaces button.visible, #workspaces button.active {
border-bottom: 3px solid #${config.look.colors.prime};
background: #${config.look.colors.mid};
border-bottom: 3px solid #${config.vars.colors.prime};
background: #${config.vars.colors.mid};
}
#workspaces button.urgent {
border-bottom: 3px solid #${config.look.colors.urgent};
border-bottom: 3px solid #${config.vars.colors.urgent};
}
#workspaces button:hover {
box-shadow: none;
background: #${config.look.colors.light};
background: #${config.vars.colors.light};
}
#mpris { border-bottom: 3px solid #ffb066; }

78
modules/home/wms/sway/hotkeys/default.nix
View file

@ -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'';

53
modules/home/wms/sway/outputs/default.nix
View file

@ -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);
};
}

16
modules/home/wms/sway/rules/default.nix
View file

@ -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"; }];
};
};
}

44
modules/home/wms/sway/theme/default.nix
View file

@ -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;
};