diff --git a/laptop/configuration.nix b/laptop/configuration.nix index 5d213e02..125362e6 100644 --- a/laptop/configuration.nix +++ b/laptop/configuration.nix @@ -8,6 +8,8 @@ ./hardware-configuration.nix # Home-Manager Nix configuration file. ./home-manager.nix + # Gnome configuration file. + ./gnome.nix ]; # Keep the system up-to-date automatically @@ -85,32 +87,11 @@ enable = true; touchpad.tapping = true; }; - # Enable the GNOME Desktop Environment. - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; # Enable nVidia drivers videoDrivers = [ "nvidia" ]; autorun = true; }; - # Set Gnome settings: - services.gnome = { - games.enable = false; - core-utilities.enable = true; - }; - - # https://nixos.wiki/wiki/GNOME - environment.gnome.excludePackages = (with pkgs; [ - gnome.cheese - gnome.gnome-music - gnome.epiphany - gnome.geary - gnome.totem - gnome.gnome-characters - gnome-tour - gnome.gnome-maps - ]); - # Enable sound with pipewire. sound.enable = true; hardware.pulseaudio.enable = false; @@ -158,15 +139,6 @@ iotop glxinfo tailscale - - # Gnome Extensions / Packages - gnomeExtensions.tiling-assistant - gnomeExtensions.dash-to-dock - gnomeExtensions.blur-my-shell - gnomeExtensions.vitals - gnomeExtensions.user-themes - gnomeExtensions.caffeine - gnome3.gnome-tweaks ]; # Enable the OpenSSH daemon and Tailscale. diff --git a/laptop/gnome.nix b/laptop/gnome.nix new file mode 100644 index 00000000..132cb19a --- /dev/null +++ b/laptop/gnome.nix @@ -0,0 +1,38 @@ +{ config, pkgs, ... }: { + services.xserver = { + # Enable the GNOME Desktop Environment. + displayManager.gdm.enable = true; + desktopManager.gnome.enable = true; + }; + + # Set Gnome settings: + services.gnome = { + games.enable = false; + core-utilities.enable = true; + }; + + # https://nixos.wiki/wiki/GNOME + environment.gnome.excludePackages = (with pkgs; [ + gnome.cheese + gnome.gnome-music + gnome.epiphany + gnome.geary + gnome.totem + gnome.gnome-characters + gnome-tour + gnome.gnome-maps + ]); + + # Gnome extensions + environment.systemPackages = with pkgs; [ + # Gnome Extensions / Packages + gnomeExtensions.tiling-assistant + gnomeExtensions.dash-to-dock + gnomeExtensions.blur-my-shell + gnomeExtensions.vitals + gnomeExtensions.user-themes + gnomeExtensions.caffeine + gnome3.gnome-tweaks + ]; + +} \ No newline at end of file diff --git a/laptop/home-manager.nix b/laptop/home-manager.nix index 11cdca3c..4ca58e36 100644 --- a/laptop/home-manager.nix +++ b/laptop/home-manager.nix @@ -8,9 +8,8 @@ in ]; home-manager.users.albert = { - /* The home.stateVersion option does not have a default and must be set */ home.stateVersion = "23.05"; - /* Here goes the rest of your home-manager config, e.g. home.packages = [ pkgs.foo ]; */ + # User Home-Manager config location programs.git = { enable = true; userName = "albert"; @@ -22,9 +21,8 @@ in }; home-manager.users.root = { - /* The home.stateVersion option does not have a default and must be set */ home.stateVersion = "23.05"; - /* Here goes the rest of your home-manager config, e.g. home.packages = [ pkgs.foo ]; */ + # User Home-Manager config location programs.git = { enable = true; userName = "albert";