Update "A happy GNOME" config

modules/themes/a-happy-gnome/config/dconf/keybindings.conf

@@ -0,0 +1,52 @@
+# This is used in tandem with Pop shell plugin.
+[org/gnome/desktop/wm/keybindings]
+begin-resize=['<Super>r']
+close=['<Alt>F4', '<Super>q']
+cycle-group=@as []
+cycle-group-backward=@as []
+cycle-windows=['<Super>grave']
+cycle-windows-backward=['<Shift><Super>grave']
+maximize=@as []
+minimize=@as []
+move-to-monitor-down=@as []
+move-to-monitor-left=@as []
+move-to-monitor-right=@as []
+move-to-monitor-up=@as []
+move-to-workspace-first=['<Shift><Super>Home', '<Shift><Super>k']
+move-to-workspace-left=@as []
+move-to-workspace-right=@as []
+move-to-workspace-last=['<Shift><Super>End', '<Shift><Super>j']
+panel-main-menu=@as []
+switch-group=@as []
+switch-group-backward=@as []
+switch-input-source=['<Super>i']
+switch-input-source-backward=['<Shift><Super>i']
+switch-to-workspace-up=@as []
+switch-to-workspace-left=['<Primary><Super>h', '<Super>Page_Up']
+switch-to-workspace-right=['<Primary><Super>l', '<Super>Page_Down']
+switch-to-workspace-down=@as []
+toggle-fullscreen=['<Super>f']
+toggle-maximized=['<Shift><Super>f']
+toggle-overview=['<Shift><Super>s']
+toggle-tiled-left=@as []
+toggle-tiled-right=@as []
+
+[org/gnome/shell/extensions/pop-shell]
+pop-workspace-down=['<Shift><Super>l', '<Shift><Super>Right', '<Shift><Super>Page_Down']
+pop-workspace-up=['<Shift><Super>h', '<Shift><Super>Left', '<Shift><Super>Page_Up']
+pop-monitor-up=['<Alt><Super>k', '<Alt><Super>Up']
+pop-monitor-left=['<Alt><Super>h', '<Alt><Super>Left']
+pop-monitor-right=['<Alt><Super>l', '<Alt><Super>Right']
+pop-monitor-down=['<Alt><Super>j', '<Alt><Super>Down']
+
+[org/gnome/shell/keybindings]
+toggle-message-tray=['<Super>v']
+
+# We don't want to restore them shortcuts.
+[org/gnome/mutter/wayland/keybindings]
+restore-shortcuts=@as []
+
+[org/gnome/settings-daemon/plugins/media-keys]
+screensaver=['<Super>Escape']
+logout=['<Shift><Super>Escape']
+help=@as []

modules/themes/a-happy-gnome/default.nix

@@ -6,7 +6,7 @@ let
   dconf = pkgs.gnome3.dconf;
   customDconfDb = pkgs.stdenv.mkDerivation {
     name = "${name}-dconf-db";
-    buildCommand = "${dconf}/bin/dconf compile $out ${./schemas}";
+    buildCommand = "${dconf}/bin/dconf compile $out ${./config/dconf}";
   };
 in
 {
@@ -28,10 +28,10 @@ in
       gnome-music
       gnome-software
       yelp
-    ] ++ [
+    ] ++ (with pkgs; [
       gnome-user-docs
       gnome-tour
-    ];
+    ]);
 
     programs.dconf = {
       enable = true;

modules/themes/a-happy-gnome/schemas/keybindings.conf

@@ -1,40 +0,0 @@
-# This is used in tandem with Pop shell plugin.
-[org/gnome/desktop/wm/keybindings]
-begin-resize=['<Super>r']
-close=['<Alt>F4', '<Super>q']
-cycle-group=@as []
-cycle-group-backward=@as []
-cycle-windows=['<Super>grave']
-cycle-windows-backward=['<Shift><Super>grave']
-maximize=@as []
-minimize=@as []
-move-to-monitor-down=['<Alt><Super>j']
-move-to-monitor-left=['<Alt><Super>h']
-move-to-monitor-right=['<Alt><Super>l']
-move-to-monitor-up=['<Alt><Super>k']
-move-to-workspace-left=['<Shift><Super>h']
-move-to-workspace-right=['<Shift><Super>l']
-panel-main-menu=@as []
-switch-group=@as []
-switch-group-backward=@as []
-switch-input-source=['<Super>i']
-switch-input-source-backward=['<Shift><Super>i']
-switch-to-workspace-left=['<Primary><Super>h']
-switch-to-workspace-right=['<Primary><Super>l']
-toggle-fullscreen=['<Super>f']
-toggle-maximized=['<Shift><Super>f']
-toggle-overview=['<Shift><Super>s']
-toggle-tiled-left=@as []
-toggle-tiled-right=@as []
-
-[org/gnome/shell/keybindings]
-toggle-message-tray=['<Super>v']
-
-# We don't want to restore them shortcuts.
-[org/gnome/mutter/wayland/keybindings]
-restore-shortcuts=@as []
-
-[org/gnome/settings-daemon/plugins/media-keys]
-screensaver=['<Super>Escape']
-logout=['<Shift><Super>Escape']
-help=@as []