From ef4717e6cd3d73a520f2634b23e64b6e0bd207ad Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Wed, 8 Mar 2023 10:46:41 -0800
Subject: [PATCH] xborders: use nixpkgs

---
 hosts/home.nix                |  1 -
 modules/i3/default.nix        |  1 +
 modules/xborders/default.nix  |  7 -----
 modules/xborders/setup.py     | 12 ---------
 modules/xborders/xborders.nix | 48 -----------------------------------
 5 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 modules/xborders/default.nix
 delete mode 100644 modules/xborders/setup.py
 delete mode 100644 modules/xborders/xborders.nix

diff --git a/hosts/home.nix b/hosts/home.nix
index 63d1d1c..d038d15 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -19,7 +19,6 @@ in
     ../modules/startpage
     ../modules/terminal
     ../modules/todo-txt
-    ../modules/xborders
   ];
 
   home.file."./.background-image".source = theme.wallpaper;
diff --git a/modules/i3/default.nix b/modules/i3/default.nix
index 23aa48e..f6d5550 100644
--- a/modules/i3/default.nix
+++ b/modules/i3/default.nix
@@ -8,6 +8,7 @@ in with theme.colors; {
   home.packages = with pkgs; [
     playerctl # pactl comes with PulseAudio
     wmctrl # For rofi power menu
+    xborders # Active window borders
   ];
 
   # Screenshots
diff --git a/modules/xborders/default.nix b/modules/xborders/default.nix
deleted file mode 100644
index f0e721b..0000000
--- a/modules/xborders/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    (pkgs.callPackage ./xborders.nix {})
-  ];
-}
diff --git a/modules/xborders/setup.py b/modules/xborders/setup.py
deleted file mode 100644
index a002625..0000000
--- a/modules/xborders/setup.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from setuptools import setup
-
-setup(
-    name='@pname@',
-    version='@version@',
-    author='deter0',
-    description='@desc@',
-    install_requires=['pycairo', 'requests', 'PyGObject'],
-    scripts=[
-        'xborders',
-    ],
-)
diff --git a/modules/xborders/xborders.nix b/modules/xborders/xborders.nix
deleted file mode 100644
index 9436697..0000000
--- a/modules/xborders/xborders.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib, pkgs, ... }:
-
-with pkgs; callPackage python3Packages.buildPythonPackage rec {
-  pname = "xborders";
-  version = "3.4"; # in version.txt
-
-  src = fetchFromGitHub {
-    owner = "deter0";
-    repo = "xborder";
-    rev = "e74ae532b9555c59d195537934fa355b3fea73c5";
-    hash = "sha256-UKsseNkXest6npPqJKvKL0iBWeK+S7zynrDlyXIOmF4=";
-  };
-
-  buildInputs = [
-    libwnck
-    gtk3
-    libnotify
-  ];
-
-  nativeBuildInputs = [
-    wrapGAppsHook
-    gobject-introspection
-  ];
-
-  propagatedBuildInputs = with python3Packages; [
-    pycairo
-    requests
-    pygobject3
-  ];
-
-  postPatch = let
-    setup = pkgs.substituteAll {
-      src = ./setup.py;
-      desc = meta.description; # "description" is reserved 
-      inherit pname version;
-    };
-  in ''
-    ln -s ${setup} setup.py
-  '';
-
-  meta = with lib; {
-    description = "Active window border replacement for window managers.";
-    homepage = "https://github.com/deter0/xborder";
-    license = licenses.unlicense;
-    maintainers = with maintainers; [ elnudev ];
-    platforms = platforms.linux;
-  };
-}