dan/dotfiles
1
0
Fork 0
mirror of https://github.com/danbulant/dotfiles synced 2026-06-11 10:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

attempt to simplify and fix

Browse source
This commit is contained in:
Daniel Bulant 2026-06-04 23:09:58 +02:00
parent 47b0bbcd1c
commit 8b4ec77e93
No known key found for this signature in database
2 changed files with 16 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
servers/ui-mode/configuration.nix
View file

@ -109,17 +109,13 @@
LC_TIME = "en_GB.UTF-8";
};
services.displayManager.sddm.enable = true;
services.displayManager.sddm.wayland.enable = true;
services.desktopManager.plasma6 = {
enable = true;
};
# services.desktopManager.gnome.enable = true;
services.xserver = {
enable = false;
xkb = {
layout = "us";
variant = "";
};
services.xserver.xkb = {
layout = "us";
variant = "";
};
services.printing.enable = true;
@ -223,8 +219,6 @@
programs.hyprland = {
enable = true;
# Installs UWSM's user units required by the Hyprland (uwsm-managed) session.
withUWSM = true;
# package = hyprland.packages.${pkgs.system}.hyprland;
# portalPackage = hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland.override
# {
@ -257,45 +251,18 @@
};
};
};
systemd.user.services = {
xdg-desktop-portal-hyprland = {
unitConfig = {
Description = "Portal service (Hyprland implementation)";
PartOf = "graphical-session.target";
After = [
"graphical-session.target"
"wayland-session-waitenv.service"
"wayland-wm@hyprland.desktop.service"
];
Wants = [ "wayland-session-waitenv.service" ];
ConditionEnvironment = [
"WAYLAND_DISPLAY"
"HYPRLAND_INSTANCE_SIGNATURE"
];
};
serviceConfig = {
Type = "dbus";
BusName = "org.freedesktop.impl.portal.desktop.hyprland";
ExecStart = "${pkgs.xdg-desktop-portal-hyprland}/libexec/xdg-desktop-portal-hyprland";
Restart = "on-failure";
RestartSec = "2s";
Slice = "session.slice";
};
systemd.user.services.plasma-xdg-desktop-portal-kde = {
unitConfig = {
Description = "Xdg Desktop Portal For KDE";
PartOf = "graphical-session.target";
After = "plasma-core.target";
ConditionEnvironment = "XDG_CURRENT_DESKTOP=KDE";
};
plasma-xdg-desktop-portal-kde = {
unitConfig = {
Description = "Xdg Desktop Portal For KDE";
PartOf = "graphical-session.target";
After = "plasma-core.target";
ConditionEnvironment = "XDG_CURRENT_DESKTOP=KDE";
};
serviceConfig = {
ExecStart = "${pkgs.kdePackages.xdg-desktop-portal-kde}/libexec/xdg-desktop-portal-kde";
BusName = "org.freedesktop.impl.portal.desktop.kde";
Slice = "session.slice";
Restart = "no";
};
serviceConfig = {
ExecStart = "${pkgs.kdePackages.xdg-desktop-portal-kde}/libexec/xdg-desktop-portal-kde";
BusName = "org.freedesktop.impl.portal.desktop.kde";
Slice = "session.slice";
Restart = "no";
};
};
programs.dank-material-shell.greeter = {

19
servers/ui-mode/home.nix
View file

@ -38,22 +38,7 @@ let
};
});
};
codexbarWrapped = pkgs.writeShellApplication {
name = "codexbar";
runtimeInputs = [ pkgs.bubblewrap ];
text = ''
exec bwrap \
--die-with-parent \
--bind / / \
--dev-bind /dev /dev \
--proc /proc \
--tmpfs /usr \
--dir /usr/bin \
--ro-bind ${pkgs.which}/bin/which /usr/bin/which \
-- \
${codexbar.packages.${pkgs.system}.default}/bin/codexbar "$@"
'';
};
vesktopWrapped = pkgs.vesktop.overrideAttrs (oldAttrs: {
nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ];
postFixup = (oldAttrs.postFixup or "") + ''
@ -81,7 +66,7 @@ in
firefox
unrar
wine
codexbarWrapped
codexbar.packages.${pkgs.system}.default
codex
jellyfin-desktop
(kdePackages.qt6ct.overrideAttrs (oldAttrs: {