update apparmor.d rules

This commit is contained in:
Grimmauld 2024-10-17 23:23:50 +02:00
parent 513d99ab68
commit 0fc6f9d53b
Signed by: Grimmauld
GPG Key ID: C2946668769F91FB
5 changed files with 17 additions and 12 deletions

View File

@ -11,18 +11,19 @@ in
config = lib.mkIf (enable && graphical) { config = lib.mkIf (enable && graphical) {
qt = { qt = {
enable = true; enable = true;
style = "kvantum"; style = "breeze";
platformTheme = "qt5ct"; platformTheme = "lxqt";
}; };
environment.systemPackages = environment.systemPackages =
with pkgs; with pkgs;
with kdePackages; with kdePackages;
[ [
qtstyleplugin-kvantum # qtstyleplugin-kvantum
catppuccin-sddm-corners catppuccin-sddm-corners
libsForQt5.qtgraphicaleffects libsForQt5.qtgraphicaleffects
catppuccin-kvantum # catppuccin-kvantum
breeze
kdePackages.audiocd-kio kdePackages.audiocd-kio
kdePackages.kio-extras kdePackages.kio-extras
kdePackages.kio kdePackages.kio
@ -32,7 +33,7 @@ in
qtwayland qtwayland
]; ];
environment.pathsToLink = [ "/share/Kvantum" ]; # environment.pathsToLink = [ "/share/Kvantum" ];
services.displayManager = { services.displayManager = {
sddm = { sddm = {
@ -44,6 +45,10 @@ in
defaultSession = lib.optionalString sway.enable "sway"; defaultSession = lib.optionalString sway.enable "sway";
}; };
xdg.portal.lxqt.styles = with pkgs; [
kdePackages.breeze-qt5
];
boot.plymouth = { boot.plymouth = {
themePackages = with pkgs; [ catppuccin-plymouth ]; themePackages = with pkgs; [ catppuccin-plymouth ];
theme = "catppuccin-macchiato"; theme = "catppuccin-macchiato";

View File

@ -4,10 +4,10 @@ buildGoModule {
version = "unstable-2024-10-12"; version = "unstable-2024-10-12";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "04df7052725b4ac473f1bdcd1e1644b8163ff0d2"; rev = "93269e0596a8d416a9ee647146c983115da2f346";
owner = "roddhjav"; owner = "roddhjav";
repo = "apparmor.d"; repo = "apparmor.d";
hash = "sha256-USDbCBx6+exHJM834f+dr9fmF9hx3Xo/ddhGJVpYjC0="; hash = "sha256-x8vnKEx/HZOweVX2Fu8ydGVpnS4gxsVJBbUWtKuwMUM=";
}; };
vendorHash = "sha256-YkOcpzn5AKFMDWUYbKY8DzGMiIMSyaDfexFmXv5HNQI="; vendorHash = "sha256-YkOcpzn5AKFMDWUYbKY8DzGMiIMSyaDfexFmXv5HNQI=";

View File

@ -1,5 +1,5 @@
diff --git a/apparmor.d/tunables/multiarch.d/system b/apparmor.d/tunables/multiarch.d/system diff --git a/apparmor.d/tunables/multiarch.d/system b/apparmor.d/tunables/multiarch.d/system
index be37123f..9166eaee 100644 index be37123f..908951af 100644
--- a/apparmor.d/tunables/multiarch.d/system --- a/apparmor.d/tunables/multiarch.d/system
+++ b/apparmor.d/tunables/multiarch.d/system +++ b/apparmor.d/tunables/multiarch.d/system
@@ -106,8 +106,21 @@ @@ -106,8 +106,21 @@
@ -21,8 +21,8 @@ index be37123f..9166eaee 100644
+ +
+@{nix_store}=/nix/store/@{rand32}-@{nix_package_name} +@{nix_store}=/nix/store/@{rand32}-@{nix_package_name}
+@{base_paths}={@{nix_store},/run/current-system/sw,/etc/profiles/per-user/@{user}} +@{base_paths}={@{nix_store},/run/current-system/sw,/etc/profiles/per-user/@{user}}
+@{bin}={@{base_paths}/bin,/{,usr/}{,s}bin} +@{bin}={@{base_paths}/{bin,libexec},/{,usr/}{,s}bin}
+@{lib}=@{base_paths}/lib +@{lib}=@{base_paths}/lib{exec,}
# Common places for temporary files # Common places for temporary files
@{tmp}=/tmp/ /tmp/user/@{uid}/ @{tmp}=/tmp/ /tmp/user/@{uid}/

View File

@ -110,11 +110,10 @@ in
/sys/devices/@{pci}/boot_vga r, /sys/devices/@{pci}/boot_vga r,
/sys/devices/@{pci}/**/id{Vendor,Product} r, /sys/devices/@{pci}/**/id{Vendor,Product} r,
/dev/ r, /dev/ r,
/run/current-system/sw/bin/xdg-open rPx, @{bin}/xdg-open rPx,
''; '';
"local/sudo" = '' "local/sudo" = ''
@{nix_store}/libexec/sudo/** m,
/run/wrappers/wrappers.*/unix_chkpwd rPx -> unix-chkpwd, /run/wrappers/wrappers.*/unix_chkpwd rPx -> unix-chkpwd,
''; '';

View File

@ -34,6 +34,7 @@ in
xdg-desktop-portal-wlr xdg-desktop-portal-wlr
xdg-desktop-portal-kde xdg-desktop-portal-kde
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
lxqt.xdg-desktop-portal-lxqt
]; ];
wlr.enable = true; wlr.enable = true;