diff options
| author | Profpatsch <mail@profpatsch.de> | 2016-06-05 22:49:42 +0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2016-06-06 13:32:38 +0200 |
| commit | 83a5f8a5d5ad8512ad3c4d4661c3b80e6d2d54f9 (patch) | |
| tree | 377b04c5623adf11996299ac7088e9d86b85702b /machines | |
| parent | bab446318a9d06c135d6ebd05386842c5a93feea (diff) | |
machines/katara: vim -> vim_configurable
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/profpatsch/katara.nix | 5 | ||||
| -rw-r--r-- | machines/profpatsch/pkgs.nix | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix index 39abd7a5..bf1f6bc9 100644 --- a/machines/profpatsch/katara.nix +++ b/machines/profpatsch/katara.nix @@ -93,7 +93,7 @@ in { # Packages - environment.sessionVariables = { EDITOR = "${pkgs.vim}/bin/vim"; }; + environment.sessionVariables = { EDITOR = "${myPkgs.vim}/bin/vim"; }; environment.systemPackages = with pkgs; let @@ -119,7 +119,7 @@ in { traceroute # trace ip routes # TODO move into atool deps unzip # extract zip archives - vim # slight improvement over vi + myPkgs.vim # slight improvement over vi wget # the other URL file fetcher wirelesstools # iwlist (wifi scan) ]; @@ -151,6 +151,7 @@ in { userPrograms = [ abcde # high-level cd-ripper with tag support anki # spaced repetition system + # TODO integrate lame into audacity audacity lame.lib # audio editor and mp3 codec myPkgs.beets # audio file metadata tagger # chromium # browser diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix index c1b2c271..cfeff565 100644 --- a/machines/profpatsch/pkgs.nix +++ b/machines/profpatsch/pkgs.nix @@ -54,5 +54,7 @@ let poezio = pkgs.python34Packages.poezio; + vim = vim_configurable; + in -{ inherit taffybar offlineimap sent mpv beets git-annex poezio; } +{ inherit taffybar offlineimap sent mpv beets git-annex poezio vim; } |