From a7b12d2e18a1c11910fa32bffda3e63d9c6f5821 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Mon, 30 Nov 2020 12:02:18 +0100
Subject: [PATCH 1/3] add volman

---
 roles/desktop.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/roles/desktop.nix b/roles/desktop.nix
index a0c563f..202939b 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -100,6 +100,7 @@ in {
     wl-clipboard
     xdg_utils
     xfce.thunar
+    xfce.thunar-volman
     unstable.keepassxc
     (
       pkgs.writeTextFile {
@@ -127,6 +128,8 @@ in {
     )
   ];
 
+  services.gvfs.enable = true;
+
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
 

From c4886b737ee438ec305cedcef45cfb26ade33091 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Mon, 30 Nov 2020 12:02:42 +0100
Subject: [PATCH 2/3] upgrade to python38

---
 roles/dev.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/roles/dev.nix b/roles/dev.nix
index 9a9d598..38bd76c 100644
--- a/roles/dev.nix
+++ b/roles/dev.nix
@@ -6,10 +6,12 @@ in {
   environment.systemPackages = with pkgs; [
     gnumake
     go
-    python37
-    python37Packages.pyls-black
-    python37Packages.pyls-isort
-    python37Packages.pyls-mypy
+    python38
+    python38Packages.pyls-black
+    python38Packages.pyls-isort
+    python38Packages.pyls-mypy
+    python38Packages.python-language-server
+    python38Packages.requests
     rustup
     unstable.golangci-lint
     unstable.gopls

From de2c484d2e5aa64c410add5a22de4765175aecbb Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Mon, 30 Nov 2020 12:03:11 +0100
Subject: [PATCH 3/3] add vault-sink

---
 packages/skaffold.nix | 29 +++++++++++++++++++++++++++++
 roles/admin.nix       |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 packages/skaffold.nix

diff --git a/packages/skaffold.nix b/packages/skaffold.nix
new file mode 100644
index 0000000..77a45d5
--- /dev/null
+++ b/packages/skaffold.nix
@@ -0,0 +1,29 @@
+with import <nixpkgs> {};
+
+stdenv.mkDerivation {
+  name = "skaffold";
+  version = "1.17.0";
+  src = fetchurl {
+    url = "https://github.com/GoogleContainerTools/skaffold/releases/download/v1.17.0/skaffold-linux-amd64";
+    sha256 = "734a23dfe90b01feb927c44168c93b72afd05d8b978319b4670dc7e6a5e887fe";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+  ];
+
+  unpackPhase = ''
+    cp $src skaffold
+  '';
+
+  installPhase = ''
+    install -m 755 -D skaffold $out/bin/skaffold
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://skaffold.dev";
+    description = "skaffold";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ foosinn ];
+  };
+}
diff --git a/roles/admin.nix b/roles/admin.nix
index 70708fd..db9f23b 100644
--- a/roles/admin.nix
+++ b/roles/admin.nix
@@ -16,6 +16,8 @@ in {
 
     podman-compose
     fuse-overlayfs
+
+    (import ../packages/skaffold.nix)
   ];
 
   virtualisation.podman = {