Merge pull request 'Chore/remove nix support' (#159) from chore/remove-nix-support into main

Reviewed-on: #159

.gitea/ISSUE_TEMPLATE/bug.yaml

@@ -38,7 +38,6 @@ body:
       attributes:
           label: OS
           options:
-              - NixOS
               - Arch
               - Debian / Ubuntu
               - Fedora

README.md

@@ -84,89 +84,11 @@ Defaults from `CMakeLists.txt`:
 - shell config install dir: `etc/xdg/quickshell/zshell`
 - greeter install dir: `etc/xdg/quickshell/zshell-greeter`
 
-### Nix Flake
+### Nix
 
-_Note that Nix is not actively developed at this point. Things may be broken. Feel free to suggest fixes in a PR_
+Nix support has been removed. Reason being that none of us actively develop for Nix. Having a `flake.nix` in the project will give the wrong idea.
 
-The flake exposes:
+Contributions for Nix support are welcome, the caveat being that reviews of these contributions can be of lower quality.
-
-- `packages.<system>.zshell`
-- `packages.<system>.zshell-cli`
-
-Add it as an input in your system flake:
-
-```nix
-{
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    z-bar-qt = {
-      url = git+https://git.zach-dev.cc/zach/z-bar-qt.git
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-}
-```
-
-Full `flake.nix` example (`nixosConfigurations`):
-
-```nix
-{
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    z-bar-qt = {
-      url = git+https://git.zach-dev.cc/zach/z-bar-qt.git
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
-  outputs = inputs@{ nixpkgs, ... }:
-  let
-    system = "x86_64-linux";
-  in {
-    nixosConfigurations.my-host = nixpkgs.lib.nixosSystem {
-      inherit system;
-      specialArgs = { inherit inputs; };
-      modules = [
-        ({ ... }: {
-          environment.systemPackages = [
-            inputs.z-bar-qt.packages.${system}.zshell
-            inputs.z-bar-qt.packages.${system}.zshell-cli
-          ];
-        })
-        ./configuration.nix
-      ];
-    };
-  };
-}
-```
-
-Then install shell + CLI from the flake packages:
-
-```nix
-{ pkgs, inputs, ... }:
-let
-  system = pkgs.stdenv.hostPlatform.system;
-in {
-  environment.systemPackages = [
-    inputs.z-bar-qt.packages.${system}.zshell
-    inputs.z-bar-qt.packages.${system}.zshell-cli
-  ];
-}
-```
-
-If you use Home Manager, the same packages can be added to `home.packages`.
-
-Run shell via wrapper binary:
-
-```bash
-zshell
-```
-
-CLI entrypoint:
-
-```bash
-zshell-cli
-```
 
 ## Running
 

flake.lock

@@ -1,48 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1771369470,
-        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "0182a361324364ae3f436a63005877674cf45efb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "quickshell": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1770693276,
-        "narHash": "sha256-ngXnN5YXu+f45+QGYNN/VEBMQmcBCYGRCqwaK8cxY1s=",
-        "ref": "refs/heads/master",
-        "rev": "dacfa9de829ac7cb173825f593236bf2c21f637e",
-        "revCount": 735,
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "quickshell": "quickshell"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,71 +0,0 @@
-{
-  description = "Flake for zshell";
-  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.nixfmt);
-
-    packages = forAllSystems (
-      pkgs: let
-        pythonEnv = pkgs.python3.withPackages (ps: [
-          ps.pillow
-          ps.materialyoucolor
-        ]);
-      in rec {
-        zshell-cli = pkgs.callPackage ./nix/zshell-cli.nix {};
-
-        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 pythonEnv zshell-cli;
-        };
-
-        default = zshell;
-      }
-    );
-
-    devShells = forAllSystems (pkgs: {
-      default = let
-        system = pkgs.stdenv.hostPlatform.system;
-        shellPkg = self.packages.${system}.zshell;
-        cliPkg = self.packages.${system}.zshell-cli;
-      in
-        pkgs.mkShell.override {stdenv = shellPkg.stdenv;} {
-          inputsFrom = [
-            shellPkg
-            shellPkg.plugin
-          ];
-
-          packages = with pkgs; [
-            shellPkg
-            cliPkg
-
-            material-symbols
-            rubik
-            nerd-fonts.caskaydia-cove
-          ];
-        };
-    });
-  };
-}

nix/app2unit.nix

@@ -1,16 +0,0 @@
-{
-  pkgs,
-  fetchFromGitHub,
-  ...
-}:
-pkgs.app2unit.overrideAttrs (
-  final: prev: rec {
-    version = "1.0.3";
-    src = fetchFromGitHub {
-      owner = "Vladimir-csp";
-      repo = "app2unit";
-      tag = "v${version}";
-      hash = "sha256-7eEVjgs+8k+/NLteSBKgn4gPaPLHC+3Uzlmz6XB0930=";
-    };
-  }
-)

