diff options
| -rw-r--r-- | flake.lock | 53 | ||||
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | packages/default.nix | 1 | ||||
| -rw-r--r-- | packages/phocus/default.nix | 60 |
4 files changed, 18 insertions, 97 deletions
diff --git a/flake.lock b/flake.lock index e59ef57..1c15b2c 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ ] }, "locked": { - "lastModified": 1643151280, - "narHash": "sha256-sVlOWjDm+QU9vIjY+awfOwB5T/Sl8R+LkP9sNXhVCw4=", + "lastModified": 1643567433, + "narHash": "sha256-tyFgodcZRlt0ZshbgyLf4m/Sd/ys9p0AHfeVZQ50WKU=", "owner": "nix-community", "repo": "home-manager", - "rev": "990ca662c4b92636053ea399f5fb80702830522c", + "rev": "95d39e13a4a7a818c87f2701b59820d3ac0e674c", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "master": { "locked": { - "lastModified": 1643202076, - "narHash": "sha256-EcrUSBkBnw3KtDBoDwHvvwR1R6YF0axNFE4Vd2++iok=", + "lastModified": 1643584460, + "narHash": "sha256-27x8ypxlBryYw4NLAGiti6CxlJcbSPVtbxs9JeiFcu0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e722007bf05802573b41701c49da6c8814878171", + "rev": "777442a9cbd8988bcc2c3a8ed63ad922ef366366", "type": "github" }, "original": { @@ -114,11 +114,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1643095335, - "narHash": "sha256-NgrojDU8ziCZ6ImaD4xJ+6zw7OoWZSgiZYoD7dWCSVE=", + "lastModified": 1643575794, + "narHash": "sha256-446DcNBiPTxmCixiAcfriIbT+Roc+Umj7xkfL4VzhQU=", "owner": "neovim", "repo": "neovim", - "rev": "ecec957125ca95ef5fbc4534d62ed16cfedb0c44", + "rev": "a28a9aec635676873e18e1ffe8d2334dd00a7ad3", "type": "github" }, "original": { @@ -130,11 +130,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1642961095, - "narHash": "sha256-RLatktZmvwFBOyqdoIk4qdS4OGKB7aKIvvs4ZP2L8D8=", + "lastModified": 1643247693, + "narHash": "sha256-rmShxIuNjYBz4l83J0J++sug+MURUY1koPCzX4F8hfo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "604c44137d97b5111be1ca5c0d97f6e24fbc5c2c", + "rev": "6c4b9f1a2fd761e2d384ef86cff0d208ca27fdca", "type": "github" }, "original": { @@ -144,22 +144,6 @@ "type": "github" } }, - "phocus": { - "flake": false, - "locked": { - "lastModified": 1620191988, - "narHash": "sha256-jetVGSSMlzuR0WJD5ExEC71gNGK06QWY2wRFSyhDz80=", - "ref": "master", - "rev": "cd013dedeeb94cccc534d9e6e50249ef965707bc", - "revCount": 130, - "type": "git", - "url": "https://git.sr.ht/~boppy/phocus" - }, - "original": { - "type": "git", - "url": "https://git.sr.ht/~boppy/phocus" - } - }, "root": { "inputs": { "chaotic-nixpkgs": "chaotic-nixpkgs", @@ -167,7 +151,6 @@ "master": "master", "neovim": "neovim", "nixpkgs-2111": "nixpkgs-2111", - "phocus": "phocus", "sops-nix": "sops-nix", "unstable": "unstable", "unstable-small": "unstable-small", @@ -196,11 +179,11 @@ }, "unstable": { "locked": { - "lastModified": 1643080866, - "narHash": "sha256-iO3Z6jw0HEiie8UnXVpq1SxphprDYBXrVzubEa5D4eE=", + "lastModified": 1643347846, + "narHash": "sha256-O0tyXF//ppRpe9yT1Uu5n34yI2MWDyY6ZiJ4Qn5zIkE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c07b471b52be8fbc49a7dc194e9b37a6e19ee04d", + "rev": "5bb20f9dc70e9ee16e21cc404b6508654931ce41", "type": "github" }, "original": { @@ -212,11 +195,11 @@ }, "unstable-small": { "locked": { - "lastModified": 1643140919, - "narHash": "sha256-L3R/OxLzejyJ9j0pOkMxr9BY3qWhUrtic2Dv3I63mcY=", + "lastModified": 1643543326, + "narHash": "sha256-x+GAWcv2fxJMCerYkH6jOYnKenzjcFCKQUcx61oTKhY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9ddd6d7266f287eb6a2cd0d3c1797e2708f621b2", + "rev": "180be3e2b7ec82fab523a3b132fee63c05145c30", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 965bd44..dfacbf5 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,6 @@ chaotic-nixpkgs.url = "git+https://git.sr.ht/~boppy/chaotic-nixpkgs?ref=main"; chaotic-nixpkgs.inputs.nixpkgs.follows = "unstable-small"; - phocus = { url = "git+https://git.sr.ht/~boppy/phocus"; flake = false; }; wallpapers = { url = "git+https://git.sr.ht/~boppy/wall?ref=main"; flake = false; }; }; diff --git a/packages/default.nix b/packages/default.nix index b908fc7..5411894 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -4,5 +4,4 @@ let in { "neovim" = neovim.packages.x86_64-linux.neovim; - "phocus" = pkgs.callPackage ./phocus { src = inputs.phocus; }; } diff --git a/packages/phocus/default.nix b/packages/phocus/default.nix deleted file mode 100644 index 662a199..0000000 --- a/packages/phocus/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenvNoCC, sass, src }: - -let - # Iceberg theme with nightlamp bg - colors = { - base00 = "18191f"; - base01 = "17171b"; - base02 = "c9cdd7"; - base03 = "6b7089"; - base04 = "090a10"; - base05 = "c6c8d1"; - base06 = "d0d2db"; - base07 = "27282e"; - base08 = "e27878"; - base09 = "e2a478"; - base0A = "e9b189"; - base0B = "b4be82"; - base0C = "89b8c2"; - base0D = "84a0c6"; - base0E = "a093c7"; - base0F = "a0a0d3"; - }; -in -stdenvNoCC.mkDerivation rec { - pname = "phocus"; - version = "unstable-2021-05-05"; - - inherit src; - - patchPhase = with colors; '' - runHook prePatch - substituteInPlace scss/gtk-3.0/_colors.scss \ - --replace 16161c ${base00} \ - --replace 232530 ${base01} \ - --replace 2e303e ${base03} \ - --replace e95678 ${base08} \ - --replace f09383 ${base09} \ - --replace fab795 ${base0A} \ - --replace 29d398 ${base0B} \ - --replace 1eb980 ${base0B} \ - --replace 26bbd9 ${base0D} \ - --replace ee64ae ${base0E} \ - --replace ec6a88 ${base08} \ - --replace fdf0ed ${base05} \ - --replace aabbcc ${base0D} \ - --replace ccbbaa ${base0E} - runHook postPatch - ''; - - nativeBuildInputs = [ sass ]; - - installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; - - meta = with lib; { - description = "phocus with nightlamp (iceberg variant) theme"; - homepage = "https://git.sr.ht/~boppy/phocus"; - license = [ licenses.mit ]; - maintainers = with maintainers; [ boppyt ]; - }; -} |