liv/nixos-config
1
0
Fork 0
mirror of https://github.com/Ahwxorg/nixos-config.git synced 2025-12-04 15:00:13 +01:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: liv:dc1bd0dc1807d06a48f79892b4396253f7ea494c
Branches Tags
liv:master
...
compare: liv:cfa3de1bb5eefe6c8f0c068396d8cb567a11efb8
Branches Tags
liv:master

5 commits
dc1bd0dc18 ... cfa3de1bb5

Author SHA1 Message Date
Ahwx
cfa3de1bb5 chore: set ip for direct connection on iris 2025-10-03 15:26:08 +02:00
Ahwx
e256b86334 chore: merge remote-tracking branch 'refs/remotes/origin/master' 2025-10-03 15:25:02 +02:00
Ahwx
09df3d83aa chore: disable lid state waybar thing 2025-10-03 15:24:47 +02:00
Ahwx
de2713fab9 chore: change some waybar configuration 2025-10-03 15:24:28 +02:00
Ahwx
60060d94dd chore: do not allow u2f to unlock or login to computer anymore 2025-10-03 15:23:59 +02:00
4 changed files with 325 additions and 330 deletions
Download patch file Download diff file Expand all files Collapse all files

20
hosts/iris/default.nix
View file

@ -27,17 +27,15 @@
networkmanager.enable = true; networkmanager.enable = true;
}; };
systemd.network.networks."99-local" = { networking = {
matchConfig.name = "enp68s0"; interfaces.ens4d1 = {
address = [ ipv4.addresses = [
"192.168.1.100/24" {
]; address = "192.168.1.101";
routes = [ prefixLength = 24;
{ }
Gateway = "172.16.10.1"; ];
GatewayOnLink = false; };
}
];
}; };
liv = { liv = {

6
modules/core/yubikey.nix
View file

@ -18,8 +18,8 @@
}; };
services = { services = {
login.u2fAuth = true; login.u2fAuth = false;
greetd.u2fAuth = true; greetd.u2fAuth = false;
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 = true; hyprlock.u2fAuth = false;
hyprlock.fprintAuth = hyprlock.fprintAuth =
if (host == "sakura") then if (host == "sakura") then
true true

619
modules/home/waybar/default.nix
View file

@ -22,347 +22,349 @@
home.file = { home.file = {
"/home/${username}/.config/waybar/config" = { "/home/${username}/.config/waybar/config" = {
text = '' text = ''
[{ [{
"layer": "bottom", "layer": "top",
"position": "bottom", "position": "top",
"modules-left": [ "modules-left": [
"privacy", "privacy",
"network", "network",
"custom/vpn", "custom/vpn",
"custom/devices", "custom/devices",
"custom/spotify", "custom/spotify",
"tray", "tray",
], ],
"modules-center": [ "modules-center": [
"hyprland/workspaces", "hyprland/workspaces",
], ],
"modules-right": [ "modules-right": [
"custom/yubikey#icon", "custom/yubikey#icon",
"custom/yubikey#data", "custom/yubikey#data",
"group/hardware", "group/hardware",
"group/resources", "group/resources",
"bluetooth", "bluetooth",
// "wireplumber", // "wireplumber",
"group/audio", "group/audio",
"group/battery", "group/battery",
"group/clock" "group/clock"
], ],
"hyprland/window": { "hyprland/window": {
"format": "{}", "format": "{}",
"rewrite": { "rewrite": {
"(.*) - zsh": "> [$1]" "(.*) - zsh": "> [$1]"
}, },
"separate-outputs": true "separate-outputs": true
}, },
"sway/workspaces": { "sway/workspaces": {
"all-outputs": true, "all-outputs": true,
"disable-scroll": true, "disable-scroll": true,
"format": "{name}" "format": "{name}"
}, },
"hyprland/workspaces": { "hyprland/workspaces": {
"all-outputs": true, "all-outputs": true,
"disable-scroll": true, "disable-scroll": true,
"format": "{name}" "format": "{name}"
}, },
// "group/network": { // "group/network": {
// "orientation": "horizontal", // "orientation": "horizontal",
// "modules": [ // "modules": [
// "network", // "network",
// "custom/vpn", // "custom/vpn",
// ], // ],
// "drawer": { // "drawer": {
// "transition-left-to-right": true, // "transition-left-to-right": true,
// "transition-duration": 500 // "transition-duration": 500
// } // }
// }, // },
"network": { "network": {
"format": "󰈀 {ifname}", "format": "󰈀 {ifname}",
"format-wifi": " {essid} - {ipaddr}/{cidr} <span color='#aaaaaa'>{signalStrength}%</span>", // "format-wifi": "<span color='#aaaaaa'>WLAN:</span> {essid} - {ipaddr}/{cidr} <span color='#aaaaaa'>{signalStrength}%</span>",
"format-ethernet": "󰈀 {ipaddr}/{cidr}", "format-wifi": "<span color='#aaaaaa'>WLAN:</span> {ipaddr}/{cidr} <span color='#aaaaaa'>{signalStrength}%</span>",
"format-disconnected": "󰈂", "format-ethernet": "<span color='#aaaaaa'>LAN:</span> {ipaddr}/{cidr}",
"tooltip-format": "{ifname} via {gwaddr}", "format-disconnected": "<span color='#aaaaaa'>WLAN:</span> down",
"tooltip-format-wifi": "{essid} ({signalStrength}%)", "tooltip-format": "{ifname} via {gwaddr}",
"tooltip-format-ethernet": "{ifname}", "tooltip-format-wifi": "{essid} ({signalStrength}%)",
"tooltip-format-disconnected": "Disconnected" "tooltip-format-ethernet": "{ifname}",
}, "tooltip-format-disconnected": "Disconnected"
},
"custom/vpn": { "custom/vpn": {
"format": "{icon}", "format": "{icon}",
"tooltip-format": "{text}", "tooltip-format": "{text}",
"format-icons": [ "","" ], "format-icons": [ "","" ],
"return-type": "json", "return-type": "json",
"exec": "~/.local/bin/waybar-vpn", "exec": "~/.local/bin/waybar-vpn",
"interval": 30 "interval": 30
}, },
"custom/spotify": { "custom/spotify": {
"interval": 5, "interval": 5,
"return-type": "json", "return-type": "json",
"exec": "~/.local/bin/waybar-music", "exec": "~/.local/bin/waybar-music",
"on-click": "playerctl play-pause", "on-click": "playerctl play-pause",
"escape": true "escape": true
}, },
"custom/devices": { "custom/devices": {
"interval": 60, "interval": 60,
"font-size": 14, "font-size": 14,
// "return-type": "json", // "return-type": "json",
"exec": "~/.local/bin/waybar-devices", "exec": "~/.local/bin/waybar-devices",
}, },
"privacy": { "privacy": {
"icon-spacing": 8, "icon-spacing": 8,
"icon-size": 14, "icon-size": 14,
"transition-duration": 250, "transition-duration": 250,
"modules": [ "modules": [
{ {
"type": "screenshare", "type": "screenshare",
"tooltip": true, "tooltip": true,
"tooltip-icon-size": 24 "tooltip-icon-size": 24
}, },
{ {
"type": "audio-out", "type": "audio-out",
"tooltip": true, "tooltip": true,
"tooltip-icon-size": 24 "tooltip-icon-size": 24
}, },
{ {
"type": "audio-in", "type": "audio-in",
"tooltip": true, "tooltip": true,
"tooltip-icon-size": 24 "tooltip-icon-size": 24
} }
] ]
}, },
"tray": { "tray": {
"icon-size": 12, "icon-size": 12,
"spacing": 0 "spacing": 0
}, },
"sway/mode": { "sway/mode": {
"format": " {}", "format": " {}",
"tooltip": false "tooltip": false
}, },
"custom/yubikey#icon": { "custom/yubikey#icon": {
"exec": "~/.local/bin/waybar-yubikey 0", "exec": "~/.local/bin/waybar-yubikey 0",
"return-type": "json" "return-type": "json"
}, },
"custom/yubikey#data": { "custom/yubikey#data": {
"exec": "~/.local/bin/waybar-yubikey 1", "exec": "~/.local/bin/waybar-yubikey 1",
"return-type": "json" "return-type": "json"
}, },
"group/hardware": { "group/hardware": {
"orientation": "horizontal", "orientation": "horizontal",
"modules": [ "modules": [
"cpu", "cpu",
"temperature#cpu", "temperature#cpu",
"temperature#gpu", "temperature#gpu",
"temperature#nvme", "temperature#nvme",
"temperature#wifi" "temperature#wifi"
], ],
"drawer": { "drawer": {
"transition-left-to-right": false, "transition-left-to-right": false,
"transition-duration": 500 "transition-duration": 500
} }
}, },
"cpu": { "cpu": {
"interval": 30, "interval": 30,
"format": " {avg_frequency:3.2f}GHz <span color='#aaaaaa'>{usage}%</span>", "format": "<span color='#aaaaaa'>FREQ:</span> {avg_frequency:3.2f}GHz <span color='#aaaaaa'>{usage}%</span> ",
"states": { "states": {
"warning": 70, "warning": 70,
"critical": 90 "critical": 90
}, },
}, },
"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": {
"orientation": "horizontal", "orientation": "horizontal",
"modules": [ "memory", "disk#root" ], "modules": [ "memory", "disk#root" ],
"drawer": { "drawer": {
"transition-left-to-right": false, "transition-left-to-right": false,
"transition-duration": 500 "transition-duration": 500
} }
}, },
"memory": { "memory": {
"interval": 60, "interval": 60,
"format": "󰘚 {used:3.1f}GiB/<span color='#aaaaaa'>{total:3.1f}GiB</span>" "format": "<span color='#aaaaaa'>RAM:</span> {used:3.1f}GiB/<span color='#aaaaaa'>{total:3.1f}GiB</span> "
}, },
"disk#root": { "disk#root": {
"interval": 360, "interval": 360,
"format": " {used}/<span color='#aaaaaa'>{total}</span>", "format": "DISK: {used}/<span color='#aaaaaa'>{total}</span>",
"path": "/" "path": "/"
}, },
"bluetooth": { "bluetooth": {
// "controller": "controller1", // "controller": "controller1",
"on-click": "~/.local/bin/waybar-bluetooth toggle", "on-click": "~/.local/bin/waybar-bluetooth toggle",
"format": "<span color='#aaaaaa'>󰂲</span>", "format": "<span color='#aaaaaa'>󰂲</span>",
"format-disabled": "<span color='#333333'></span>", "format-disabled": "<span color='#333333'></span>",
"format-connected": "", "format-connected": "",
"format-connected-battery": " {device_battery_percentage}%", "format-connected-battery": " {device_battery_percentage}%",
"tooltip-format": "{controller_alias}\t\t[{controller_address}]", "tooltip-format": "{controller_alias}\t\t[{controller_address}]",
"tooltip-format-connected": "{controller_alias}\t\t[{controller_address}]\n\n{device_enumerate}", "tooltip-format-connected": "{controller_alias}\t\t[{controller_address}]\n\n{device_enumerate}",
"tooltip-format-connected-battery": "{controller_alias}\t\t[{controller_address}]\n\n{device_enumerate}", "tooltip-format-connected-battery": "{controller_alias}\t\t[{controller_address}]\n\n{device_enumerate}",
"tooltip-format-enumerate-connected": "{device_alias}\t\t[{device_address}]", "tooltip-format-enumerate-connected": "{device_alias}\t\t[{device_address}]",
"tooltip-format-enumerate-connected-battery": "{device_alias} ({device_battery_percentage})\t\t[{device_address}]" "tooltip-format-enumerate-connected-battery": "{device_alias} ({device_battery_percentage})\t\t[{device_address}]"
}, },
"group/audio": { "group/audio": {
"orientation": "horizontal", "orientation": "horizontal",
"modules": [ "modules": [
"wireplumber", "wireplumber",
"custom/audio-internal", "custom/audio-internal",
"custom/audio-headphones", "custom/audio-headphones",
"custom/audio-hdmi" "custom/audio-hdmi"
], ],
"drawer": { "drawer": {
"transition-left-to-right": false, "transition-left-to-right": false,
"transition-duration": 500 "transition-duration": 500
} }
}, },
"wireplumber": { "wireplumber": {
"format": "{icon} {node_name}/<span color='#aaaaaa'>{volume}</span>", "format": "{icon} {node_name}/{volume}",
"format-muted": "", "format-muted": "",
"on-click": "pavucontrol-qt", "on-click": "pavucontrol-qt",
"on-click-right": "helvum", "on-click-right": "helvum",
"format-icons": ["", "", ""] "format-icons": ["", "", ""]
}, },
"custom/audio-internal": { "custom/audio-internal": {
"format": "󱡬 ", "format": "󱡬 ",
"tooltip-format": "Internal", "tooltip-format": "Internal",
"on-click": "audio-router analog", "on-click": "audio-router analog",
"interval": "once" "interval": "once"
}, },
"custom/audio-hdmi": { "custom/audio-hdmi": {
"format": "󰡁 ", "format": "󰡁 ",
"tooltip-format": "HDMI", "tooltip-format": "HDMI",
"on-click": "audio-router hdmi", "on-click": "audio-router hdmi",
"interval": "once" "interval": "once"
}, },
"group/battery": { "group/battery": {
"orientation": "horizontal", "orientation": "horizontal",
"modules": [ "modules": [
"battery", "battery",
"custom/powerdraw" "custom/powerdraw"
], ],
"drawer": { "drawer": {
"transition-left-to-right": false, "transition-left-to-right": false,
"transition-duration": 500 "transition-duration": 500
} }
}, },
"battery": { "battery": {
"bat": "BAT1", "bat": "BAT1",
"interval": 30, "interval": 20,
"states": { "states": {
"warning": 20, "warning": 20,
"critical": 10 "critical": 10
}, },
"format-time": "{H}:{m}", "format-time": "{H}:{m}",
"format": "{icon} {time} <span color='#aaaaaa'>{capacity}%</span>", "format": "<span color='#aaaaaa'>BATT:</span> {time} {capacity}%",
"format-discharging": "{icon} <span color='#aaaaaa'>{capacity}%</span>", "format-alt": "<span color='#aaaaaa'>BATT: {time}</span> ",
"format-discharging-warning": "{icon} <span color='#FF5F1F'>{capacity}%</span>", "format-discharging": "<span color='#aaaaaa'>BATT:</span> {capacity}%",
"format-discharging-critical": "{icon} <span color='#FF3131'>{capacity}%</span>", "format-discharging-warning": "<span color='#aaaaaa'>BATT:</span> <span color='#FF5F1F'>{capacity}%</span>",
"format-charging": "{icon} <span color='#DAF7A6'>{capacity}%</span><span color='#aaaaaa'> @ {power:2.0f}W</span>", "format-discharging-critical": "<span color='#aaaaaa'>BATT:</span> <span color='#FF3131'>{capacity}%</span>",
"format-full": "󱐥 <span color='#aaaaaa'>{capacity}%</span>", "format-charging": "<span color='#aaaaaa'>BATT:</span> <span color='#DAF7A6'>{capacity}%</span><span color='#aaaaaa'> @ {power:2.0f}W</span>",
"format-not-charging": "󱐤 <span color='#aaaaaa'>{capacity}%</span>", "format-full": "<span color='#aaaaaa'>BATT:</span> 󱐥 {capacity}%",
"format-icons": [" ", " ", " ", " ", " "], "format-not-charging": "<span color='#aaaaaa'>BATT:</span> 󱐤 {capacity}%",
}, // "format-icons": [" ", " ", " ", " ", " "], // use {icon}
},
"custom/powerdraw": { "custom/powerdraw": {
"interval": 60, "interval": 60,
"exec": "~/.local/bin/waybar-powerdraw", "exec": "~/.local/bin/waybar-powerdraw",
}, },
"group/clock": { "group/clock": {
"orientation": "horizontal", "orientation": "horizontal",
"modules": [ "clock#time", "custom/clock#minutes", "clock#date" ], "modules": [ "clock#time", "custom/clock#minutes", "clock#date" ],
"drawer": { "drawer": {
"transition-left-to-right": false, "transition-left-to-right": false,
"transition-duration": 500 "transition-duration": 500
} }
}, },
"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",
"mode-mon-col" : 2, "mode-mon-col" : 2,
"weeks-pos" : "right", "weeks-pos" : "right",
"on-scroll" : 1, "on-scroll" : 1,
"format": { "format": {
"months": "<span color='#ffead3'><b>{}</b></span>", "months": "<span color='#ffead3'><b>{}</b></span>",
"days": "<span color='#ecc6d9'><b>{}</b></span>", "days": "<span color='#ecc6d9'><b>{}</b></span>",
"weeks": "<span color='#99ffdd'><b>W{}</b></span>", "weeks": "<span color='#99ffdd'><b>W{}</b></span>",
"weekdays": "<span color='#ffcc66'><b>{}</b></span>", "weekdays": "<span color='#ffcc66'><b>{}</b></span>",
"today": "<span color='#ff6699'><b><u>{}</u></b></span>" "today": "<span color='#ff6699'><b><u>{}</u></b></span>"
} }
}, },
"actions": { "actions": {
"on-click-right": "mode", "on-click-right": "mode",
"on-scroll-up": "shift_up", "on-scroll-up": "shift_up",
"on-scroll-down": "shift_down" "on-scroll-down": "shift_down"
} }
}, },
"clock#time": { "clock#time": {
"interval": 60, "interval": 60,
"format": " <span color='#aaaaaa'>{:%I:%M %p}</span>", "format": "<span color='#aaaaaa'>CEST:</span> {:%I:%M %p}",
"actions": { "actions": {
"on-scroll-up": "tz_up", "on-scroll-up": "tz_up",
"on-scroll-down": "tz_down" "on-scroll-down": "tz_down"
} }
}, },
"custom/clock#minutes": { "custom/clock#minutes": {
"interval": 60, "interval": 60,
"format": " <span color='#aaaaaa'>{}</span> ", "format": "CEST: <span color='#aaaaaa'>{}</span> ",
"exec": "~/.local/bin/waybar-minutes" "exec": "~/.local/bin/waybar-minutes"
} }
} }
] ]
''; '';
}; };
"/home/${username}/.config/waybar/style.css" = { "/home/${username}/.config/waybar/style.css" = {
@ -377,17 +379,18 @@
/* margin: 0 0px; */ /* margin: 0 0px; */
} }
window#waybar.bottom { window#waybar.top {
/* 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-bottom: none; border-top: 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 {
@ -439,7 +442,7 @@
#workspaces button { #workspaces button {
/*padding: 4px 6px;*/ /*padding: 4px 6px;*/
padding: 4px 6px; padding: 4px 6px;
color: #555555; color: #aaaaaa;
border-radius: 0px; border-radius: 0px;
/*min-width: 32px;*/ /*min-width: 32px;*/
} }

8
modules/home/waybar/scripts.nix
View file

@ -181,12 +181,6 @@
#!/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)"
@ -206,7 +200,7 @@
CTEXT="󰗟 " CTEXT="󰗟 "
fi fi
echo "$LTEXT $CTEXT $MTEXT" echo "$CTEXT $MTEXT"
fi fi
''; '';
}; };