flavours: add module

.github/CODEOWNERS

@@ -72,6 +72,9 @@
 
 /modules/programs/firefox.nix                         @rycee
 
+/modules/programs/flavours.nix                        @misterio77
+/tests/modules/programs/flavours                      @misterio77
+
 /modules/programs/foot.nix                            @plabadens
 /tests/modules/programs/foot                          @plabadens
 

home-manager/default.nix

@@ -11,8 +11,8 @@ let
 
   pathStr = if path == null then "" else path;
 
-  nixos-option =
-    callPackage (pkgs.path + "/nixos/modules/installer/tools/nixos-option") { };
+  nixos-option = pkgs.nixos-option or (callPackage
+    (pkgs.path + "/nixos/modules/installer/tools/nixos-option") { });
 
 in runCommand "home-manager" {
   preferLocalBuild = true;

modules/lib/maintainers.nix

@@ -115,4 +115,14 @@
     githubId = 56614642;
     name = "Ilan Joselevich";
   };
+  misterio77 = {
+    email = "eu@misterio.me";
+    github = "Misterio77";
+    githubId = 5727578;
+    name = "Gabriel Fontes";
+    keys = [{
+      longkeyid = "rsa3072/0x245CAB70B4C225E9";
+      fingerprint = "7088 C742 1873 E0DB 97FF 17C2 245C AB70 B4C2 25E9";
+    }];
+  };
 }

modules/misc/news.nix

@@ -2118,6 +2118,13 @@ in
           A new module is available: 'programs.himalaya'.
         '';
       }
+
+      {
+        time = "2021-07-07T00:58:43+00:00";
+        message = ''
+          A new module is available: 'programs.flavours'.
+        '';
+      }
     ];
   };
 }

modules/modules.nix

@@ -70,6 +70,7 @@ let
     (loadModule ./programs/feh.nix { })
     (loadModule ./programs/firefox.nix { })
     (loadModule ./programs/fish.nix { })
+    (loadModule ./programs/flavours.nix { })
     (loadModule ./programs/foot.nix { condition = hostPlatform.isLinux; })
     (loadModule ./programs/fzf.nix { })
     (loadModule ./programs/getmail.nix { condition = hostPlatform.isLinux; })

modules/programs/flavours.nix

@@ -0,0 +1,64 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.flavours;
+
+  tomlFormat = pkgs.formats.toml { };
+
+in {
+  meta.maintainers = [ maintainers.misterio77 ];
+
+  options.programs.flavours = {
+    enable = mkEnableOption "Flavours, a base16 manager";
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.flavours;
+      defaultText = literalExample "pkgs.flavours";
+      description = "The package to use for the flavours binary.";
+    };
+
+    settings = mkOption {
+      type = tomlFormat.type;
+      default = { };
+      defaultText = literalExample "{ }";
+      example = literalExample ''
+        {
+          shell = "bash -c '{}'";
+          item = [
+            {
+              file = "~/.config/alacritty/colors.yml";
+              template = "alacritty";
+              subtemplate = "default-256";
+              rewrite = true;
+            }
+            {
+              file = "~/.config/sway/colors";
+              template = "sway";
+              subtemplate = "colors";
+              hook = "swaymsg reload";
+              rewrite = true;
+            }
+          ];
+        }
+      '';
+      description = ''
+        Configuration written to
+        <filename>$XDG_CONFIG_HOME/flavours/config.toml</filename>.
+        </para><para>
+        See <link xlink:href="https://github.com/Misterio77/flavours#setup" /> for all options
+        and some examples.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+    xdg.configFile."flavours/config.toml" = mkIf (cfg.settings != { }) {
+      source = tomlFormat.generate "flavours-config" cfg.settings;
+    };
+  };
+}

modules/programs/qutebrowser.nix

@@ -306,7 +306,25 @@ in {
       };
 
     xdg.configFile."qutebrowser/config.py" =
-      mkIf pkgs.stdenv.hostPlatform.isLinux { text = qutebrowserConfig; };
+      mkIf pkgs.stdenv.hostPlatform.isLinux {
+        text = qutebrowserConfig;
+        onChange = ''
+          hash="$(echo -n $USER | md5sum | cut -d' ' -f1)"
+          socket="''${XDG_RUNTIME_DIR:-/run/user/$UID}/qutebrowser/ipc-$hash"
+          if [ -S $socket ]; then
+            echo "Reloading qutebrowser"
+            command=${
+              escapeShellArg (builtins.toJSON {
+                args = [ ":config-source" ];
+                target_arg = null;
+                protocol_version = 1;
+              })
+            }
+            $DRY_RUN_CMD echo $command | ${pkgs.socat}/bin/socat -lf /dev/null - UNIX-CONNECT:$socket
+          fi
+          unset hash socket command
+        '';
+      };
 
     xdg.configFile."qutebrowser/quickmarks" =
       mkIf (cfg.quickmarks != { } && pkgs.stdenv.hostPlatform.isLinux) {

tests/default.nix

@@ -50,6 +50,7 @@ import nmt {
     ./modules/programs/direnv
     ./modules/programs/feh
     ./modules/programs/fish
+    ./modules/programs/flavours
     ./modules/programs/gh
     ./modules/programs/git
     ./modules/programs/gpg

tests/modules/programs/flavours/default.nix

@@ -0,0 +1 @@
+{ flavours-settings = ./settings.nix; }

tests/modules/programs/flavours/settings-expected.toml

@@ -0,0 +1,19 @@
+shell = "bash -c '{}'"
+[[item]]
+file = "~/.config/sway/config"
+hook = "swaymsg reload"
+light = false
+subtemplate = "colors"
+template = "sway"
+
+[[item]]
+file = "~/.config/waybar/colors.css"
+rewrite = true
+template = "waybar"
+
+[[item]]
+end = "/* End Flavours */"
+file = "~/.config/beautifuldiscord/style.css"
+start = "/* Start Flavours */"
+subtemplate = "css-variables"
+template = "styles"

tests/modules/programs/flavours/settings.nix

@@ -0,0 +1,46 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.flavours = {
+      enable = true;
+
+      settings = {
+        shell = "bash -c '{}'";
+        item = [
+          {
+            file = "~/.config/sway/config";
+            template = "sway";
+            subtemplate = "colors";
+            hook = "swaymsg reload";
+            light = false;
+          }
+          {
+            file = "~/.config/waybar/colors.css";
+            template = "waybar";
+            rewrite = true;
+          }
+          {
+            file = "~/.config/beautifuldiscord/style.css";
+            template = "styles";
+            subtemplate = "css-variables";
+            start = "/* Start Flavours */";
+            end = "/* End Flavours */";
+          }
+        ];
+      };
+    };
+
+    nixpkgs.overlays = [
+      (self: super: { flavours = pkgs.writeScriptBin "dummy-flavours" ""; })
+    ];
+
+    nmt.script = ''
+      assertFileContent \
+        home-files/.config/flavours/config.toml \
+        ${./settings-expected.toml}
+    '';
+  };
+}

tests/modules/programs/xmobar/basic-configuration.nix

@@ -6,6 +6,7 @@ with lib;
   config = {
     programs.xmobar = {
       enable = true;
+      package = pkgs.writeScriptBin "dummy" "";
       extraConfig = ''
         Config
           { font        = "Fira Code"