Skip to content

Commit 4a6dc81

Browse files
committed
treewide: migrate to 24.11
1 parent d20becc commit 4a6dc81

File tree

6 files changed

+19
-21
lines changed

6 files changed

+19
-21
lines changed

flake/nixpkgs.nix

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,7 @@ import inputs.nixpkgs {
5252
vscode
5353
;
5454

55-
# FIXME: pin 23.11 release for broken packages
5655
inherit (nixpkgs-23-11)
57-
audacity
58-
jetbrains
59-
libreoffice
60-
openshot-qt
61-
thunderbird
62-
6356
# needed for interop with php74
6457
apacheHttpd
6558
;

home/base/general.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ in
112112

113113
programs.fzf.enable = true;
114114

115-
# FIXME: set to sd-switch once it works for krypton
116-
systemd.user.startServices = "legacy";
115+
systemd.user.startServices = true;
117116
}
118117

119118
(mkIf (!cfg.minimal) {

home/wm/general/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ in
7777
config.lib.custom.mkScript
7878
(item.name or item.command)
7979
./wm-script.sh
80-
[ pkgs.gnome.zenity ]
80+
[ pkgs.zenity ]
8181
{
8282
inherit (item) command message;
8383

lib/common-config.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ _:
3232
flake-registry = null;
3333
};
3434

35-
package = pkgs.nixVersions.nix_2_22; # TODO: after next release, set to stable
35+
package = pkgs.nixVersions.stable;
3636
registry = {
3737
nixpkgs.flake = inputs.nixpkgs;
3838
nix-config.flake = inputs.self;

nixos/base/desktop.nix

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,18 @@ in
6969

7070
programs.ssh.askPassword = "";
7171

72-
services.xserver = mkIf cfg.enableXserver {
73-
enable = true;
72+
services = {
73+
pipewire.enable = false;
7474

75-
displayManager.lightdm.enable = true;
75+
xserver = mkIf cfg.enableXserver {
76+
enable = true;
7677

77-
# FIXME: why is this line needed? ~/.xsession is executed anyway..
78-
windowManager.dwm.enable = true;
79-
};
78+
displayManager.lightdm.enable = true;
8079

81-
sound.enable = true;
80+
# FIXME: why is this line needed? ~/.xsession is executed anyway..
81+
windowManager.dwm.enable = true;
82+
};
83+
};
8284

8385
xdg = {
8486
autostart.enable = true;

nixos/system/nvidia-optimus/default.nix

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,14 @@ in
6363
)
6464
];
6565

66-
hardware.nvidia.prime = {
67-
inherit (cfg) amdgpuBusId nvidiaBusId;
66+
hardware.nvidia = {
67+
open = false;
6868

69-
offload.enable = true;
69+
prime = {
70+
inherit (cfg) amdgpuBusId nvidiaBusId;
71+
72+
offload.enable = true;
73+
};
7074
};
7175

7276
services.xserver.videoDrivers = [ "nvidia" ];

0 commit comments

Comments
 (0)