some tuning

7 files changed, 42 insertions, 15 deletions

diff --git a/dotfiles.sh b/dotfiles.sh
index 8cc28d0..8977abd 100644
--- a/dotfiles.sh
+++ b/dotfiles.sh
@@ -1 +1 @@
-stow --target=$HOME --dotfiles -vv tmux zsh nvim git
+stow --target=$HOME --dotfiles -vv tmux zsh nvim git haskell
diff --git a/ghc/.ghci b/ghc/.ghci
deleted file mode 100644
index 03e689f..0000000
--- a/ghc/.ghci
+++ /dev/null
@@ -1,5 +0,0 @@
--- :set prompt "\ESC[34mλ> \ESC[m"
--- :set prompt "%s λ>"
--- :set prompt "\ESC[0;36m\STX%s\n\ESC[0;34m\STXλ> \ESC[m\STX"
--- :module +Data.List
--- :def hoogle \s -> return $ ":! hoogle --count=15 \"" ++ s ++ "\""
diff --git a/git/dot-gitconfig b/git/dot-gitconfig
index e5c0949..73c4937 100644
--- a/git/dot-gitconfig
+++ b/git/dot-gitconfig
@@ -1,6 +1,6 @@
 [user]
-	name = Miguel
-	email = m.i@gmx.at
+	name = Michal Idziorek
+        email = m.i@gmx.at
 
 [merge]
     tool = vimdiff
@@ -20,9 +20,9 @@
     prompt = true
 
 [pager]
-    diff = delta
-    show = delta
-    log = delta
+    diff   = delta
+    show   = delta
+    log    = delta
     reflog = delta
 
 [interactive]
diff --git a/haskell/dot-ghci b/haskell/dot-ghci
new file mode 100644
index 0000000..a4f7e1d
--- /dev/null
+++ b/haskell/dot-ghci
@@ -0,0 +1,21 @@
+import qualified Data.Text as T
+import qualified Data.List as L
+
+:seti -XOverloadedStrings
+
+:set prompt "\ESC[0;36m\STX%s\n\ESC[0;34m\STXλ> \ESC[m\STX"
+:set prompt-cont "\ESC[0;33m\STX|> \ESC[m\STX"
+
+:{
+dotGHCI_myPrint :: (Show a) => a -> IO ()
+dotGHCI_myPrint a = putStrLn $ "\n\ESC[0;33m\STX" <> show a <> "\ESC[m\STX"
+:}
+
+:seti -interactive-print dotGHCI_myPrint
+
+-- :def hoogle \s -> return $ ":! hoogle --count=15 \"" ++ s ++ "\""
+
+:set +t
+:set +m
+:set +s
+
diff --git a/haskell/dot-haskeline b/haskell/dot-haskeline
new file mode 100644
index 0000000..ab1f04e
--- /dev/null
+++ b/haskell/dot-haskeline
@@ -0,0 +1,4 @@
+maxHistorySize: Nothing
+historyDuplicates: IgnoreConsecutive
+completionPromptLimit: Just 250
+editMode: Vi
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index c193c7e..e2df3a9 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -26,6 +26,8 @@ Plug 'tpope/vim-dadbod'
 Plug 'tpope/vim-vinegar'
 Plug 'tpope/vim-eunuch'
 
+Plug 'godlygeek/tabular'
+
 Plug 'junegunn/fzf',                   { 'do': { -> fzf#install() }                }
 Plug 'junegunn/fzf.vim'
 
@@ -42,6 +44,7 @@ Plug 'christoomey/vim-tmux-navigator'
 
 Plug 'mbbill/undotree'
 
+
 " haskell related
 Plug 'neovimhaskell/haskell-vim'
 Plug 'alx741/vim-stylishask'
diff --git a/zsh/dot-zshrc b/zsh/dot-zshrc
index 9cc2d24..66133d9 100644
--- a/zsh/dot-zshrc
+++ b/zsh/dot-zshrc
@@ -1,7 +1,9 @@
-if [ -z "$TMUX" ]
-then
-    tmux -2 attach -t TMUX || tmux -2 new -s TMUX
-fi
+#if [ -z "$TMUX" ]
+#then
+#    tmux -2 attach -t TMUX || tmux -2 new -s TMUX
+#fi
+
+export ZIM_HOME=$HOME/.zim
 
 # Start configuration added by Zim install {{{
 #
@@ -226,3 +228,5 @@ export PATH=$HOME/.local/bin:$PATH
 eval "$(direnv hook zsh)"
 
 cd $HOME
+
+if [ -e /home/miguel/.nix-profile/etc/profile.d/nix.sh ]; then . /home/miguel/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer