diff --git a/.config/quickshell/ii/scripts/colors/flake.lock b/.config/quickshell/ii/scripts/colors/flake.lock new file mode 100644 index 000000000..081117fe8 --- /dev/null +++ b/.config/quickshell/ii/scripts/colors/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1754725699, + "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/.config/quickshell/ii/scripts/colors/flake.nix b/.config/quickshell/ii/scripts/colors/flake.nix index 4029adf1e..41045d7b7 100644 --- a/.config/quickshell/ii/scripts/colors/flake.nix +++ b/.config/quickshell/ii/scripts/colors/flake.nix @@ -1,9 +1,9 @@ { - description = "Development shell for switchwall.sh"; + description = "A flake that provides a runnable switchwall script."; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-utils.url = "github.com/numtide/flake-utils"; + flake-utils.url = "github:numtide/flake-utils"; }; outputs = { @@ -17,34 +17,63 @@ pythonWithPackages = pkgs.python3.withPackages (ps: with ps; [ + dbus-python materialyoucolor pillow ]); - in { - devShells.default = pkgs.mkShell { - packages = [ - pkgs.bash + + switchwallScript = pkgs.stdenv.mkDerivation { + pname = "switchwall"; + version = "1.0"; + src = ./.; + + buildInputs = [ + pkgs.makeWrapper pkgs.jq - pkgs.imagemagick # Provides the 'identify' command + pkgs.imagemagick pkgs.ffmpeg pkgs.mpvpaper - pkgs.kitty # The terminal used in the script - pkgs.kdialog - pkgs.libnotify # Provides notify-send + pkgs.libnotify pkgs.hyprpicker pkgs.matugen + pkgs.bash + pkgs.pipewire + pkgs.dbus + pkgs.kdePackages.plasma-desktop + # pkgs.kdePackages.plasma-framework + pkgs.kdePackages.kdialog pythonWithPackages ]; - shellHook = '' - export XDG_CONFIG_HOME=$HOME/.config - export XDG_CACHE_HOME=$HOME/.cache - export XDG_STATE_HOME=$HOME/.local/state - export ILLOGICAL_IMPULSE_VIRTUAL_ENV=$XDG_STATE_HOME/quickshell/.venv - export PATH=$PATH:${pkgs.matugen}/bin - export SCRIPT_DIR=$(pwd) + nativeBuildInputs = [pkgs.qt6.wrapQtAppsHook]; + + installPhase = '' + mkdir -p $out/bin + cp switchwall.sh $out/bin/ + chmod +x $out/bin/switchwall.sh + + wrapProgram $out/bin/switchwall.sh \ + --prefix PATH : "${pkgs.lib.makeBinPath [ + pkgs.jq + pkgs.imagemagick + pkgs.ffmpeg + pkgs.mpvpaper + pkgs.kdePackages.kdialog + pkgs.libnotify + pkgs.hyprpicker + pkgs.matugen + pythonWithPackages + pkgs.bash + pkgs.pipewire + pkgs.kdePackages.plasma-desktop + ]}" ''; }; + in { + packages.default = switchwallScript; + apps.default = flake-utils.lib.mkApp { + drv = switchwallScript; + }; } ); } diff --git a/.config/quickshell/ii/scripts/colors/nix_switchwall.sh b/.config/quickshell/ii/scripts/colors/nix_switchwall.sh old mode 100644 new mode 100755 diff --git a/modules/packages.nix b/modules/packages.nix index 0531db0dd..732643fe8 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -47,6 +47,7 @@ with pkgs; [ starship # ttf-gabarito-git nerd-fonts.jetbrains-mono + material-symbols # ttf-material-symbols-variable-git # ttf-readex-pro # ttf-rubik-vf