Merge pull request #545 from JakeStanger/build/nix/refactor

Nix refactor

flake.nix

@@ -1,47 +1,47 @@
 {
   description = "Nix Flake for ironbar";
+
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     crane = {
       url = "github:ipetkov/crane";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     naersk.url = "github:nix-community/naersk";
   };
-  outputs = {
-    self,
-    nixpkgs,
-    rust-overlay,
-    crane,
-    naersk,
-    ...
-  }: let
+
+  outputs = { self, nixpkgs, rust-overlay, crane, naersk, ... }:
+    let
       inherit (nixpkgs) lib;
-    genSystems = lib.genAttrs [
-      "aarch64-linux"
-      "x86_64-linux"
-    ];
+
+      genSystems = lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
+
       pkgsFor = system:
         import nixpkgs {
           inherit system;
 
-        overlays = [
-          self.overlays.default
-          rust-overlay.overlays.default
-        ];
+          overlays = [ self.overlays.default rust-overlay.overlays.default ];
         };
+
       mkRustToolchain = pkgs:
         pkgs.rust-bin.stable.latest.default.override {
-        extensions = ["rust-src"];
+          extensions = [ "rust-src" ];
         };
+
     in {
-    overlays.default = final: prev: let
+      overlays.default = final: prev:
+        let
           rust = mkRustToolchain final;
+
           craneLib = (crane.mkLib final).overrideToolchain rust;
+
           naersk' = prev.callPackage naersk {
             cargo = rust;
             rustc = rust;
@@ -51,27 +51,30 @@
             cargo = rust;
             rustc = rust;
           };
+
           props = builtins.fromTOML (builtins.readFile ./Cargo.toml);
-      mkDate = longDate: (lib.concatStringsSep "-" [
+
+          mkDate = longDate:
+            (lib.concatStringsSep "-" [
               (builtins.substring 0 4 longDate)
               (builtins.substring 4 2 longDate)
               (builtins.substring 6 2 longDate)
             ]);
+
           builder = "naersk";
         in {
           ironbar = let
-        version = props.package.version + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
-      in
-        if builder == "crane"
-        then
+            version = props.package.version + "+date="
+              + (mkDate (self.lastModifiedDate or "19700101")) + "_"
+              + (self.shortRev or "dirty");
+          in if builder == "crane" then
             prev.callPackage ./nix/default.nix {
               inherit version;
               inherit rustPlatform;
               builderName = builder;
               builder = craneLib;
             }
-        else if builder == "naersk"
-        then
+          else if builder == "naersk" then
             prev.callPackage ./nix/default.nix {
               inherit version;
               inherit rustPlatform;
@@ -85,29 +88,26 @@
               builderName = builder;
             };
         };
-    packages = genSystems (
-      system: let
-        pkgs = pkgsFor system;
-      in
-        (self.overlays.default pkgs pkgs)
-        // {
+
+      packages = genSystems (system:
+        let pkgs = pkgsFor system;
+        in (self.overlays.default pkgs pkgs) // {
           default = self.packages.${system}.ironbar;
-        }
-    );
-    apps = genSystems (system: let
-      pkgs = pkgsFor system;
-    in {
-      default = {
-        type = "app";
-        program = "${pkgs.ironbar}/bin/ironbar";
-      };
+        });
+
+      apps = genSystems (system:
+        let pkgs = pkgsFor system;
+        in rec {
           ironbar = {
             type = "app";
             program = "${pkgs.ironbar}/bin/ironbar";
           };
+
+          default = ironbar;
         });
 
-    devShells = genSystems (system: let
+      devShells = genSystems (system:
+        let
           pkgs = pkgsFor system;
           rust = mkRustToolchain pkgs;
 
@@ -139,77 +139,84 @@
 
         });
 
-    homeManagerModules.default = {
-      config,
-      lib,
-      pkgs,
-      ...
-    }: let
+      homeManagerModules.default = { config, lib, pkgs, ... }:
+        let
           cfg = config.programs.ironbar;
-      defaultIronbarPackage = self.packages.${pkgs.hostPlatform.system}.default;
-      jsonFormat = pkgs.formats.json {};
+          defaultIronbarPackage =
+            self.packages.${pkgs.hostPlatform.system}.default;
+          jsonFormat = pkgs.formats.json { };
         in {
           options.programs.ironbar = {
             enable = lib.mkEnableOption "ironbar status bar";
+
             package = lib.mkOption {
               type = with lib.types; package;
               default = defaultIronbarPackage;
               description = "The package for ironbar to use.";
             };
+
             systemd = lib.mkOption {
               type = lib.types.bool;
               default = pkgs.stdenv.isLinux;
               description = "Whether to enable to systemd service for ironbar.";
             };
+
             style = lib.mkOption {
               type = lib.types.lines;
               default = "";
               description = "The stylesheet to apply to ironbar.";
             };
+
             config = lib.mkOption {
               type = jsonFormat.type;
-          default = {};
+              default = { };
               description = "The config to pass to ironbar.";
             };
+
             features = lib.mkOption {
               type = lib.types.listOf lib.types.nonEmptyStr;
-          default = [];
+              default = [ ];
               description = "The features to be used.";
             };
+
           };
-      config = let
-        pkg = cfg.package.override {features = cfg.features;};
-      in
-        lib.mkIf cfg.enable {
-          home.packages = [pkg];
+          config = let pkg = cfg.package.override { features = cfg.features; };
+          in lib.mkIf cfg.enable {
+            home.packages = [ pkg ];
+
             xdg.configFile = {
               "ironbar/config.json" = lib.mkIf (cfg.config != "") {
                 source = jsonFormat.generate "ironbar-config" cfg.config;
               };
-            "ironbar/style.css" = lib.mkIf (cfg.style != "") {
-              text = cfg.style;
-            };
+
+              "ironbar/style.css" =
+                lib.mkIf (cfg.style != "") { text = cfg.style; };
             };
+
             systemd.user.services.ironbar = lib.mkIf cfg.systemd {
               Unit = {
                 Description = "Systemd service for Ironbar";
-              Requires = ["graphical-session.target"];
+                Requires = [ "graphical-session.target" ];
               };
+
               Service = {
                 Type = "simple";
                 ExecStart = "${pkg}/bin/ironbar";
               };
-            Install.WantedBy = [
-              (lib.mkIf config.wayland.windowManager.hyprland.systemd.enable "hyprland-session.target")
-              (lib.mkIf config.wayland.windowManager.sway.systemd.enable "sway-session.target")
-              (lib.mkIf config.wayland.windowManager.river.systemd.enable "river-session.target")
+
+              Install.WantedBy = with config.wayland.windowManager; [
+                (lib.mkIf hyprland.systemd.enable "hyprland-session.target")
+                (lib.mkIf sway.systemd.enable "sway-session.target")
+                (lib.mkIf river.systemd.enable "river-session.target")
               ];
             };
           };
         };
     };
+
   nixConfig = {
-    extra-substituters = ["https://jakestanger.cachix.org"];
-    extra-trusted-public-keys = ["jakestanger.cachix.org-1:VWJE7AWNe5/KOEvCQRxoE8UsI2Xs2nHULJ7TEjYm7mM="];
+    extra-substituters = [ "https://cache.garnix.io" ];
+    extra-trusted-public-keys =
+      [ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ];
   };
 }

nix/default.nix

@@ -25,14 +25,23 @@
   builderName ? "nix",
   builder ? {},
 }: let
+  hasFeature = f: features == [ ] || builtins.elem f features;
+
   basePkg = rec {
     inherit version;
+
     pname = "ironbar";
+
     src = builtins.path {
       name = "ironbar";
       path = lib.cleanSource ../.;
     };
-    nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ];
+
+    nativeBuildInputs = [
+        pkg-config
+        wrapGAppsHook
+        gobject-introspection
+    ];
 
     buildInputs = [
       gtk3
@@ -44,18 +53,16 @@
       gnome.adwaita-icon-theme
       hicolor-icon-theme
       gsettings-desktop-schemas
-      libxkbcommon
-      libpulseaudio
-      openssl
-      luajit
-    ];
+      libxkbcommon ]
+      ++ (if hasFeature "http" then [ openssl ] else [])
+      ++ (if hasFeature "volume" then [ libpulseaudio ] else [])
+      ++ (if hasFeature "cairo" then [ luajit ] else []);
 
     propagatedBuildInputs = [ gtk3 ];
 
     lgi = luajitPackages.lgi;
 
-    preFixup = ''
-      gappsWrapperArgs+=(
+    gappsWrapperArgs = ''
         # Thumbnailers
             --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
             --prefix XDG_DATA_DIRS : "${librsvg}/share"
@@ -64,59 +71,59 @@
 
             # gtk-launch
             --suffix PATH : "${lib.makeBinPath [ gtk3 ]}"
-
-        # cairo
+    ''
+    + (if hasFeature "cairo" then ''
         --prefix LUA_PATH : "./?.lua;${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/?/init.lua;${luajit}/share/lua/5.1/\?.lua;${luajit}/share/lua/5.1/?/init.lua"
         --prefix LUA_CPATH : "./?.so;${lgi}/lib/lua/5.1/?.so;${luajit}/lib/lua/5.1/?.so;${luajit}/lib/lua/5.1/loadall.so"
+    '' else "");
+
+    preFixup = ''
+      gappsWrapperArgs+=(
+        ${gappsWrapperArgs}
       )
     '';
+
     passthru = {
       updateScript = gnome.updateScript {
         packageName = pname;
         attrPath = "gnome.${pname}";
       };
     };
+
     meta = with lib; {
       homepage = "https://github.com/JakeStanger/ironbar";
-      description = "Customisable gtk-layer-shell wlroots/sway bar written in rust.";
+      description =
+        "Customisable gtk-layer-shell wlroots/sway bar written in rust.";
       license = licenses.mit;
       platforms = platforms.linux;
       mainProgram = "ironbar";
     };
+
   };
+
   flags = let
-    noDefault =
-      if features == []
-      then ""
-      else "--no-default-features";
-    featuresStr =
-      if features == []
-      then ""
-      else ''-F "${builtins.concatStringsSep "," features}"'';
-  in [noDefault featuresStr];
-in
-  if builderName == "naersk"
-  then
-    builder.buildPackage (basePkg
-      // {
-        cargoBuildOptions = old: old ++ flags;
-      })
-  else if builderName == "crane"
-  then
-    builder.buildPackage (basePkg
-      // {
+    noDefault = if features == [ ] then "" else "--no-default-features";
+
+    featuresStr = if features == [ ] then
+      ""
+    else
+      ''-F "${builtins.concatStringsSep "," features}"'';
+
+  in [ noDefault featuresStr ];
+in if builderName == "naersk" then
+  builder.buildPackage (basePkg // { cargoBuildOptions = old: old ++ flags; })
+else if builderName == "crane" then
+  builder.buildPackage (basePkg // {
     cargoExtraArgs = builtins.concatStringsSep " " flags;
     doCheck = false;
   })
-  else
-    rustPlatform.buildRustPackage (basePkg
-      // {
-        buildNoDefaultFeatures =
-          if features == []
-          then false
-          else true;
+else
+  rustPlatform.buildRustPackage (basePkg // {
+    buildNoDefaultFeatures = features != [ ];
+
     buildFeatures = features;
-        cargoDeps = rustPlatform.importCargoLock {lockFile = ../Cargo.lock;};
+    cargoDeps = rustPlatform.importCargoLock { lockFile = ../Cargo.lock; };
     cargoLock.lockFile = ../Cargo.lock;
-        cargoLock.outputHashes."stray-0.1.3" = "sha256-7mvsWZFmPWti9AiX67h6ZlWiVVRZRWIxq3pVaviOUtc=";
+    cargoLock.outputHashes."stray-0.1.3" =
+      "sha256-7mvsWZFmPWti9AiX67h6ZlWiVVRZRWIxq3pVaviOUtc=";
   })