diff --git a/lib/nixos/configuration.nix b/lib/nixos/configuration.nix index c11513c5..22aefdd0 100644 --- a/lib/nixos/configuration.nix +++ b/lib/nixos/configuration.nix @@ -6,22 +6,6 @@ }: { pkgs, ... }: let - configure-gtk = pkgs.writeTextFile { - name = "configure-gtk"; - destination = "/bin/configure-gtk"; - executable = true; - text = - let - schema = pkgs.gsettings-desktop-schemas; - datadir = "${schema}/share/gsettings-schemas/${schema.name}"; - in - '' - export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS - gnome_schema=org.gnome.desktop.interface - gsettings set $gnome_schema gtk-theme 'Breeze Dark' - ''; - }; - theme = import "${self}/lib/theme" { inherit pkgs; }; username = "opdavies"; @@ -164,7 +148,6 @@ in arandr backintime brightnessctl - configure-gtk cpufrequtils ffmpegthumbnailer libnotify diff --git a/lib/nixos/default.nix b/lib/nixos/default.nix index b38695a0..74e47575 100644 --- a/lib/nixos/default.nix +++ b/lib/nixos/default.nix @@ -38,8 +38,6 @@ inputs.nixpkgs.lib.nixosSystem { }; } - (import ./modules/autorandr.nix) - (import ./modules/awesome.nix { inherit inputs @@ -48,6 +46,8 @@ inputs.nixpkgs.lib.nixosSystem { username ; }) + (import ./modules/autorandr.nix) + (import ./modules/gnome.nix) configuration hardwareConfiguration diff --git a/lib/nixos/home-manager/desktop.nix b/lib/nixos/home-manager/desktop.nix index e7654884..aa37bd35 100644 --- a/lib/nixos/home-manager/desktop.nix +++ b/lib/nixos/home-manager/desktop.nix @@ -9,6 +9,7 @@ ./modules/alacritty.nix ./modules/copyq.nix ./modules/espanso.nix + ./modules/gtk.nix ./modules/feh.nix ./modules/flameshot.nix ./modules/gtk.nix diff --git a/lib/nixos/modules/gnome.nix b/lib/nixos/modules/gnome.nix new file mode 100644 index 00000000..c08c2dee --- /dev/null +++ b/lib/nixos/modules/gnome.nix @@ -0,0 +1,5 @@ +{ + services = { + xserver.desktopManager.gnome.enable = true; + }; +}