diff options
| -rw-r--r-- | hosts/home.nix | 2 | ||||
| -rw-r--r-- | overlays/base.nix | 17 | ||||
| -rw-r--r-- | packages/default.nix | 1 | ||||
| -rw-r--r-- | packages/xwinwrap/default.nix | 51 |
4 files changed, 17 insertions, 54 deletions
diff --git a/hosts/home.nix b/hosts/home.nix index f47e625..cfd4677 100644 --- a/hosts/home.nix +++ b/hosts/home.nix @@ -11,7 +11,7 @@ in scrot qemu redshift - custom.xwinwrap + xwinwrap discord mpv sxiv diff --git a/overlays/base.nix b/overlays/base.nix index 4429243..46eb48c 100644 --- a/overlays/base.nix +++ b/overlays/base.nix @@ -8,7 +8,7 @@ final: prev: sha256 = "sha256-jcfcOEQTdAw/4yFmHO3MtXjhcxNnNpqJgjuxy0T8zIs="; }; }); - + dmenu = prev.dmenu.overrideAttrs (old: { src = prev.fetchFromGitHub { owner = "Baitinq"; @@ -30,6 +30,7 @@ final: prev: neovim = prev.neovim.override { vimAlias = true; + viAlias = true; configure = { packages.myPlugins = with prev.vimPlugins; { start = [ @@ -45,6 +46,20 @@ final: prev: }; }; + xwinwrap = prev.xwinwrap.overrideAttrs (old: { + src = prev.fetchFromGitHub { + owner = "Baitinq"; + repo = "xwinwrap"; + rev = "401b5a5eb092173443253cdd57736cd6bf401e40"; + sha256 = "sha256-8+asreFjzD49O3sZlAXBsWD3PU0rqkbs/J3Dq9VeiYA="; + }; + buildPhase = "make all"; + installPhase = '' + mkdir -p $out/bin + mv xwinwrap $out/bin/xwinwrap + ''; + }); + kcc = prev.kcc.overrideAttrs (oldAttrs: { version = "5.5.2"; src = prev.fetchFromGitHub { diff --git a/packages/default.nix b/packages/default.nix index 508561c..279c9f5 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -2,7 +2,6 @@ final: prev: { custom.smart-wallpaper = prev.callPackage ./smart-wallpaper { }; custom.dwmbar = prev.callPackage ./dwmbar { }; - custom.xwinwrap = prev.callPackage ./xwinwrap { }; custom.trackma = prev.callPackage ./trackma { }; custom.anime-downloader = prev.callPackage ./anime-downloader { pkgs = prev; }; custom.adl = prev.callPackage ./adl { anime-downloader = final.custom.anime-downloader; trackma = final.custom.trackma; }; diff --git a/packages/xwinwrap/default.nix b/packages/xwinwrap/default.nix deleted file mode 100644 index f3db34d..0000000 --- a/packages/xwinwrap/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, xlibsWrapper }: - -stdenv.mkDerivation rec { - pname = "xwinwrap"; - version = "4"; - - src = fetchFromGitHub { - owner = "Baitinq"; - repo = "xwinwrap"; - rev = "401b5a5eb092173443253cdd57736cd6bf401e40"; - sha256 = "sha256-8+asreFjzD49O3sZlAXBsWD3PU0rqkbs/J3Dq9VeiYA="; - }; - - buildInputs = [ xlibsWrapper ]; - - buildPhase = - if stdenv.hostPlatform.system == "x86_64-linux" then '' - make all - '' else if stdenv.hostPlatform.system == "i686-linux" then '' - make all - '' else - throw "xwinwrap is not supported on ${stdenv.hostPlatform.system}"; - - installPhase = '' - mkdir -p $out/bin - mv xwinwrap $out/bin - ''; - - meta = with lib; { - description = - "A utility that allows you to use an animated X window as the wallpaper"; - longDescription = '' - XWinWrap is a small utility written a loooong time ago that allowed you to - stick most of the apps to your desktop background. What this meant was you - could use an animated screensaver (like glmatrix, electric sheep, etc) or - even a movie, and use it as your wallpaper. But only one version of this - app was ever released, and it had a few problems, like: - - Well, sticking didn’t work. So if you did a “minimize all” or “go to - desktop” kind of thing, your “wallpaper” got minimized as well. - - The geometry option didn’t work, so you could not create, e.g., a small - matrix window surrounded by your original wallpaper. - Seeing no-one picking it up, I decided to give it a bit of polish last - weekend by fixing the above problems and also add a few features. And here - it is, in its new avatar “Shantz XWinWrap”. - ''; - license = licenses.hpnd; - homepage = "https://shantanugoel.com/2008/09/03/shantz-xwinwrap/"; - maintainers = with maintainers; [ infinisil ]; - platforms = platforms.linux; - }; -} |