From d66e2900ee093eec9a08c45d03ce5cc65c6aad67 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Tue, 5 Jan 2021 12:41:39 +0100
Subject: [PATCH 1/5] update skaffold

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

diff --git a/packages/skaffold.nix b/packages/skaffold.nix
index 77a45d5..eb42f25 100644
--- a/packages/skaffold.nix
+++ b/packages/skaffold.nix
@@ -1,11 +1,11 @@
 with import <nixpkgs> {};
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "skaffold";
-  version = "1.17.0";
+  version = "1.17.2";
   src = fetchurl {
-    url = "https://github.com/GoogleContainerTools/skaffold/releases/download/v1.17.0/skaffold-linux-amd64";
-    sha256 = "734a23dfe90b01feb927c44168c93b72afd05d8b978319b4670dc7e6a5e887fe";
+    url = "https://github.com/GoogleContainerTools/skaffold/releases/download/v${version}/skaffold-linux-amd64";
+    sha256 = "55dea8be16fa3abd81820a6a03f5d708beb5e152fe71e00f00744a4dd321c55a";
   };
 
   nativeBuildInputs = [
@@ -18,6 +18,8 @@ stdenv.mkDerivation {
 
   installPhase = ''
     install -m 755 -D skaffold $out/bin/skaffold
+    echo $out/bin/skaffold
+    ls -lah $out/bin/skaffold
   '';
 
   meta = with stdenv.lib; {

From b92ad8584c901d14612524c5e9ab5451bf877272 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Tue, 5 Jan 2021 12:42:08 +0100
Subject: [PATCH 2/5] fix cpu performance

---
 hardware/xps15-sphere.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hardware/xps15-sphere.nix b/hardware/xps15-sphere.nix
index 156cb6a..0d2afde 100644
--- a/hardware/xps15-sphere.nix
+++ b/hardware/xps15-sphere.nix
@@ -10,10 +10,11 @@ in {
     [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
     ];
 
+  boot.extraModulePackages = [ ];
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot.kernelParams = [ "intel_pstate=active" ];
 
   nixpkgs.config.packageOverrides = pkgs: {
     vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };

From fc72eed505a591cd03df62988abbc65a95a75d1b Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Tue, 5 Jan 2021 12:42:53 +0100
Subject: [PATCH 3/5] readd add lid switch

---
 dotfiles/sway/config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dotfiles/sway/config b/dotfiles/sway/config
index 7d6492a..9d791ae 100644
--- a/dotfiles/sway/config
+++ b/dotfiles/sway/config
@@ -37,6 +37,8 @@ bindsym $mod+z exec swaylock -t -i /home/stefan/Downloads/bg.jpg --scaling=fill
 bindsym $mod+Up exec light -A 5
 bindsym $mod+Down exec light -U 5
 bindsym Print exec grim -g "$(slurp)" - | wl-copy -t image/png
+bindswitch --reload --locked lid:on output eDP-1 disable
+bindswitch --reload --locked lid:off output eDP-1 enable
 
 # app rules
 for_window [app_id="org.keepassxc.KeePassXC"] floating enable

From 5b3fee0d47da4939e7dee2cbe1c0291fddb9c6ae Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Tue, 5 Jan 2021 12:43:37 +0100
Subject: [PATCH 4/5] add helm2

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

diff --git a/packages/helm2.nix b/packages/helm2.nix
new file mode 100644
index 0000000..29956c3
--- /dev/null
+++ b/packages/helm2.nix
@@ -0,0 +1,29 @@
+with import <nixpkgs> {};
+
+stdenv.mkDerivation rec {
+  name = "helm2";
+  version = "2.14.3";
+  src = fetchurl {
+    url = "https://get.helm.sh/helm-v${version}-linux-amd64.tar.gz";
+    sha256 = "38614a665859c0f01c9c1d84fa9a5027364f936814d1e47839b05327e400bf55";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+  ];
+
+  unpackPhase = ''
+    tar xvpzf $src
+  '';
+
+  installPhase = ''
+    install -m 755 -D linux-amd64/helm $out/bin/helm2
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://helm.sh";
+    description = "helms depricated v2 verison";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ foosinn ];
+  };
+}
diff --git a/roles/admin.nix b/roles/admin.nix
index db9f23b..1e1590a 100644
--- a/roles/admin.nix
+++ b/roles/admin.nix
@@ -18,6 +18,7 @@ in {
     fuse-overlayfs
 
     (import ../packages/skaffold.nix)
+    (import ../packages/helm2.nix)
   ];
 
   virtualisation.podman = {

From 5fb2d57754e67a1fe35d320e933a20b86944be9c Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Tue, 5 Jan 2021 12:47:51 +0100
Subject: [PATCH 5/5] fix python environment

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

diff --git a/roles/dev.nix b/roles/dev.nix
index 38bd76c..1b7b2ac 100644
--- a/roles/dev.nix
+++ b/roles/dev.nix
@@ -3,20 +3,24 @@
 let
   unstable = import <nixos-unstable> {};
 in {
+
   environment.systemPackages = with pkgs; [
     gnumake
     go
-    python38
-    python38Packages.pyls-black
-    python38Packages.pyls-isort
-    python38Packages.pyls-mypy
-    python38Packages.python-language-server
-    python38Packages.requests
     rustup
     unstable.golangci-lint
     unstable.gopls
     unstable.rust-analyzer
 
+    (python38.withPackages(python-packages: with python-packages; [
+      pyls-black
+      pyls-isort
+      pyls-mypy
+      python-language-server
+      pyyaml
+      requests
+    ]))
+
     emacs
     ltrace
     sops