Browse Source

Switch from F1 to just 1 to trigger the default countdown timer

master
Peter J. Jones 1 year ago
parent
commit
b6308a0b88
Signed by: Peter Jones <pjones@devalot.com> GPG Key ID: 9DAFAA8D01941E49
3 changed files with 3 additions and 46 deletions
  1. 0
    28
      GNUmakefile
  2. 2
    17
      default.nix
  3. 1
    1
      src/Clockdown/Core/Config.hs

+ 0
- 28
GNUmakefile View File

@@ -1,28 +0,0 @@
################################################################################
export TMPDIR = $(HOME)/tmp

################################################################################
TMP_DUMMY = $(TMPDIR)/.dummy
STACK_OPTS = --stack-yaml=build/stack.yaml

################################################################################
.PHONY: all clean test

################################################################################
all: $(TMP_DUMMY)
stack $(STACK_OPTS) setup
stack $(STACK_OPTS) build
hlint src test *.hs

################################################################################
test:
stack $(STACK_OPTS) test

################################################################################
clean:
stack $(STACK_OPTS) clean

################################################################################
$(TMP_DUMMY):
mkdir -p $(dir $@)
touch $@

+ 2
- 17
default.nix View File

@@ -1,17 +1,2 @@
# These arguments are so you can override settings from the command
# line using the `nix-hs' tool.
{ nixpkgs ? import <nixpkgs> { }
, compiler ? "default"
, profiling ? false
}:

let
pkgs = nixpkgs;

buildInputs = with pkgs; [
# List extra dependencies here.
];

in
pkgs.nix-hs.interactive ./clockdown.nix
{ inherit compiler profiling buildInputs; }
{ pkgs ? (import <nixpkgs> {}).pkgs }:
pkgs.haskellPackages.callPackage ./clockdown.nix { }

+ 1
- 1
src/Clockdown/Core/Config.hs View File

@@ -72,7 +72,7 @@ defaultKeys =
, (([], RawKey '+'), TimeSucc)
, (([], RawKey '-'), TimePred)
, (([], RawKey '_'), TimeSucc)
, (([], FKey 1), NewCountdown defaultCountdownName)
, (([], RawKey '1'), NewCountdown defaultCountdownName)
]

--------------------------------------------------------------------------------

Loading…
Cancel
Save