home-mods/firefox/zen-browser.nix

@@ -25,7 +25,7 @@
   programs.zen-browser = (import ./_base.nix args) // { package = pkgs.my.zen-browser; };
 
   home.sessionVariables = {
-    BROWSER = "${pkgs.my.zen-browser}/bin/zen-browser";
+    BROWSER = "zen-browser";
     MOZ_USE_XINPUT2 = "1";
     MOZ_ENABLE_WAYLAND = "1";
   };

home-mods/shell/default.nix

@@ -404,7 +404,6 @@ in
       rage
       nh
       pkgs.agenix-rekey
-      my.aaxtomp3
       # android-studio-full
     ];
   };

os-mods/common/default.nix

@@ -131,7 +131,7 @@ in
       flake = "/home/tristand/nix";
     };
     rust-motd = {
-      enable = true;
+      # enable = true; # broken atm
       enableMotdInSSHD = true;
       settings = {
         banner = {

os-mods/ryzenapu/default.nix

@@ -21,7 +21,7 @@
     let
       tcl = "80";
       # coall = "1048561"; # 1048561 = 0x100000 - 15(mV) $ math "0x100000-15" # slight undervolt
-      coall = "1048576"; # no oc?
+      coall = " 1048576";  # no oc?
       defaults = "--tctl-temp=${tcl} --set-coall=${coall}";
     in
     {

os-mods/virt/default.nix

@@ -11,36 +11,20 @@
     virt-viewer
     virt-top
     spice-gtk
-    podman-bootc
-    bootc
     inputs.winapps.packages."${system}".winapps
     inputs.winapps.packages."${system}".winapps-launcher
   ];
 
   boot.kernelModules = [ "kvm-amd" ]; # TODO check cpu and enable intel kvm if needed
 
-  virtualisation = {
+  virtualisation.waydroid.enable = true;
-    # waydroid.enable = true;
+  virtualisation.docker = {
-    containers.enable = true;
+    enable = true;
-    podman = {
+    package = pkgs.docker;
-      enable = true;
 
-      autoPrune.enable = true;
+    storageDriver = lib.mkDefault "overlay2";
-
+    liveRestore = false;
-      dockerCompat = true;
+    autoPrune.enable = true;
-      dockerSocket.enable = true;
-
-      defaultNetwork.settings.dns_enabled = true;
-    };
-
-    docker = {
-      enable = false;
-      package = pkgs.docker;
-
-      storageDriver = lib.mkDefault "overlay2";
-      liveRestore = false;
-      autoPrune.enable = true;
-    };
   };
 
   security.wrappers.spice-client-glib-usb-acl-helper = {

pkgs/aaxtomp3.nix

@@ -1,81 +0,0 @@
-{
-  bash,
-  bc,
-  coreutils,
-  fetchFromGitHub,
-  ffmpeg,
-  findutils,
-  gawk,
-  gnugrep,
-  gnused,
-  jq,
-  lame,
-  lib,
-  mediainfo,
-  mp4v2,
-  ncurses,
-  resholve,
-}:
-
-resholve.mkDerivation rec {
-  pname = "aaxtomp3";
-  version = "1.3";
-
-  src = fetchFromGitHub {
-    owner = "damajor";
-    repo = "aaxtomp3";
-    rev = "patch-1";
-    hash = "sha256-e+A4PLr3/WF/KeEeS6mwpc0ybvTyXTpxoOn6Bj6ZmMg=";
-  };
-
-  postPatch = ''
-    substituteInPlace AAXtoMP3 \
-      --replace 'AAXtoMP3' 'aaxtomp3'
-    substituteInPlace interactiveAAXtoMP3 \
-      --replace 'AAXtoMP3' 'aaxtomp3' \
-      --replace 'call="./aaxtomp3"' 'call="$AAXTOMP3"'
-  '';
-
-  installPhase = ''
-    install -Dm 755 AAXtoMP3 $out/bin/aaxtomp3
-    install -Dm 755 interactiveAAXtoMP3 $out/bin/interactiveaaxtomp3
-  '';
-
-  solutions.default = {
-    scripts = [
-      "bin/aaxtomp3"
-      "bin/interactiveaaxtomp3"
-    ];
-    interpreter = "${bash}/bin/bash";
-    inputs = [
-      bc
-      coreutils
-      ffmpeg
-      findutils
-      gawk
-      gnugrep
-      gnused
-      jq
-      lame
-      mediainfo
-      mp4v2
-      ncurses
-    ];
-    keep."$call" = true;
-    fix = {
-      "$AAXTOMP3" = [ "${placeholder "out"}/bin/aaxtomp3" ];
-      "$FIND" = [ "find" ];
-      "$GREP" = [ "grep" ];
-      "$SED" = [ "sed" ];
-      "$FFPROBE" = [ "ffprobe" ];
-      "$FFMPEG" = [ "ffmpeg" ];
-    };
-  };
-
-  meta = with lib; {
-    description = "Convert Audible's .aax filetype to MP3, FLAC, M4A, or OPUS";
-    homepage = "https://krumpetpirate.github.io/AAXtoMP3";
-    license = licenses.wtfpl;
-    maintainers = with maintainers; [ urandom ];
-  };
-}