Modules/Niri: Replace kde polkit agent with gnome's + fix waybar rounded corner clipping
This commit is contained in:
@ -53,15 +53,30 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Disable niri polkit if we use DMS, as it has its own
|
# Disable Niri's kde auth agent and start gnome auth agent instead
|
||||||
systemd.user.services.niri-flake-polkit = lib.mkForce {};
|
systemd.user.services.niri-flake-polkit = lib.mkForce {};
|
||||||
|
systemd.user.services.polkit-gnome-authentication-agent-1 = {
|
||||||
|
Unit = {
|
||||||
|
Description = "polkit-gnome-authentication-agent-1";
|
||||||
|
Wants = ["graphical-session.target"];
|
||||||
|
After = ["graphical-session.target"];
|
||||||
|
};
|
||||||
|
Install = {
|
||||||
|
WantedBy = ["graphical-session.target"];
|
||||||
|
};
|
||||||
|
Service = {
|
||||||
|
Type = "simple";
|
||||||
|
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
|
||||||
|
Restart = "on-failure";
|
||||||
|
RestartSec = 1;
|
||||||
|
TimeoutStopSec = 10;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
home = {
|
home = {
|
||||||
file = {
|
file = {
|
||||||
# Link theme for flatpak
|
# Link theme for flatpak
|
||||||
".themes/${config.gtk.theme.name}".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
|
".themes/${config.gtk.theme.name}".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
|
||||||
|
|
||||||
".config/ashell/config.toml".source = config.lib.file.mkOutOfStoreSymlink "${config.paths.dotfiles}/ashell/config.toml";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
@ -82,8 +97,6 @@ in {
|
|||||||
# ncpamixer # Audio control
|
# ncpamixer # Audio control
|
||||||
wiremix # Audio control
|
wiremix # Audio control
|
||||||
|
|
||||||
ashell # Wayland bar
|
|
||||||
|
|
||||||
# GTK apps (look good and work well with xdg portals)
|
# GTK apps (look good and work well with xdg portals)
|
||||||
nautilus # Fallback file chooser used by xdg-desktop-portal-gnome
|
nautilus # Fallback file chooser used by xdg-desktop-portal-gnome
|
||||||
|
|
||||||
@ -141,9 +154,7 @@ in {
|
|||||||
prefer-no-csd = true; # Disable client-side decorations (e.g. window titlebars)
|
prefer-no-csd = true; # Disable client-side decorations (e.g. window titlebars)
|
||||||
|
|
||||||
spawn-at-startup = [
|
spawn-at-startup = [
|
||||||
# TODO: Depend on options
|
{argv = ["ashell" "-c" "${config.paths.dotfiles}/ashell/config.toml"];}
|
||||||
# {argv = ["noctalia-shell"];}
|
|
||||||
{argv = ["dms" "run"];}
|
|
||||||
|
|
||||||
{argv = ["kitty" "--hold" "fastfetch"];}
|
{argv = ["kitty" "--hold" "fastfetch"];}
|
||||||
{argv = ["fcitx5"];}
|
{argv = ["fcitx5"];}
|
||||||
@ -330,14 +341,9 @@ in {
|
|||||||
|
|
||||||
layer-rules = [
|
layer-rules = [
|
||||||
{
|
{
|
||||||
# Set the overview wallpaper on the backdrop (Noctalia).
|
# Waybar rounded corners background clipping fix
|
||||||
matches = [{namespace = "^noctalia-overview*";}];
|
matches = [{namespace = "waybar";}];
|
||||||
place-within-backdrop = true;
|
opacity = 0.99;
|
||||||
}
|
|
||||||
{
|
|
||||||
# Set the overview wallpaper on the backdrop (DMS).
|
|
||||||
matches = [{namespace = "^dms:blurwallpaper$";}];
|
|
||||||
place-within-backdrop = true;
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -346,8 +352,6 @@ in {
|
|||||||
honor-xdg-activation-with-invalid-serial = [];
|
honor-xdg-activation-with-invalid-serial = [];
|
||||||
};
|
};
|
||||||
|
|
||||||
# TODO: Only start hypr... stuff with hyprland, not systemd (hypridle, hyprpaper currently)
|
|
||||||
|
|
||||||
# TODO: Move values to config option and set in home/christoph/niri.nix
|
# TODO: Move values to config option and set in home/christoph/niri.nix
|
||||||
binds = with config.lib.niri.actions; {
|
binds = with config.lib.niri.actions; {
|
||||||
# Applications
|
# Applications
|
||||||
|
|||||||
Reference in New Issue
Block a user