File tree Expand file tree Collapse file tree 6 files changed +19
-21
lines changed
Expand file tree Collapse file tree 6 files changed +19
-21
lines changed Original file line number Diff line number Diff 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 ;
Original file line number Diff line number Diff line change 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 ) {
Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff line change 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 ;
Original file line number Diff line number Diff line change 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 ;
Original file line number Diff line number Diff line change 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" ] ;
You can’t perform that action at this time.
0 commit comments