random

modules/overlay-pkgs/cantata/default.nix

@@ -20,6 +20,8 @@
 , lame
 , withMusicbrainz ? false
 , libmusicbrainz5
+, libebur128
+, kdePackages
 
 , withTaglib ? true
 , taglib
@@ -88,8 +90,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nullobsi";
     repo = "cantata";
-    rev = "a19efdf9649c50320f8592f07d82734c352ace9c";
+    rev = "dc5a0ce77cdf3eaacce29180fe7d2c710b3f31af";
-    sha256 = "TVqgTYpHyU1OM9XddJ915GM1XQQrhH9V7yhSxQOaXRs=";
+    sha256 = "YcGqVZuP7slfxo5oe0lBPchVCXm+UsSN/wpglwn6UmU=";
   };
 
   patches = [
@@ -108,6 +110,9 @@ stdenv.mkDerivation rec {
     qtbase
     qtsvg
     qtwayland
+    libebur128
+    kdePackages.kitemviews
+    kdePackages.karchive
     (perl.withPackages (ppkgs: with ppkgs; [ URI ]))
   ]
   ++ lib.flatten (builtins.catAttrs "pkgs" (builtins.filter (e: e.enable) options));

modules/overlay-pkgs/default.nix

@@ -7,6 +7,14 @@
       mcontrolcenter = final.callPackage ./mcontrolcenter.nix {};
       cantata = final.qt6Packages.callPackage ./cantata {};
       tws = final.callPackage ./tws.nix {};
+      libsigrok = prev.libsigrok.overrideAttrs {
+        src = pkgs.fetchFromGitHub {
+          owner = "sipeed";
+          repo = "libsigrok";
+          rev = "4bd54163630ab48e3d5cd540ea9e8cf9809c6f3d";
+          hash = "sha256-Rl5w2jABGTKPnRXZJehNMEBNeGe4POHOoRzffIhAMTM=";
+        };
+      };
     })
   ];
 }

modules/overlay-pkgs/tws.nix

@@ -47,7 +47,7 @@
     glib
     gtk2
     gtk3
-    javaPackages.openjfx21
+    javaPackages.openjfx25
     libdrm
     libGL
     libxkbcommon
@@ -74,7 +74,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://download2.interactivebrokers.com/installers/tws/latest-standalone/tws-latest-standalone-linux-x64.sh";
-    hash = "sha256-Wk7lRE5ypJeAQfvi5aEDZYfUF6fJ3ktueYYytHohIGU=";
+    hash = "sha256-QN7dSe+R2kfDjtJWa9TIGbc8zCSC3XNmxSxOZOjOB2o=";
   };
 
   nativeBuildInputs = [

modules/system.nix

@@ -16,6 +16,8 @@
   services.upower.enable = true;
   services.power-profiles-daemon.enable = true;
 
+  services.nixseparatedebuginfod2.enable = true;
+
   environment.systemPackages = with pkgs; [
     git
     git-lfs

modules/user/dokapon.nix

@@ -1,64 +0,0 @@
-{ nixpak, pkgs, ... }:
-let
-  dokaponGameDir = "/home/admin/Downloads/dokapon/game";
-
-  mkNixPak = nixpak.lib.nixpak {
-    inherit (pkgs) lib;
-    inherit pkgs;
-  };
-
-  dokapon = mkNixPak {
-    config =
-      { sloth, ... }:
-      {
-        app.package = pkgs.writeShellScriptBin "dokapon" ''
-          cd ${dokaponGameDir}
-          exec ${pkgs.wine64}/bin/wine64 DkkStm.exe "$@"
-        '';
-
-        flatpak.appId = "com.dokapon.kingdom";
-
-        bubblewrap = {
-          network = true;
-
-          bind.rw = [
-            (sloth.concat' sloth.xdgDataHome "/dokapon")
-            (sloth.concat' sloth.homeDir "/.wine")
-            "/tmp"
-            "/run/user/1000"
-          ];
-
-          bind.ro = [
-            (sloth.concat' dokaponGameDir "")
-          ];
-
-          sockets = {
-            wayland = true;
-            pipewire = true;
-            pulse = true;
-          };
-
-          env = {
-            WINEDEBUG = "-all";
-            WINEESYNC = "1";
-            XDG_DATA_HOME = sloth.concat' sloth.xdgDataHome "";
-            XDG_CACHE_HOME = sloth.concat' sloth.xdgCacheHome "";
-          };
-        };
-
-        dbus.policies = {
-          "org.freedesktop.Notifications" = "talk";
-        };
-
-        gpu.enable = true;
-        locale.enable = true;
-        fonts.enable = true;
-      };
-
-  };
-in
-{
-  environment.systemPackages = [
-    dokapon.config.env
-  ];
-}

modules/user/general.nix

@@ -3,7 +3,11 @@
 
   system.extraDependencies = with pkgs; [ ungoogled-chromium ];
 
-  environment.systemPackages = with pkgs; [ nix-output-monitor ];
+  environment.systemPackages = with pkgs; [
+    nix-output-monitor
+    pulseview # here because usev rules in libsigrok
+  ];
+  services.udev.packages = [ pkgs.libsigrok ];
   environment.sessionVariables.FLAKE = "/home/admin/nixnew";
 
   programs.steam = {
@@ -26,7 +30,7 @@
       material-symbols
       font-awesome
       corefonts
-      vistafonts
+      vista-fonts
     ]);
 
     fontconfig = {
@@ -97,6 +101,8 @@
     ];
   };
 
+  #programs.ladybird.enable = true;
+
   home-manager.users.${config.main-user} = homeInputs: let
     homeConfig = homeInputs.config;
   in {
@@ -106,7 +112,6 @@
       ./modules/wofi
       ./modules/dolphin
       ./modules/firefox
-      ./modules/element.nix
       ./modules/keepassxc
       ./dev-support.nix
     ];
@@ -135,6 +140,7 @@
       freetube
       jujutsu
 
+      freecad
       tws
 
       distrobox
@@ -162,7 +168,7 @@
     services = {
       mpd = {
         enable = true;
-        musicDirectory = "/pool/music";
+        musicDirectory = "/pool2/music";
         network.startWhenNeeded = true;
 
         extraConfig = ''

systems/msi/hardware-configuration.nix

@@ -13,10 +13,10 @@
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  boot.supportedFilesystems = [ "zfs" ];
+  #boot.supportedFilesystems = [ "zfs" ];
-  networking.hostId = "fd4421b3";
+  #networking.hostId = "fd4421b3";
-  systemd.services.zfs-mount.enable = false;
+  #systemd.services.zfs-mount.enable = false;
-  services.zfs.autoScrub.enable = true;
+  #services.zfs.autoScrub.enable = true;
 
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/c9cb1730-c0d1-4a2e-a092-12dfa7098476";
@@ -28,6 +28,7 @@
       fsType = "vfat";
     };
 
+/*
   fileSystems."/pool/games" = {
     fsType = "zfs";
     device = "pool/games";
@@ -42,6 +43,7 @@
     fsType = "zfs";
     device = "pool/music";
   };
+*/
 
   swapDevices = [ ];