From 5a87930cad75500be7c672ec59632ca4eb5c9269 Mon Sep 17 00:00:00 2001 From: Zacharias-Brohn Date: Sun, 23 Nov 2025 22:40:07 +0100 Subject: [PATCH] nix test failed --- flake.nix | 47 --------------------------------- image_colors.json | 56 ---------------------------------------- nix/app2unit.nix | 14 ---------- nix/default.nix | 66 ----------------------------------------------- 4 files changed, 183 deletions(-) delete mode 100644 flake.nix delete mode 100644 image_colors.json delete mode 100644 nix/app2unit.nix delete mode 100644 nix/default.nix diff --git a/flake.nix b/flake.nix deleted file mode 100644 index b50f289..0000000 --- a/flake.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - - quickshell = { - url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; - - outputs = { - self, - nixpkgs, - ... - } @ inputs: let - forAllSystems = fn: - nixpkgs.lib.genAttrs nixpkgs.lib.platforms.linux ( - system: fn nixpkgs.legacyPackages.${system} - ); - in { - formatter = forAllSystems (pkgs: pkgs.alejandra); - - packages = forAllSystems (pkgs: rec { - zshell = pkgs.callPackage ./nix { - rev = self.rev or self.dirtyRev; - stdenv = pkgs.clangStdenv; - quickshell = inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default.override { - withX11 = false; - withI3 = false; - }; - app2unit = pkgs.callPackage ./nix/app2unit.nix {inherit pkgs;}; - }; - debug = zshell.override {debug = true;}; - default = zshell; - }); - - devShells = forAllSystems (pkgs: { - default = let - shell = self.packages.${pkgs.stdenv.hostPlatform.system}.zshell; - in - pkgs.mkShell.override {stdenv = shell.stdenv;} { - inputsFrom = [shell shell.plugin]; - packages = with pkgs; [clazy material-symbols rubik nerd-fonts.caskaydia-cove]; - }; - }); - }; -} diff --git a/image_colors.json b/image_colors.json deleted file mode 100644 index 5672f64..0000000 --- a/image_colors.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "primary_paletteKeyColor": "#A56A24", - "secondary_paletteKeyColor": "#587C8E", - "tertiary_paletteKeyColor": "#3A8188", - "neutral_paletteKeyColor": "#6F7979", - "neutral_variant_paletteKeyColor": "#697A7B", - "background": "#0C1515", - "onBackground": "#DAE4E4", - "surface": "#0C1515", - "surfaceDim": "#0C1515", - "surfaceBright": "#313B3B", - "surfaceContainerLowest": "#071010", - "surfaceContainerLow": "#141D1E", - "surfaceContainer": "#182122", - "surfaceContainerHigh": "#222C2C", - "surfaceContainerHighest": "#2D3637", - "onSurface": "#DAE4E4", - "surfaceVariant": "#394A4A", - "onSurfaceVariant": "#B8CACA", - "inverseSurface": "#DAE4E4", - "inverseOnSurface": "#293232", - "outline": "#829494", - "outlineVariant": "#394A4A", - "shadow": "#000000", - "scrim": "#000000", - "surfaceTint": "#FFB86E", - "primary": "#FFB86E", - "onPrimary": "#492900", - "primaryContainer": "#693C00", - "onPrimaryContainer": "#FFDCBD", - "inversePrimary": "#88520A", - "secondary": "#A6CCE0", - "onSecondary": "#0A3545", - "secondaryContainer": "#284E5E", - "onSecondaryContainer": "#C2E8FD", - "tertiary": "#8CD2D9", - "onTertiary": "#00363B", - "tertiaryContainer": "#569BA2", - "onTertiaryContainer": "#000000", - "error": "#FFB4AB", - "onError": "#690005", - "errorContainer": "#93000A", - "onErrorContainer": "#FFDAD6", - "primaryFixed": "#FFDCBD", - "primaryFixedDim": "#FFB86E", - "onPrimaryFixed": "#2C1600", - "onPrimaryFixedVariant": "#693C00", - "secondaryFixed": "#C2E8FD", - "secondaryFixedDim": "#A6CCE0", - "onSecondaryFixed": "#001F2A", - "onSecondaryFixedVariant": "#264B5C", - "tertiaryFixed": "#A8EEF6", - "tertiaryFixedDim": "#8CD2D9", - "onTertiaryFixed": "#002022", - "onTertiaryFixedVariant": "#004F55" -} \ No newline at end of file diff --git a/nix/app2unit.nix b/nix/app2unit.nix deleted file mode 100644 index 51b4241..0000000 --- a/nix/app2unit.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - pkgs, # To ensure the nixpkgs version of app2unit - fetchFromGitHub, - ... -}: -pkgs.app2unit.overrideAttrs (final: prev: rec { - version = "1.0.3"; # Fix old issue related to missing env var - src = fetchFromGitHub { - owner = "Vladimir-csp"; - repo = "app2unit"; - tag = "v${version}"; - hash = "sha256-7eEVjgs+8k+/NLteSBKgn4gPaPLHC+3Uzlmz6XB0930="; - }; -}) diff --git a/nix/default.nix b/nix/default.nix deleted file mode 100644 index f043b7f..0000000 --- a/nix/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - rev, - lib, - stdenv, - makeWrapper, - makeFontsConf, - app2unit, - swappy, - bash, - hyprland, - material-symbols, - rubik, - nerd-fonts, - qt6, - quickshell, - pipewire, - cmake, - ninja, - pkg-config, -}: let - version = "1.0.0"; - - runtimeDeps = - [ - app2unit - swappy - bash - hyprland - ]; - - fontconfig = makeFontsConf { - fontDirectories = [material-symbols rubik nerd-fonts.caskaydia-cove]; - }; - - plugin = stdenv.mkDerivation { - name = "zshell-qml-plugin"; - src = lib.fileset.toSource { - root = ./..; - fileset = lib.fileset.union ./../CMakeLists.txt ./../Plugins; - }; - - nativeBuildInputs = [cmake ninja pkg-config]; - buildInputs = [qt6.qtbase qt6.qtdeclarative libqalculate pipewire]; - - dontWrapQtApps = true; - }; -in - stdenv.mkDerivation { - pname = "zshell"; - src = ./..; - - nativeBuildInputs = [cmake ninja makeWrapper qt6.wrapQtAppsHook]; - buildInputs = [quickshell plugin qt6.qtbase]; - propagatedBuildInputs = runtimeDeps; - - cmakeFlags = - [ - (lib.cmakeFeature "INSTALL_QSCONFDIR" "${placeholder "out"}/share/zshell") - ]; - - dontStrip = debug; - - passthru = { - inherit plugin; - }; - }