From 263638210a04efbd4d9467c8f8a0182d5f6d74a5 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Sat, 10 Jul 2021 20:31:14 +0200
Subject: [PATCH 1/6] use stable kernel for zfs compatibility

---
 hardware/x220-discovery.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hardware/x220-discovery.nix b/hardware/x220-discovery.nix
index 7082acf..7230b17 100644
--- a/hardware/x220-discovery.nix
+++ b/hardware/x220-discovery.nix
@@ -36,7 +36,6 @@ in {
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
 
   # custom
-  boot.kernelPackages = unstable.linuxPackages_latest;
   boot.loader.systemd-boot.enable = true;
   networking.hostId = "ef3a5d57";
   networking.hostName = "discovery";

From b428dcad0937e2a62e8ff94d5c8e33498f374733 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Sat, 10 Jul 2021 20:31:38 +0200
Subject: [PATCH 2/6] add ntfs support

---
 roles/base.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roles/base.nix b/roles/base.nix
index f3c6766..bc64e3c 100644
--- a/roles/base.nix
+++ b/roles/base.nix
@@ -24,6 +24,7 @@ in {
     ncdu
     nix-index
     nload
+    ntfs3g
     openssl
     patchelf
     pv

From da350e3e7cdbfa9dbc2010e7ed957014ea10620a Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Sat, 10 Jul 2021 20:32:20 +0200
Subject: [PATCH 3/6] remove bazel

---
 roles/dev.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/roles/dev.nix b/roles/dev.nix
index d046695..53d0670 100644
--- a/roles/dev.nix
+++ b/roles/dev.nix
@@ -30,7 +30,6 @@ in {
     parallel
     sops
     tig
-    unstable.bazel
 
     openssl pkg-config nasm cmake zlib gcc binutils-unwrapped
   ];

From 7482d92923d6b304ce100a6296550aef756d7c7c Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Sat, 10 Jul 2021 20:32:34 +0200
Subject: [PATCH 4/6] Revert "remove bazel"

This reverts commit 3733a42641a6e9ac3e031b5184247eecc1d10f34.
---
 roles/dev.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roles/dev.nix b/roles/dev.nix
index 53d0670..d046695 100644
--- a/roles/dev.nix
+++ b/roles/dev.nix
@@ -30,6 +30,7 @@ in {
     parallel
     sops
     tig
+    unstable.bazel
 
     openssl pkg-config nasm cmake zlib gcc binutils-unwrapped
   ];

From 9d44ab40b1e428248476b1ddf191f7cbab7a12fe Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Sat, 10 Jul 2021 20:33:14 +0200
Subject: [PATCH 5/6] remove i3config

---
 roles/desktop.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/roles/desktop.nix b/roles/desktop.nix
index 4858459..d8ac11b 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -38,7 +38,6 @@ in {
 
   environment = {
     etc = {
-      "i3/config".source = ../dotfiles/i3/config;
       "sway/config".source = ../dotfiles/sway/config;
       "sway/status.toml".source = ../dotfiles/sway/status.toml;
       "xdg/alacritty/alacritty.yml".source = ../dotfiles/alacritty.yml;

From 43f1e60f415e6d23272fc055d500f302357fc9c7 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Sat, 10 Jul 2021 20:33:28 +0200
Subject: [PATCH 6/6] add some 3d packages

---
 roles/private.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/roles/private.nix b/roles/private.nix
index dd070ba..70bac0d 100644
--- a/roles/private.nix
+++ b/roles/private.nix
@@ -15,8 +15,12 @@ in {
     pkgsCross.avr.libcCross
 
     cura
+    candle
     openscad
     kicad
+    blender
+    python3Packages.numpy
+    python3Packages.shapely
 
     steam
     unstable.obs-studio