Merge pull request #44 from gvolpe/fix/gvariant-mk-functions

Use GVariant `mk` functions
nix-community · Aug 13, 2021 · d96e369 · d96e369
2 parents 42940e9 + 3ae3f36
commit d96e369
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 29 deletions.
diff --git a/output/clocks.nix b/output/clocks.nix
@@ -1,9 +1,8 @@
 # Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
 { lib, ... }:
 
-let
-  mkTuple = lib.hm.gvariant.mkTuple;
-in
+with lib.hm.gvariant;
+
 {
   dconf.settings = {
     "org/gnome/clocks" = {

diff --git a/output/custom.nix b/output/custom.nix
@@ -1,9 +1,8 @@
 # Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
 { lib, ... }:
 
-let
-  mkTuple = lib.hm.gvariant.mkTuple;
-in
+with lib.hm.gvariant;
+
 {
   dconf.settings = {
     "ca/desrt/dconf-editor" = {

diff --git a/output/dconf.nix b/output/dconf.nix
@@ -1,9 +1,8 @@
 # Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
 { lib, ... }:
 
-let
-  mkTuple = lib.hm.gvariant.mkTuple;
-in
+with lib.hm.gvariant;
+
 {
   dconf.settings = {
     "org/virt-manager/virt-manager/urls" = {
@@ -97,7 +96,7 @@ in
     };
 
     "org/gnome/desktop/input-sources" = {
-      current = "uint32 0";
+      current = mkUint32 0;
       sources = [ (mkTuple [ "xkb" "us" ]) ];
       xkb-options = [ "terminate:ctrl_alt_bksp" "lv3:ralt_switch" "caps:ctrl_modifier" ];
     };
@@ -173,7 +172,7 @@ in
     };
 
     "org/gnome/desktop/session" = {
-      idle-delay = "uint32 0";
+      idle-delay = mkUint32 0;
     };
 
     "org/gnome/desktop/sound" = {
@@ -339,7 +338,7 @@ in
     };
 
     "org/gnome/software" = {
-      check-timestamp = "int64 1592897410";
+      check-timestamp = mkInt64 1592897410;
     };
 
     "org/gnome/system/location" = {

diff --git a/output/json.nix b/output/json.nix
@@ -1,9 +1,8 @@
 # Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
 { lib, ... }:
 
-let
-  mkTuple = lib.hm.gvariant.mkTuple;
-in
+with lib.hm.gvariant;
+
 {
   dconf.settings = {
     "org/gnome/shell/extensions/sound-output-device-chooser" = {

diff --git a/output/negative.nix b/output/negative.nix
@@ -1,9 +1,8 @@
 # Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
 { lib, ... }:
 
-let
-  mkTuple = lib.hm.gvariant.mkTuple;
-in
+with lib.hm.gvariant;
+
 {
   dconf.settings = {
     "org/gnome/settings-daemon/plugins/color" = {

diff --git a/output/nested.nix b/output/nested.nix
@@ -1,9 +1,8 @@
 # Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
 { lib, ... }:
 
-let
-  mkTuple = lib.hm.gvariant.mkTuple;
-in
+with lib.hm.gvariant;
+
 {
   dconf.settings = {
     "org/gnome/desktop/peripherals/mouse" = {

diff --git a/output/quotes.nix b/output/quotes.nix
@@ -1,9 +1,8 @@
 # Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
 { lib, ... }:
 
-let
-  mkTuple = lib.hm.gvariant.mkTuple;
-in
+with lib.hm.gvariant;
+
 {
   dconf.settings = {
     "org/gnome/evince" = {

diff --git a/src/Nix.hs b/src/Nix.hs
@@ -17,9 +17,8 @@ renderHeader = T.unlines
   [ "# Generated via dconf2nix: https://github.com/gvolpe/dconf2nix"
   , "{ lib, ... }:"
   , ""
-  , "let"
-  , "  mkTuple = lib.hm.gvariant.mkTuple;"
-  , "in"
+  , "with lib.hm.gvariant;"
+  , ""
   , "{"
   , "  dconf.settings = {"
   ]
@@ -55,8 +54,8 @@ renderValue raw = Nix $ renderValue' raw <> ";"
   renderValue' (B   v) = T.toLower . T.pack $ show v
   renderValue' (I   v) = T.pack $ show v
   renderValue' (D   v) = T.pack $ show v
-  renderValue' (I32 v) = "\"uint32 " <> T.pack (show v) <> "\""
-  renderValue' (I64 v) = "\"int64 " <> T.pack (show v) <> "\""
+  renderValue' (I32 v) = "mkUint32 " <> T.pack (show v)
+  renderValue' (I64 v) = "mkInt64 " <> T.pack (show v)
   renderValue' (T x y) =
     let wrapNegNumber x | x < 0     = "(" <> T.pack (show x) <> ")"
                         | otherwise = T.pack $ show x