Skip to content

Commit

Permalink
[travis] run dotfiles provisioning via nix-shell directly
Browse files Browse the repository at this point in the history
  • Loading branch information
dmalikov committed Dec 5, 2014
1 parent d2fd8a4 commit b721ae8
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cabal-dev
dist
tags
result
env.nix
14 changes: 6 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@ ghc:
- 7.8

before_install:
- cabal install alex happy
- cabal install c2hs
- cabal install cabal-install cabalg
- cabal install data-default
- |
bash <(curl -sS https://nixos.org/nix/install)
source $HOME/.nix-profile/etc/profile.d/nix.sh
nix-channel --update
install:
- cabalg https://github.com/biegunka/biegunka@develop -- --force-reinstalls
- nix-shell -p '(haskellPackages.callPackage ./default.nix { })' --command 'dotfiles --x220 --changes'

script:
- biegunka run biegunka/ -- --x220 --changes
- biegunka run biegunka/ -- --s10 --changes
script: true
2 changes: 1 addition & 1 deletion biegunka.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pkgs.haskellPackages.cabal.mkDerivation (self: {
pname = "biegunka";
version = "0.2";
src = pkgs.fetchgit {
url = "git@github.com:biegunka/biegunka.git";
url = "https://github.com/biegunka/biegunka.git";
sha256 = "545e6e86f229e6f5c53faa581a607c4be14c81948c8d6ab861881edceee66e59";
rev = "e61187c74a089411d2b23b5234a7cd93de5d8c92";
fetchSubmodules = false;
Expand Down
12 changes: 6 additions & 6 deletions biegunka/Profiles.hs
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import Control.Biegunka.Source.Git
{-# ANN module ("HLint: ignore Use camelCase" :: String) #-}

dotfiles :: Script Actions () -> Script Sources ()
dotfiles as = git' "git@github.com:dmalikov/dotfiles" "git/dotfiles" $ def & actions .~ as
dotfiles as = git' "https://github.com/dmalikov/dotfiles" "git/dotfiles" $ def & actions .~ as

profile_vim :: Script Sources ()
profile_vim = do
profile "vim/rc" $ do
git_ "git@github.com:Shougo/neobundle.vim" ".vim/bundle/neobundle.vim"
git "git@github.com:tpope/vim-pathogen" ".vim/bundle/vim-pathogen" $
git_ "https://github.com/Shougo/neobundle.vim" ".vim/bundle/neobundle.vim"
git "https://github.com/tpope/vim-pathogen" ".vim/bundle/vim-pathogen" $
copy "autoload/pathogen.vim" ".vim/autoload/pathogen.vim"
dotfiles $ copy "configs/vim/vimrc" ".vimrc"
profile "vim/syntax" $ do
Expand Down Expand Up @@ -120,8 +120,8 @@ profile_bash = profile "bash" $

profile_zsh :: Script Sources ()
profile_zsh = profile "zsh" $ do
git_ "git@github.com:zsh-users/zsh-completions" "git/zsh-completions"
git_ "git@github.com:zsh-users/zsh-syntax-highlighting" "git/zsh-syntax-highlighting"
git_ "https://github.com/zsh-users/zsh-completions" "git/zsh-completions"
git_ "https://github.com/zsh-users/zsh-syntax-highlighting" "git/zsh-syntax-highlighting"
dotfiles $ do
copy "configs/zsh/zshrc" ".zshrc"
copy "configs/zsh/zshenv" ".zshenv"
Expand All @@ -144,7 +144,7 @@ profile_gtk = profile "gtk" $

profile_tmux :: Script Sources ()
profile_tmux = profile "tmux" $ do
git_ "git@github.com:richo/battery" "git/tmux-battery"
git_ "https://github.com/richo/battery" "git/tmux-battery"
dotfiles $ do
substitute "configs/tmux/conf.template" ".tmux.conf"
copy "configs/tmux/keybindings" ".tmux.keybindings"
Expand Down

0 comments on commit b721ae8

Please sign in to comment.