Skip to content

Commit 33179d7

Browse files
committed
chore: merge w main
2 parents 6df6d08 + 66d677e commit 33179d7

File tree

5 files changed

+6
-16
lines changed

5 files changed

+6
-16
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ versioning is done in a continuous fashion without worries of breaking changes.
88

99
- `nix`: rebuild the darwin machine with an installed switch script 2025-03-03
1010
- `nix`: setup an installation and teardown script for mac machines 2025-03-02
11+
- `nix`: move pulse audio from hardware to services in toms configs 2025-03-02
1112
- `nix`: avoid global packages while overlayed other packages exist 2025-03-02
1213
- `nix`: skip specific darwin configurations of the package manager 2025-03-02
1314
- `nix`: remove explicit setup of the nix daemon for darwins laptop 2025-02-28

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
nixpkgs.overlays = [ nur.overlays.default ];
3737
home-manager = {
3838
sharedModules = [ nur.modules.homeManager.default ];
39-
useGlobalPkgs = true;
39+
useGlobalPkgs = false; # https://github.com/zimeg/.DOTFILES/issues/29
4040
useUserPackages = false;
4141
users = {
4242
"eden.zimbelman" = {
@@ -79,7 +79,7 @@
7979
{
8080
home-manager = {
8181
sharedModules = [ nur.modules.homeManager.default ];
82-
useGlobalPkgs = true;
82+
useGlobalPkgs = false; # https://github.com/zimeg/.DOTFILES/issues/29
8383
useUserPackages = true;
8484
users = {
8585
default = {

machines/tom/configuration.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
./hardware/configuration
2020
./hardware/graphics
2121
(import ./hardware/nvidia { config = config; })
22-
./hardware/pulseaudio
2322
./programs/gnupg
2423
./security/rtkit
2524
./services/github-runners
@@ -29,6 +28,7 @@
2928
./services/pipewire
3029
./services/plasma6
3130
./services/printing
31+
./services/pulseaudio
3232
./services/sddm
3333
./services/tailscale
3434
./services/xserver
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# https://github.com/pulseaudio/pulseaudio
22
{
3-
hardware.pulseaudio = {
3+
services.pulseaudio = {
44
enable = false;
55
};
66
}

machines/work/configuration.nix

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,11 @@
22
{ self, ... }:
33
{
44
nix = {
5-
settings = {
6-
experimental-features = [
7-
"flakes"
8-
"nix-command"
9-
];
10-
sandbox = true;
11-
};
5+
enable = false; # https://github.com/zimeg/.DOTFILES/issues/28
126
};
137
nixpkgs = {
148
hostPlatform = "aarch64-darwin";
159
};
16-
services = {
17-
nix-daemon = {
18-
enable = true;
19-
};
20-
};
2110
system = {
2211
configurationRevision = self.rev or self.dirtyRev or null;
2312
stateVersion = 5;

0 commit comments

Comments
 (0)