diff --git a/hosts/elisabeth/secrets/kanidm/secrets.nix.age b/hosts/elisabeth/secrets/kanidm/secrets.nix.age index bba5498..7ad762c 100644 Binary files a/hosts/elisabeth/secrets/kanidm/secrets.nix.age and b/hosts/elisabeth/secrets/kanidm/secrets.nix.age differ diff --git a/hosts/octoprint/net.nix b/hosts/octoprint/net.nix index cae42c1..93c7ce7 100644 --- a/hosts/octoprint/net.nix +++ b/hosts/octoprint/net.nix @@ -8,7 +8,7 @@ systemd.network.networks = { "01-lan1" = { DHCP = "yes"; - matchConfig.MACAddress = config.secrets.secrets.local.networking.lan01.mac; + matchConfig.MACAddress = config.secrets.secrets.local.networking.interfaces.lan01.mac; networkConfig = { IPv6PrivacyExtensions = "yes"; MulticastDNS = true; @@ -18,7 +18,7 @@ }; "01-wlan1" = { DHCP = "yes"; - matchConfig.MACAddress = config.secrets.secrets.local.networking.wlan01.mac; + matchConfig.MACAddress = config.secrets.secrets.local.networking.interfaces.wlan01.mac; networkConfig = { IPv6PrivacyExtensions = "yes"; MulticastDNS = true; diff --git a/hosts/octoprint/secrets/secrets.nix.age b/hosts/octoprint/secrets/secrets.nix.age index 4f72fb2..423c6a7 100644 Binary files a/hosts/octoprint/secrets/secrets.nix.age and b/hosts/octoprint/secrets/secrets.nix.age differ diff --git a/hosts/patricknix/net.nix b/hosts/patricknix/net.nix index f821b48..ef25c8a 100644 --- a/hosts/patricknix/net.nix +++ b/hosts/patricknix/net.nix @@ -31,7 +31,7 @@ systemd.network.networks = { "01-lan1" = { DHCP = "yes"; - matchConfig.MACAddress = config.secrets.secrets.local.networking.lan01.mac; + matchConfig.MACAddress = config.secrets.secrets.local.networking.interfaces.lan01.mac; networkConfig = { IPv6PrivacyExtensions = "yes"; MulticastDNS = true; @@ -42,7 +42,7 @@ }; "02-lan1" = { DHCP = "yes"; - matchConfig.MACAddress = config.secrets.secrets.local.networking.lan02.mac; + matchConfig.MACAddress = config.secrets.secrets.local.networking.interfaces.lan02.mac; networkConfig = { IPv6PrivacyExtensions = "yes"; MulticastDNS = true; @@ -53,7 +53,7 @@ }; "01-wlan1" = { DHCP = "yes"; - matchConfig.MACAddress = config.secrets.secrets.local.networking.wlan01.mac; + matchConfig.MACAddress = config.secrets.secrets.local.networking.interfaces.wlan01.mac; networkConfig = { IPv6PrivacyExtensions = "yes"; MulticastDNS = true; diff --git a/hosts/patricknix/secrets/secrets.nix.age b/hosts/patricknix/secrets/secrets.nix.age index f461b36..300bece 100644 Binary files a/hosts/patricknix/secrets/secrets.nix.age and b/hosts/patricknix/secrets/secrets.nix.age differ diff --git a/users/common/graphical/wayland/waybar/waybar.css b/users/common/graphical/wayland/waybar/waybar.css index cbf7698..9399902 100644 --- a/users/common/graphical/wayland/waybar/waybar.css +++ b/users/common/graphical/wayland/waybar/waybar.css @@ -1,4 +1,3 @@ - window#waybar { background-color: #000000; border-bottom: 3px solid alpha(#485263, 0.7); @@ -85,20 +84,27 @@ button:hover { } +#battery { + color: #ffffff; + background-color: #000000; +} + #battery.charging, #battery.plugged { background-color: #26A65B; } @keyframes blink { - to { - background-color: #ffffff; - color: #000000; + + 0%, + 49% { + background-color: #000000; + } + + 50%, + 100% { + background-color: #e05f65; } -} -#battery { - color: #ffffff; - background-color: #000000; } /* Using steps() instead of linear as a timing function to limit cpu usage */ @@ -108,10 +114,9 @@ button:hover { #battery.critical:not(.charging) { background-color: #e05f65; animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: steps(2); + animation-duration: 2s; + animation-timing-function: steps(12); animation-iteration-count: infinite; - animation-direction: alternate; } #battery.warning:not(.charging) { diff --git a/users/patrick/ssh.nix b/users/patrick/ssh.nix index 4b6ccbe..9200c06 100644 --- a/users/patrick/ssh.nix +++ b/users/patrick/ssh.nix @@ -18,11 +18,6 @@ user = "root"; }; - "gojo" = { - hostname = "gojo.local"; - user = "root"; - }; - "patricknix" = { hostname = "patricknix.local"; user = "root"; @@ -37,10 +32,6 @@ hostname = "desktopnix.local"; user = "root"; }; - "binex" = { - hostname = "praksrv.sec.in.tum.de"; - user = "team402"; - }; "*" = { user = "root"; identitiesOnly = true;