courge: fix GTK config

diff --git a/home-manager/profiles/graphical.nix b/home-manager/profiles/graphical.nix
index 84cca4ff103e1c4d0218c27f501224b298ea4c11..886a153b806840143bf7f99e8655849f8c8f3e8f 100644 (file)
--- a/home-manager/profiles/graphical.nix
+++ b/home-manager/profiles/graphical.nix
@@ -3,7 +3,6 @@
   imports = [
     ./redshift.nix
   ];
-  gtk.enable = true;
   home.packages = [
     pkgs.arandr
     pkgs.glib.bin
@@ -20,7 +19,6 @@
   home.sessionVariables = lib.mkIf (!nixosConfig.services.gnome.at-spi2-core.enable) {
     NO_AT_BRIDGE = "1";
   };
-  services.redshift.enable = lib.mkDefault true;
   # keycode <num> = <x> <Shift+x> _ _ <AltGr+x> <AltGr+Shift+x> _ _"
   home.file.".Xmodmap".text = ''
     ! — (tiret insécable) with AltGr+Shift+-
@@ -43,11 +41,15 @@
   };
   dconf.settings = {
     "org/gnome/desktop/interface" = {
-      color-scheme = "prefer-dark";
+      color-scheme = lib.mkDefault "prefer-dark";
     };
   };
   gtk = {
+    enable = lib.mkDefault true;
     theme.name = "Adwaita";
+    theme.package = pkgs.gnome.gnome-themes-extra;
+    iconTheme.package = pkgs.gnome.adwaita-icon-theme;
+    iconTheme.name = "Adwaita";
     gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
     gtk3 = {
       bookmarks = lib.mkDefault [

diff --git a/home-manager/profiles/redshift.nix b/home-manager/profiles/redshift.nix
index 17d89951eb5f977d0e7ab51b6102e0a5925cf44e..c10e2d99a06023c1013c82a26acd4fd639f91729 100644 (file)
--- a/home-manager/profiles/redshift.nix
+++ b/home-manager/profiles/redshift.nix
@@ -1,7 +1,7 @@
 { lib, ... }:
 {
   services.redshift = {
-    enable = true;
+    enable = lib.mkDefault true;
     latitude = lib.mkDefault "-45.7800";
     longitude = lib.mkDefault "1.9700";
     temperature.day = lib.mkDefault 6500;

diff --git a/homes/mo/hosts/courge.nix b/homes/mo/hosts/courge.nix
index 77f57a71dbfdfbf0854370962ad2f3300def6403..024add9f1a4292e6a0b48d69d9d798280f04a9e3 100644 (file)
--- a/homes/mo/hosts/courge.nix
+++ b/homes/mo/hosts/courge.nix
@@ -1,31 +1,24 @@
 { pkgs, lib, config, ... }:
 {
   imports = [
+    ../../../home-manager/profiles/firefox.nix
     ../../../home-manager/profiles/gnupg.nix
+    ../../../home-manager/profiles/graphical.nix
     ../../../home-manager/profiles/video.nix
-    ../../../home-manager/profiles/firefox.nix
   ];
   home.sessionVariables = { };
   home.packages = [
+    pkgs.dino
+    pkgs.evince
+    pkgs.gthumb
     pkgs.libreoffice
     pkgs.thunderbird
-    pkgs.gthumb
-    pkgs.evince
-    pkgs.stellarium
     pkgs.vlc
-    pkgs.dino
-    #pkgs.chromium
-    #pkgs.gpsbabel
-    #(pkgs.qgis.override { extraPythonPackages = (ps: [
-    #  ps.pyqt5_with_qtwebkit
-    #]); })
-    #pkgs.libva-utils
-    #pkgs.ristretto
-    #pkgs.xfce.mousepad
-    #pkgs.mate.pluma
-    #pkgs.wxmaxima
-    #pkgs.espeak-ng
-    #pkgs.iodine
-    #pkgs.qsynth
   ];
+  dconf.settings = {
+    "org/gnome/desktop/interface" = {
+      color-scheme = "prefer-light";
+    };
+  };
+  services.redshift.enable = false;
 }