From 10cf36936e38067f0f2cca5887f732040af28574 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Thu, 9 Jun 2022 09:20:58 -0700 Subject: ref(GTK): remove the profile for GTK All the configuration is done at the host level. Change-Id: Ib5ef71ea7955f6872fb08f576e48b24a70600693 Reviewed-on: https://cl.fcuny.net/c/world/+/296 Reviewed-by: Franck Cuny --- hosts/aptos/default.nix | 3 +++ hosts/aptos/home.nix | 1 + hosts/carmel/default.nix | 3 +++ hosts/carmel/home.nix | 1 + profiles/default.nix | 2 +- profiles/desktop/default.nix | 5 +---- profiles/gtk/default.nix | 13 ------------- 7 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 profiles/gtk/default.nix diff --git a/hosts/aptos/default.nix b/hosts/aptos/default.nix index 04d45ee..08fb55e 100644 --- a/hosts/aptos/default.nix +++ b/hosts/aptos/default.nix @@ -10,6 +10,9 @@ ./services.nix ]; + # Allow setting GTK configuration using home-manager + programs.dconf.enable = true; + virtualisation.docker = { enable = true; }; virtualisation.containerd = { diff --git a/hosts/aptos/home.nix b/hosts/aptos/home.nix index 133c6ed..e317788 100644 --- a/hosts/aptos/home.nix +++ b/hosts/aptos/home.nix @@ -5,6 +5,7 @@ # desktop evince.enable = true; + gtk.enable = true; pcmanfm.enable = true; # multimedia diff --git a/hosts/carmel/default.nix b/hosts/carmel/default.nix index 87ad97d..bfe0502 100644 --- a/hosts/carmel/default.nix +++ b/hosts/carmel/default.nix @@ -10,6 +10,9 @@ ./profile.nix ]; + # Allow setting GTK configuration using home-manager + programs.dconf.enable = true; + hardware.opengl.driSupport = true; # This value determines the NixOS release from which the default diff --git a/hosts/carmel/home.nix b/hosts/carmel/home.nix index 133c6ed..e317788 100644 --- a/hosts/carmel/home.nix +++ b/hosts/carmel/home.nix @@ -5,6 +5,7 @@ # desktop evince.enable = true; + gtk.enable = true; pcmanfm.enable = true; # multimedia diff --git a/profiles/default.nix b/profiles/default.nix index 1dcb283..19780e7 100644 --- a/profiles/default.nix +++ b/profiles/default.nix @@ -1 +1 @@ -{ ... }: { imports = [ ./gtk ./wm ./desktop ]; } +{ ... }: { imports = [ ./wm ./desktop ]; } diff --git a/profiles/desktop/default.nix b/profiles/desktop/default.nix index 1edc246..50b7828 100644 --- a/profiles/desktop/default.nix +++ b/profiles/desktop/default.nix @@ -12,10 +12,7 @@ in { # we need avahi in order to use the printer/scanner avahi.enable = true; }; - profiles = { - gtk.enable = true; - wm.windowManager = "sway"; - }; + profiles = { wm.windowManager = "sway"; }; programs = { sway.enable = true; }; }; }; diff --git a/profiles/gtk/default.nix b/profiles/gtk/default.nix deleted file mode 100644 index c84832b..0000000 --- a/profiles/gtk/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, lib, ... }: -let cfg = config.my.profiles.gtk; -in { - options.my.profiles.gtk = with lib; { - enable = mkEnableOption "gtk profile"; - }; - config = lib.mkIf cfg.enable { - # Allow setting GTK configuration using home-manager - programs.dconf.enable = true; - # GTK theme configuration - my.home.gtk.enable = true; - }; -} -- cgit 1.4.1