From e9fcc90c41dbccbb18c7b7314096b854b21ee02a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 11 Apr 2024 20:04:38 +0200 Subject: pkgs: update and drop icon theme --- flake.lock | 12 ++++++------ flake.nix | 3 ++- nixos/modules/desktop.nix | 5 ++++- pkgs/default.nix | 10 +++++++--- pkgs/sdcv/default.nix | 12 ++++++------ pkgs/stardict/cz.nix | 8 ++++---- pkgs/stardict/de-cz.nix | 8 ++++---- pkgs/stardict/en-cz.nix | 8 ++++---- pkgs/theme/delft-icon-theme.nix | 41 ----------------------------------------- 9 files changed, 37 insertions(+), 70 deletions(-) delete mode 100644 pkgs/theme/delft-icon-theme.nix diff --git a/flake.lock b/flake.lock index 3ff7deb..57f9ec0 100644 --- a/flake.lock +++ b/flake.lock @@ -259,11 +259,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1710927472, - "narHash": "sha256-aXzoPTvHjMiAp+ZXKt+oxOgw3MlY4JechopKa+WzPjQ=", + "lastModified": 1712843601, + "narHash": "sha256-rP6jyldorUthnWWhnMMC+Zlrm5jopoAddbJaV76tiS8=", "owner": "cynerd", "repo": "nixdeploy", - "rev": "5c9ca8950cdba970cca3964780205b91d009b3f7", + "rev": "0ce1fa81bddfd7b32661222d5d2afe9b6d03cc1c", "type": "gitlab" }, "original": { @@ -332,11 +332,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712435251, - "narHash": "sha256-LWr+It6EMsG7pSo1BGSWLD1Px+ruoebzCGscRqNRB7E=", + "lastModified": 1712821377, + "narHash": "sha256-Ecicszr4B4ZsL5dLnYGDNVO4J1Qc+1NYedm3frzCxvQ=", "owner": "cynerd", "repo": "nixpkgs", - "rev": "af2fc37c473b4c1f4508c16ea25eb2747e7934b2", + "rev": "d764d77b96b77a02575d70f2e815a19db518756e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3b6c0af..c9ae314 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,8 @@ description = "Cynerd's personal flake"; inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable-small"; + #nixpkgs.url = "nixpkgs/nixos-unstable"; + nixpkgs.url = "github:cynerd/nixpkgs/bcg-fix-unstable"; nixos-hardware.url = "nixos-hardware"; nixdeploy.url = "gitlab:cynerd/nixdeploy"; personal-secret.url = "git+ssh://git@cynerd.cz/nixos-personal-secret"; diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix index c45aa82..87f18e8 100644 --- a/nixos/modules/desktop.nix +++ b/nixos/modules/desktop.nix @@ -41,6 +41,7 @@ in { myswaylock alacritty + gnome.nautilus kanshi wdisplays @@ -100,10 +101,12 @@ in { spotify nordic - delft-icon-theme + nordzy-cursor-theme + nordzy-icon-theme gnome.adwaita-icon-theme vanilla-dmz sound-theme-freedesktop + gnome.gnome-characters gucharmap (sdcv.withDictionaries [stardict-en-cz stardict-de-cz stardict-cz]) diff --git a/pkgs/default.nix b/pkgs/default.nix index 77b6215..0a09f9f 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,10 +1,12 @@ -final: prev: { +final: prev: let + inherit (final.lib) optional; + is_cross = final.buildPlatform != final.targetPlatform; +in { luks-hw-password = final.callPackage ./luks-hw-password {}; dev = final.callPackage ./dev { devShells = import ../devShells final; }; - delft-icon-theme = final.callPackage ./theme/delft-icon-theme.nix {}; background-lnxpcs = final.callPackage ./theme/background-lnxpcs.nix {}; swaybackground = final.callPackage ./theme/swaybackground.nix {}; myswaylock = final.callPackage ./theme/myswaylock.nix {}; @@ -34,6 +36,8 @@ final: prev: { outputs = ["out"]; }; gnupg = prev.gnupg.overrideAttrs (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [prev.libgpg-error]; + nativeBuildInputs = + oldAttrs.nativeBuildInputs + ++ (optional is_cross prev.libgpg-error); }); } diff --git a/pkgs/sdcv/default.nix b/pkgs/sdcv/default.nix index 6a9147d..8817270 100644 --- a/pkgs/sdcv/default.nix +++ b/pkgs/sdcv/default.nix @@ -10,15 +10,15 @@ pcre, readline, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (attrs: { pname = "sdcv"; - version = "0.5.3"; + version = "0.5.5"; src = fetchFromGitHub { owner = "Dushistov"; - repo = pname; - rev = "d054adb37c635ececabc31b147c968a480d1891a"; - hash = "sha256-mJ9LrQ/l0SRmueg+IfGnS0NcNheGdOZ2Gl7KMFiK6is="; + repo = attrs.pname; + rev = "v${attrs.version}"; + hash = "sha256-EyvljVXhOsdxIYOGTzD+T16nvW7/RNx3DuQ2OdhjXJ4="; }; nativeBuildInputs = [cmake pkg-config gettext]; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { homepage = "https://dushistov.github.io/sdcv/"; license = licenses.gpl2; }; -} +}) diff --git a/pkgs/stardict/cz.nix b/pkgs/stardict/cz.nix index 0ce4100..2df19bc 100644 --- a/pkgs/stardict/cz.nix +++ b/pkgs/stardict/cz.nix @@ -3,13 +3,13 @@ stdenvNoCC, fetchurl, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (attrs: { pname = "stardict-cz"; version = "20171101"; src = fetchurl { - url = "https://dl.cihar.com/slovnik/stable/stardict-czech-${version}.tar.gz"; - sha256 = "14kch0cms3d77js2kyx7risadlzk3waig22gch59qp9y86b9w0zz"; + url = "https://dl.cihar.com/slovnik/stable/stardict-czech-${attrs.version}.tar.gz"; + hash = "sha256-/wOelkE+XZwKZE+IFxUf89OmdMyn+ym0PKcNXRmAbJI="; }; installPhase = '' @@ -22,4 +22,4 @@ stdenvNoCC.mkDerivation rec { homepage = "http://slovnik.zcu.cz/"; license = licenses.gpl3; }; -} +}) diff --git a/pkgs/stardict/de-cz.nix b/pkgs/stardict/de-cz.nix index 93f0744..ab41257 100644 --- a/pkgs/stardict/de-cz.nix +++ b/pkgs/stardict/de-cz.nix @@ -3,13 +3,13 @@ stdenvNoCC, fetchurl, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (attrs: { pname = "stardict-de-cz"; version = "20200501"; src = fetchurl { - url = "http://dl.cihar.com/slovnik/stable/stardict-german-czech-${version}.tar.gz"; - sha256 = "1d91pmflaz9zgblalk9b2ib6idj6akm64wvslmzsydwn738n6va2"; + url = "http://dl.cihar.com/slovnik/stable/stardict-german-czech-${attrs.version}.tar.gz"; + hash = "sha256-Qm1j0TiWN69/pXpzYupURrZoVhQrTaroej99RV29IbU="; }; installPhase = '' @@ -23,4 +23,4 @@ stdenvNoCC.mkDerivation rec { homepage = "http://slovnik.zcu.cz/"; license = licenses.gpl3; }; -} +}) diff --git a/pkgs/stardict/en-cz.nix b/pkgs/stardict/en-cz.nix index ead1a31..6c0f393 100644 --- a/pkgs/stardict/en-cz.nix +++ b/pkgs/stardict/en-cz.nix @@ -3,13 +3,13 @@ stdenvNoCC, fetchurl, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (attrs: { pname = "stardict-en-cz"; version = "20210401"; src = fetchurl { - url = "http://dl.cihar.com/slovnik/stable/stardict-english-czech-${version}.tar.gz"; - sha256 = "1rh2ybqwzw258g4d4aydc587mbqqq7m7fzkxq9kf3b7x9xqzx6ia"; + url = "http://dl.cihar.com/slovnik/stable/stardict-english-czech-${attrs.version}.tar.gz"; + hash = "sha256-Kpr+cU/9rOFmwn1+d+rBGK96UGHNK9LIQ0Xwz/HyAuY="; }; installPhase = '' @@ -23,4 +23,4 @@ stdenvNoCC.mkDerivation rec { homepage = "http://slovnik.zcu.cz/"; license = licenses.gpl3; }; -} +}) diff --git a/pkgs/theme/delft-icon-theme.nix b/pkgs/theme/delft-icon-theme.nix deleted file mode 100644 index fb0b6e3..0000000 --- a/pkgs/theme/delft-icon-theme.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchFromGitHub, - gtk3, - gnome-icon-theme, - hicolor-icon-theme, -}: -stdenvNoCC.mkDerivation rec { - pname = "delft-icon-theme"; - version = "1.15"; - - src = fetchFromGitHub { - owner = "madmaxms"; - repo = "iconpack-delft"; - rev = "v${version}"; - sha256 = "fluSh2TR1CdIW54wkUp1QRB0m9akFKnSn4d+0z6gkLA="; - }; - - nativeBuildInputs = [gtk3]; - - propagatedBuildInputs = [gnome-icon-theme hicolor-icon-theme]; - - dontDropIconThemeCache = true; - - installPhase = '' - mkdir -p $out/share/icons - cp -a Delft* $out/share/icons/ - - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done - ''; - - meta = with lib; { - description = "Delft icon theme"; - homepage = "https://github.com/madmaxms/iconpack-delft"; - license = licenses.gpl3Only; - platforms = platforms.linux; - }; -} -- cgit v1.2.3