na 1.2.37 → 1.2.39

data/lib/na/next_action.rb

@@ -7,6 +7,10 @@ module NA
 
     attr_accessor :verbose, :extension, :na_tag, :command_line, :command, :globals, :global_file, :cwd_is, :cwd, :stdin
 
+    def theme
+      @theme ||= NA::Theme.load_theme
+    end
+
     ##
     ## Output to STDERR
     ##
@@ -19,7 +23,7 @@ module NA
       return if debug && !NA.verbose
 
       if debug
-        $stderr.puts NA::Color.template("{xdw}#{msg}{x}")
+        $stderr.puts NA::Color.template("{x}#{NA.theme[:debug]}#{msg}{x}")
       else
         $stderr.puts NA::Color.template("{x}#{msg}{x}")
       end
@@ -100,7 +104,7 @@ module NA
         f.puts(content)
       end
       save_working_dir(target)
-      notify("{y}Created {bw}#{target}")
+      notify("#{NA.theme[:warning]}Created #{NA.theme[:file]}#{target}")
     end
 
     ##
@@ -116,7 +120,7 @@ module NA
     def select_file(files, multiple: false)
       res = choose_from(files, prompt: multiple ? 'Select files' : 'Select a file', multiple: multiple)
 
-      notify('{r}No file selected, cancelled', exit_code: 1) unless res && res.length.positive?
+      notify("#{NA.theme[:error]}No file selected, cancelled", exit_code: 1) unless res && res.length.positive?
 
       res
     end
@@ -143,7 +147,7 @@ module NA
                             done: done })
 
       unless todo.actions.count.positive?
