diff --git a/nix/alex-desktop.nix b/nix/alex-desktop.nix index e68e0de..d59ea4c 100644 --- a/nix/alex-desktop.nix +++ b/nix/alex-desktop.nix @@ -29,8 +29,8 @@ }; services.xserver.enable = true; - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + services.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; systemd.targets.sleep.enable = false; systemd.targets.suspend.enable = false; @@ -43,7 +43,7 @@ }; services.printing.enable = true; - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/nix/home-manager/alex.home.nix b/nix/home-manager/alex.home.nix index 55502ad..fa805ba 100644 --- a/nix/home-manager/alex.home.nix +++ b/nix/home-manager/alex.home.nix @@ -27,10 +27,6 @@ ]; programs.direnv = { enable = true; - nix-direnv.enable = true; - - enableBashIntegration = true; - enableFishIntegration = true; }; home.sessionVariables = { EDITOR = "vim"; diff --git a/nix/home-manager/desktop.home.nix b/nix/home-manager/desktop.home.nix index 8b63d96..18eeb6a 100644 --- a/nix/home-manager/desktop.home.nix +++ b/nix/home-manager/desktop.home.nix @@ -24,6 +24,7 @@ enable = true; enableFishIntegration = true; }; + fonts.fontconfig.enable = true; dconf.enable = true; dconf.settings = {