Compare commits
1 Commits
8bd9961deb
...
hyprland
| Author | SHA1 | Date | |
|---|---|---|---|
| 6802dee96f |
@@ -11,7 +11,6 @@ with lib;
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.pia-vpn;
|
cfg = config.pia-vpn;
|
||||||
hostName = config.networking.hostName;
|
|
||||||
|
|
||||||
mkContainer = name: ctr: {
|
mkContainer = name: ctr: {
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
@@ -29,9 +28,6 @@ let
|
|||||||
config = { config, pkgs, lib, ... }: {
|
config = { config, pkgs, lib, ... }: {
|
||||||
imports = allModules ++ [ ctr.config ];
|
imports = allModules ++ [ ctr.config ];
|
||||||
|
|
||||||
ntfy-alerts.ignoredUnits = [ "logrotate" ];
|
|
||||||
ntfy-alerts.hostLabel = "${hostName}/${name}";
|
|
||||||
|
|
||||||
# Static IP with gateway pointing to VPN container
|
# Static IP with gateway pointing to VPN container
|
||||||
networking.useNetworkd = true;
|
networking.useNetworkd = true;
|
||||||
systemd.network.enable = true;
|
systemd.network.enable = true;
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ with lib;
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.pia-vpn;
|
cfg = config.pia-vpn;
|
||||||
hostName = config.networking.hostName;
|
|
||||||
scripts = import ./scripts.nix;
|
scripts = import ./scripts.nix;
|
||||||
|
|
||||||
# Port forwarding derived state
|
# Port forwarding derived state
|
||||||
@@ -99,8 +98,6 @@ in
|
|||||||
|
|
||||||
# Route ntfy alerts through the host proxy (VPN container has no gateway on eth0)
|
# Route ntfy alerts through the host proxy (VPN container has no gateway on eth0)
|
||||||
ntfy-alerts.curlExtraArgs = "--proxy http://${cfg.hostAddress}:${toString cfg.proxyPort}";
|
ntfy-alerts.curlExtraArgs = "--proxy http://${cfg.hostAddress}:${toString cfg.proxyPort}";
|
||||||
ntfy-alerts.ignoredUnits = [ "logrotate" ];
|
|
||||||
ntfy-alerts.hostLabel = "${hostName}/pia-vpn";
|
|
||||||
|
|
||||||
# Enable forwarding so bridge traffic can go through WG
|
# Enable forwarding so bridge traffic can go through WG
|
||||||
boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
|
boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
|
||||||
@@ -273,17 +270,10 @@ in
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
MAX_RETRIES=4
|
|
||||||
for attempt in $(seq 1 $MAX_RETRIES); do
|
|
||||||
if check_vpn; then
|
if check_vpn; then
|
||||||
rm -f "$COUNTER_FILE"
|
rm -f "$COUNTER_FILE"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
if [ "$attempt" -lt "$MAX_RETRIES" ]; then
|
|
||||||
echo "Attempt $attempt/$MAX_RETRIES failed, retrying in 5 minutes..." >&2
|
|
||||||
sleep 300
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# Failed — read and update counter (reset if from a previous day)
|
# Failed — read and update counter (reset if from a previous day)
|
||||||
today=$(date +%Y-%m-%d)
|
today=$(date +%Y-%m-%d)
|
||||||
@@ -312,7 +302,7 @@ in
|
|||||||
description = "Periodic PIA VPN connectivity check";
|
description = "Periodic PIA VPN connectivity check";
|
||||||
wantedBy = [ "timers.target" ];
|
wantedBy = [ "timers.target" ];
|
||||||
timerConfig = {
|
timerConfig = {
|
||||||
OnCalendar = "*:0/30";
|
OnCalendar = "*:0/5";
|
||||||
RandomizedDelaySec = "30s";
|
RandomizedDelaySec = "30s";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -26,12 +26,6 @@
|
|||||||
default = [ ];
|
default = [ ];
|
||||||
description = "Unit names to skip failure notifications for.";
|
description = "Unit names to skip failure notifications for.";
|
||||||
};
|
};
|
||||||
|
|
||||||
hostLabel = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = config.networking.hostName;
|
|
||||||
description = "Label used in ntfy alert titles to identify this host/container.";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf config.thisMachine.hasRole."ntfy" {
|
config = lib.mkIf config.thisMachine.hasRole."ntfy" {
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ in
|
|||||||
--max-time 30 --retry 3 \
|
--max-time 30 --retry 3 \
|
||||||
${cfg.curlExtraArgs} \
|
${cfg.curlExtraArgs} \
|
||||||
-H "Authorization: Bearer $NTFY_TOKEN" \
|
-H "Authorization: Bearer $NTFY_TOKEN" \
|
||||||
-H "Title: Service failure on ${cfg.hostLabel}" \
|
-H "Title: Service failure on ${config.networking.hostName}" \
|
||||||
-H "Priority: high" \
|
-H "Priority: high" \
|
||||||
-H "Tags: rotating_light" \
|
-H "Tags: rotating_light" \
|
||||||
-H "Message: Unit $unit failed at $(date +%c)" \
|
-H "Message: Unit $unit failed at $(date +%c)" \
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ in
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./kde.nix
|
./kde.nix
|
||||||
|
./hyprland.nix
|
||||||
./yubikey.nix
|
./yubikey.nix
|
||||||
./chromium.nix
|
./chromium.nix
|
||||||
./firefox.nix
|
./firefox.nix
|
||||||
|
|||||||
49
common/pc/hyprland.nix
Normal file
49
common/pc/hyprland.nix
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
{ lib, config, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.de;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
programs.hyprland.enable = true;
|
||||||
|
programs.hyprland.withUWSM = true;
|
||||||
|
programs.hyprland.xwayland.enable = true;
|
||||||
|
|
||||||
|
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
# Bar
|
||||||
|
waybar
|
||||||
|
|
||||||
|
# Launcher
|
||||||
|
wofi
|
||||||
|
|
||||||
|
# Notifications
|
||||||
|
mako
|
||||||
|
|
||||||
|
# Lock/idle
|
||||||
|
hyprlock
|
||||||
|
hypridle
|
||||||
|
|
||||||
|
# Wallpaper
|
||||||
|
hyprpaper
|
||||||
|
|
||||||
|
# Polkit
|
||||||
|
hyprpolkitagent
|
||||||
|
|
||||||
|
# Screenshots
|
||||||
|
grim
|
||||||
|
slurp
|
||||||
|
|
||||||
|
# Clipboard
|
||||||
|
wl-clipboard
|
||||||
|
cliphist
|
||||||
|
|
||||||
|
# Color picker
|
||||||
|
hyprpicker
|
||||||
|
|
||||||
|
# Brightness (laptop keybinds)
|
||||||
|
brightnessctl
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -9,14 +9,6 @@ in
|
|||||||
services.displayManager.sddm.wayland.enable = true;
|
services.displayManager.sddm.wayland.enable = true;
|
||||||
services.desktopManager.plasma6.enable = true;
|
services.desktopManager.plasma6.enable = true;
|
||||||
|
|
||||||
services.displayManager.sessionPackages = [
|
|
||||||
pkgs.plasma-bigscreen
|
|
||||||
];
|
|
||||||
|
|
||||||
# Bigscreen binaries must be on PATH for autostart services, KCMs, and
|
|
||||||
# internal plasmashell launches (settings, input handler, envmanager, etc.)
|
|
||||||
environment.systemPackages = [ pkgs.plasma-bigscreen ];
|
|
||||||
|
|
||||||
# kde apps
|
# kde apps
|
||||||
users.users.googlebot.packages = with pkgs; [
|
users.users.googlebot.packages = with pkgs; [
|
||||||
# akonadi
|
# akonadi
|
||||||
|
|||||||
@@ -8,29 +8,6 @@ in
|
|||||||
programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
hardware.steam-hardware.enable = true; # steam controller
|
hardware.steam-hardware.enable = true; # steam controller
|
||||||
|
|
||||||
# Login DE Option: Steam Gamescope (Steam Deck-like session)
|
|
||||||
programs.gamescope = {
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
programs.steam.gamescopeSession = {
|
|
||||||
enable = true;
|
|
||||||
args = [
|
|
||||||
"--hdr-enabled"
|
|
||||||
"--hdr-itm-enabled"
|
|
||||||
"--adaptive-sync"
|
|
||||||
];
|
|
||||||
steamArgs = [
|
|
||||||
"-steamos3"
|
|
||||||
"-gamepadui"
|
|
||||||
"-pipewire-dmabuf"
|
|
||||||
];
|
|
||||||
env = {
|
|
||||||
STEAM_ENABLE_VOLUME_HANDLER = "1";
|
|
||||||
STEAM_DISABLE_AUDIO_DEVICE_SWITCHING = "1";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
environment.systemPackages = [ pkgs.gamescope-wsi ];
|
|
||||||
|
|
||||||
users.users.googlebot.packages = [
|
users.users.googlebot.packages = [
|
||||||
pkgs.steam
|
pkgs.steam
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ config, lib, allModules, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
# Gitea Actions Runner inside a NixOS container.
|
# Gitea Actions Runner inside a NixOS container.
|
||||||
# The container shares the host's /nix/store (read-only) and nix-daemon socket,
|
# The container shares the host's /nix/store (read-only) and nix-daemon socket,
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
thisMachineIsARunner = config.thisMachine.hasRole."gitea-actions-runner";
|
thisMachineIsARunner = config.thisMachine.hasRole."gitea-actions-runner";
|
||||||
hostName = config.networking.hostName;
|
hostOverlays = config.nixpkgs.overlays;
|
||||||
containerName = "gitea-runner";
|
containerName = "gitea-runner";
|
||||||
giteaRunnerUid = 991;
|
giteaRunnerUid = 991;
|
||||||
giteaRunnerGid = 989;
|
giteaRunnerGid = 989;
|
||||||
@@ -32,10 +32,8 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = { config, lib, pkgs, ... }: {
|
config = { config, lib, pkgs, ... }: {
|
||||||
imports = allModules;
|
system.stateVersion = "25.11";
|
||||||
|
nixpkgs.overlays = hostOverlays;
|
||||||
ntfy-alerts.ignoredUnits = [ "logrotate" ];
|
|
||||||
ntfy-alerts.hostLabel = "${hostName}/${containerName}";
|
|
||||||
|
|
||||||
services.gitea-actions-runner.instances.inst = {
|
services.gitea-actions-runner.instances.inst = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ in
|
|||||||
auth-default-access = "deny-all";
|
auth-default-access = "deny-all";
|
||||||
behind-proxy = true;
|
behind-proxy = true;
|
||||||
enable-login = true;
|
enable-login = true;
|
||||||
attachment-expiry-duration = "48h";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# backups
|
# backups
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ let
|
|||||||
thisMachineIsPersonal = osConfig.thisMachine.hasRole."personal";
|
thisMachineIsPersonal = osConfig.thisMachine.hasRole."personal";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
imports = [ ./hyprland.nix ];
|
||||||
home.username = "googlebot";
|
home.username = "googlebot";
|
||||||
home.homeDirectory = "/home/googlebot";
|
home.homeDirectory = "/home/googlebot";
|
||||||
|
|
||||||
|
|||||||
276
home/hyprland.nix
Normal file
276
home/hyprland.nix
Normal file
@@ -0,0 +1,276 @@
|
|||||||
|
{ lib, osConfig, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
thisMachineIsPersonal = osConfig.thisMachine.hasRole."personal";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
config = lib.mkIf thisMachineIsPersonal {
|
||||||
|
wayland.windowManager.hyprland = {
|
||||||
|
enable = true;
|
||||||
|
systemd.enable = false; # Required when using UWSM
|
||||||
|
|
||||||
|
settings = {
|
||||||
|
"$mod" = "SUPER";
|
||||||
|
"$terminal" = "ghostty";
|
||||||
|
"$menu" = "wofi --show drun";
|
||||||
|
|
||||||
|
general = {
|
||||||
|
gaps_in = 5;
|
||||||
|
gaps_out = 10;
|
||||||
|
border_size = 2;
|
||||||
|
"col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
|
||||||
|
"col.inactive_border" = "rgba(595959aa)";
|
||||||
|
layout = "dwindle";
|
||||||
|
};
|
||||||
|
|
||||||
|
decoration = {
|
||||||
|
rounding = 10;
|
||||||
|
|
||||||
|
blur = {
|
||||||
|
enabled = true;
|
||||||
|
size = 3;
|
||||||
|
passes = 1;
|
||||||
|
};
|
||||||
|
|
||||||
|
shadow = {
|
||||||
|
enabled = true;
|
||||||
|
range = 4;
|
||||||
|
render_power = 3;
|
||||||
|
color = "rgba(1a1a1aee)";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
animations = {
|
||||||
|
enabled = true;
|
||||||
|
bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
|
||||||
|
animation = [
|
||||||
|
"windows, 1, 7, myBezier"
|
||||||
|
"windowsOut, 1, 7, default, popin 80%"
|
||||||
|
"border, 1, 10, default"
|
||||||
|
"borderangle, 1, 8, default"
|
||||||
|
"fade, 1, 7, default"
|
||||||
|
"workspaces, 1, 6, default"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
dwindle = {
|
||||||
|
pseudotile = true;
|
||||||
|
preserve_split = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
input = {
|
||||||
|
follow_mouse = 1;
|
||||||
|
touchpad = {
|
||||||
|
natural_scroll = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
misc = {
|
||||||
|
force_default_wallpaper = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
bind = [
|
||||||
|
# Applications
|
||||||
|
"$mod, Return, exec, $terminal"
|
||||||
|
"$mod, D, exec, $menu"
|
||||||
|
"$mod, L, exec, hyprlock"
|
||||||
|
|
||||||
|
# Window management
|
||||||
|
"$mod, Q, killactive"
|
||||||
|
"$mod, F, fullscreen"
|
||||||
|
"$mod, V, togglefloating"
|
||||||
|
"$mod, P, pseudo"
|
||||||
|
"$mod, J, togglesplit"
|
||||||
|
|
||||||
|
# Move focus
|
||||||
|
"$mod, left, movefocus, l"
|
||||||
|
"$mod, right, movefocus, r"
|
||||||
|
"$mod, up, movefocus, u"
|
||||||
|
"$mod, down, movefocus, d"
|
||||||
|
|
||||||
|
# Switch workspaces
|
||||||
|
"$mod, 1, workspace, 1"
|
||||||
|
"$mod, 2, workspace, 2"
|
||||||
|
"$mod, 3, workspace, 3"
|
||||||
|
"$mod, 4, workspace, 4"
|
||||||
|
"$mod, 5, workspace, 5"
|
||||||
|
"$mod, 6, workspace, 6"
|
||||||
|
"$mod, 7, workspace, 7"
|
||||||
|
"$mod, 8, workspace, 8"
|
||||||
|
"$mod, 9, workspace, 9"
|
||||||
|
"$mod, 0, workspace, 10"
|
||||||
|
|
||||||
|
# Move active window to workspace
|
||||||
|
"$mod SHIFT, 1, movetoworkspace, 1"
|
||||||
|
"$mod SHIFT, 2, movetoworkspace, 2"
|
||||||
|
"$mod SHIFT, 3, movetoworkspace, 3"
|
||||||
|
"$mod SHIFT, 4, movetoworkspace, 4"
|
||||||
|
"$mod SHIFT, 5, movetoworkspace, 5"
|
||||||
|
"$mod SHIFT, 6, movetoworkspace, 6"
|
||||||
|
"$mod SHIFT, 7, movetoworkspace, 7"
|
||||||
|
"$mod SHIFT, 8, movetoworkspace, 8"
|
||||||
|
"$mod SHIFT, 9, movetoworkspace, 9"
|
||||||
|
"$mod SHIFT, 0, movetoworkspace, 10"
|
||||||
|
|
||||||
|
# Scroll through workspaces
|
||||||
|
"$mod, mouse_down, workspace, e+1"
|
||||||
|
"$mod, mouse_up, workspace, e-1"
|
||||||
|
|
||||||
|
# Screenshots
|
||||||
|
", Print, exec, grim -g \"$(slurp)\" - | wl-copy"
|
||||||
|
"SHIFT, Print, exec, grim - | wl-copy"
|
||||||
|
|
||||||
|
# Clipboard history
|
||||||
|
"$mod SHIFT, V, exec, cliphist list | wofi --dmenu | cliphist decode | wl-copy"
|
||||||
|
];
|
||||||
|
|
||||||
|
bindm = [
|
||||||
|
# Move/resize with mouse
|
||||||
|
"$mod, mouse:272, movewindow"
|
||||||
|
"$mod, mouse:273, resizewindow"
|
||||||
|
];
|
||||||
|
|
||||||
|
bindel = [
|
||||||
|
# Volume
|
||||||
|
", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
|
||||||
|
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
||||||
|
|
||||||
|
# Brightness
|
||||||
|
", XF86MonBrightnessUp, exec, brightnessctl s 10%+"
|
||||||
|
", XF86MonBrightnessDown, exec, brightnessctl s 10%-"
|
||||||
|
];
|
||||||
|
|
||||||
|
bindl = [
|
||||||
|
", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||||
|
];
|
||||||
|
|
||||||
|
exec-once = [
|
||||||
|
"waybar"
|
||||||
|
"mako"
|
||||||
|
"hyprpaper"
|
||||||
|
"wl-paste --type text --watch cliphist store"
|
||||||
|
"wl-paste --type image --watch cliphist store"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Waybar
|
||||||
|
programs.waybar = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
mainBar = {
|
||||||
|
layer = "top";
|
||||||
|
position = "top";
|
||||||
|
height = 30;
|
||||||
|
modules-left = [ "hyprland/workspaces" ];
|
||||||
|
modules-center = [ "clock" ];
|
||||||
|
modules-right = [ "network" "pulseaudio" "battery" "tray" ];
|
||||||
|
|
||||||
|
clock = {
|
||||||
|
format = "{:%H:%M %Y-%m-%d}";
|
||||||
|
};
|
||||||
|
|
||||||
|
battery = {
|
||||||
|
format = "{capacity}% {icon}";
|
||||||
|
format-icons = [ "" "" "" "" "" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
network = {
|
||||||
|
format-wifi = "{essid} ({signalStrength}%) ";
|
||||||
|
format-ethernet = "{ipaddr}/{cidr} ";
|
||||||
|
format-disconnected = "Disconnected ";
|
||||||
|
};
|
||||||
|
|
||||||
|
pulseaudio = {
|
||||||
|
format = "{volume}% {icon}";
|
||||||
|
format-muted = "";
|
||||||
|
format-icons = {
|
||||||
|
default = [ "" "" "" ];
|
||||||
|
};
|
||||||
|
on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
|
||||||
|
};
|
||||||
|
|
||||||
|
tray = {
|
||||||
|
spacing = 10;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Notifications
|
||||||
|
services.mako = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
default-timeout = 5000;
|
||||||
|
border-radius = 5;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Idle daemon
|
||||||
|
services.hypridle = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
general = {
|
||||||
|
lock_cmd = "pidof hyprlock || hyprlock";
|
||||||
|
before_sleep_cmd = "loginctl lock-session";
|
||||||
|
after_sleep_cmd = "hyprctl dispatch dpms on";
|
||||||
|
};
|
||||||
|
|
||||||
|
listener = [
|
||||||
|
{
|
||||||
|
timeout = 300;
|
||||||
|
on-timeout = "loginctl lock-session";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
timeout = 330;
|
||||||
|
on-timeout = "hyprctl dispatch dpms off";
|
||||||
|
on-resume = "hyprctl dispatch dpms on";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
timeout = 1800;
|
||||||
|
on-timeout = "systemctl suspend";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Lock screen
|
||||||
|
programs.hyprlock = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
general = {
|
||||||
|
hide_cursor = true;
|
||||||
|
grace = 5;
|
||||||
|
};
|
||||||
|
|
||||||
|
background = [
|
||||||
|
{
|
||||||
|
monitor = "";
|
||||||
|
color = "rgba(25, 20, 20, 1.0)";
|
||||||
|
blur_passes = 2;
|
||||||
|
blur_size = 7;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
input-field = [
|
||||||
|
{
|
||||||
|
monitor = "";
|
||||||
|
size = "200, 50";
|
||||||
|
outline_thickness = 3;
|
||||||
|
dots_size = 0.33;
|
||||||
|
dots_spacing = 0.15;
|
||||||
|
outer_color = "rgb(151515)";
|
||||||
|
inner_color = "rgb(200, 200, 200)";
|
||||||
|
font_color = "rgb(10, 10, 10)";
|
||||||
|
fade_on_empty = true;
|
||||||
|
placeholder_text = "<i>Password...</i>";
|
||||||
|
hide_input = false;
|
||||||
|
position = "0, -20";
|
||||||
|
halign = "center";
|
||||||
|
valign = "center";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
# thunderbolt
|
# thunderbolt
|
||||||
services.hardware.bolt.enable = false;
|
services.hardware.bolt.enable = true;
|
||||||
|
|
||||||
# firmware
|
# firmware
|
||||||
firmware.x86_64.enable = true;
|
firmware.x86_64.enable = true;
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
# thunderbolt
|
# thunderbolt
|
||||||
services.hardware.bolt.enable = false;
|
services.hardware.bolt.enable = true;
|
||||||
|
|
||||||
# firmware
|
# firmware
|
||||||
firmware.x86_64.enable = true;
|
firmware.x86_64.enable = true;
|
||||||
|
|||||||
@@ -5,6 +5,10 @@
|
|||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# Login DE Option: Steam
|
||||||
|
programs.steam.gamescopeSession.enable = true;
|
||||||
|
# programs.gamescope.capSysNice = true;
|
||||||
|
|
||||||
# Login DE Option: Kodi
|
# Login DE Option: Kodi
|
||||||
services.xserver.desktopManager.kodi.enable = true;
|
services.xserver.desktopManager.kodi.enable = true;
|
||||||
services.xserver.desktopManager.kodi.package =
|
services.xserver.desktopManager.kodi.package =
|
||||||
@@ -31,7 +35,7 @@
|
|||||||
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
|
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
|
||||||
];
|
];
|
||||||
|
|
||||||
services.displayManager.defaultSession = "plasma-bigscreen-wayland";
|
services.displayManager.defaultSession = "plasma";
|
||||||
|
|
||||||
users.users.cris = {
|
users.users.cris = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
@@ -50,10 +54,10 @@
|
|||||||
uid = 1002;
|
uid = 1002;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Auto login into Plasma Bigscreen in john zoidberg account
|
# Auto login into Plasma in john zoidberg account
|
||||||
services.displayManager.sddm.settings = {
|
services.displayManager.sddm.settings = {
|
||||||
Autologin = {
|
Autologin = {
|
||||||
Session = "plasma-bigscreen-wayland";
|
Session = "plasma";
|
||||||
User = "john";
|
User = "john";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -31,12 +31,4 @@ in
|
|||||||
../patches/music-assistant-zeroconf-port.patch
|
../patches/music-assistant-zeroconf-port.patch
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
# Plasma Bigscreen: TV-optimized KDE shell (not yet packaged in nixpkgs)
|
|
||||||
plasma-bigscreen = import ./plasma-bigscreen.nix {
|
|
||||||
inherit (prev.kdePackages)
|
|
||||||
mkKdeDerivation plasma-workspace plasma-wayland-protocols
|
|
||||||
qtmultimedia qtwayland qtwebengine qcoro;
|
|
||||||
inherit (prev) lib fetchFromGitLab pkg-config sdl3 libcec wayland;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,79 +0,0 @@
|
|||||||
{
|
|
||||||
mkKdeDerivation,
|
|
||||||
lib,
|
|
||||||
fetchFromGitLab,
|
|
||||||
pkg-config,
|
|
||||||
plasma-workspace,
|
|
||||||
qtmultimedia,
|
|
||||||
qtwayland,
|
|
||||||
qtwebengine,
|
|
||||||
qcoro,
|
|
||||||
plasma-wayland-protocols,
|
|
||||||
wayland,
|
|
||||||
sdl3,
|
|
||||||
libcec,
|
|
||||||
}:
|
|
||||||
mkKdeDerivation {
|
|
||||||
pname = "plasma-bigscreen";
|
|
||||||
version = "unstable-2026-03-07";
|
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
|
||||||
domain = "invent.kde.org";
|
|
||||||
owner = "plasma";
|
|
||||||
repo = "plasma-bigscreen";
|
|
||||||
rev = "bd143fea7e386bac1652b8150a3ed3d5ef7cf93c";
|
|
||||||
hash = "sha256-y439IX7e0+XqxqFj/4+P5le0hA7DiwA+smDsD0UH/fI=";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
../patches/plasma-bigscreen-input-handler-app-id.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
extraNativeBuildInputs = [ pkg-config ];
|
|
||||||
|
|
||||||
extraBuildInputs = [
|
|
||||||
qtmultimedia
|
|
||||||
qtwayland
|
|
||||||
qtwebengine
|
|
||||||
qcoro
|
|
||||||
plasma-wayland-protocols
|
|
||||||
wayland
|
|
||||||
sdl3
|
|
||||||
libcec
|
|
||||||
];
|
|
||||||
|
|
||||||
# Match project version to installed Plasma release so cmake version checks pass
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace CMakeLists.txt \
|
|
||||||
--replace-fail 'set(PROJECT_VERSION "6.5.80")' \
|
|
||||||
'set(PROJECT_VERSION "${plasma-workspace.version}")'
|
|
||||||
|
|
||||||
# Upstream references a nonexistent startplasma-waylandsession binary.
|
|
||||||
# Fix this in the cmake template (before @KDE_INSTALL_FULL_LIBEXECDIR@ is substituted).
|
|
||||||
substituteInPlace bin/plasma-bigscreen-wayland.in \
|
|
||||||
--replace-fail \
|
|
||||||
'startplasma-wayland --xwayland --libinput --exit-with-session=@KDE_INSTALL_FULL_LIBEXECDIR@/startplasma-waylandsession' \
|
|
||||||
'startplasma-wayland'
|
|
||||||
'';
|
|
||||||
|
|
||||||
# FIXME: work around Qt 6.10 cmake API changes
|
|
||||||
cmakeFlags = [ "-DQT_FIND_PRIVATE_MODULES=1" ];
|
|
||||||
|
|
||||||
# QML lint fails on missing runtime-only imports (org.kde.private.biglauncher)
|
|
||||||
# that are only available inside a running Plasma session
|
|
||||||
dontQmlLint = true;
|
|
||||||
|
|
||||||
postFixup = ''
|
|
||||||
# Session .desktop references $out/libexec/plasma-dbus-run-session-if-needed
|
|
||||||
# but the binary lives in plasma-workspace
|
|
||||||
substituteInPlace "$out/share/wayland-sessions/plasma-bigscreen-wayland.desktop" \
|
|
||||||
--replace-fail \
|
|
||||||
"$out/libexec/plasma-dbus-run-session-if-needed" \
|
|
||||||
"${plasma-workspace}/libexec/plasma-dbus-run-session-if-needed"
|
|
||||||
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru.providedSessions = [ "plasma-bigscreen-wayland" ];
|
|
||||||
|
|
||||||
meta.license = with lib.licenses; [ gpl2Plus ];
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
Use the correct app_id when pre-authorizing remote-desktop portal access.
|
|
||||||
|
|
||||||
The portal's isAppMegaAuthorized() looks up the caller's specific app_id in
|
|
||||||
the PermissionStore. An empty string only matches apps the portal cannot
|
|
||||||
identify; it is not a wildcard. Since the input handler is launched via
|
|
||||||
KIO::CommandLauncherJob with a desktopName, the portal resolves it to the
|
|
||||||
desktop file ID, so the empty-string entry never matches.
|
|
||||||
|
|
||||||
--- a/inputhandler/xdgremotedesktopsystem.cpp
|
|
||||||
+++ b/inputhandler/xdgremotedesktopsystem.cpp
|
|
||||||
@@ -66,7 +67,7 @@
|
|
||||||
QDBusReply<void> reply = permissionStore.call(QStringLiteral("SetPermission"),
|
|
||||||
QStringLiteral("kde-authorized"), // table
|
|
||||||
true, // create table if not exists
|
|
||||||
QStringLiteral("remote-desktop"), // id
|
|
||||||
- QLatin1String(""), // app (empty for host applications)
|
|
||||||
+ QStringLiteral("org.kde.plasma.bigscreen.inputhandler"),
|
|
||||||
QStringList{QStringLiteral("yes")}); // permissions
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user