From 0f1099f5f376ab42550c7f0630bcea53ebe08053 Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Wed, 8 Mar 2023 10:38:33 -0800 Subject: [PATCH 1/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/ef7d316578367ed7732a21eede6c79546a36124f' (2023-02-28) → 'github:nix-community/home-manager/36999b8d19eb6eebb41983ef017d7e0095316af2' (2023-03-08) • Updated input 'home-manager/utils': 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) → 'github:numtide/flake-utils/3db36a8b464d0c4532ba1c7dda728f4576d6d073' (2023-02-13) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/7f5639fa3b68054ca0b062866dc62b22c3f11505' (2023-02-26) → 'github:nixos/nixpkgs/c707238dc262923da5a53a5a11914117caac07a2' (2023-03-07) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 2565ca1..5570ab0 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1677621055, - "narHash": "sha256-n3D/pZX0cYEpWKcLJSFImo5Dpk3D1RrxKVDmI6lnaIg=", + "lastModified": 1678271387, + "narHash": "sha256-H2dv/i1LRlunRtrESirELzfPWdlG/6ElDB1ksO529H4=", "owner": "nix-community", "repo": "home-manager", - "rev": "ef7d316578367ed7732a21eede6c79546a36124f", + "rev": "36999b8d19eb6eebb41983ef017d7e0095316af2", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677407201, - "narHash": "sha256-3blwdI9o1BAprkvlByHvtEm5HAIRn/XPjtcfiunpY7s=", + "lastModified": 1678201391, + "narHash": "sha256-dX4z2oSJ5UKzY5wb5HX2VaPP08DPWZ6B7EHzOJfP7GM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7f5639fa3b68054ca0b062866dc62b22c3f11505", + "rev": "c707238dc262923da5a53a5a11914117caac07a2", "type": "github" }, "original": { @@ -45,11 +45,11 @@ }, "utils": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { From ef4717e6cd3d73a520f2634b23e64b6e0bd207ad Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Wed, 8 Mar 2023 10:46:41 -0800 Subject: [PATCH 2/2] 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; - }; -}