More small changes to formatting and such

This commit is contained in:
Jimbo 2024-10-15 17:10:40 -04:00
parent c3bc3a56f7
commit 25a3a7e237
6 changed files with 25 additions and 28 deletions

View file

@ -12,7 +12,7 @@
style = "beam"; style = "beam";
}; };
colors = { colors = {
alpha = "0.65"; alpha = "0.85";
background = "${config.look.colors.dark}"; background = "${config.look.colors.dark}";
regular0 = "3f3f3f"; regular0 = "3f3f3f";
regular1 = "cc0000"; regular1 = "cc0000";

View file

@ -16,7 +16,7 @@
}; };
}; };
iconTheme = { iconTheme = {
package = pkgs.papirus-icon-theme.override { color = "indigo"; }; package = pkgs.papirus-icon-theme.override { color = "red"; };
name = "Papirus-Dark"; name = "Papirus-Dark";
}; };
cursorTheme = { cursorTheme = {

View file

@ -11,7 +11,7 @@
swayWindowsModule = { swayWindowsModule = {
icon = true; icon = true;
icon-size = 15; icon-size = 15;
all-config = true; all-outputs = true;
tooltip = false; tooltip = false;
rewrite = { rewrite = {
"(.*) LibreWolf" = " $1"; "(.*) LibreWolf" = " $1";

View file

@ -2,24 +2,7 @@
{ {
services = { services = {
# Configure greetd for "auto" login (single user only) # Configure greetd for "auto" login (single user only)
greetd = let greetd = {
startSway = pkgs.writeScript "startsway" ''
# Use NVIDIA variables if drivers are in use
if lspci -k | grep "Kernel driver in use: nvidia" &> /dev/null; then
export LIBVA_DRIVER_NAME=nvidia
export GBM_BACKEND=nvidia-drm
export __GLX_VENDOR_LIBRARY_NAME=nvidia
export WLR_NO_HARDWARE_CURSORS=1
else
:
fi
export XDG_CURRENT_DESKTOP=sway
export QT_QPA_PLATFORM="wayland;xcb"
sway --unsupported-gpu
'';
in {
enable = true; enable = true;
restart = true; restart = true;
settings = { settings = {
@ -28,7 +11,22 @@
switch = true; switch = true;
}; };
default_session = { default_session = {
command = "${startSway}"; command = ''
if lspci -k | grep "Kernel driver in use: nvidia" &> /dev/null; then
export LIBVA_DRIVER_NAME=nvidia
export GBM_BACKEND=nvidia-drm
export __GLX_VENDOR_LIBRARY_NAME=nvidia
export WLR_NO_HARDWARE_CURSORS=1
else
:
fi
export WLR_RENDERER=vulkan
export XDG_CURRENT_DESKTOP=sway
export QT_QPA_PLATFORM="wayland;xcb"
sway --unsupported-gpu
'';
user = "jimbo"; user = "jimbo";
}; };
}; };

View file

@ -9,8 +9,6 @@
in { in {
firewall = { firewall = {
allowPing = false; allowPing = false;
# Add extra input rules using nftables
extraInputRules = '' extraInputRules = ''
ip saddr { ${outputs.ips.localSpan}.0/24, ${outputs.ips.wgSpan}.0/24 } tcp dport 2049 accept comment "Accept NFS" ip saddr { ${outputs.ips.localSpan}.0/24, ${outputs.ips.wgSpan}.0/24 } tcp dport 2049 accept comment "Accept NFS"
ip saddr { ${outputs.ips.pc}, ${outputs.secrets.lunaIP}, ${outputs.secrets.cornIP} } tcp dport { 1935, 1945 } accept comment "Accept RTMP" ip saddr { ${outputs.ips.pc}, ${outputs.secrets.lunaIP}, ${outputs.secrets.cornIP} } tcp dport { 1935, 1945 } accept comment "Accept RTMP"
@ -42,6 +40,7 @@
ip saddr ${outputs.secrets.cornIP} tcp dport { 9943, 9944 } dnat to ${outputs.ips.vm} comment "VM ALVR TCP" ip saddr ${outputs.secrets.cornIP} tcp dport { 9943, 9944 } dnat to ${outputs.ips.vm} comment "VM ALVR TCP"
ip saddr ${outputs.secrets.cornIP} udp dport { 9943, 9944 } dnat to ${outputs.ips.vm} comment "VM ALVR UDP" ip saddr ${outputs.secrets.cornIP} udp dport { 9943, 9944 } dnat to ${outputs.ips.vm} comment "VM ALVR UDP"
} }
chain POSTROUTING { chain POSTROUTING {
type nat hook postrouting priority 100; policy accept; type nat hook postrouting priority 100; policy accept;
oifname "${outputs.ips.netInt}" masquerade oifname "${outputs.ips.netInt}" masquerade

View file

@ -6,11 +6,11 @@
audio.enable = true; audio.enable = true;
wireplumber = { wireplumber = {
enable = true; enable = true;
configPackages = [ configPackages = [(
(pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/11-bluetooth-policy.conf" '' pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/11-bluetooth-policy.conf" ''
wireplumber.settings = { bluetooth.autoswitch-to-headset-profile = false } wireplumber.settings = { bluetooth.autoswitch-to-headset-profile = false }
'') ''
]; )];
}; };
alsa = { alsa = {
enable = true; enable = true;