Clean up that gnome glib thing into a single file

JorelAli · Sep 20, 2019 · 151ccc6 · 151ccc6
1 parent 2e0ba85
commit 151ccc6
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 33 deletions.
diff --git a/configuration.nix b/configuration.nix
@@ -49,30 +49,6 @@ in let
 
   color = id: (import ./programconfigs/configutil.nix).getColor id false;
 
-
-
-  nixos-gsettings-desktop-schemas = let
-    defaultPackages = with pkgs; [ gsettings-desktop-schemas gnome3.gnome-shell ];
-  in with lib;
-  pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; }
-    ''
-     mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
-     ${concatMapStrings
-        (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n")
-        (defaultPackages)}
-     chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
-     cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
-       [org.gnome.desktop.background]
-       picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png'
-       [org.gnome.desktop.screensaver]
-       picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bottom.png'
-       [org.gnome.shell]
-       favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]
-     EOF
-     ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/
-    '';
-
-
 ##### NixOS configuration starts here ##########################################
 
 in {
@@ -84,6 +60,7 @@ in {
     ./cachix.nix                        # Import cached nixpkg locations
     ./extrapackages/vim.nix             # Import neovim setup
     ./programthemes.nix
+    ./glib-networking.nix
   ] ++ [
     ./modules/dunst.nix
     ./modules/xcompmgr.nix
@@ -206,11 +183,6 @@ in {
     ANDROID_HOME = "$HOME/Android/Sdk";       # Set the home of the android SDK
 
     BAT_PAGER = "less -RF";                   # Use less -RF as the pager for bat
-
-    GIO_EXTRA_MODULES = [ "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" ];
-
-    NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
-
   };
 
 ##### /etc/ Files ##############################################################
@@ -395,6 +367,9 @@ in {
 
     ncurses                             # Library to create Text User Interfaces
     rustup                              # Rust toolchain manager
+    cargo
+    rustc
+    pkgconfig
 
     ### GUI/Window Manager #####################################################
 
@@ -632,15 +607,11 @@ in {
 
 ##### Services #################################################################
 
-  systemd.packages = [ pkgs.glib-networking ];
-
   services = {
 
     dunst.enable = true;
     xcompmgr.enable = true;
 
-    dbus.packages = [pkgs.glib-networking];
-
     ### Compton ###########################################
     # Compositing effects for windows (Blur backgrounds!) #
     #######################################################

diff --git a/glib-networking.nix b/glib-networking.nix
@@ -0,0 +1,35 @@
+{ config, pkgs, lib, ... }: 
+
+let 
+
+  nixos-gsettings-desktop-schemas = let
+    defaultPackages = with pkgs; [ gsettings-desktop-schemas gnome3.gnome-shell ];
+  in with lib;
+  pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; }
+    ''
+     mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
+     ${concatMapStrings
+        (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n")
+        (defaultPackages)}
+     chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
+     cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
+       [org.gnome.desktop.background]
+       picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png'
+       [org.gnome.desktop.screensaver]
+       picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bottom.png'
+       [org.gnome.shell]
+       favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]
+     EOF
+     ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/
+    '';
+in {
+
+  environment.variables = {
+    NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
+    GIO_EXTRA_MODULES = [ "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" ];
+  };
+
+  systemd.packages = [ pkgs.glib-networking ];
+  services.dbus.packages = [ pkgs.glib-networking ];
+
+}