mirror of
https://github.com/oddlama/nix-config.git
synced 2025-10-11 07:10:39 +02:00
chore: update flake, add uwsm
This commit is contained in:
parent
080e8b7f52
commit
cde4da7e51
16 changed files with 397 additions and 74 deletions
|
@ -57,9 +57,9 @@ in
|
|||
|
||||
# Autostart hyprland if on tty1 (once, don't restart after logout)
|
||||
programs.zsh.initExtra = lib.mkOrder 9999 ''
|
||||
if [[ -t 0 && "$(tty || true)" == /dev/tty1 && -z "$DISPLAY" && -z "$WAYLAND_DISPLAY" ]]; then
|
||||
echo "Login shell detected. Starting hyprland..."
|
||||
dbus-run-session Hyprland
|
||||
if [[ -t 0 && "$(tty || true)" == /dev/tty1 && -z "$DISPLAY" && -z "$WAYLAND_DISPLAY" ]] && uwsm check may-start; then
|
||||
echo "Login shell detected. Starting Hyprland..."
|
||||
uwsm start -S -F Hyprland
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
|
|
@ -49,7 +49,7 @@ in {
|
|||
|
||||
bind =
|
||||
[
|
||||
"SUPER + CTRL + SHIFT,q,exit"
|
||||
"SUPER + CTRL + SHIFT,q,exec,uwsm stop"
|
||||
|
||||
# Applications
|
||||
"SUPER,code:49,exec,${rofi-drun}" # SUPER+^
|
||||
|
@ -123,12 +123,10 @@ in {
|
|||
|
||||
decoration.rounding = 4;
|
||||
exec-once = [
|
||||
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"systemctl --user restart xdg-desktop-portal.service"
|
||||
"${pkgs.waybar}/bin/waybar"
|
||||
"${pkgs.swaynotificationcenter}/bin/swaync"
|
||||
"${lib.getExe pkgs.whisper-overlay}"
|
||||
"uwsm finalize"
|
||||
# "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
# "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
# "systemctl --user restart xdg-desktop-portal.service"
|
||||
];
|
||||
|
||||
input = {
|
||||
|
|
|
@ -86,7 +86,4 @@
|
|||
)
|
||||
+ (builtins.readFile ./swaync-style.css);
|
||||
};
|
||||
|
||||
# Started via hyprland to ensure it restarts properly with hyprland
|
||||
systemd.user.services.swaync.Install.WantedBy = lib.mkForce [];
|
||||
}
|
||||
|
|
|
@ -28,6 +28,7 @@ in {
|
|||
Unit = {
|
||||
Description = "Wayland wallpaper daemon";
|
||||
PartOf = ["graphical-session.target"];
|
||||
After = ["graphical-session.target"];
|
||||
};
|
||||
Service = {
|
||||
ExecStart = "${pkgs.swww}/bin/swww-daemon";
|
||||
|
|
|
@ -5,8 +5,7 @@
|
|||
}: {
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
# Started via hyprland to ensure it restarts properly with hyprland
|
||||
systemd.enable = false;
|
||||
systemd.enable = true;
|
||||
style = ./waybar-style.css;
|
||||
settings.main = {
|
||||
layer = "top";
|
||||
|
@ -246,4 +245,9 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.services.waybar = {
|
||||
Unit.After = ["graphical-session.target"];
|
||||
Service.Slice = ["app-graphical.slice"];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue