add gnome as module, rollback nixvim

This commit is contained in:
Anthony Rodriguez 2024-09-05 16:11:32 +02:00
parent 63fd57d7ba
commit dfdd05a0c6
Signed by: nezia
GPG key ID: EE3BE97C040A86CE
4 changed files with 21 additions and 10 deletions

View file

@ -524,11 +524,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1725499492, "lastModified": 1725478117,
"narHash": "sha256-IjpbYl4ljZ6gffzfH/n2qYbtu7PZ1KM2LW+cVL6w1bk=", "narHash": "sha256-Ly0DgmYniwBtQ+3aW4JO9ETJq9nbPemlISxC6MEDyB8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "e48da949cf41597d43f8e3880fc1389129ad7427", "rev": "2ef974182ef62a6a6992118f0beb54dce812ae9b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -3,8 +3,8 @@
imports = [ imports = [
./system ./system
./syncthing ./syncthing
./gnome.nix
./sops.nix ./sops.nix
./stylix.nix ./stylix.nix
]; ];
modules.gnome.enable = true;
} }

View file

@ -1,4 +1,7 @@
_: _:
{ {
imports = [ ./nvidia.nix ]; imports = [
./nvidia.nix
./gnome.nix
];
} }

View file

@ -1,13 +1,20 @@
{ pkgs, ... }: { config, lib, pkgs, ... }:
let
{ cfg = config.modules.gnome;
config = { in
{
options = {
modules.gnome = {
enable = lib.mkEnableOption "Enable Gnome";
};
};
config = lib.mkIf cfg.enable {
services.xserver = { services.xserver = {
enable = true; enable = true;
displayManager.gdm.enable = true; displayManager.gdm.enable = true;
desktopManager.gnome = { desktopManager.gnome = {
enable = true; enable = true;
extraGSettingsOverridePackages = [ pkgs.gnome.mutter ]; extraGSettingsOverridePackages = [ pkgs.mutter ];
extraGSettingsOverrides = '' extraGSettingsOverrides = ''
[org.gnome.mutter] [org.gnome.mutter]
experimental-features=['scale-monitor-framebuffer'] experimental-features=['scale-monitor-framebuffer']
@ -24,3 +31,4 @@
]; ];
}; };
} }