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 @@
1
-################################################################################
2
-export TMPDIR = $(HOME)/tmp
3
-
4
-################################################################################
5
-TMP_DUMMY     = $(TMPDIR)/.dummy
6
-STACK_OPTS    = --stack-yaml=build/stack.yaml
7
-
8
-################################################################################
9
-.PHONY: all clean test
10
-
11
-################################################################################
12
-all: $(TMP_DUMMY)
13
-	stack $(STACK_OPTS) setup
14
-	stack $(STACK_OPTS) build
15
-	hlint src test *.hs
16
-
17
-################################################################################
18
-test:
19
-	stack $(STACK_OPTS) test
20
-
21
-################################################################################
22
-clean:
23
-	stack $(STACK_OPTS) clean
24
-
25
-################################################################################
26
-$(TMP_DUMMY):
27
-	mkdir -p $(dir $@)
28
-	touch $@

+ 2
- 17
default.nix View File

@@ -1,17 +1,2 @@
1
-# These arguments are so you can override settings from the command
2
-# line using the `nix-hs' tool.
3
-{ nixpkgs   ? import <nixpkgs> { }
4
-, compiler  ? "default"
5
-, profiling ? false
6
-}:
7
-
8
-let
9
-  pkgs = nixpkgs;
10
-
11
-  buildInputs = with pkgs; [
12
-    # List extra dependencies here.
13
-  ];
14
-
15
-in
16
-  pkgs.nix-hs.interactive ./clockdown.nix
17
-    { inherit compiler profiling buildInputs; }
1
+{ pkgs ? (import <nixpkgs> {}).pkgs }:
2
+pkgs.haskellPackages.callPackage ./clockdown.nix { }

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

@@ -72,7 +72,7 @@ defaultKeys =
72 72
              , (([],      RawKey '+'),  TimeSucc)
73 73
              , (([],      RawKey '-'),  TimePred)
74 74
              , (([],      RawKey '_'),  TimeSucc)
75
-             , (([],      FKey 1),      NewCountdown defaultCountdownName)
75
+             , (([],      RawKey '1'),  NewCountdown defaultCountdownName)
76 76
              ]
77 77
 
78 78
 --------------------------------------------------------------------------------

Loading…
Cancel
Save