3 files changed, 1 insertions, 56 deletions
diff --git a/pkgs/barista/default.nix b/pkgs/barista/default.nix
deleted file mode 100644
index d097996..0000000
--- a/pkgs/barista/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  buildGoModule,
-  fetchFromGitHub,
-  wirelesstools,
-  fontawesomeMetadata,
-  materialDesignIconsMetadata,
-  i3statusGo ? null,
-}:
-
-let
-  useDefaultConfig = i3statusGo == null;
-in
-buildGoModule {
-  name = "barista";
-  version = "autorelease";
-
-  src = fetchFromGitHub {
-    owner = "soumya92";
-    repo = "barista";
-    rev = "ce8f4953e9ccf194b769f3d9ddb6806a1f7677d7";
-    sha256 = "sha256-SzB4Zf9qW0ylob4iLTHR3tZpUl9Ns/F3gaUjuU+Ys1k=";
-  };
-
-  patchPhase = ''
-    mkdir main
-  ''
-  + (
-    if useDefaultConfig then # use samples/i3status/i3status.go as config
-      ''
-        mv samples/i3status/i3status.go main/i3status.go
-      ''
-    # import config and patch font loading
-    else
-      ''
-        cp ${i3statusGo} main/i3status.go
-        substituteInPlace main/i3status.go \
-                          --replace 'fontawesome.Load()' 'fontawesome.Load("${fontawesomeMetadata}")' \
-                          --replace 'mdi.Load()' 'mdi.Load("${materialDesignIconsMetadata}")'
-      ''
-  )
-  # patch call to iwgetid
-  + ''
-    substituteInPlace modules/wlan/wlan.go \
-                      --replace '/sbin/iwgetid' '${wirelesstools}/bin/iwgetid'
-  '';
-
-  subPackages = [ "main/i3status.go" ];
-
-  vendorHash = "sha256-gpzxwtGxHcidRYY8o1Lz0iboU5aNnwsWfOoGo6Lvefo=";
-}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 9fd96e5..2fdae90 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,11 +1,6 @@
 super:
 let
   self = {
-    barista = super.callPackage ./barista {
-      fontawesomeMetadata = self.static.fontMetadata.fontawesome;
-      materialDesignIconsMetadata = self.static.fontMetadata.materialDesignIcons;
-    };
-
     lib = import ./lib { inherit (super) lib; };
 
     lockscreen = super.callPackage ./lockscreen { };
diff --git a/pkgs/lib/home-manager/default.nix b/pkgs/lib/home-manager/default.nix
index e07e0b8..91149d6 100644
--- a/pkgs/lib/home-manager/default.nix
+++ b/pkgs/lib/home-manager/default.nix
@@ -11,7 +11,7 @@
       ...
     }@config:
     {
-      services.${name} = { inherit (config) Unit Install Service; };
+      services.${name} = { inherit (config) Unit Service; };
       timers.${name} = {
         inherit (config) Unit Install;
         Timer = config.Timer // {