From bd11c2279634b7e8a879c29f81536c597cc97a01 Mon Sep 17 00:00:00 2001
From: willifan <willifan@pm.me>
Date: Sat, 1 Nov 2025 18:37:42 +0100
Subject: [PATCH 1/4] added Freecad

---
 modules/nixos/desktop/applications.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/nixos/desktop/applications.nix b/modules/nixos/desktop/applications.nix
index e319af9..b4f546a 100644
--- a/modules/nixos/desktop/applications.nix
+++ b/modules/nixos/desktop/applications.nix
@@ -27,6 +27,7 @@ lib.mkIf config.desktop.enable {
       prusa-slicer
       UVtools
       audacity
+      freecad-wayland
     ]);
 
 }

From 746dba5a9ea42693f0f3e8bb221d35ad87e73e65 Mon Sep 17 00:00:00 2001
From: willifan <willifan@pm.me>
Date: Thu, 6 Nov 2025 12:29:47 +0100
Subject: [PATCH 2/4] added blender and openscad

---
 modules/nixos/desktop/applications.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/nixos/desktop/applications.nix b/modules/nixos/desktop/applications.nix
index b4f546a..2582bcd 100644
--- a/modules/nixos/desktop/applications.nix
+++ b/modules/nixos/desktop/applications.nix
@@ -21,13 +21,14 @@ lib.mkIf config.desktop.enable {
       qemu
 
       libreoffice
-      #blender
       gimp
       inkscape
       prusa-slicer
       UVtools
       audacity
       freecad-wayland
+      blender
+      openscad
     ]);
 
 }

From 599ffc234a3ec925d9f50fabff17bbb132b337f2 Mon Sep 17 00:00:00 2001
From: willifan <willifan@pm.me>
Date: Thu, 6 Nov 2025 12:32:46 +0100
Subject: [PATCH 3/4] added vlc

---
 modules/nixos/desktop/applications.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/nixos/desktop/applications.nix b/modules/nixos/desktop/applications.nix
index 2582bcd..d4e43f5 100644
--- a/modules/nixos/desktop/applications.nix
+++ b/modules/nixos/desktop/applications.nix
@@ -5,6 +5,7 @@ lib.mkIf config.desktop.enable {
     (with pkgs; [
 
       feh
+      vlc
 
       enpass
       proton-pass

From 27420bc9a33a7dc0b7028a06faf16ade72e726bb Mon Sep 17 00:00:00 2001
From: willifan <willifan@pm.me>
Date: Thu, 6 Nov 2025 12:35:15 +0100
Subject: [PATCH 4/4] adapt to mako changes

---
 modules/home-manager/desktop/compositors/wlroots_utils.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/home-manager/desktop/compositors/wlroots_utils.nix b/modules/home-manager/desktop/compositors/wlroots_utils.nix
index 63709da..3d7cb58 100644
--- a/modules/home-manager/desktop/compositors/wlroots_utils.nix
+++ b/modules/home-manager/desktop/compositors/wlroots_utils.nix
@@ -43,8 +43,10 @@ in
 
     services.mako = lib.mkIf config.desktop.mako.enable {
       enable = true;
-      borderRadius = 10;
-      borderSize = 2;
+      settings = {
+        borderRadius = 10;
+        borderSize = 2;
+      };
     };
 
     services.hypridle = lib.mkIf config.desktop.hypridle.enable {