diff --git a/flake.lock b/flake.lock index feb976d..a2b340c 100644 --- a/flake.lock +++ b/flake.lock @@ -256,16 +256,16 @@ ] }, "locked": { - "lastModified": 1735344290, - "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "613691f285dad87694c2ba1c9e6298d04736292d", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -414,13 +414,13 @@ "type": "github" } }, - "nixpkgsSmall": { + "nixpkgs_2": { "locked": { - "lastModified": 1735640024, - "narHash": "sha256-4I5qiwYmZFygUC3numWaMhStwRYX+Lk0ISddJIoHEwE=", + "lastModified": 1734927162, + "narHash": "sha256-egJAEOe61A3FFU1KkG7GW51Q9uq39L4yfkrGfA2p2Eo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc130b5a632d110d76f1584213eab6e029fd7802", + "rev": "d28f9301c35e66751872254b8029f31fa9e0da20", "type": "github" }, "original": { @@ -430,38 +430,6 @@ "type": "github" } }, - "nixpkgsUnstable": { - "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1735531152, - "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_3": { "locked": { "lastModified": 1731763621, @@ -489,8 +457,6 @@ "nix-secrets": "nix-secrets", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_2", - "nixpkgsSmall": "nixpkgsSmall", - "nixpkgsUnstable": "nixpkgsUnstable", "sops-nix": "sops-nix" } }, diff --git a/flake.nix b/flake.nix index edd13df..77793e4 100644 --- a/flake.nix +++ b/flake.nix @@ -2,12 +2,10 @@ description = "the silliest NixOS config!"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - nixpkgsSmall.url = "github:NixOS/nixpkgs/nixos-24.11-small"; - nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11-small"; sops-nix.url = "github:Mic92/sops-nix"; - home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; alejandra.url = "github:kamadorueda/alejandra/3.0.0"; @@ -38,7 +36,6 @@ { self, nixpkgs, - nixpkgsSmall, sops-nix, nixos-generators, nix-darwin, @@ -59,7 +56,7 @@ in { nixosConfigurations = { - sisyphe = nixpkgsSmall.lib.nixosSystem { + sisyphe = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = specialArgs; modules = [ diff --git a/hosts/goober/configuration.nix b/hosts/goober/configuration.nix index ec48d21..0d5e89c 100644 --- a/hosts/goober/configuration.nix +++ b/hosts/goober/configuration.nix @@ -65,7 +65,7 @@ # Define a user account. Don't forget to set a password with ‘passwd’. users.users.harry123 = { isNormalUser = true; - extraGroups = [ "wheel" "audio" "video" ]; # Enable ‘sudo’ for the user. + extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. packages = with pkgs; [ firefox tailscale diff --git a/hosts/goober/features/hardware/pipewire.nix b/hosts/goober/features/hardware/pipewire.nix index 08ba1e1..80d289d 100644 --- a/hosts/goober/features/hardware/pipewire.nix +++ b/hosts/goober/features/hardware/pipewire.nix @@ -1,10 +1,33 @@ {config, pkgs, ...}: { + sound.enable = false; security.rtkit.enable = true; - services.pipewire.enable = false; - hardware.pulseaudio.enable = true; - hardware.pulseaudio.support32Bit = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + #jack.enable = true; + wireplumber.extraConfig."10-bluez" = { + "monitor.bluez.properties" = { + "bluez5.enable-sbc-xq" = true; + "bluez5.enable-msbc" = true; + "bluez5.enable-hw-volume" = true; + "bluez5.roles" = [ + "hsp_hs" + "hsp_ag" + "hfp_hf" + "hfp_ag" + ]; + }; + }; + }; + services.pipewire.wireplumber.extraConfig."11-bluetooth-policy" = { + "wireplumber.settings" = { + "bluetooth.autoswitch-to-headset-profile" = false; + }; + }; environment.systemPackages = [ pkgs.pwvucontrol ]; diff --git a/hosts/goober/features/software/default.nix b/hosts/goober/features/software/default.nix index 84fecea..211d816 100644 --- a/hosts/goober/features/software/default.nix +++ b/hosts/goober/features/software/default.nix @@ -3,6 +3,6 @@ imports = [ ./neovim.nix ./flatpak.nix - ./discord.nix + # ./discord.nix ]; } diff --git a/hosts/goober/features/software/discord.nix b/hosts/goober/features/software/discord.nix index 83e5ea2..6472a05 100644 --- a/hosts/goober/features/software/discord.nix +++ b/hosts/goober/features/software/discord.nix @@ -2,6 +2,7 @@ { environment.systemPackages = with pkgs; [ (discord.override { + withOpenASAR = true; # can do this here too withVencord = true; }) ]; diff --git a/hosts/goober/features/software/flatpak.nix b/hosts/goober/features/software/flatpak.nix index 20da69a..5e16022 100644 --- a/hosts/goober/features/software/flatpak.nix +++ b/hosts/goober/features/software/flatpak.nix @@ -3,6 +3,7 @@ services.flatpak.packages = [ "io.github.zen_browser.zen" + "dev.vencord.Vesktop" "com.unicornsonlsd.finamp" ];