add stuff

common/modules/packages.nix

@@ -29,10 +29,14 @@
   # cli util to upate hardware
   services.fwupd.enable = true;
   programs.steam.enable = true;
+  virtualisation.docker.enable = true;
 
   # use zsh shell
   programs.zsh.enable = true;
 
+  # enable virtualization support for eg. boxes
+  virtualisation.libvirtd.enable = true;
+
   # packages in global env
   environment.systemPackages = with pkgs; [
     # system utilities
@@ -47,7 +51,8 @@
     neofetch
     dmidecode
 
-    #(pkgs.callPackage ./resources.nix { })
+    (pkgs.callPackage ./resources.nix { })
+    bottles
 
     # web
     firefox
@@ -55,6 +60,7 @@
     openscad
     vscode
     git
+    ninja
     flutter
     prusa-slicer
 
@@ -62,11 +68,18 @@
     discord
     
     rustup
+    gcc
+    sqlite
+    sea-orm-cli
+    poetry
+    python3
     
     ## ides
     jetbrains.idea-ultimate
     jetbrains.dataspell
+    jetbrains.rust-rover
     gnome-builder
+    gnome.gnome-boxes
 
     ## R statistics stuff
     rstudio
@@ -85,7 +98,15 @@
     diebahn
     appflowy
     kicad
+    authenticator
+    dialect
+    gnome-decoder
+    video-trimmer
+    pods
+
+    eyedropper
+    gaphor
   ] ++ ([
-    custompkgs.resources
+    #custompkgs.resources
     ]);
 }

common/modules/resources.nix

@@ -13,23 +13,25 @@
 , glib
 , gtk4
 , libadwaita
+, dmidecode
+, util-linux
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "resources";
   version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "nokyan";
-    repo = pname;
-    rev = "refs/tags/v${version}";
+    repo = "resources";
+    rev = "refs/tags/v${finalAttrs.version}";
     hash = "sha256-OVz1vsmOtH/5sEuyl2BfDqG2/9D1HGtHA0FtPntKQT0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
-    inherit src;
-    name = "${pname}-v${version}";
-    hash = "sha256-JxcqHM7jccZ+YwU93AejXejZK1bj7IggO1QrE5cSPYU=";
+    inherit (finalAttrs) src;
+    name = "resources-${finalAttrs.version}";
+    hash = "sha256-MNYKfvbLQPWm7MKS5zYGrc+aoC9WeU5FTftkCrogZg0=";
   };
 
   nativeBuildInputs = [
@@ -50,15 +52,26 @@ stdenv.mkDerivation rec {
     libadwaita
   ];
 
+  postPatch = ''
+    substituteInPlace src/utils/memory.rs \
+      --replace '"dmidecode"' '"${dmidecode}/bin/dmidecode"'
+    substituteInPlace src/utils/cpu.rs \
+      --replace '"lscpu"' '"${util-linux}/bin/lscpu"'
+    substituteInPlace src/utils/memory.rs \
+      --replace '"pkexec"' '"/run/wrappers/bin/pkexec"'
+  '';
+
   mesonFlags = [
-    "-Dprofile=default"
+    (lib.mesonOption "profile" "default")
   ];
 
   meta = {
-    description = "Resources";
+    changelog = "https://github.com/nokyan/resources/releases/tag/${finalAttrs.version}";
+    description = "Monitor your system resources and processes";
     homepage = "https://github.com/nokyan/resources";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ dotlambda foo-dogsquared ];
-    platforms = lib.platforms.all;
+    mainProgram = "resources";
+    maintainers = with lib.maintainers; [ lukas-heiligenbrunner ewuuwe ];
+    platforms = lib.platforms.linux;
   };
-}
+})