diff --git a/hosts/home.nix b/hosts/home.nix index 849904f..feb1704 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 5da8475..e0c8db1 100644 --- a/modules/i3/default.nix +++ b/modules/i3/default.nix @@ -60,7 +60,7 @@ in with theme.colors; { }; startup = [ { - command = "(systemctl --user restart polybar &) && (nm-applet &) && (nextcloud &) && (xborders --border-rgb ${builtins.substring 1 6 primary}ff --border-radius 12 --border-width 2 --smart-hide-border)"; + command = "(systemctl --user restart polybar &) && (nm-applet &) && (nextcloud &)"; always = true; notification = false; } diff --git a/modules/picom/default.nix b/modules/picom/default.nix index 41f9b51..57f8288 100644 --- a/modules/picom/default.nix +++ b/modules/picom/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ ... }: { services.picom = { diff --git a/modules/terminal/default.nix b/modules/terminal/default.nix index 67799b3..f62cc7e 100644 --- a/modules/terminal/default.nix +++ b/modules/terminal/default.nix @@ -12,7 +12,7 @@ in name = "FiraCode Nerd Font Mono"; size = 12; }; - extraConfig = "enable_audio_bell 0\nconfirm_os_window_close 0\nbackground_opacity 0.7\nwindow_padding_width 2"; + extraConfig = "enable_audio_bell 0\nconfirm_os_window_close 0\nbackground_opacity 0.7"; }; programs.bash.shellAliases = { # Fix for ""'xterm-kitty': unknown terminal type" error in remote sessions 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/xborders.nix b/modules/xborders/xborders.nix deleted file mode 100644 index 3ec4507..0000000 --- a/modules/xborders/xborders.nix +++ /dev/null @@ -1,39 +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 = "d840ed649e92b7ad399cdb1a30aeca7d09f2c08f"; - sha256 = "sha256-Q2WWXekUL/OOr/OBqJOZbAHaWURbP+coBVp206uPSNY="; - }; - buildInputs = [ libwnck gtk3 libnotify ]; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; - propagatedBuildInputs = with python3Packages; [ pycairo requests pygobject3 ]; - preBuild = '' - sed '52,58!d' ${pname} - sed -i '51 a\ return ${version}' ${pname} - cat >setup.py <<'EOF' - from setuptools import setup - setup( - name='${pname}', - version='${version}', - author='deter0', - description='${meta.description}', - install_requires=['pycairo', 'requests', 'PyGObject'], - scripts=[ - '${pname}', - ], - ) - EOF - ''; - meta = with lib; { - description = "Active window border replacement for window managers."; - homepage = "https://github.com/deter0/xborder"; - license = licenses.unlicense; - maitainers = with maintainers; [ elnudev ]; - platforms = platforms.linux; - }; -}