Switch to deploy configuration

This commit is contained in:
Filippo Berto 2022-12-13 12:22:18 +01:00
parent 0c40f2cd09
commit 994708ec16
No known key found for this signature in database
GPG key ID: FE98AE5EC52B1056
2 changed files with 17 additions and 14 deletions

View file

@ -45,24 +45,27 @@
};
overlays = [
# Packages
# (_: _: { stable = import nixpkgs { inherit config overlays; }; unstable = import nixpkgs-u { inherit config overlays; }; })
# Combine stable and unstable packages
(_: _: {
stable = import nixpkgs { inherit config overlays; };
unstable = import nixpkgs-u { inherit config overlays; };
})
# Nix rice
nix-rice.overlays.default
(import ./rice.nix)
# Flakes packages
(final: _: {
clipedit = final.callPackage ./custom/clipedit { };
update-background = final.callPackage ./custom/update-background {
(self: _: {
clipedit = self.callPackage ./custom/clipedit { };
update-background = self.callPackage ./custom/update-background {
backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+";
};
lockscreen = final.callPackage ./custom/lockscreen {
palette = final.rice.colorPalette;
font = final.rice.font.normal;
lockscreen = self.callPackage ./custom/lockscreen {
palette = self.rice.colorPalette;
font = self.rice.font.normal;
};
sddm-theme-clairvoyance = final.callPackage ./custom/sddm-theme-clairvoyance {
sddm-theme-clairvoyance = self.callPackage ./custom/sddm-theme-clairvoyance {
wallpaper = ./wallpapers/comfy_waves.jpg;
};
})

View file

@ -1,4 +1,4 @@
final: prev:
self: super:
let
# nord = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/nord.nix);
# onedark = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/onedark.nix);
@ -6,12 +6,12 @@ let
# mkpm = with prev.lib.rice; palette.tPalette color.hexToRgba (import ./themes/monokai-pro-machine.nix);
# bloom = with prev.lib.rice;
# palette.tPalette color.hexToRgba (import ./themes/bloom.nix);
ayu-mirage = with prev.lib.rice;
ayu-mirage = with super.lib.rice;
palette.tPalette color.hexToRgba (import ./themes/ayu-mirage.nix);
in
(rec {
rice = {
colorPalette = with prev.lib.rice; rec {
colorPalette = with super.lib.rice; rec {
normal = palette.defaultPalette // {
inherit (ayu-mirage.normal) black red green yellow blue magenta cyan white;
};
@ -29,12 +29,12 @@ in
font = {
normal = {
name = "Cantarell";
package = final.cantarell-fonts;
package = self.cantarell-fonts;
size = 10;
};
monospace = {
name = "FiraCode Nerd Font Mono";
package = (final.nerdfonts.override { fonts = [ "FiraCode" ]; });
package = (self.nerdfonts.override { fonts = [ "FiraCode" ]; });
size = 10;
};
};