From 9a3e50be1fe877c168869e5750711610fb23bb8e Mon Sep 17 00:00:00 2001 From: Cookiez Date: Sat, 16 May 2026 21:49:56 +0200 Subject: [PATCH] Added more binary caches for faster build times. And configured Sleepy Launcher for Zenless Zone Zero --- flake.lock | 60 +++++++++++++++++++++++++++++++++ flake.nix | 6 ++++ modules/configuration.nix | 34 +++++++++++++++++-- modules/packages/cli.nix | 1 + modules/packages/desktop.nix | 1 + modules/packages/essentials.nix | 1 + 6 files changed, 101 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 85fbbfe..bdacaab 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,27 @@ { "nodes": { + "aagl": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1778493762, + "narHash": "sha256-PG7vz7Dk3U3hB8OXtIS3bJ4QmJEw08ycFprJuAO7YS0=", + "owner": "ezKEa", + "repo": "aagl-gtk-on-nix", + "rev": "75aac6845b47e913b53c2a0af7fd124fdb8fe84a", + "type": "github" + }, + "original": { + "owner": "ezKEa", + "repo": "aagl-gtk-on-nix", + "type": "github" + } + }, "alejandra": { "inputs": { "fenix": "fenix", @@ -129,6 +151,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -544,6 +582,7 @@ }, "root": { "inputs": { + "aagl": "aagl", "alejandra": "alejandra", "grub2-themes": "grub2-themes", "home-manager": "home-manager", @@ -576,6 +615,27 @@ "type": "github" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "aagl", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1777605393, + "narHash": "sha256-Hjp0VOOHgHcTrX23iVvnfAudPcuCmfkfpQNFwv2v/ks=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "ff88db34cfa486fc4964a6991cab1678d82eee8c", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "stylix": { "inputs": { "base16": "base16", diff --git a/flake.nix b/flake.nix index c125431..5feb3d9 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + aagl = { + url = "github:ezKEa/aagl-gtk-on-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixos-hardware.url = "github:NixOS/nixos-hardware"; #To Provide Framework13 hardware modules home-manager.url = "github:nix-community/home-manager/master"; @@ -61,6 +66,7 @@ home-manager, plasma-manager, nixos-hardware, + aagl, stylix, niri, grub2-themes, diff --git a/modules/configuration.nix b/modules/configuration.nix index b71d16f..f632808 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -31,6 +31,7 @@ inputs.home-manager.nixosModules.home-manager inputs.grub2-themes.nixosModules.default inputs.nix-flatpak.nixosModules.nix-flatpak + inputs.aagl.nixosModules.default ./hardware-configuration.nix ./firefox @@ -237,8 +238,28 @@ ssh.askPassword = lib.mkForce "${pkgs.kdePackages.ksshaskpass}/bin/ksshaskpass"; + sleepy-launcher.enable = true; #Zenless zone zero launcher + #In order for dynamically linked executables to work - nix-ld.enable = true; + nix-ld = { + enable = true; + #To ensure that the neccesary libraries are included in the wrapper + libraries = with pkgs; [ + wayland + libadwaita + gtk4 + gtk3 + glib + gdk-pixbuf + pango + cairo + libGL + openssl + dbus + fontconfig + freetype + ]; + }; }; # Configure console keymap @@ -354,7 +375,16 @@ }; #Allow Nix Commands - nix.settings.experimental-features = ["nix-command" "flakes"]; + nix.settings = { + experimental-features = ["nix-command" "flakes"]; + + max-substitution-jobs = 32; + http-connections = 50; + + #Both needed for sleepy-launcher to work + extra-substituters = ["https://ezkea.cachix.org" "https://nix-community.cachix.org"]; + extra-trusted-public-keys = ["ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="]; + }; # Allow unfree packages nixpkgs.config.allowUnfree = true; diff --git a/modules/packages/cli.nix b/modules/packages/cli.nix index bc7bd69..b8d9985 100644 --- a/modules/packages/cli.nix +++ b/modules/packages/cli.nix @@ -7,6 +7,7 @@ }: { environment.systemPackages = with pkgs; [ #CLI tools + imagemagick #Used as a dependency for Zenless Zone Zero #pdftk #PDF toolkit #yt-dlp #YouTube and others video downloader tailscale #VPN diff --git a/modules/packages/desktop.nix b/modules/packages/desktop.nix index 4b6911b..7de683f 100644 --- a/modules/packages/desktop.nix +++ b/modules/packages/desktop.nix @@ -26,6 +26,7 @@ #sqlite #Lightweight Database system #Desktop Applications + protonup-qt #For managing proton versions drawio ryubing #Nintendo Switch Emulator vlc #VLC Media Player diff --git a/modules/packages/essentials.nix b/modules/packages/essentials.nix index 458b6e4..acd8d85 100644 --- a/modules/packages/essentials.nix +++ b/modules/packages/essentials.nix @@ -20,6 +20,7 @@ #efibootmgr #A tool to manage UEFI boot entries zip #A utility for ZIP archives unzip #A utility for ZIP archives + p7zip rar #A utility for RAR archives gnutar #A utility for .tar archives cron #A tool to set up commands to run scheduled