config sync

3 files changed, 57 insertions, 14 deletions

diff --git a/packages.nix b/packages.nix
index e12063d..e715f68 100644
--- a/packages.nix
+++ b/packages.nix
@@ -12,9 +12,7 @@ let
     dmenu
     anypinentry
     bslock
-
-    # Not local
-    #pkgs.bspwm
+    sidekick
   ];
 
   devPackages = with pkgs; [
@@ -94,18 +92,23 @@ let
     file
     at
     bc
+    tty-clock
 
     # Audio
     alsaUtils
-    qjackctl
+    pavucontrol
+    obs-studio
+
+    # qjackctl
     #qsynth
-    ardour
+    # ardour
 
     # X stuff
     picom
     brightnessctl
     xorg.xinit
     xorg.xrandr
+    arandr
     xorg.xmodmap
     xorg.xkill
     xclip
diff --git a/packages/default.nix b/packages/default.nix
index 7ac6593..98ce3f1 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -1,12 +1,13 @@
 { pkgs }:
 {
-  dmenu = pkgs.callPackage ./dmenu/pkg.nix {};
-  bslock = pkgs.callPackage ./bslock/pkg.nix {};
-  sensible-apps = pkgs.callPackage ./sensible-apps/pkg.nix {};
-  shotkey = pkgs.callPackage ./shotkey/pkg.nix {};
-  dwm = pkgs.callPackage ./dwm/pkg.nix {};
-  dwmblocks = pkgs.callPackage ./dwmblocks/pkg.nix {};
-  st = pkgs.callPackage ./st/pkg.nix {};
-  anypinentry = pkgs.callPackage ./anypinentry/pkg.nix {};
-  xmonad = pkgs.callPackage ./xmonad/pkg.nix {};
+  dmenu = pkgs.callPackage ./dmenu/pkg.nix { };
+  bslock = pkgs.callPackage ./bslock/pkg.nix { };
+  sensible-apps = pkgs.callPackage ./sensible-apps/pkg.nix { };
+  shotkey = pkgs.callPackage ./shotkey/pkg.nix { };
+  dwm = pkgs.callPackage ./dwm/pkg.nix { };
+  dwmblocks = pkgs.callPackage ./dwmblocks/pkg.nix { };
+  st = pkgs.callPackage ./st/pkg.nix { };
+  anypinentry = pkgs.callPackage ./anypinentry/pkg.nix { };
+  xmonad = pkgs.callPackage ./xmonad/pkg.nix { };
+  sidekick = pkgs.libsForQt5.callPackage ./sidekick-dashboard/pkg.nix { };
 }
diff --git a/packages/sidekick-dashboard/pkg.nix b/packages/sidekick-dashboard/pkg.nix
new file mode 100644
index 0000000..b38aa4c
--- /dev/null
+++ b/packages/sidekick-dashboard/pkg.nix
@@ -0,0 +1,39 @@
+{ stdenv, pkgs, fetchFromGithub, rustPlatform, lib, wrapQtAppsHook, qtbase, makeWrapper }:
+with pkgs.lib;
+
+let
+  src = fetchFromGitHub {
+    owner = "mozilla";
+    repo = "nixpkgs-mozilla";
+    rev = "15b7a05f20aab51c4ffbefddb1b448e862dccb7d"; # 10th April 2022
+    sha256 = "sha256-YeN4bpPvHkVOpQzb8APTAfE7/R+MFMwJUMkqmfvytSk=";
+  };
+  moz = import "${src.out}/rust-overlay.nix" pkgs pkgs;
+  rust = moz.latest.rustChannels.nightly.rust.override {
+    extensions = [ "rust-src" ];
+  };
+in
+rustPlatform.buildRustPackage rec {
+  pname = "sidekick-dashboard";
+  version = "0.0.0";
+
+  src = pkgs.fetchFromGitHub {
+    owner = "phenax";
+    repo = "sidekick-dashboard";
+    rev = "994450070a984448cb0b286fc729a92c6487c0c9";
+    sha256 = "sha256-M4mbep/qxRsRxZdILxKY5ejRPVZ3Pm6nuToDCZky/A0=";
+  };
+
+  cargoSha256 = "sha256-dgW2SlpKovw79wkdGcbVm6c8KqkbcZlvZCwCcdVBShw=";
+
+  nativeBuildInputs = with pkgs; [ cmake wrapQtAppsHook clang ];
+  buildInputs = with pkgs; [
+    pkg-config
+    libclang
+    libGL
+    qt5.full
+    qtbase
+    libsForQt5.qmake
+    makeWrapper
+  ];
+}