From 46075b214a2c851216fffd4fc80e4256a9be6ec4 Mon Sep 17 00:00:00 2001
From: atagen <atagen@boss.co>
Date: Sat, 3 Sep 2022 21:37:00 +1000
Subject: [PATCH] package new bismuth, add inkscape

---
 home/home.nix             |  3 ++-
 home/homepkgs/bismuth.nix | 49 +++++++++++++++++++++++++++++++++++++++
 system/wollomi.nix        |  2 +-
 3 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 home/homepkgs/bismuth.nix

diff --git a/home/home.nix b/home/home.nix
index 2c54e66..5ede64c 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -21,6 +21,7 @@
     thunderbird
 
     clementine
+    inkscape
 
     btop
     bat
@@ -38,7 +39,6 @@
     zoxide
     meslo-lgs-nf
 
-    libsForQt5.bismuth
     libsForQt5.ark
     libsForQt5.qtstyleplugin-kvantum
 
@@ -48,6 +48,7 @@
 
     (callPackage ./homepkgs/git-credential-keepassxc.nix { })
     (callPackage ./homepkgs/culr.nix { })
+    (libsForQt5.callPackage ./homepkgs/bismuth.nix { })
 
   ];
 
diff --git a/home/homepkgs/bismuth.nix b/home/homepkgs/bismuth.nix
new file mode 100644
index 0000000..e12a8be
--- /dev/null
+++ b/home/homepkgs/bismuth.nix
@@ -0,0 +1,49 @@
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, kcoreaddons
+, kwindowsystem
+, plasma-framework
+, systemsettings
+, cmake
+, extra-cmake-modules
+, esbuild
+}:
+
+mkDerivation rec {
+  pname = "bismuth";
+  version = "3.1.3";
+
+  src = fetchFromGitHub {
+    owner = "Bismuth-Forge";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-IWwFsYqoqW3924+pf8L+acIt31aU/mhqakXbT9Q4Bqw=";
+  };
+
+  cmakeFlags = [
+    "-DUSE_TSC=OFF"
+    "-DUSE_NPM=OFF"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+    esbuild
+  ];
+
+  buildInputs = [
+    kcoreaddons
+    kwindowsystem
+    plasma-framework
+    systemsettings
+  ];
+
+  meta = with lib; {
+    description = "A dynamic tiling extension for KWin";
+    license = licenses.mit;
+    maintainers = with maintainers; [ pasqui23 ];
+    homepage = "https://bismuth-forge.github.io/bismuth/";
+    inherit (kwindowsystem.meta) platforms;
+  };
+}
diff --git a/system/wollomi.nix b/system/wollomi.nix
index b9c155f..c9f4520 100644
--- a/system/wollomi.nix
+++ b/system/wollomi.nix
@@ -60,5 +60,5 @@
       options = [ "rw" "uid=1000" "gid=100" ];
   };
 
-  networking.firewall.enable = false;
+  # networking.firewall.enable = false;
 }