diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-01-31 09:40:38 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-01-31 09:41:24 +0100 |
| commit | 01751a944792fc4d381c91ed8b3fcacdbff41785 (patch) | |
| tree | 75e9e3da1e06fdfb3e14f8544bf0bb8b9e6987d3 /nixos | |
| parent | 68b4a1f669e2ca95ebbb3f80631952a7168214f1 (diff) | |
| parent | e01c15d433cdaacca0c0525a29ce304b3832d16a (diff) | |
| download | nixlib-01751a944792fc4d381c91ed8b3fcacdbff41785.tar nixlib-01751a944792fc4d381c91ed8b3fcacdbff41785.tar.gz nixlib-01751a944792fc4d381c91ed8b3fcacdbff41785.tar.bz2 nixlib-01751a944792fc4d381c91ed8b3fcacdbff41785.tar.lz nixlib-01751a944792fc4d381c91ed8b3fcacdbff41785.tar.xz nixlib-01751a944792fc4d381c91ed8b3fcacdbff41785.tar.zst nixlib-01751a944792fc4d381c91ed8b3fcacdbff41785.zip | |
Merge #22309: vim: allow building with gtk3
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 17e84b1d9a16..21453d1917e8 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -78,7 +78,7 @@ in { }; debug = mkEnableOption "gnome-session debug messages"; - }; + }; environment.gnome3.packageSet = mkOption { default = null; @@ -86,7 +86,7 @@ in { description = "Which GNOME 3 package set to use."; apply = p: if p == null then pkgs.gnome3 else p; }; - + environment.gnome3.excludePackages = mkOption { default = []; example = literalExample "[ pkgs.gnome3.totem ]"; @@ -125,6 +125,9 @@ in { services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ]; + # If gnome3 is installed, build vim for gtk3 too. + nixpkgs.config.vim.gui = "gtk3"; + fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ]; services.xserver.desktopManager.session = singleton |