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