mirror of
https://github.com/Ahwxorg/nixos-config.git
synced 2025-12-04 23:00:14 +01:00
Compare commits
No commits in common. "cfa3de1bb5eefe6c8f0c068396d8cb567a11efb8" and "dc1bd0dc1807d06a48f79892b4396253f7ea494c" have entirely different histories.
cfa3de1bb5
...
dc1bd0dc18
4 changed files with 330 additions and 325 deletions
|
|
@ -27,16 +27,18 @@
|
||||||
networkmanager.enable = true;
|
networkmanager.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
networking = {
|
systemd.network.networks."99-local" = {
|
||||||
interfaces.ens4d1 = {
|
matchConfig.name = "enp68s0";
|
||||||
ipv4.addresses = [
|
address = [
|
||||||
|
"192.168.1.100/24"
|
||||||
|
];
|
||||||
|
routes = [
|
||||||
{
|
{
|
||||||
address = "192.168.1.101";
|
Gateway = "172.16.10.1";
|
||||||
prefixLength = 24;
|
GatewayOnLink = false;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
liv = {
|
liv = {
|
||||||
desktop.enable = true;
|
desktop.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,8 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
login.u2fAuth = false;
|
login.u2fAuth = true;
|
||||||
greetd.u2fAuth = false;
|
greetd.u2fAuth = true;
|
||||||
sudo.u2fAuth = true;
|
sudo.u2fAuth = true;
|
||||||
swaylock.fprintAuth =
|
swaylock.fprintAuth =
|
||||||
if (host == "sakura") then
|
if (host == "sakura") then
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
else
|
else
|
||||||
false;
|
false;
|
||||||
# No longer using Hyprlock, might stay here for if I ever switch to it again.
|
# No longer using Hyprlock, might stay here for if I ever switch to it again.
|
||||||
hyprlock.u2fAuth = false;
|
hyprlock.u2fAuth = true;
|
||||||
hyprlock.fprintAuth =
|
hyprlock.fprintAuth =
|
||||||
if (host == "sakura") then
|
if (host == "sakura") then
|
||||||
true
|
true
|
||||||
|
|
|
||||||
|
|
@ -23,8 +23,8 @@
|
||||||
"/home/${username}/.config/waybar/config" = {
|
"/home/${username}/.config/waybar/config" = {
|
||||||
text = ''
|
text = ''
|
||||||
[{
|
[{
|
||||||
"layer": "top",
|
"layer": "bottom",
|
||||||
"position": "top",
|
"position": "bottom",
|
||||||
|
|
||||||
"modules-left": [
|
"modules-left": [
|
||||||
"privacy",
|
"privacy",
|
||||||
|
|
@ -85,10 +85,9 @@
|
||||||
|
|
||||||
"network": {
|
"network": {
|
||||||
"format": " {ifname}",
|
"format": " {ifname}",
|
||||||
// "format-wifi": "<span color='#aaaaaa'>WLAN:</span> {essid} - {ipaddr}/{cidr} <span color='#aaaaaa'>{signalStrength}%</span>",
|
"format-wifi": " {essid} - {ipaddr}/{cidr} <span color='#aaaaaa'>{signalStrength}%</span>",
|
||||||
"format-wifi": "<span color='#aaaaaa'>WLAN:</span> {ipaddr}/{cidr} <span color='#aaaaaa'>{signalStrength}%</span>",
|
"format-ethernet": " {ipaddr}/{cidr}",
|
||||||
"format-ethernet": "<span color='#aaaaaa'>LAN:</span> {ipaddr}/{cidr}",
|
"format-disconnected": "",
|
||||||
"format-disconnected": "<span color='#aaaaaa'>WLAN:</span> down",
|
|
||||||
"tooltip-format": "{ifname} via {gwaddr}",
|
"tooltip-format": "{ifname} via {gwaddr}",
|
||||||
"tooltip-format-wifi": "{essid} ({signalStrength}%)",
|
"tooltip-format-wifi": "{essid} ({signalStrength}%)",
|
||||||
"tooltip-format-ethernet": "{ifname}",
|
"tooltip-format-ethernet": "{ifname}",
|
||||||
|
|
@ -179,7 +178,7 @@
|
||||||
|
|
||||||
"cpu": {
|
"cpu": {
|
||||||
"interval": 30,
|
"interval": 30,
|
||||||
"format": "<span color='#aaaaaa'>FREQ:</span> {avg_frequency:3.2f}GHz <span color='#aaaaaa'>{usage}%</span> ",
|
"format": " {avg_frequency:3.2f}GHz <span color='#aaaaaa'>{usage}%</span>",
|
||||||
"states": {
|
"states": {
|
||||||
"warning": 70,
|
"warning": 70,
|
||||||
"critical": 90
|
"critical": 90
|
||||||
|
|
@ -189,25 +188,25 @@
|
||||||
"temperature#cpu": {
|
"temperature#cpu": {
|
||||||
"hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input",
|
"hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input",
|
||||||
"critical-threshold": 80,
|
"critical-threshold": 80,
|
||||||
"format": "CPU <span color='#aaaaaa'>{temperatureC}°C</span>"
|
"format": " CPU <span color='#aaaaaa'>{temperatureC}°C</span>"
|
||||||
},
|
},
|
||||||
|
|
||||||
"temperature#gpu": {
|
"temperature#gpu": {
|
||||||
"hwmon-path": "/sys/class/hwmon/hwmon0/temp1_input",
|
"hwmon-path": "/sys/class/hwmon/hwmon0/temp1_input",
|
||||||
"critical-threshold": 80,
|
"critical-threshold": 80,
|
||||||
"format": "GPU <span color='#aaaaaa'>{temperatureC}°C</span>"
|
"format": "· GPU <span color='#aaaaaa'>{temperatureC}°C</span>"
|
||||||
},
|
},
|
||||||
|
|
||||||
"temperature#nvme": {
|
"temperature#nvme": {
|
||||||
"hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
|
"hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
|
||||||
"critical-threshold": 80,
|
"critical-threshold": 80,
|
||||||
"format": "NVMe <span color='#aaaaaa'>{temperatureC}°C</span>"
|
"format": "· NVMe <span color='#aaaaaa'>{temperatureC}°C</span>"
|
||||||
},
|
},
|
||||||
|
|
||||||
"temperature#wifi": {
|
"temperature#wifi": {
|
||||||
"hwmon-path": "/sys/class/hwmon/hwmon11/temp1_input",
|
"hwmon-path": "/sys/class/hwmon/hwmon11/temp1_input",
|
||||||
"critical-threshold": 80,
|
"critical-threshold": 80,
|
||||||
"format": "WiFi <span color='#aaaaaa'>{temperatureC}°C</span>"
|
"format": "· WiFi <span color='#aaaaaa'>{temperatureC}°C</span>"
|
||||||
},
|
},
|
||||||
|
|
||||||
"group/resources": {
|
"group/resources": {
|
||||||
|
|
@ -221,12 +220,12 @@
|
||||||
|
|
||||||
"memory": {
|
"memory": {
|
||||||
"interval": 60,
|
"interval": 60,
|
||||||
"format": "<span color='#aaaaaa'>RAM:</span> {used:3.1f}GiB/<span color='#aaaaaa'>{total:3.1f}GiB</span> "
|
"format": " {used:3.1f}GiB/<span color='#aaaaaa'>{total:3.1f}GiB</span>"
|
||||||
},
|
},
|
||||||
|
|
||||||
"disk#root": {
|
"disk#root": {
|
||||||
"interval": 360,
|
"interval": 360,
|
||||||
"format": "DISK: {used}/<span color='#aaaaaa'>{total}</span>",
|
"format": " {used}/<span color='#aaaaaa'>{total}</span>",
|
||||||
"path": "/"
|
"path": "/"
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
@ -259,7 +258,7 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
"wireplumber": {
|
"wireplumber": {
|
||||||
"format": "{icon} {node_name}/{volume}",
|
"format": "{icon} {node_name}/<span color='#aaaaaa'>{volume}</span>",
|
||||||
"format-muted": "",
|
"format-muted": "",
|
||||||
"on-click": "pavucontrol-qt",
|
"on-click": "pavucontrol-qt",
|
||||||
"on-click-right": "helvum",
|
"on-click-right": "helvum",
|
||||||
|
|
@ -294,21 +293,20 @@
|
||||||
|
|
||||||
"battery": {
|
"battery": {
|
||||||
"bat": "BAT1",
|
"bat": "BAT1",
|
||||||
"interval": 20,
|
"interval": 30,
|
||||||
"states": {
|
"states": {
|
||||||
"warning": 20,
|
"warning": 20,
|
||||||
"critical": 10
|
"critical": 10
|
||||||
},
|
},
|
||||||
"format-time": "{H}:{m}",
|
"format-time": "{H}:{m}",
|
||||||
"format": "<span color='#aaaaaa'>BATT:</span> {time} {capacity}%",
|
"format": "{icon} {time} <span color='#aaaaaa'>{capacity}%</span>",
|
||||||
"format-alt": "<span color='#aaaaaa'>BATT: {time}</span> ",
|
"format-discharging": "{icon} <span color='#aaaaaa'>{capacity}%</span>",
|
||||||
"format-discharging": "<span color='#aaaaaa'>BATT:</span> {capacity}%",
|
"format-discharging-warning": "{icon} <span color='#FF5F1F'>{capacity}%</span>",
|
||||||
"format-discharging-warning": "<span color='#aaaaaa'>BATT:</span> <span color='#FF5F1F'>{capacity}%</span>",
|
"format-discharging-critical": "{icon} <span color='#FF3131'>{capacity}%</span>",
|
||||||
"format-discharging-critical": "<span color='#aaaaaa'>BATT:</span> <span color='#FF3131'>{capacity}%</span>",
|
"format-charging": "{icon} <span color='#DAF7A6'>{capacity}%</span><span color='#aaaaaa'> @ {power:2.0f}W</span>",
|
||||||
"format-charging": "<span color='#aaaaaa'>BATT:</span> <span color='#DAF7A6'>{capacity}%</span><span color='#aaaaaa'> @ {power:2.0f}W</span>",
|
"format-full": " <span color='#aaaaaa'>{capacity}%</span>",
|
||||||
"format-full": "<span color='#aaaaaa'>BATT:</span> {capacity}%",
|
"format-not-charging": " <span color='#aaaaaa'>{capacity}%</span>",
|
||||||
"format-not-charging": "<span color='#aaaaaa'>BATT:</span> {capacity}%",
|
"format-icons": [" ", " ", " ", " ", " "],
|
||||||
// "format-icons": [" ", " ", " ", " ", " "], // use {icon}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
"custom/powerdraw": {
|
"custom/powerdraw": {
|
||||||
|
|
@ -327,7 +325,7 @@
|
||||||
|
|
||||||
"clock#date": {
|
"clock#date": {
|
||||||
"interval": 60,
|
"interval": 60,
|
||||||
"format": "<span color='#ffffff'> {:%a %e %b %Y}</span>",
|
"format": " <span color='#ffffff'> {:%a %e %b %Y}</span>",
|
||||||
"tooltip-format": "<big>{:%B %Y}</big>\n<tt>{calendar}</tt>",
|
"tooltip-format": "<big>{:%B %Y}</big>\n<tt>{calendar}</tt>",
|
||||||
"calendar": {
|
"calendar": {
|
||||||
"mode" : "year",
|
"mode" : "year",
|
||||||
|
|
@ -351,7 +349,7 @@
|
||||||
|
|
||||||
"clock#time": {
|
"clock#time": {
|
||||||
"interval": 60,
|
"interval": 60,
|
||||||
"format": "<span color='#aaaaaa'>CEST:</span> {:%I:%M %p}",
|
"format": " <span color='#aaaaaa'>{:%I:%M %p}</span>",
|
||||||
"actions": {
|
"actions": {
|
||||||
"on-scroll-up": "tz_up",
|
"on-scroll-up": "tz_up",
|
||||||
"on-scroll-down": "tz_down"
|
"on-scroll-down": "tz_down"
|
||||||
|
|
@ -360,7 +358,7 @@
|
||||||
|
|
||||||
"custom/clock#minutes": {
|
"custom/clock#minutes": {
|
||||||
"interval": 60,
|
"interval": 60,
|
||||||
"format": "CEST: <span color='#aaaaaa'>{}</span> ",
|
"format": " <span color='#aaaaaa'>{}</span> ",
|
||||||
"exec": "~/.local/bin/waybar-minutes"
|
"exec": "~/.local/bin/waybar-minutes"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -379,18 +377,17 @@
|
||||||
/* margin: 0 0px; */
|
/* margin: 0 0px; */
|
||||||
}
|
}
|
||||||
|
|
||||||
window#waybar.top {
|
window#waybar.bottom {
|
||||||
/* background-color: rgba(115, 116, 116, 0.22); */
|
/* background-color: rgba(115, 116, 116, 0.22); */
|
||||||
background-color: rgba(0, 0, 0, 0.25);
|
background-color: rgba(0, 0, 0, 0.25);
|
||||||
border-top: none;
|
border-bottom: none;
|
||||||
color: #eeeeee;
|
color: #eeeeee;
|
||||||
transition-property: background-color;
|
transition-property: background-color;
|
||||||
transition-duration: .5s;
|
transition-duration: .5s;
|
||||||
}
|
}
|
||||||
|
|
||||||
window#waybar.hidden {
|
window#waybar.hidden {
|
||||||
/* opacity: 0.25; */
|
opacity: 0.25;
|
||||||
opacity: 0.00;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
label#window {
|
label#window {
|
||||||
|
|
@ -442,7 +439,7 @@
|
||||||
#workspaces button {
|
#workspaces button {
|
||||||
/*padding: 4px 6px;*/
|
/*padding: 4px 6px;*/
|
||||||
padding: 4px 6px;
|
padding: 4px 6px;
|
||||||
color: #aaaaaa;
|
color: #555555;
|
||||||
border-radius: 0px;
|
border-radius: 0px;
|
||||||
/*min-width: 32px;*/
|
/*min-width: 32px;*/
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -181,6 +181,12 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
if [[ "$(hostname)" == "sakura" ]]; then
|
if [[ "$(hostname)" == "sakura" ]]; then
|
||||||
|
if [[ $(cat /proc/acpi/button/lid/LID0/state | grep "open") ]]; then
|
||||||
|
LTEXT=" "
|
||||||
|
else
|
||||||
|
LTEXT=" "
|
||||||
|
fi
|
||||||
|
|
||||||
MICROPHONE_STATE="$(sudo framework_tool --privacy | tail -n2 | head -n1)"
|
MICROPHONE_STATE="$(sudo framework_tool --privacy | tail -n2 | head -n1)"
|
||||||
CAMERA_STATE="$(sudo framework_tool --privacy | tail -n1)"
|
CAMERA_STATE="$(sudo framework_tool --privacy | tail -n1)"
|
||||||
|
|
||||||
|
|
@ -200,7 +206,7 @@
|
||||||
CTEXT=" "
|
CTEXT=" "
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "$CTEXT $MTEXT"
|
echo "$LTEXT $CTEXT $MTEXT"
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue