Compare commits
	
		
			2 Commits
		
	
	
		
			90e1c36244
			...
			4525b47d35
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 4525b47d35 | |||
| 4d9937cf9d | 
@ -17,11 +17,11 @@
 | 
				
			|||||||
    },
 | 
					    },
 | 
				
			||||||
    "nixpkgs": {
 | 
					    "nixpkgs": {
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
        "lastModified": 1677932085,
 | 
					        "lastModified": 1684049129,
 | 
				
			||||||
        "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=",
 | 
					        "narHash": "sha256-7WB9LpnPNAS8oI7hMoHeKLNhRX7k3CI9uWBRSfmOCCE=",
 | 
				
			||||||
        "owner": "nixos",
 | 
					        "owner": "nixos",
 | 
				
			||||||
        "repo": "nixpkgs",
 | 
					        "repo": "nixpkgs",
 | 
				
			||||||
        "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89",
 | 
					        "rev": "0470f36b02ef01d4f43c641bbf07020bcab71bf1",
 | 
				
			||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										20
									
								
								flammea.nix
									
									
									
									
									
								
							
							
								
								
								
								
								
									
									
								
							
						
						
									
										20
									
								
								flammea.nix
									
									
									
									
									
								
							@ -29,6 +29,7 @@ let mpdStreamingPort = 8080; in
 | 
				
			|||||||
    "zenpower"
 | 
					    "zenpower"
 | 
				
			||||||
  ];
 | 
					  ];
 | 
				
			||||||
  boot.extraModulePackages = [ ];
 | 
					  boot.extraModulePackages = [ ];
 | 
				
			||||||
 | 
					  boot.supportedFilesystems = [ "zfs" ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  fileSystems."/" =
 | 
					  fileSystems."/" =
 | 
				
			||||||
    { device = "/dev/disk/by-uuid/3b8c5c8a-fff2-49ba-98bd-ceb01d6d57c3";
 | 
					    { device = "/dev/disk/by-uuid/3b8c5c8a-fff2-49ba-98bd-ceb01d6d57c3";
 | 
				
			||||||
@ -110,7 +111,7 @@ let mpdStreamingPort = 8080; in
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  networking.firewall.trustedInterfaces = [ "tailscale0" ];
 | 
					  networking.firewall.trustedInterfaces = [ "tailscale0" ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  services.openssh.forwardX11 = true;
 | 
					  services.openssh.settings.X11Forwarding = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  fileSystems."/mnt/aplysia".device = pkgs.lib.mkOverride 10 "//aplysia.auroch-boa.ts.net/export";
 | 
					  fileSystems."/mnt/aplysia".device = pkgs.lib.mkOverride 10 "//aplysia.auroch-boa.ts.net/export";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -127,9 +128,7 @@ let mpdStreamingPort = 8080; in
 | 
				
			|||||||
  #     );
 | 
					  #     );
 | 
				
			||||||
  # };
 | 
					  # };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  #boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_latest;
 | 
					  boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_6_1;
 | 
				
			||||||
  # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages;
 | 
					 | 
				
			||||||
  # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_5_8;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # services.xserver = {
 | 
					  # services.xserver = {
 | 
				
			||||||
  #   videoDrivers = [ "amdgpu" ];
 | 
					  #   videoDrivers = [ "amdgpu" ];
 | 
				
			||||||
@ -184,14 +183,13 @@ let mpdStreamingPort = 8080; in
 | 
				
			|||||||
    '';
 | 
					    '';
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  services.pipewire = {
 | 
					  environment.etc."pipewire/pipewire-pulse.conf.d/listen.conf".text = ''
 | 
				
			||||||
    config.pipewire-pulse = {
 | 
					    pulse.properties = {
 | 
				
			||||||
      "pulse.properties"."server.address" = [
 | 
					      server.address = [
 | 
				
			||||||
        "unix:native"
 | 
					        "unix:native"
 | 
				
			||||||
        "tcp:127.0.0.1:4713"
 | 
					        "tcp:127.0.0.1:4713"
 | 
				
			||||||
        # "tcp:100.97.134.100:4713"
 | 
					        # "tcp:100.97.134.100:4713"
 | 
				
			||||||
      ];
 | 
					      ]
 | 
				
			||||||
    };
 | 
					    }
 | 
				
			||||||
  };
 | 
					  '';
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										24
									
								
								pipewire.nix
									
									
									
									
									
								
							
							
								
								
								
								
								
									
									
								
							
						
						
									
										24
									
								
								pipewire.nix
									
									
									
									
									
								
							@ -12,18 +12,18 @@
 | 
				
			|||||||
    pulse.enable = true;
 | 
					    pulse.enable = true;
 | 
				
			||||||
    jack.enable = true;
 | 
					    jack.enable = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    media-session.config.bluez-monitor.rules = [
 | 
					    # media-session.config.bluez-monitor.rules = [
 | 
				
			||||||
      {
 | 
					    #   {
 | 
				
			||||||
        # Matches all cards
 | 
					    #     # Matches all cards
 | 
				
			||||||
        matches = [ { "device.name" = "~bluez_card.*"; } ];
 | 
					    #     matches = [ { "device.name" = "~bluez_card.*"; } ];
 | 
				
			||||||
        actions = {
 | 
					    #     actions = {
 | 
				
			||||||
          "update-props" = {
 | 
					    #       "update-props" = {
 | 
				
			||||||
            "bluez5.reconnect-profiles" = [ "hfp_hf" "hsp_hs" "a2dp_sink" ];
 | 
					    #         "bluez5.reconnect-profiles" = [ "hfp_hf" "hsp_hs" "a2dp_sink" ];
 | 
				
			||||||
            "bluez5.msbc-support" = true;
 | 
					    #         "bluez5.msbc-support" = true;
 | 
				
			||||||
          };
 | 
					    #       };
 | 
				
			||||||
        };
 | 
					    #     };
 | 
				
			||||||
      }
 | 
					    #   }
 | 
				
			||||||
    ];
 | 
					    # ];
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  environment.systemPackages = with pkgs; [
 | 
					  environment.systemPackages = with pkgs; [
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user