diff --git a/auxin/configuration.nix b/auxin/configuration.nix index 972f425..06cd809 100644 --- a/auxin/configuration.nix +++ b/auxin/configuration.nix @@ -79,8 +79,8 @@ # services.printing.enable = true; # Enable sound. - sound.enable = true; - hardware.pulseaudio.enable = true; + # sound.enable = true; + # hardware.pulseaudio.enable = true; # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; @@ -233,6 +233,14 @@ # Enable the OpenSSH daemon. services = { + pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + }; openssh = { enable = true; settings = { diff --git a/flake.lock b/flake.lock index 0983d48..39034fe 100644 --- a/flake.lock +++ b/flake.lock @@ -186,16 +186,14 @@ }, "nix-darwin": { "inputs": { - "nixpkgs": [ - "nixpkgs-darwin" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1719845423, - "narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=", + "lastModified": 1720845312, + "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "ec12b88104d6c117871fad55e931addac4626756", + "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", "type": "github" }, "original": { @@ -269,6 +267,20 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1718149104, + "narHash": "sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e913ae340076bbb73d9f4d3d065c2bca7caafb16", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1720954236, "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", @@ -289,7 +301,7 @@ "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-darwin": "nix-darwin", "nixos-unstable": "nixos-unstable", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-unstable": "nixpkgs-unstable" } diff --git a/flake.nix b/flake.nix index 11ab6d5..e253b76 100644 --- a/flake.nix +++ b/flake.nix @@ -3,20 +3,20 @@ description = "flake for mira::{auxin, leptin, gastrin}"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixos-unstable = { url = "github:NixOS/nixpkgs/nixos-unstable"; - inputs.nixpkgs.follows = "nixos-unstable"; + # inputs.nixpkgs.follows = "nixos-unstable"; }; nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; + # inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin"; - neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; + nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin"; + neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; nix-darwin = { url = "github:LnL7/nix-darwin"; - inputs.nixpkgs.follows = "nixpkgs-darwin"; + # inputs.nixpkgs.follows = "nixpkgs-darwin"; }; }; @@ -27,10 +27,9 @@ nix-darwin, nixpkgs-unstable, ... - }@inputs: - let overlays = [inputs.neovim-nightly-overlay.overlays.default]; - in - { + } @ inputs: let + overlays = [inputs.neovim-nightly-overlay.overlays.default]; + in { nixosConfigurations = { auxin = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; @@ -40,16 +39,19 @@ }; }; darwinConfigurations = { - leptin = nix-darwin.lib.darwinSystem { system = "aarch64-darwin"; modules = [ ./leptin/configuration.nix {nixpkgs.overlays = overlays;} ]; - specialArgs = { inherit nixpkgs-darwin; inherit nix-darwin; inherit inputs; inherit nixpkgs-unstable; }; + specialArgs = { + inherit nixpkgs-darwin; + inherit nix-darwin; + inherit inputs; + inherit nixpkgs-unstable; + }; }; }; }; } -