audio-and-unlock

2025-07-15 21:24:52 +02:00
parent fa0dc92c7b
commit a8254832dd
5 changed files with 62 additions and 27 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -242,11 +242,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748665073,
-        "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=",
+        "lastModified": 1750792728,
+        "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "282e1e029cb6ab4811114fc85110613d72771dea",
+        "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557",
        "type": "github"
      },
      "original": {
@@ -421,11 +421,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1748942041,
-        "narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=",
+        "lastModified": 1750837715,
+        "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853",
+        "rev": "98236410ea0fe204d0447149537a924fb71a6d4f",
        "type": "github"
      },
      "original": {
@@ -453,11 +453,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1748889542,
-        "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
+        "lastModified": 1751211869,
+        "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
+        "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51",
        "type": "github"
      },
      "original": {
@@ -531,11 +531,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1748693115,
-        "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
+        "lastModified": 1751011381,
+        "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
+        "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7",
        "type": "github"
      },
      "original": {
@@ -547,11 +547,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1748856973,
-        "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=",
+        "lastModified": 1751180975,
+        "narHash": "sha256-BKk4yDiXr4LdF80OTVqYJ53Q74rOcA/82EClXug8xsY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8",
+        "rev": "a48741b083d4f36dd79abd9f760c84da6b4dc0e5",
        "type": "github"
      },
      "original": {
@@ -566,11 +566,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1748954271,
-        "narHash": "sha256-tpA8Nlj5cMqMIVAQDE/9CmA45thnFOSZseTBVtBwWlU=",
+        "lastModified": 1751281595,
+        "narHash": "sha256-y0fShu8oxqjP+LNNZWvxQGdlLkZmnK75nNCe8jfIfN0=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "0f3c9ccce1d63b0fd1d60ce41d9714932760f3a8",
+        "rev": "f73c91ffeff4282beb786e4e3de0db037fe07969",
        "type": "github"
      },
      "original": {
@@ -693,11 +693,11 @@
    },
    "unstable": {
      "locked": {
-        "lastModified": 1748856973,
-        "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=",
+        "lastModified": 1751180975,
+        "narHash": "sha256-BKk4yDiXr4LdF80OTVqYJ53Q74rOcA/82EClXug8xsY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8",
+        "rev": "a48741b083d4f36dd79abd9f760c84da6b4dc0e5",
        "type": "github"
      },
      "original": {
--- a/home/profiles/audio.nix
+++ b/home/profiles/audio.nix
@@ -1,7 +1,25 @@
 {pkgs, config, lib, ...}:
 let
  cfg = config.profiles.audio;
-  audio-plugins = pkgs.symlinkJoin { name = "audio-plugins"; paths = [ pkgs.lsp-plugins pkgs.speech-denoiser ];};
+  # audio-plugins = pkgs.symlinkJoin {
+  #   name = "audio-plugins";
+  #   stripPrefix = "/lib";
+  #   paths = [
+  #     pkgs.lsp-plugins
+  #     pkgs.rnnoise-plugin
+  #   ];
+  # };
+  audio-plugins = pkgs.buildEnv {
+    name = "audio-plugins";
+    paths = [
+      pkgs.lsp-plugins
+      # pkgs.calf
+      # pkgs.tal-plugins
+      pkgs.rnnoise-plugin
+    ];
+    # pathsToLink = [ "/lib/lv2" "/lib/ladspa" "/lib/clap" "/lib/vst" "/lib/vst3" ];
+  };
+
 in
 {
  options.profiles.audio = {
--- a/home/profiles/base/default.nix
+++ b/home/profiles/base/default.nix
@@ -81,7 +81,7 @@ in
      eza
      ripgrep

-      gregctl
+      # gregctl
 #      wack
 #
      unstable.ollama
@@ -336,7 +336,7 @@ in

    home.sessionVariables = {
      EDITOR = "hx";
-      GRZEGORZ_DEFAULT_API_BASE = "https://georg-backend.pvv.ntnu.no/api";
+      GRZEGORZ_DEFAULT_API_BASE = "https://georg-backend.pvv.ntnu.no/api/";
      OLLAMA_HOST="100.64.0.19";
    };

--- a/home/profiles/xsession/default.nix
+++ b/home/profiles/xsession/default.nix
@@ -70,9 +70,9 @@ in
            "XF86AudioMicMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-source-mute 1 toggle";

            # Georg volume controls
-            "Shift+XF86AudioRaiseVolume" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} set-volume -- +5%";
-            "Shift+XF86AudioLowerVolume" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} set-volume -- -5%";
-            "Shift+XF86AudioMute" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} toggle";
+            # "Shift+XF86AudioRaiseVolume" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} set-volume -- +5%";
+            # "Shift+XF86AudioLowerVolume" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} set-volume -- -5%";
+            # "Shift+XF86AudioMute" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} toggle";

            "XF86MonBrightnessUp" = "exec --no-startup-id brightnessctl set +5%";
            "XF86MonBrightnessDown" = "exec --no-startup-id brightnessctl set 5%-";
--- a/hosts/asuka/soryu/configuration.nix
+++ b/hosts/asuka/soryu/configuration.nix
@@ -35,6 +35,22 @@
    };
  };

+  boot.kernelParams = [ "ip=dhcp" ];
+  boot.initrd.availableKernelModules = [ "r8169" ];
+  boot.initrd.network.enable = true;
+  boot.initrd.network.ssh = {
+    enable = true;
+    port = 22;
+    authorizedKeys = [
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp8iMOx3eTiG5AmDh2KjKcigf7xdRKn9M7iZQ4RqP0np0UN2NUbu+VAMJmkWFyi3JpxmLuhszU0F1xY+3qM3ARduy1cs89B/bBE85xlOeYhcYVmpcgPR5xduS+TuHTBzFAgp+IU7/lgxdjcJ3PH4K0ruGRcX1xrytmk/vdY8IeSk3GVWDRrRbH6brO4cCCFjX0zJ7G6hBQueTPQoOy3jrUvgpRkzZY4ZCuljXtxbuX5X/2qWAkp8ca0iTQ5FzNA5JUyj+DWeEzjIEz6GrckOdV2LjWpT9+CtOqoPZOUudE1J9mJk4snNlMQjE06It7Kr50bpwoPqnxjo7ZjlHFLezl"
+    ];
+    hostKeys = [
+      "/etc/secrets/initrd/ssh_host_rsa_key"
+      "/etc/secrets/initrd/ssh_host_ed25519_key"
+    ];
+    shell = "/bin/cryptsetup-askpass";
+  };
+
  hardware.bluetooth.enable = true;

  boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
@@ -119,6 +135,7 @@
  security.rtkit.enable = false; # Enable again when mumble is fixed
  services.pipewire = {
    enable = true;
+    extraLv2Packages = [ pkgs.rnnoise-plugin.lv2 ];
    alsa.enable = true;
    alsa.support32Bit = true;
    pulse.enable = true;