From 4b6e9c9c3cb7eb57b3f0ec233560541c6f8af77f Mon Sep 17 00:00:00 2001
From: kczulko <karol.czulkowski@protonmail.com>
Date: Mon, 22 Nov 2021 13:57:05 +0100
Subject: [PATCH] Remove custom metals + enable docker.

---
 common.nix                              |  4 +++-
 users/kczulko/customizations/all.nix    |  1 -
 users/kczulko/customizations/metals.nix | 11 -----------
 users/kczulko/user-profile.nix          | 17 +++++------------
 workstation.nix                         |  7 +++++--
 5 files changed, 13 insertions(+), 27 deletions(-)
 delete mode 100644 users/kczulko/customizations/metals.nix

diff --git a/common.nix b/common.nix
index cf941b1..3877d09 100644
--- a/common.nix
+++ b/common.nix
@@ -67,6 +67,7 @@ in
     git
     git-crypt
     git-lfs
+    htop
     lshw
     lsof
     mkpasswd
@@ -99,6 +100,7 @@ in
     # use the example session manager (no others are packaged yet so this is enabled by default,
     # no need to redefine it in your config for now)
     #media-session.enable = true;
+
     media-session.config.bluez-monitor.rules = [
       {
         # Matches all cards
@@ -128,7 +130,7 @@ in
   };
 
   # Enable sound.
-  config.sound.enable = true;
+  # config.sound.enable = true;
   config.hardware = {
 
     bluetooth = {
diff --git a/users/kczulko/customizations/all.nix b/users/kczulko/customizations/all.nix
index 0432bc8..6516fc1 100644
--- a/users/kczulko/customizations/all.nix
+++ b/users/kczulko/customizations/all.nix
@@ -1,7 +1,6 @@
 {pkgs,...}:
 
 {
-  metals = import ./metals.nix { inherit pkgs; };
   polybar-launcher = import ./polybar-launcher.nix { inherit pkgs; };
   setup-resolution = import ./setup-resolution.nix { inherit pkgs; };
 }
diff --git a/users/kczulko/customizations/metals.nix b/users/kczulko/customizations/metals.nix
deleted file mode 100644
index 762df5d..0000000
--- a/users/kczulko/customizations/metals.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{pkgs,...}: with pkgs;
-
-let
-  metalsVersion = "0.9.4";
-  metalsSha256 = "1k07gg13z3kambvvrxsc27781cd5npb2a50ahdbj7x6j6h67k0pg";
-  metalsPkg = metals;
-  tarball = fetchTarball https://github.com/kczulko/scala-dev-env/tarball/master;
-in
-  callPackage "${tarball}/metals.nix" {
-    inherit metalsPkg metalsVersion metalsSha256;
-  }
diff --git a/users/kczulko/user-profile.nix b/users/kczulko/user-profile.nix
index c73fa30..8fc5e8f 100644
--- a/users/kczulko/user-profile.nix
+++ b/users/kczulko/user-profile.nix
@@ -8,15 +8,9 @@ let
   secrets        = import ../../secrets.nix;
   customizations = import ./customizations/all.nix { inherit pkgs; };
 
-  # TODO: fix with overlay
-  sbtJava8 = pkgs.sbt.override { jre = pkgs.openjdk8; };
-
-  metalsJava8 = unstable.metals.override { jdk = pkgs.openjdk8; jre = pkgs.openjdk8; };
-  bloopJava8 = pkgs.bloop.override { jre = pkgs.openjdk8; };
-
   # for cisco vpn connection
   openconnect-sso = import (
-    fetchTarball https://github.com/kczulko/openconnect-sso/archive/15114b75d6735ce723b843a4e804dc74efd4073b.tar.gz
+    fetchTarball https://github.com/kczulko/openconnect-sso/archive/aa2264471b0a02eddba54b995fbb3d5daca07c12.tar.gz
   );
 
 in {
@@ -58,8 +52,7 @@ in {
       TERM = "xterm-256color";
     };
     home.packages = with pkgs; [
-      # customizations.metals
-      bloopJava8
+      bloop
       cabal2nix
       calcurse
       customizations.polybar-launcher
@@ -68,12 +61,12 @@ in {
       gnome3.gnome-screenshot
       gscan2pdf
       ispell
-      metalsJava8
+      unstable.metals
       nix-prefetch-git
       noisetorch
       openconnect-sso
-      openjdk8
-      sbtJava8
+      openjdk
+      sbt
       slack-dark
       unrar
       unstable.cabal-install
diff --git a/workstation.nix b/workstation.nix
index c83cf6a..29fe77a 100644
--- a/workstation.nix
+++ b/workstation.nix
@@ -8,6 +8,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware/workstation.nix
+      "${builtins.fetchGit { url = "https://github.com/NixOS/nixos-hardware.git"; }}/common/cpu/intel"
       ./common.nix
       ./desktops/default-desktop.nix
       ./users/kczulko/user-profile.nix
@@ -20,6 +21,8 @@
   boot.zfs.requestEncryptionCredentials = true;
   boot.supportedFilesystems = [ "zfs" ];
 
+  virtualisation.docker.enable = true;
+
   # enable virtualisation
   #virtualisation.virtualbox.host.enable = true;
   #users.extraGroups.vboxusers.members = [ "kczulko" ];
@@ -29,12 +32,12 @@
     useDHCP = false;
     interfaces = {
       enp2s0.useDHCP = true;
-      wlp0s20f0u6.useDHCP = true;
+      wlp0s20f0u5.useDHCP = true;
     };
     # required by zfs
     hostId ="acef45ac";
     hostName = "workstation";
-    wireless.interfaces = [ "wlp0s20f0u6" ];
+    wireless.interfaces = [ "wlp0s20f0u5" ];
     # Network (Wireless and cord)
     networkmanager.enable = true;