From e4c1b7e498adc8435efe56470bf778a281562c94 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 1 Aug 2024 17:15:33 -0400 Subject: [PATCH] eg --- flake.lock | 8 ++++---- flake.nix | 31 ++++++++++++++++--------------- overlay.nix | 7 +++++++ theme-platinum9/default.nix | 4 ++-- 4 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 overlay.nix diff --git a/flake.lock b/flake.lock index 0c747cd..4939f1a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1687288566, - "narHash": "sha256-VckkiJ88Gzdc2cstm0z5eFcrHbvkm4VjxavHBGssvZI=", + "lastModified": 1722372011, + "narHash": "sha256-B2xRiC3NEJy/82ugtareBkRqEkPGpMyjaLxaR8LBxNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6c73c5fe53bb3afbf65e870541e0645e9145171", + "rev": "cf05eeada35e122770c5c14add958790fcfcbef5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 8a3af15..d54f293 100644 --- a/flake.nix +++ b/flake.nix @@ -1,26 +1,27 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; }; outputs = { self, nixpkgs }: let system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - atauPkgs = { - atau-wallpapers = pkgs.callPackage ./atau-wallpapers { }; - theme-platinum9 = pkgs.callPackage ./theme-platinum9 { }; - gtk-theme-mac-os-9 = pkgs.callPackage ./gtk-theme-mac-os-9 { }; - nineicons-redux = pkgs.callPackage ./nineicons-redux { }; - }; + overlay = import ./overlay.nix; + pkgs = import nixpkgs { inherit system; overlays = [ overlay ]; }; + + # test = pkgs.adwaita-icon-theme; + # atauPkgs = { + # atau-wallpapers = pkgs.callPackage ./atau-wallpapers { }; + # # theme-platinum9 = pkgs.callPackage ./theme-platinum9 { + # # adwaita-icon-theme = test; + # # }; + + # gtk-theme-mac-os-9 = pkgs.callPackage./gtk-theme-mac-os-9 { }; + # nineicons-redux = pkgs.callPackage./nineicons-redux { }; + # }; in { - packages.${system} = { - default = atauPkgs.theme-platinum9; - } // atauPkgs; - - overlays.default = final: prev: { - atau-pkgs = atauPkgs; - }; + packages.${system} = pkgs; + overlays.default = overlay; }; } diff --git a/overlay.nix b/overlay.nix new file mode 100644 index 0000000..4b6939d --- /dev/null +++ b/overlay.nix @@ -0,0 +1,7 @@ +prev: final: { + atau-pkgs = { + atau-wallpapers = final.callPackage ./atau-wallpapers { }; + gtk-theme-mac-os-9 = final.callPackage ./gtk-theme-mac-os-9 { }; + nineicons-redux = final.callPackage ./nineicons-redux { }; + }; +} diff --git a/theme-platinum9/default.nix b/theme-platinum9/default.nix index 23e0c50..f651406 100644 --- a/theme-platinum9/default.nix +++ b/theme-platinum9/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gtk3, adwaita-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, gtk3, adwaita-icon-theme, ... }: stdenv.mkDerivation rec { name = "theme-platinum9"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ adwaita-icon-theme - hicolor-icon-theme + # hicolor-icon-theme ]; dontDropIconThemeCache = true;