about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--hosts/home.nix2
-rw-r--r--packages/default.nix1
-rw-r--r--packages/dwmbar/default.nix26
3 files changed, 1 insertions, 28 deletions
diff --git a/hosts/home.nix b/hosts/home.nix
index 2b7d208..008ab5c 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -32,10 +32,10 @@
       jrnl
       todo-txt-cli
       element-desktop
+      dwmbar
     ] ++
     (with pkgs.custom; [
       smart-wallpaper
-      dwmbar
       lemacs
     ]);
   };
diff --git a/packages/default.nix b/packages/default.nix
index 2ef9b52..51bfe77 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -2,7 +2,6 @@ final: prev:
 {
   custom = {
     smart-wallpaper = prev.callPackage ./smart-wallpaper { };
-    dwmbar = prev.callPackage ./dwmbar { };
     adl = prev.callPackage ./adl { };
     kindlegen = prev.callPackage ./kindlegen { };
     manga-cli = prev.callPackage ./manga-cli { };
diff --git a/packages/dwmbar/default.nix b/packages/dwmbar/default.nix
deleted file mode 100644
index 1704b9d..0000000
--- a/packages/dwmbar/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-}:
-
-stdenv.mkDerivation {
-  pname = "dwmbar";
-  version = "1.0";
-  
-  src = fetchFromGitHub {
-    owner = "thytom";
-    repo = "dwmbar";
-    rev = "574f5703c558a56bc9c354471543511255423dc7";
-    sha256 = "sha256-IrelZpgsxq2dnsjMdh7VC5eKffEGRbDkZmZBD+tROPs=";
-  };
-  
-  installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/config
-    cp -r modules/ $out/config/
-    install config $out/config/config
-    install bar.sh $out/config/bar.sh
-    substituteInPlace dwmbar --replace 'DEFAULT_CONFIG_DIR="/usr/share/dwmbar"' "DEFAULT_CONFIG_DIR=\"$out/config\""
-    install dwmbar $out/bin/dwmbar
-  '';
-}