diff --git a/configs/sternchen/packages.nix b/configs/sternchen/packages.nix index 678ba44..026f5e0 100644 --- a/configs/sternchen/packages.nix +++ b/configs/sternchen/packages.nix @@ -15,7 +15,7 @@ in { keepass firefox google-chrome - #tor-browser-bundle-bin + tor-browser-bundle-bin #(tor-browser-bundle-bin.overrideAttrs (old: { # #version = "10.0.13"; # src = pkgs.fetchurl { diff --git a/configs/sterni/packages.nix b/configs/sterni/packages.nix index 943c709..291dee0 100644 --- a/configs/sterni/packages.nix +++ b/configs/sterni/packages.nix @@ -7,6 +7,9 @@ in { environment.systemPackages = with pkgs; [ + # bluetooth gui + blueberry + nextcloud-client gimp inkscape diff --git a/modules/system/x11.nix b/modules/system/x11.nix index 7bf4c67..8105b78 100644 --- a/modules/system/x11.nix +++ b/modules/system/x11.nix @@ -32,11 +32,17 @@ in { # window-manager : Xmonad # ----------------------- - desktopManager = { xterm.enable = false; }; - displayManager.defaultSession = lib.mkDefault "none+xmonad"; - displayManager.autoLogin.enable = lib.mkDefault true; - displayManager.autoLogin.user = cfg.autoLoginUser; - displayManager.lightdm.enable = lib.mkDefault true; + displayManager = { + defaultSession = lib.mkDefault "none+xmonad"; + autoLogin.enable = lib.mkDefault true; + autoLogin.user = cfg.autoLoginUser; + lightdm.enable = lib.mkDefault true; + }; + + desktopManager = { + xterm.enable = false; + gnome3.enable = lib.mkDefault true; + }; windowManager = { xmonad.enable = true; xmonad.enableContribAndExtras = true;