-        NA.notify("{r}No matching actions found in {bw}#{File.basename(target, ".#{NA.extension}")}")
+        NA.notify("#{NA.theme[:error]}No matching actions found in #{File.basename(target, ".#{NA.extension}").highlight_filename}")
         return
       end
 
@@ -152,7 +156,7 @@ module NA
       options = todo.actions.map { |action| "#{action.line} % #{action.parent.join('/')} : #{action.action}" }
       res = choose_from(options, prompt: 'Make a selection: ', multiple: true, sorted: true)
 
-      NA.notify('{r}Cancelled', exit_code: 1) unless res && res.length.positive?
+      NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless res && res.length.positive?
 
       selected = NA::Actions.new
       res.each do |result|
@@ -193,12 +197,13 @@ module NA
         end
 
         if new_path.join('') =~ /Archive/i
-          line = todo.projects.last.last_line
+          line = todo.projects.last&.last_line || 0
           content = content.split(/\n/).insert(line, input.join("\n")).join("\n")
         else
           split = content.split(/\n/)
-          before = split.slice(0, todo.projects.first.line).join("\n")
-          after = split.slice(todo.projects.first.line, split.count - todo.projects.first.line).join("\n")
+          line = todo.projects.first&.line || 0
+          before = split.slice(0, line).join("\n")
+          after = split.slice(line, split.count - 0).join("\n")
           content = "#{before}\n#{input.join("\n")}\n#{after}"
         end
 
@@ -247,11 +252,11 @@ module NA
         project = project.sub(/:$/, '')
         target_proj = projects.select { |pr| pr.project =~ /#{project.gsub(/:/, '.*?:.*?')}/i }.first
         if target_proj.nil?
-          res = NA.yn(NA::Color.template("{y}Project {bw}#{project}{xy} doesn't exist, add it"), default: true)
+          res = NA.yn(NA::Color.template("#{NA.theme[:warning]}Project #{NA.theme[:file]}#{project}#{NA.theme[:warning]} doesn't exist, add it"), default: true)
           if res
             target_proj = insert_project(target, project, projects)
           else
-            NA.notify('{x}Cancelled', exit_code: 1)
+            NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1)
           end
         end
       end
@@ -270,7 +275,7 @@ module NA
                         projects.select { |proj| proj.project =~ /^#{add.parent.join(':')}$/ }.first
                       end
 
-        NA.notify("{r}Error parsing project #{target}", exit_code: 1) if target_proj.nil?
+        NA.notify("#{NA.theme[:error]}Error parsing project #{NA.theme[:filename]}#{target}", exit_code: 1) if target_proj.nil?
 
         indent = "\t" * target_proj.indent
         note = note.split("\n") unless note.is_a?(Array)
@@ -364,7 +369,11 @@ module NA
       backup_file(target)
       File.open(target, 'w') { |f| f.puts contents.join("\n") }
 
-      add ? notify("{by}Task added to {bw}#{target}") : notify("{by}Task updated in {bw}#{target}")
+      if add
+        notify("#{NA.theme[:success]}Task added to #{NA.theme[:filename]}#{target}")
+      else
+        notify("#{NA.theme[:success]}Task updated in #{NA.theme[:filename]}#{target}")
+      end
     end
 
     ##
@@ -385,7 +394,6 @@ module NA
         else
           project = NA.cwd
         end
-        puts [add_tag, project]
       end
 
       action = Action.new(file, project, parent, action, nil, note)
@@ -519,12 +527,12 @@ module NA
     ##
     def match_working_dir(search, distance: 1, require_last: true)
       file = database_path
-      NA.notify('{r}No na database found', exit_code: 1) unless File.exist?(file)
+      NA.notify("#{NA.theme[:error]}No na database found", exit_code: 1) unless File.exist?(file)
 
       dirs = file.read_file.split("\n")
 
       optional = search.filter { |s| !s[:negate] }.map { |t| t[:token] }
-      required = search.filter { |s| s[:required] }.map { |t| t[:token] }
+      required = search.filter { |s| s[:required] && !s[:negate] }.map { |t| t[:token] }
       negated = search.filter { |s| s[:negate] }.map { |t| t[:token] }
 
       optional.push('*') if optional.count.zero? && required.count.zero? && negated.count.positive?
@@ -533,9 +541,9 @@ module NA
         optional = ['*']
       end
 
-      NA.notify("{dw}Optional directory regex: {x}#{optional.map { |t| t.dir_to_rx(distance: distance) }}", debug: true)
-      NA.notify("{dw}Required directory regex: {x}#{required.map { |t| t.dir_to_rx(distance: distance) }}", debug: true)
-      NA.notify("{dw}Negated directory regex: {x}#{negated.map { |t| t.dir_to_rx(distance: distance, require_last: false) }}", debug: true)
+      NA.notify("Optional directory regex: {x}#{optional.map { |t| t.dir_to_rx(distance: distance) }}", debug: true)
+      NA.notify("Required directory regex: {x}#{required.map { |t| t.dir_to_rx(distance: distance) }}", debug: true)
+      NA.notify("Negated directory regex: {x}#{negated.map { |t| t.dir_to_rx(distance: distance, require_last: false) }}", debug: true)
 
       if require_last
         dirs.delete_if { |d| !d.sub(/\.#{NA.extension}$/, '').dir_matches(any: optional, all: required, none: negated) }
@@ -546,9 +554,9 @@ module NA
         end
       end
 
-      dirs = dirs.sort.uniq
+      dirs = dirs.sort_by { |d| File.basename(d) }.uniq
       if dirs.empty? && require_last
-        NA.notify('{y}No matches, loosening search', debug: true)
+        NA.notify("#{NA.theme[:warning]}No matches, loosening search", debug: true)
         match_working_dir(search, distance: 2, require_last: false)
       else
         dirs
@@ -605,7 +613,7 @@ module NA
       if file
         restore_modified_file(file)
       else
-        NA.notify('{br}No matching file found')
+        NA.notify("#{NA.theme[:error]}No matching file found")
       end
     end
 
@@ -618,9 +626,9 @@ module NA
       bak_file = File.join(File.dirname(file), ".#{File.basename(file)}.bak")
       if File.exist?(bak_file)
         FileUtils.mv(bak_file, file)
-        NA.notify("{bg}Backup restored for #{file}")
+        NA.notify("#{NA.theme[:success]}Backup restored for #{file.highlight_filename}")
       else
-        NA.notify("{br}Backup file for #{file} not found")
+        NA.notify("#{NA.theme[:error]}Backup file for #{file.highlight_filename} not found")
       end
     end
 
@@ -698,13 +706,13 @@ module NA
              else
                file = database_path
                content = File.exist?(file) ? file.read_file.strip : ''
-               notify('{br}Database empty', exit_code: 1) if content.empty?
+               notify("#{NA.theme[:error]}Database empty", exit_code: 1) if content.empty?
 
                content.split(/\n/)
              end
 
       dirs.map! do |dir|
-        "{xdg}#{dir.sub(/^#{ENV['HOME']}/, '~').sub(%r{/([^/]+)\.#{NA.extension}$}, '/{xby}\1{x}')}"
+        dir.highlight_filename
       end
 
       puts NA::Color.template(dirs.join("\n"))
@@ -717,13 +725,13 @@ module NA
 
       if searches.key?(title)
         res = yn('Overwrite existing definition?', default: true)
-        notify('{r}Cancelled', exit_code: 0) unless res
+        notify("#{NA.theme[:error]}Cancelled", exit_code: 0) unless res
 
       end
 
       searches[title] = search
       File.open(file, 'w') { |f| f.puts(YAML.dump(searches)) }
-      NA.notify("{y}Search #{title} saved", exit_code: 0)
+      NA.notify("#{NA.theme[:success]}Search #{NA.theme[:filename]}#{title}#{NA.theme[:success]} saved", exit_code: 0)
     end
 
     def load_searches
@@ -743,37 +751,41 @@ module NA
     end
 
     def delete_search(strings = nil)
-      NA.notify('{r}Name search required', exit_code: 1) if strings.nil? || strings.empty?
+      NA.notify("#{NA.theme[:error]}Name of search required", exit_code: 1) if strings.nil? || strings.empty?
 
       file = database_path(file: 'saved_searches.yml')
-      NA.notify('{r}No search definitions file found', exit_code: 1) unless File.exist?(file)
+      NA.notify("#{NA.theme[:error]}No search definitions file found", exit_code: 1) unless File.exist?(file)
+
+      strings = [strings] unless strings.is_a? Array
 
       searches = YAML.safe_load(file.read_file)
-      keys = searches.keys.delete_if { |k| k !~ /(#{strings.join('|')})/ }
+      keys = searches.keys.delete_if { |k| k !~ /(#{strings.map(&:wildcard_to_rx).join('|')})/ }
 
-      res = yn(NA::Color.template(%({y}Remove #{keys.count > 1 ? 'searches' : 'search'} {bw}"#{keys.join(', ')}"{x})),
+      NA.notify("#{NA.theme[:error]}No search named #{strings.join(', ')} found", exit_code: 1) if keys.empty?
+
+      res = yn(NA::Color.template(%(#{NA.theme[:warning]}Remove #{keys.count > 1 ? 'searches' : 'search'} #{NA.theme[:filename]}"#{keys.join(', ')}"{x})),
                default: false)
 
-      NA.notify('{r}Cancelled', exit_code: 1) unless res
+      NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless res
 
       searches.delete_if { |k| keys.include?(k) }
 
       File.open(file, 'w') { |f| f.puts(YAML.dump(searches)) }
 
-      NA.notify("{y}Deleted {bw}#{keys.count}{xy} #{keys.count > 1 ? 'searches' : 'search'}", exit_code: 0)
+      NA.notify("#{NA.theme[:warning]}Deleted {bw}#{keys.count}{x}#{NA.theme[:warning]} #{keys.count > 1 ? 'searches' : 'search'}", exit_code: 0)
     end
 
     def edit_searches
       file = database_path(file: 'saved_searches.yml')
       searches = load_searches
 
-      NA.notify('{r}No search definitions found', exit_code: 1) unless searches.count.positive?
+      NA.notify("#{NA.theme[:error]}No search definitions found", exit_code: 1) unless searches.count.positive?
 
-      editor = ENV['EDITOR']
-      NA.notify('{r}No $EDITOR defined', exit_code: 1) unless editor && TTY::Which.exist?(editor)
+      editor = NA.default_editor
+      NA.notify("#{NA.theme[:error]}No $EDITOR defined", exit_code: 1) unless editor && TTY::Which.exist?(editor)
 
       system %(#{editor} "#{file}")
-      NA.notify("Opened #{file} in #{editor}", exit_code: 0)
+      NA.notify("#{NA.theme[:success]}Opened #{file} in #{editor}", exit_code: 0)
     end
 
     ##
@@ -786,10 +798,26 @@ module NA
       backup = File.join(File.dirname(target), file)
       FileUtils.cp(target, backup)
       save_modified_file(target)
-      NA.notify("{dw}Backup file created at #{backup}", debug: true)
+      NA.notify("#{NA.theme[:warning]}Backup file created at #{backup.highlight_filename}", debug: true)
     end
 
-    private
+    ##
+    ## Request terminal input from user, readline style
+    ##
+    ## @param      options  [Hash] The options
+    ## @param      prompt   [String] The prompt
+    ##
+    def request_input(options, prompt: 'Enter text')
+      if $stdin.isatty && TTY::Which.exist?('gum') && options[:tagged].empty?
+        opts = [%(--placeholder "#{prompt}"),
+                '--char-limit=500',
+                "--width=#{TTY::Screen.columns}"]
+        `gum input #{opts.join(' ')}`.strip
+      elsif $stdin.isatty && options[:tagged].empty?
+        NA.notify("#{NA.theme[:prompt]}#{prompt}:")
+        reader.read_line(NA::Color.template("#{NA.theme[:filename]}> #{NA.theme[:action]}")).strip
+      end
+    end
 
     ##
     ## Generate a menu of options and allow user selection
@@ -815,30 +843,43 @@ module NA
               header = "esc: cancel,#{multiple ? ' tab: multi-select, ctrl-a: select all,' : ''} return: confirm"
               default_args << %(--header="#{header}")
               default_args.concat(fzf_args)
-              `echo #{Shellwords.escape(options.join("\n"))}|#{TTY::Which.which('fzf')} #{default_args.join(' ')}`.strip
+              options = NA::Color.uncolor(NA::Color.template(options.join("\n")))
+              `echo #{Shellwords.escape(options)}|#{TTY::Which.which('fzf')} #{default_args.join(' ')}`.strip
             elsif TTY::Which.exist?('gum')
               args = [
                 '--cursor.foreground="151"',
                 '--item.foreground=""'
               ]
               args.push '--no-limit' if multiple
-              puts NS::Color.template("{bw}#{prompt}{x}")
-              `echo #{Shellwords.escape(options.join("\n"))}|#{TTY::Which.which('gum')} choose #{args.join(' ')}`.strip
+              puts NA::Color.template("#{NA.theme[:prompt]}#{prompt}{x}")
+              options = NA::Color.uncolor(NA::Color.template(options.join("\n")))
+              `echo #{Shellwords.escape(options)}|#{TTY::Which.which('gum')} choose #{args.join(' ')}`.strip
             else
               reader = TTY::Reader.new
               puts
               options.each.with_index do |f, i|
-                puts NA::Color.template(format("{bw}%<idx> 2d{xw}) {y}%<action>s{x}\n", idx: i + 1, action: f))
+                puts NA::Color.template(format("#{NA.theme[:prompt]}%<idx> 2d{xw}) #{NA.theme[:filename]}%<action>s{x}\n", idx: i + 1, action: f))
+              end
+              result = reader.read_line(NA::Color.template("#{NA.theme[:prompt]}#{prompt}{x}")).strip
+              if multiple
+                mult_res = []
+                result = result.gsub(/,/, ' ').gsub(/ +/, ' ').split(/ /)
+                result.each do |r|
+                  mult_res << options[r.to_i - 1] if r.to_i&.positive?
+                end
+                mult_res.join("\n")
+              else
+                result.to_i&.positive? ? options[result.to_i - 1] : nil
               end
-              result = reader.read_line(NA::Color.template("{bw}#{prompt}{x}")).strip
-              result.to_i&.positive? ? options[result.to_i - 1] : nil
             end
 
-      return false if res.strip.size.zero?
-
-      multiple ? res.split(/\n/) : res
+      return false if res&.strip&.size&.zero?
+      pp NA::Color.uncolor(NA::Color.template(res))
+      multiple ? NA::Color.uncolor(NA::Color.template(res)).split(/\n/) : NA::Color.uncolor(NA::Color.template(res))
     end
 
+    private
+
     ##
     ## macOS open command
     ##
@@ -871,7 +912,7 @@ module NA
       if TTY::Which.exist?('xdg-open')
         `xdg-open #{Shellwords.escape(file)}`
       else
-        notify('{r}Unable to determine executable for `xdg-open`.')
+        notify("#{NA.theme[:error]}Unable to determine executable for `xdg-open`.")
       end
     end
   end

data/lib/na/pager.rb

@@ -44,7 +44,7 @@ module NA
           IO.select [input]
 
           begin
-            NA.notify("{dw}Pager #{pager}", debug: true)
+            NA.notify("#{NA.theme[:debug]}Pager #{pager}", debug: true)
             exec(pager)
           rescue SystemCallError => e
             raise Errors::DoingStandardError, "Pager error, #{e}"

data/lib/na/prompt.rb

@@ -14,7 +14,7 @@ module NA
                   when :tag
                     'na tagged $(basename "$PWD")'
                   else
-                    NA.notify('When using a global file, a prompt hook requires `--cwd_as [tag|project]`', exit_code: 1)
+                    NA.notify("#{NA.theme[:error]}When using a global file, a prompt hook requires `--cwd_as [tag|project]`", exit_code: 1)
                   end
                 else
                   'na next'
@@ -31,7 +31,7 @@ module NA
                   when :tag
                     'na tagged (basename "$PWD")'
                   else
-                    NA.notify('When using a global file, a prompt hook requires `--cwd_as [tag|project]`', exit_code: 1)
+                    NA.notify("#{NA.theme[:error]}When using a global file, a prompt hook requires `--cwd_as [tag|project]`", exit_code: 1)
                   end
                 else
                   'na next'
@@ -50,7 +50,7 @@ module NA
                   when :tag
                     'na tagged $(basename "$PWD")'
                   else
-                    NA.notify('When using a global file, a prompt hook requires `--cwd_as [tag|project]`', exit_code: 1)
+                    NA.notify("#{NA.theme[:error]}When using a global file, a prompt hook requires `--cwd_as [tag|project]`", exit_code: 1)
                   end
                 else
                   'na next'
@@ -83,7 +83,7 @@ module NA
       def show_prompt_hook(shell)
         file = prompt_file(shell)
 
-        NA.notify("{bw}# Add this to {y}#{file}{x}")
+        NA.notify("#{NA.theme[:warning]}# Add this to #{NA.theme[:filename]}#{file}")
         puts prompt_hook(shell)
       end
 
@@ -91,8 +91,8 @@ module NA
         file = prompt_file(shell)
 
         File.open(File.expand_path(file), 'a') { |f| f.puts prompt_hook(shell) }
-        NA.notify("{y}Added {bw}#{shell}{xy} prompt hook to {bw}#{file}{xy}.{x}")
-        NA.notify("{y}You may need to close the current terminal and open a new one to enable the script.{x}")
+        NA.notify("#{NA.theme[:success]}Added #{NA.theme[:filename]}#{shell}{x}#{NA.theme[:success]} prompt hook to #{NA.theme[:filename]}#{file}#{NA.theme[:success]}.")
+        NA.notify("#{NA.theme[:warning]}You may need to close the current terminal and open a new one to enable the script.")
       end
     end
   end

data/lib/na/string.rb

@@ -6,6 +6,15 @@ REGEX_TIME = /^#{REGEX_CLOCK}$/i.freeze
 
 # String helpers
 class ::String
+  ##
+  ## Insert a comment character at the start of every line
+  ##
+  ## @param      char  [String] The character to insert (default #)
+  ##
+  def comment(char = "#")
+    split(/\n/).map { |l| "# #{l}" }.join("\n")
+  end
+
   ##
   ## Tests if object is nil or empty
   ##
@@ -75,6 +84,17 @@ class ::String
     self =~ /@#{NA.na_tag}\b/
   end
 
+  ##
+  ## Colorize the dirname and filename of a path
+  ##
+  ## @return     Colorized string
+  ##
+  def highlight_filename
+    dir = File.dirname(self).shorten_path
+    file = File.basename(self, ".#{NA.extension}")
+    "#{NA.theme[:dirname]}#{dir}/#{NA.theme[:filename]}#{file}{x}"
+  end
+
   ##
   ## Colorize @tags with ANSI escapes
   ##
@@ -88,12 +108,18 @@ class ::String
   ##
   ## @return     [String] string with @tags highlighted
   ##
-  def highlight_tags(color: '{m}', value: '{y}', parens: '{m}', last_color: '{xg}')
+  def highlight_tags(color: NA.theme[:tags], value: NA.theme[:value], parens: NA.theme[:value_parens], last_color: NA.theme[:action])
     tag_color = NA::Color.template(color)
     paren_color = NA::Color.template(parens)
     value_color = NA::Color.template(value)
-    gsub(/(\s|m)(@[^ ("']+)(?:(\()(.*?)(\)))?/,
-         "\\1#{tag_color}\\2#{paren_color}\\3#{value_color}\\4#{paren_color}\\5#{last_color}")
+    gsub(/(?<pre>\s|m)(?<tag>@[^ ("']+)(?:(?<lparen>\()(?<val>.*?)(?<rparen>\)))?/) do
+      m = Regexp.last_match
+      if m['val']
+        "#{m['pre']}#{tag_color}#{m['tag']}#{paren_color}(#{value_color}#{m['val']}#{paren_color})#{last_color}"
+      else
+        "#{m['pre']}#{tag_color}#{m['tag']}#{last_color}"
+      end
+    end
   end
 
   ##
@@ -106,13 +132,12 @@ class ::String
   ## @param      last_color  [String] Color to restore after
   ##                         highlight
   ##
-  def highlight_search(regexes, color: '{y}', last_color: '{xg}')
+  def highlight_search(regexes, color: NA.theme[:search_highlight], last_color: NA.theme[:action])
     string = dup
-    color = NA::Color.template(color)
+    color = NA::Color.template(color.dup)
     regexes.each do |rx|
       next if rx.nil?
-
-      rx = Regexp.new(rx.wildcard_to_rx, Regexp::IGNORECASE) if rx.is_a?(String)
+      rx = Regexp.new(rx, Regexp::IGNORECASE) if rx.is_a?(String)
 
       string.gsub!(rx) do
         m = Regexp.last_match
@@ -123,6 +148,27 @@ class ::String
     string
   end
 
+  def wrap(width, indent)
+    output = []
+    line = []
+    length = indent
+    gsub!(/(@\S+)\((.*?)\)/) { "#{Regexp.last_match(1)}(#{Regexp.last_match(2).gsub(/ /, '†')})" }
+
+    split(' ').each do |word|
+      uncolored = NA::Color.uncolor(word)
+      if (length + uncolored.length + 1) < width
+        line << word
+        length += uncolored.length + 1
+      else
+        output << line.join(' ')
+        line = [word]
+        length = indent + uncolored.length + 1
+      end
+    end
+    output << line.join(' ')
+    output.join("\n" + ' ' * (indent + 2)).gsub(/†/, ' ')
+  end
+
   # Returns the last escape sequence from a string.
   #
   # @note       Actually returns all escape codes, with the

data/lib/na/theme.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module NA
+  module Theme
+    class << self
+      def template_help
+        <<~EOHELP
+          Use {X} placeholders to apply colors. Available colors are:
+
+          w: white, k: black, g: green, l: blue,
+          y: yellow, c: cyan, m: magenta, r: red,
+          W: bgwhite, K: bgblack, G: bggreen, L: bgblue,
+          Y: bgyellow, C: bgcyan, M: bgmagenta, R: bgred,
+          d: dark, b: bold, u: underline, i: italic, x: reset
+
+          Multiple placeholders can be combined in a single {} pair.
+
+          You can also use {#RGB} and {#RRGGBB} to specify hex colors.
+          Add a b before the # to make the hex a background color ({b#fa0}).
+
+
+        EOHELP
+      end
+
+      def load_theme(template: {})
+        # Default colorization, can be overridden with full or partial template variable
+        default_template = {
+          parent: '{c}',
+          bracket: '{dc}',
+          parent_divider: '{xw}/',
+          action: '{bg}',
+          project: '{xbk}',
+          tags: '{m}',
+          value_parens: '{m}',
+          values: '{c}',
+          search_highlight: '{y}',
+          note: '{dw}',
+          dirname: '{dw}',
+          filename: '{xb}{#eccc87}',
+          prompt: '{m}',
+          success: '{bg}',
+          error: '{b}{#b61d2a}',
+          warning: '{by}',
+          debug: '{dw}',
+          templates: {
+            output: '%filename%parents| %action',
+            default: '%parent%action',
+            single_file: '%parent%action',
+            multi_file: '%filename%parent%action'
+          }
+        }
+
+        # Load custom theme
+        theme_file = NA.database_path(file: 'theme.yaml')
+        theme = if File.exist?(theme_file)
+                  YAML.load(IO.read(theme_file)) || {}
+                else
+                  {}
+                end
+        theme = default_template.merge(theme)
+
+        File.open(theme_file, 'w') do |f|
+          f.puts template_help.comment
+          f.puts YAML.dump(theme)
+        end
+
+        theme.merge(template)
+      end
+    end
+  end
+end

data/lib/na/todo.rb

@@ -51,8 +51,8 @@ module NA
       negated_tag = []
       projects = []
 
-      NA.notify("{dw}Tags: #{settings[:tag]}", debug:true)
-      NA.notify("{dw}Search: #{settings[:search]}", debug:true)
+      NA.notify("Tags: #{settings[:tag]}", debug:true)
+      NA.notify("Search: #{settings[:search]}", debug:true)
 
       settings[:tag]&.each do |t|
         unless t[:tag].nil?

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.37'
+  VERSION = '1.2.39'
 end

data/lib/na.rb

@@ -13,6 +13,7 @@ require 'na/hash'
 require 'na/colors'
 require 'na/string'
 require 'na/array'
+require 'na/theme'
 require 'na/todo'
 require 'na/actions'
 require 'na/project'