nix/default.nix

@@ -1,146 +0,0 @@
-{
-  fftw,
-  libcava,
-  rev,
-  lib,
-  stdenv,
-  makeWrapper,
-  makeFontsConf,
-  app2unit,
-  networkmanager,
-  swappy,
-  wl-clipboard,
-  libqalculate,
-  bash,
-  hyprland,
-  material-symbols,
-  rubik,
-  nerd-fonts,
-  qt6,
-  quickshell,
-  aubio,
-  pipewire,
-  cmake,
-  ninja,
-  pkg-config,
-  pythonEnv,
-  zshell-cli,
-  ddcutil,
-  brightnessctl,
-}:
-let
-  version = "1.0.0";
-
-  runtimeDeps = [
-    pythonEnv
-    app2unit
-    networkmanager
-    swappy
-    wl-clipboard
-    libqalculate
-    bash
-    hyprland
-    zshell-cli
-    ddcutil
-    brightnessctl
-  ];
-
-  fontconfig = makeFontsConf {
-    fontDirectories = [
-      material-symbols
-      rubik
-      nerd-fonts.caskaydia-cove
-    ];
-  };
-
-  cmakeBuildType = "RelWithDebInfo";
-
-  cmakeVersionFlags = [
-    (lib.cmakeFeature "VERSION" version)
-    (lib.cmakeFeature "GIT_REVISION" rev)
-    (lib.cmakeFeature "DISTRIBUTOR" "nix-flake")
-  ];
-
-  plugin = stdenv.mkDerivation {
-    inherit cmakeBuildType;
-    name = "zshell-qml-plugin";
-    src = lib.fileset.toSource {
-      root = ./..;
-      fileset = lib.fileset.union ./../CMakeLists.txt ./../Plugins;
-    };
-
-    nativeBuildInputs = [
-      cmake
-      ninja
-      pkg-config
-    ];
-    buildInputs = [
-      pythonEnv
-      qt6.qtbase
-      qt6.qtdeclarative
-      libqalculate
-      pipewire
-      aubio
-      libcava
-      fftw
-    ];
-
-    dontWrapQtApps = true;
-    cmakeFlags = [
-      (lib.cmakeFeature "ENABLE_MODULES" "plugin")
-      (lib.cmakeFeature "INSTALL_QMLDIR" qt6.qtbase.qtQmlPrefix)
-    ]
-    ++ cmakeVersionFlags;
-  };
-in
-stdenv.mkDerivation {
-  inherit version cmakeBuildType;
-  pname = "zshell";
-  src = ./..;
-
-  nativeBuildInputs = [
-    cmake
-    ninja
-    makeWrapper
-    qt6.wrapQtAppsHook
-  ];
-  buildInputs = [
-    quickshell
-    plugin
-    qt6.qtbase
-    qt6.qtwayland
-  ];
-  propagatedBuildInputs = runtimeDeps;
-
-  cmakeFlags = [
-    (lib.cmakeFeature "ENABLE_MODULES" "shell")
-    (lib.cmakeFeature "INSTALL_QSCONFDIR" "${placeholder "out"}/share/ZShell")
-  ]
-  ++ cmakeVersionFlags;
-
-  prePatch = ''
-    substituteInPlace shell.qml \
-      --replace-fail 'ShellRoot {' 'ShellRoot {  settings.watchFiles: false'
-  '';
-
-  postInstall = ''
-       makeWrapper ${quickshell}/bin/qs $out/bin/zshell \
-       	--prefix PATH : "${lib.makeBinPath runtimeDeps}" \
-       	--set FONTCONFIG_FILE "${fontconfig}" \
-       	--add-flags "-p $out/share/ZShell"
-
-    echo "$out"
-       mkdir -p $out/lib
-  '';
-
-  passthru = {
-    inherit plugin;
-  };
-
-  meta = {
-    description = "A very segsy desktop shell";
-    homepage = "https://github.com/Zacharias-Brohn/z-bar-qt";
-    license = lib.licenses.gpl3Only;
-    mainProgram = "zshell";
-  };
-}

nix/zshell-cli.nix

@@ -1,28 +0,0 @@
-{
-  python3,
-  installShellFiles,
-}:
-python3.pkgs.buildPythonApplication {
-  pname = "zshell-cli";
-  version = "0.1.0";
-  src = ../cli;
-  pyproject = true;
-
-  build-system = with python3.pkgs; [
-    hatch-vcs
-    hatchling
-  ];
-
-  dependencies = with python3.pkgs; [
-    materialyoucolor
-    pillow
-    jinja2
-    typer
-  ];
-
-  pythonImportsCheck = ["zshell"];
-
-  nativeBuildInputs = [installShellFiles];
-
-  SETUPTOOLS_SCM_PRETEND_VERSION = 1;
-}