diff --git a/home-manager/common/desktops/gnome/default.nix b/home-manager/common/desktops/gnome/default.nix index 55ee1c82..b4af0df7 100644 --- a/home-manager/common/desktops/gnome/default.nix +++ b/home-manager/common/desktops/gnome/default.nix @@ -1,6 +1,14 @@ # Generated via dconf2nix: https://github.com/gvolpe/dconf2nix { lib, hostname, username, ... }: { - imports = [ - ./gnome-dconf.nix - ]; -} \ No newline at end of file + imports = [ + ./gnome-dconf.nix + ]; + programs.bash.sessionVariables = { + DISABLE_TMUX = "true"; + GTK_THEME = "Breeze"; # To set the firefox theme + }; + programs.fish.shellInit = '' + set DISABLE_TMUX "true" + ''; + +} diff --git a/home-manager/common/desktops/gnome/gnome-dconf.nix b/home-manager/common/desktops/gnome/gnome-dconf.nix index 16744517..738bd253 100644 --- a/home-manager/common/desktops/gnome/gnome-dconf.nix +++ b/home-manager/common/desktops/gnome/gnome-dconf.nix @@ -1,3 +1,3 @@ { lib, hostname, username, ... }: with lib.hm.gvariant; { # Gnome DCONF Settings -} \ No newline at end of file +} diff --git a/nixos/common/desktops/gnome/default.nix b/nixos/common/desktops/gnome/default.nix index e8f7c621..88974748 100644 --- a/nixos/common/desktops/gnome/default.nix +++ b/nixos/common/desktops/gnome/default.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, hostname, gpu, ... }: { +{ pkgs, ... }: { # Enable sound with pipewire. security.rtkit.enable = true; services.pipewire = { @@ -20,14 +20,19 @@ # hardware.nvidiaOptimus.disable = lib.mkDefault true; services.xserver = { - # https://nixos.org/manual/nixos/stable/index.html#chap-gnome - # Enable the GNOME Desktop Environment. - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; - desktopManager.gnome.extraGSettingsOverrides = '' - [org.gnome.mutter] - experimental-features=['scale-monitor-framebuffer'] - ''; + desktopManager = { + gdm = { + enable = true; + }; + gnome = { + enable = true; + extraGSettingsOverridePackages = [ pkgs.mutter ]; + extraGSettingsOverrides = '' + [org.gnome.mutter] + experimental-features=['scale-monitor-framebuffer'] + ''; + }; + }; }; # Set Gnome settings: