mirror of
https://github.com/Ahwxorg/nixos-config.git
synced 2025-12-04 15:00:13 +01:00
chore: merge remote-tracking branch 'refs/remotes/origin/master'
This commit is contained in:
commit
3a8ce89d0b
24 changed files with 502 additions and 570 deletions
|
|
@ -3,7 +3,7 @@
|
|||
imports =
|
||||
[ (import ./docker.nix) ]
|
||||
++ [ (import ./hardware.nix) ]
|
||||
++ [ (import ./displaylink.nix) ]
|
||||
# ++ [ (import ./displaylink.nix) ]
|
||||
# ++ [(import ./printing.nix)]
|
||||
++ [ (import ./xserver.nix) ]
|
||||
++ [ (import ./network.nix) ]
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
{ ... }:
|
||||
{
|
||||
imports =
|
||||
[(import ./hardware.nix)]
|
||||
++ [(import ./network.nix)]
|
||||
++ [(import ./program.nix)]
|
||||
++ [(import ./sshd.nix)]
|
||||
++ [(import ./security.nix)]
|
||||
++ [(import ./services.nix)]
|
||||
++ [(import ./system.nix)]
|
||||
++ [(import ./user.nix)];
|
||||
[ (import ./hardware.nix) ]
|
||||
++ [ (import ./network.nix) ]
|
||||
++ [ (import ./program.nix) ]
|
||||
++ [ (import ./sshd.nix) ]
|
||||
++ [ (import ./security.nix) ]
|
||||
++ [ (import ./services.nix) ]
|
||||
++ [ (import ./system.nix) ]
|
||||
++ [ (import ./user.nix) ]
|
||||
++ [ (import ./virtualization.nix) ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,5 @@
|
|||
git
|
||||
dig
|
||||
traceroute
|
||||
inputs.iamb.packages.${pkgs.stdenv.targetPlatform.system}.default
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
owner = "matrix-synapse";
|
||||
};
|
||||
"smbLoginDetails" = { };
|
||||
"syncplay" = { };
|
||||
}
|
||||
else if (host == "sakura") then
|
||||
{
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@
|
|||
libvirtd.enable =
|
||||
if (host == "violet") then
|
||||
true
|
||||
else if (host == "dandelion") then
|
||||
true
|
||||
else if (host == "sakura") then
|
||||
true
|
||||
else if (host == "yoshino") then
|
||||
|
|
@ -36,7 +38,7 @@
|
|||
# { };
|
||||
|
||||
users.groups.libvirtd.members =
|
||||
if (config.virtualisation.waydroid.enable == true) then [ username ] else [ ];
|
||||
if (config.virtualisation.libvirtd.enable == true) then [ username ] else [ ];
|
||||
|
||||
# Enable qemu etc
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
};
|
||||
|
||||
services = {
|
||||
login.u2fAuth = true;
|
||||
greetd.u2fAuth = true;
|
||||
login.u2fAuth = false;
|
||||
greetd.u2fAuth = false;
|
||||
sudo.u2fAuth = true;
|
||||
swaylock.fprintAuth =
|
||||
if (host == "sakura") then
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
else
|
||||
false;
|
||||
# No longer using Hyprlock, might stay here for if I ever switch to it again.
|
||||
hyprlock.u2fAuth = true;
|
||||
hyprlock.u2fAuth = false;
|
||||
hyprlock.fprintAuth =
|
||||
if (host == "sakura") then
|
||||
true
|
||||
|
|
|
|||
|
|
@ -23,12 +23,12 @@
|
|||
size = 14;
|
||||
};
|
||||
theme = {
|
||||
name = "Gruvbox-Green-Dark";
|
||||
package = pkgs.gruvbox-gtk-theme.override {
|
||||
colorVariants = [ "dark" ];
|
||||
themeVariants = [ "green" ];
|
||||
tweakVariants = [ "macos" ];
|
||||
};
|
||||
name = "Juno";
|
||||
package = pkgs.juno-theme; # .override {
|
||||
# colorVariants = [ "dark" ];
|
||||
# themeVariants = [ "green" ];
|
||||
# tweakVariants = [ "macos" ];
|
||||
# };
|
||||
};
|
||||
iconTheme = {
|
||||
name = "Papirus-Dark";
|
||||
|
|
|
|||
3
modules/home/steam.nix
Normal file
3
modules/home/steam.nix
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
programs.steam.enable = true;
|
||||
}
|
||||
|
|
@ -22,347 +22,349 @@
|
|||
home.file = {
|
||||
"/home/${username}/.config/waybar/config" = {
|
||||
text = ''
|
||||
[{
|
||||
"layer": "bottom",
|
||||
"position": "bottom",
|
||||
[{
|
||||
"layer": "top",
|
||||
"position": "top",
|
||||
|
||||
"modules-left": [
|
||||
"privacy",
|
||||
"network",
|
||||
"custom/vpn",
|
||||
"custom/devices",
|
||||
"custom/spotify",
|
||||
"tray",
|
||||
],
|
||||
"modules-left": [
|
||||
"privacy",
|
||||
"network",
|
||||
"custom/vpn",
|
||||
"custom/devices",
|
||||
"custom/spotify",
|
||||
"tray",
|
||||
],
|
||||
|
||||
"modules-center": [
|
||||
"hyprland/workspaces",
|
||||
],
|
||||
"modules-center": [
|
||||
"hyprland/workspaces",
|
||||
],
|
||||
|
||||
"modules-right": [
|
||||
"custom/yubikey#icon",
|
||||
"custom/yubikey#data",
|
||||
"group/hardware",
|
||||
"group/resources",
|
||||
"bluetooth",
|
||||
// "wireplumber",
|
||||
"group/audio",
|
||||
"group/battery",
|
||||
"group/clock"
|
||||
],
|
||||
"modules-right": [
|
||||
"custom/yubikey#icon",
|
||||
"custom/yubikey#data",
|
||||
"group/hardware",
|
||||
"group/resources",
|
||||
"bluetooth",
|
||||
// "wireplumber",
|
||||
"group/audio",
|
||||
"group/battery",
|
||||
"group/clock"
|
||||
],
|
||||
|
||||
"hyprland/window": {
|
||||
"format": "{}",
|
||||
"rewrite": {
|
||||
"(.*) - zsh": "> [$1]"
|
||||
},
|
||||
"separate-outputs": true
|
||||
},
|
||||
"hyprland/window": {
|
||||
"format": "{}",
|
||||
"rewrite": {
|
||||
"(.*) - zsh": "> [$1]"
|
||||
},
|
||||
"separate-outputs": true
|
||||
},
|
||||
|
||||
"sway/workspaces": {
|
||||
"all-outputs": true,
|
||||
"disable-scroll": true,
|
||||
"format": "{name}"
|
||||
},
|
||||
"sway/workspaces": {
|
||||
"all-outputs": true,
|
||||
"disable-scroll": true,
|
||||
"format": "{name}"
|
||||
},
|
||||
|
||||
"hyprland/workspaces": {
|
||||
"all-outputs": true,
|
||||
"disable-scroll": true,
|
||||
"format": "{name}"
|
||||
},
|
||||
"hyprland/workspaces": {
|
||||
"all-outputs": true,
|
||||
"disable-scroll": true,
|
||||
"format": "{name}"
|
||||
},
|
||||
|
||||
// "group/network": {
|
||||
// "orientation": "horizontal",
|
||||
// "modules": [
|
||||
// "network",
|
||||
// "custom/vpn",
|
||||
// ],
|
||||
// "drawer": {
|
||||
// "transition-left-to-right": true,
|
||||
// "transition-duration": 500
|
||||
// }
|
||||
// },
|
||||
|
||||
"network": {
|
||||
"format": " {ifname}",
|
||||
"format-wifi": " {essid} - {ipaddr}/{cidr} <span color='#aaaaaa'>{signalStrength}%</span>",
|
||||
"format-ethernet": " {ipaddr}/{cidr}",
|
||||
"format-disconnected": "",
|
||||
"tooltip-format": "{ifname} via {gwaddr}",
|
||||
"tooltip-format-wifi": "{essid} ({signalStrength}%)",
|
||||
"tooltip-format-ethernet": "{ifname}",
|
||||
"tooltip-format-disconnected": "Disconnected"
|
||||
},
|
||||
// "group/network": {
|
||||
// "orientation": "horizontal",
|
||||
// "modules": [
|
||||
// "network",
|
||||
// "custom/vpn",
|
||||
// ],
|
||||
// "drawer": {
|
||||
// "transition-left-to-right": true,
|
||||
// "transition-duration": 500
|
||||
// }
|
||||
// },
|
||||
|
||||
"network": {
|
||||
"format": " {ifname}",
|
||||
// "format-wifi": "<span color='#aaaaaa'>WLAN:</span> {essid} - {ipaddr}/{cidr} <span color='#aaaaaa'>{signalStrength}%</span>",
|
||||
"format-wifi": "<span color='#aaaaaa'>WLAN:</span> {ipaddr}/{cidr} <span color='#aaaaaa'>{signalStrength}%</span>",
|
||||
"format-ethernet": "<span color='#aaaaaa'>LAN:</span> {ipaddr}/{cidr}",
|
||||
"format-disconnected": "<span color='#aaaaaa'>WLAN:</span> down",
|
||||
"tooltip-format": "{ifname} via {gwaddr}",
|
||||
"tooltip-format-wifi": "{essid} ({signalStrength}%)",
|
||||
"tooltip-format-ethernet": "{ifname}",
|
||||
"tooltip-format-disconnected": "Disconnected"
|
||||
},
|
||||
|
||||
"custom/vpn": {
|
||||
"format": "{icon}",
|
||||
"tooltip-format": "{text}",
|
||||
"format-icons": [ "","" ],
|
||||
"return-type": "json",
|
||||
"exec": "~/.local/bin/waybar-vpn",
|
||||
"interval": 30
|
||||
},
|
||||
"custom/vpn": {
|
||||
"format": "{icon}",
|
||||
"tooltip-format": "{text}",
|
||||
"format-icons": [ "","" ],
|
||||
"return-type": "json",
|
||||
"exec": "~/.local/bin/waybar-vpn",
|
||||
"interval": 30
|
||||
},
|
||||
|
||||
"custom/spotify": {
|
||||
"interval": 5,
|
||||
"return-type": "json",
|
||||
"exec": "~/.local/bin/waybar-music",
|
||||
"on-click": "playerctl play-pause",
|
||||
"escape": true
|
||||
},
|
||||
"custom/spotify": {
|
||||
"interval": 5,
|
||||
"return-type": "json",
|
||||
"exec": "~/.local/bin/waybar-music",
|
||||
"on-click": "playerctl play-pause",
|
||||
"escape": true
|
||||
},
|
||||
|
||||
"custom/devices": {
|
||||
"interval": 60,
|
||||
"font-size": 14,
|
||||
// "return-type": "json",
|
||||
"exec": "~/.local/bin/waybar-devices",
|
||||
},
|
||||
"custom/devices": {
|
||||
"interval": 60,
|
||||
"font-size": 14,
|
||||
// "return-type": "json",
|
||||
"exec": "~/.local/bin/waybar-devices",
|
||||
},
|
||||
|
||||
"privacy": {
|
||||
"icon-spacing": 8,
|
||||
"icon-size": 14,
|
||||
"transition-duration": 250,
|
||||
"modules": [
|
||||
{
|
||||
"type": "screenshare",
|
||||
"tooltip": true,
|
||||
"tooltip-icon-size": 24
|
||||
},
|
||||
{
|
||||
"type": "audio-out",
|
||||
"tooltip": true,
|
||||
"tooltip-icon-size": 24
|
||||
},
|
||||
{
|
||||
"type": "audio-in",
|
||||
"tooltip": true,
|
||||
"tooltip-icon-size": 24
|
||||
}
|
||||
]
|
||||
},
|
||||
"privacy": {
|
||||
"icon-spacing": 8,
|
||||
"icon-size": 14,
|
||||
"transition-duration": 250,
|
||||
"modules": [
|
||||
{
|
||||
"type": "screenshare",
|
||||
"tooltip": true,
|
||||
"tooltip-icon-size": 24
|
||||
},
|
||||
{
|
||||
"type": "audio-out",
|
||||
"tooltip": true,
|
||||
"tooltip-icon-size": 24
|
||||
},
|
||||
{
|
||||
"type": "audio-in",
|
||||
"tooltip": true,
|
||||
"tooltip-icon-size": 24
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
"tray": {
|
||||
"icon-size": 12,
|
||||
"spacing": 0
|
||||
},
|
||||
"tray": {
|
||||
"icon-size": 12,
|
||||
"spacing": 0
|
||||
},
|
||||
|
||||
"sway/mode": {
|
||||
"format": " {}",
|
||||
"tooltip": false
|
||||
},
|
||||
"sway/mode": {
|
||||
"format": " {}",
|
||||
"tooltip": false
|
||||
},
|
||||
|
||||
"custom/yubikey#icon": {
|
||||
"exec": "~/.local/bin/waybar-yubikey 0",
|
||||
"return-type": "json"
|
||||
},
|
||||
"custom/yubikey#icon": {
|
||||
"exec": "~/.local/bin/waybar-yubikey 0",
|
||||
"return-type": "json"
|
||||
},
|
||||
|
||||
"custom/yubikey#data": {
|
||||
"exec": "~/.local/bin/waybar-yubikey 1",
|
||||
"return-type": "json"
|
||||
},
|
||||
"custom/yubikey#data": {
|
||||
"exec": "~/.local/bin/waybar-yubikey 1",
|
||||
"return-type": "json"
|
||||
},
|
||||
|
||||
"group/hardware": {
|
||||
"orientation": "horizontal",
|
||||
"modules": [
|
||||
"cpu",
|
||||
"temperature#cpu",
|
||||
"temperature#gpu",
|
||||
"temperature#nvme",
|
||||
"temperature#wifi"
|
||||
],
|
||||
"drawer": {
|
||||
"transition-left-to-right": false,
|
||||
"transition-duration": 500
|
||||
}
|
||||
},
|
||||
"group/hardware": {
|
||||
"orientation": "horizontal",
|
||||
"modules": [
|
||||
"cpu",
|
||||
"temperature#cpu",
|
||||
"temperature#gpu",
|
||||
"temperature#nvme",
|
||||
"temperature#wifi"
|
||||
],
|
||||
"drawer": {
|
||||
"transition-left-to-right": false,
|
||||
"transition-duration": 500
|
||||
}
|
||||
},
|
||||
|
||||
"cpu": {
|
||||
"interval": 30,
|
||||
"format": " {avg_frequency:3.2f}GHz <span color='#aaaaaa'>{usage}%</span>",
|
||||
"states": {
|
||||
"warning": 70,
|
||||
"critical": 90
|
||||
},
|
||||
},
|
||||
"cpu": {
|
||||
"interval": 30,
|
||||
"format": "<span color='#aaaaaa'>FREQ:</span> {avg_frequency:3.2f}GHz <span color='#aaaaaa'>{usage}%</span> ",
|
||||
"states": {
|
||||
"warning": 70,
|
||||
"critical": 90
|
||||
},
|
||||
},
|
||||
|
||||
"temperature#cpu": {
|
||||
"hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input",
|
||||
"critical-threshold": 80,
|
||||
"format": " CPU <span color='#aaaaaa'>{temperatureC}°C</span>"
|
||||
},
|
||||
"temperature#cpu": {
|
||||
"hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input",
|
||||
"critical-threshold": 80,
|
||||
"format": "CPU <span color='#aaaaaa'>{temperatureC}°C</span>"
|
||||
},
|
||||
|
||||
"temperature#gpu": {
|
||||
"hwmon-path": "/sys/class/hwmon/hwmon0/temp1_input",
|
||||
"critical-threshold": 80,
|
||||
"format": "· GPU <span color='#aaaaaa'>{temperatureC}°C</span>"
|
||||
},
|
||||
"temperature#gpu": {
|
||||
"hwmon-path": "/sys/class/hwmon/hwmon0/temp1_input",
|
||||
"critical-threshold": 80,
|
||||
"format": "GPU <span color='#aaaaaa'>{temperatureC}°C</span>"
|
||||
},
|
||||
|
||||
"temperature#nvme": {
|
||||
"hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
|
||||
"critical-threshold": 80,
|
||||
"format": "· NVMe <span color='#aaaaaa'>{temperatureC}°C</span>"
|
||||
},
|
||||
"temperature#nvme": {
|
||||
"hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
|
||||
"critical-threshold": 80,
|
||||
"format": "NVMe <span color='#aaaaaa'>{temperatureC}°C</span>"
|
||||
},
|
||||
|
||||
"temperature#wifi": {
|
||||
"hwmon-path": "/sys/class/hwmon/hwmon11/temp1_input",
|
||||
"critical-threshold": 80,
|
||||
"format": "· WiFi <span color='#aaaaaa'>{temperatureC}°C</span>"
|
||||
},
|
||||
"temperature#wifi": {
|
||||
"hwmon-path": "/sys/class/hwmon/hwmon11/temp1_input",
|
||||
"critical-threshold": 80,
|
||||
"format": "WiFi <span color='#aaaaaa'>{temperatureC}°C</span>"
|
||||
},
|
||||
|
||||
"group/resources": {
|
||||
"orientation": "horizontal",
|
||||
"modules": [ "memory", "disk#root" ],
|
||||
"drawer": {
|
||||
"transition-left-to-right": false,
|
||||
"transition-duration": 500
|
||||
}
|
||||
},
|
||||
"group/resources": {
|
||||
"orientation": "horizontal",
|
||||
"modules": [ "memory", "disk#root" ],
|
||||
"drawer": {
|
||||
"transition-left-to-right": false,
|
||||
"transition-duration": 500
|
||||
}
|
||||
},
|
||||
|
||||
"memory": {
|
||||
"interval": 60,
|
||||
"format": " {used:3.1f}GiB/<span color='#aaaaaa'>{total:3.1f}GiB</span>"
|
||||
},
|
||||
"memory": {
|
||||
"interval": 60,
|
||||
"format": "<span color='#aaaaaa'>RAM:</span> {used:3.1f}GiB/<span color='#aaaaaa'>{total:3.1f}GiB</span> "
|
||||
},
|
||||
|
||||
"disk#root": {
|
||||
"interval": 360,
|
||||
"format": " {used}/<span color='#aaaaaa'>{total}</span>",
|
||||
"path": "/"
|
||||
},
|
||||
"disk#root": {
|
||||
"interval": 360,
|
||||
"format": "DISK: {used}/<span color='#aaaaaa'>{total}</span>",
|
||||
"path": "/"
|
||||
},
|
||||
|
||||
"bluetooth": {
|
||||
// "controller": "controller1",
|
||||
"on-click": "~/.local/bin/waybar-bluetooth toggle",
|
||||
"format": "<span color='#aaaaaa'></span>",
|
||||
"format-disabled": "<span color='#333333'></span>",
|
||||
"format-connected": "",
|
||||
"format-connected-battery": " {device_battery_percentage}%",
|
||||
"tooltip-format": "{controller_alias}\t\t[{controller_address}]",
|
||||
"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-enumerate-connected": "{device_alias}\t\t[{device_address}]",
|
||||
"tooltip-format-enumerate-connected-battery": "{device_alias} ({device_battery_percentage})\t\t[{device_address}]"
|
||||
},
|
||||
"bluetooth": {
|
||||
// "controller": "controller1",
|
||||
"on-click": "~/.local/bin/waybar-bluetooth toggle",
|
||||
"format": "<span color='#aaaaaa'></span>",
|
||||
"format-disabled": "<span color='#333333'></span>",
|
||||
"format-connected": "",
|
||||
"format-connected-battery": " {device_battery_percentage}%",
|
||||
"tooltip-format": "{controller_alias}\t\t[{controller_address}]",
|
||||
"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-enumerate-connected": "{device_alias}\t\t[{device_address}]",
|
||||
"tooltip-format-enumerate-connected-battery": "{device_alias} ({device_battery_percentage})\t\t[{device_address}]"
|
||||
},
|
||||
|
||||
"group/audio": {
|
||||
"orientation": "horizontal",
|
||||
"modules": [
|
||||
"wireplumber",
|
||||
"custom/audio-internal",
|
||||
"custom/audio-headphones",
|
||||
"custom/audio-hdmi"
|
||||
],
|
||||
"drawer": {
|
||||
"transition-left-to-right": false,
|
||||
"transition-duration": 500
|
||||
}
|
||||
},
|
||||
"group/audio": {
|
||||
"orientation": "horizontal",
|
||||
"modules": [
|
||||
"wireplumber",
|
||||
"custom/audio-internal",
|
||||
"custom/audio-headphones",
|
||||
"custom/audio-hdmi"
|
||||
],
|
||||
"drawer": {
|
||||
"transition-left-to-right": false,
|
||||
"transition-duration": 500
|
||||
}
|
||||
},
|
||||
|
||||
"wireplumber": {
|
||||
"format": "{icon} {node_name}/<span color='#aaaaaa'>{volume}</span>",
|
||||
"format-muted": "",
|
||||
"on-click": "pavucontrol-qt",
|
||||
"on-click-right": "helvum",
|
||||
"format-icons": ["", "", ""]
|
||||
},
|
||||
"wireplumber": {
|
||||
"format": "{icon} {node_name}/{volume}",
|
||||
"format-muted": "",
|
||||
"on-click": "pavucontrol-qt",
|
||||
"on-click-right": "helvum",
|
||||
"format-icons": ["", "", ""]
|
||||
},
|
||||
|
||||
"custom/audio-internal": {
|
||||
"format": " ",
|
||||
"tooltip-format": "Internal",
|
||||
"on-click": "audio-router analog",
|
||||
"interval": "once"
|
||||
},
|
||||
"custom/audio-internal": {
|
||||
"format": " ",
|
||||
"tooltip-format": "Internal",
|
||||
"on-click": "audio-router analog",
|
||||
"interval": "once"
|
||||
},
|
||||
|
||||
"custom/audio-hdmi": {
|
||||
"format": " ",
|
||||
"tooltip-format": "HDMI",
|
||||
"on-click": "audio-router hdmi",
|
||||
"interval": "once"
|
||||
},
|
||||
"custom/audio-hdmi": {
|
||||
"format": " ",
|
||||
"tooltip-format": "HDMI",
|
||||
"on-click": "audio-router hdmi",
|
||||
"interval": "once"
|
||||
},
|
||||
|
||||
"group/battery": {
|
||||
"orientation": "horizontal",
|
||||
"modules": [
|
||||
"battery",
|
||||
"custom/powerdraw"
|
||||
],
|
||||
"drawer": {
|
||||
"transition-left-to-right": false,
|
||||
"transition-duration": 500
|
||||
}
|
||||
},
|
||||
"group/battery": {
|
||||
"orientation": "horizontal",
|
||||
"modules": [
|
||||
"battery",
|
||||
"custom/powerdraw"
|
||||
],
|
||||
"drawer": {
|
||||
"transition-left-to-right": false,
|
||||
"transition-duration": 500
|
||||
}
|
||||
},
|
||||
|
||||
"battery": {
|
||||
"bat": "BAT1",
|
||||
"interval": 30,
|
||||
"states": {
|
||||
"warning": 20,
|
||||
"critical": 10
|
||||
},
|
||||
"format-time": "{H}:{m}",
|
||||
"format": "{icon} {time} <span color='#aaaaaa'>{capacity}%</span>",
|
||||
"format-discharging": "{icon} <span color='#aaaaaa'>{capacity}%</span>",
|
||||
"format-discharging-warning": "{icon} <span color='#FF5F1F'>{capacity}%</span>",
|
||||
"format-discharging-critical": "{icon} <span color='#FF3131'>{capacity}%</span>",
|
||||
"format-charging": "{icon} <span color='#DAF7A6'>{capacity}%</span><span color='#aaaaaa'> @ {power:2.0f}W</span>",
|
||||
"format-full": " <span color='#aaaaaa'>{capacity}%</span>",
|
||||
"format-not-charging": " <span color='#aaaaaa'>{capacity}%</span>",
|
||||
"format-icons": [" ", " ", " ", " ", " "],
|
||||
},
|
||||
"battery": {
|
||||
"bat": "BAT1",
|
||||
"interval": 20,
|
||||
"states": {
|
||||
"warning": 20,
|
||||
"critical": 10
|
||||
},
|
||||
"format-time": "{H}:{m}",
|
||||
"format": "<span color='#aaaaaa'>BATT:</span> {time} {capacity}%",
|
||||
"format-alt": "<span color='#aaaaaa'>BATT: {time}</span> ",
|
||||
"format-discharging": "<span color='#aaaaaa'>BATT:</span> {capacity}%",
|
||||
"format-discharging-warning": "<span color='#aaaaaa'>BATT:</span> <span color='#FF5F1F'>{capacity}%</span>",
|
||||
"format-discharging-critical": "<span color='#aaaaaa'>BATT:</span> <span color='#FF3131'>{capacity}%</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'>BATT:</span> {capacity}%",
|
||||
"format-not-charging": "<span color='#aaaaaa'>BATT:</span> {capacity}%",
|
||||
// "format-icons": [" ", " ", " ", " ", " "], // use {icon}
|
||||
},
|
||||
|
||||
"custom/powerdraw": {
|
||||
"interval": 60,
|
||||
"exec": "~/.local/bin/waybar-powerdraw",
|
||||
},
|
||||
"custom/powerdraw": {
|
||||
"interval": 60,
|
||||
"exec": "~/.local/bin/waybar-powerdraw",
|
||||
},
|
||||
|
||||
"group/clock": {
|
||||
"orientation": "horizontal",
|
||||
"modules": [ "clock#time", "custom/clock#minutes", "clock#date" ],
|
||||
"drawer": {
|
||||
"transition-left-to-right": false,
|
||||
"transition-duration": 500
|
||||
}
|
||||
},
|
||||
"group/clock": {
|
||||
"orientation": "horizontal",
|
||||
"modules": [ "clock#time", "custom/clock#minutes", "clock#date" ],
|
||||
"drawer": {
|
||||
"transition-left-to-right": false,
|
||||
"transition-duration": 500
|
||||
}
|
||||
},
|
||||
|
||||
"clock#date": {
|
||||
"interval": 60,
|
||||
"format": " <span color='#ffffff'> {:%a %e %b %Y}</span>",
|
||||
"tooltip-format": "<big>{:%B %Y}</big>\n<tt>{calendar}</tt>",
|
||||
"calendar": {
|
||||
"mode" : "year",
|
||||
"mode-mon-col" : 2,
|
||||
"weeks-pos" : "right",
|
||||
"on-scroll" : 1,
|
||||
"format": {
|
||||
"months": "<span color='#ffead3'><b>{}</b></span>",
|
||||
"days": "<span color='#ecc6d9'><b>{}</b></span>",
|
||||
"weeks": "<span color='#99ffdd'><b>W{}</b></span>",
|
||||
"weekdays": "<span color='#ffcc66'><b>{}</b></span>",
|
||||
"today": "<span color='#ff6699'><b><u>{}</u></b></span>"
|
||||
}
|
||||
},
|
||||
"actions": {
|
||||
"on-click-right": "mode",
|
||||
"on-scroll-up": "shift_up",
|
||||
"on-scroll-down": "shift_down"
|
||||
}
|
||||
},
|
||||
"clock#date": {
|
||||
"interval": 60,
|
||||
"format": "<span color='#ffffff'> {:%a %e %b %Y}</span>",
|
||||
"tooltip-format": "<big>{:%B %Y}</big>\n<tt>{calendar}</tt>",
|
||||
"calendar": {
|
||||
"mode" : "year",
|
||||
"mode-mon-col" : 2,
|
||||
"weeks-pos" : "right",
|
||||
"on-scroll" : 1,
|
||||
"format": {
|
||||
"months": "<span color='#ffead3'><b>{}</b></span>",
|
||||
"days": "<span color='#ecc6d9'><b>{}</b></span>",
|
||||
"weeks": "<span color='#99ffdd'><b>W{}</b></span>",
|
||||
"weekdays": "<span color='#ffcc66'><b>{}</b></span>",
|
||||
"today": "<span color='#ff6699'><b><u>{}</u></b></span>"
|
||||
}
|
||||
},
|
||||
"actions": {
|
||||
"on-click-right": "mode",
|
||||
"on-scroll-up": "shift_up",
|
||||
"on-scroll-down": "shift_down"
|
||||
}
|
||||
},
|
||||
|
||||
"clock#time": {
|
||||
"interval": 60,
|
||||
"format": " <span color='#aaaaaa'>{:%I:%M %p}</span>",
|
||||
"actions": {
|
||||
"on-scroll-up": "tz_up",
|
||||
"on-scroll-down": "tz_down"
|
||||
}
|
||||
},
|
||||
"clock#time": {
|
||||
"interval": 60,
|
||||
"format": "<span color='#aaaaaa'>CEST:</span> {:%I:%M %p}",
|
||||
"actions": {
|
||||
"on-scroll-up": "tz_up",
|
||||
"on-scroll-down": "tz_down"
|
||||
}
|
||||
},
|
||||
|
||||
"custom/clock#minutes": {
|
||||
"interval": 60,
|
||||
"format": " <span color='#aaaaaa'>{}</span> ",
|
||||
"exec": "~/.local/bin/waybar-minutes"
|
||||
}
|
||||
}
|
||||
]
|
||||
"custom/clock#minutes": {
|
||||
"interval": 60,
|
||||
"format": "CEST: <span color='#aaaaaa'>{}</span> ",
|
||||
"exec": "~/.local/bin/waybar-minutes"
|
||||
}
|
||||
}
|
||||
]
|
||||
'';
|
||||
};
|
||||
"/home/${username}/.config/waybar/style.css" = {
|
||||
|
|
@ -377,17 +379,18 @@
|
|||
/* margin: 0 0px; */
|
||||
}
|
||||
|
||||
window#waybar.bottom {
|
||||
window#waybar.top {
|
||||
/* background-color: rgba(115, 116, 116, 0.22); */
|
||||
background-color: rgba(0, 0, 0, 0.25);
|
||||
border-bottom: none;
|
||||
border-top: none;
|
||||
color: #eeeeee;
|
||||
transition-property: background-color;
|
||||
transition-duration: .5s;
|
||||
}
|
||||
|
||||
window#waybar.hidden {
|
||||
opacity: 0.25;
|
||||
/* opacity: 0.25; */
|
||||
opacity: 0.00;
|
||||
}
|
||||
|
||||
label#window {
|
||||
|
|
@ -439,7 +442,7 @@
|
|||
#workspaces button {
|
||||
/*padding: 4px 6px;*/
|
||||
padding: 4px 6px;
|
||||
color: #555555;
|
||||
color: #aaaaaa;
|
||||
border-radius: 0px;
|
||||
/*min-width: 32px;*/
|
||||
}
|
||||
|
|
|
|||
|
|
@ -181,12 +181,6 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
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)"
|
||||
CAMERA_STATE="$(sudo framework_tool --privacy | tail -n1)"
|
||||
|
||||
|
|
@ -206,7 +200,7 @@
|
|||
CTEXT=" "
|
||||
fi
|
||||
|
||||
echo "$LTEXT $CTEXT $MTEXT"
|
||||
echo "$CTEXT $MTEXT"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
services = {
|
||||
anubis.instances.librey = {
|
||||
settings = {
|
||||
TARGET = "http://localhost:8080";
|
||||
TARGET = "http://localhost:8078";
|
||||
BIND = ":8079";
|
||||
BIND_NETWORK = "tcp";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
{
|
||||
services.murmur = {
|
||||
enable = true;
|
||||
openFirewall = false;
|
||||
openFirewall = true;
|
||||
bandwidth = 192000;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
# Network shares
|
||||
samba = {
|
||||
package = pkgs.samba;
|
||||
# ^^ `samba4Full` is compiled with avahi, ldap, AD etc support (compared to the default package, `samba`
|
||||
# ^^ `samba4Full` is compiled with avahi, ldap, AD etc support (compared to the default package, `samba`. samba4Full gives issue, however)
|
||||
# Required for samba to register mDNS records for auto discovery
|
||||
# See https://github.com/NixOS/nixpkgs/blob/592047fc9e4f7b74a4dc85d1b9f5243dfe4899e3/pkgs/top-level/all-packages.nix#L27268
|
||||
enable = true;
|
||||
|
|
@ -19,6 +19,16 @@
|
|||
writable = "true";
|
||||
comment = "Hello world!";
|
||||
};
|
||||
shares.violet = {
|
||||
path = "/spinners/violet";
|
||||
writable = "true";
|
||||
comment = "Hello world!";
|
||||
};
|
||||
shares.ahwx = {
|
||||
path = "/spinners/ahwx";
|
||||
writable = "true";
|
||||
comment = "Hello world!";
|
||||
};
|
||||
};
|
||||
avahi = {
|
||||
publish.enable = true;
|
||||
|
|
|
|||
|
|
@ -5,5 +5,5 @@
|
|||
# loadModels = [ "llama3.2:3b" "deepseek-r1:1.5b"];
|
||||
# acceleration = "rocm"; # nope, 5700XT is too old for this
|
||||
};
|
||||
services.open-webui.enable = true;
|
||||
services.open-webui.enable = false;
|
||||
}
|
||||
|
|
|
|||
8
modules/services/syncplay.nix
Normal file
8
modules/services/syncplay.nix
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
{ config, ... }:
|
||||
{
|
||||
services.syncplay = {
|
||||
enable = true;
|
||||
passwordFile = config.sops.secrets.syncplay.path;
|
||||
};
|
||||
networking.firewall.allowedTCPPorts = [ 8999 ];
|
||||
}
|
||||
|
|
@ -13,6 +13,7 @@
|
|||
++ [ (import ./guacamole.nix) ]
|
||||
++ [ (import ./gokapi.nix) ]
|
||||
++ [ (import ./jellyfin.nix) ]
|
||||
# ++ [ (import ./jitsi-meet.nix) ]
|
||||
++ [ (import ./librey-proxy.nix) ]
|
||||
++ [ (import ./lidarr.nix) ]
|
||||
++ [ (import ./matrix/default.nix) ]
|
||||
|
|
@ -34,5 +35,4 @@
|
|||
++ [ (import ./tailscale.nix) ]
|
||||
++ [ (import ./vaultwarden.nix) ];
|
||||
# ++ [ (import ./smart-monitoring.nix) ]
|
||||
# ++ [ (import ./jitsi-meet.nix) ]
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue