vim haskell formating, removed auto wrapping, zsh alias

7 files changed, 23 insertions, 17 deletions

diff --git a/.pluggins.vim b/.pluggins.vim
index 20c2dab..e877ab6 100644
--- a/.pluggins.vim
+++ b/.pluggins.vim
@@ -9,10 +9,11 @@ call plug#begin()
     Plug 'itchyny/lightline.vim'              " minimal status bar
     Plug 'HappyTramp/vim-syntax-extra'        " syntax highlight of C operators
     Plug 'romainl/vim-cool'                   " disable highlight after search
-    Plug 'tikhomirov/vim-glsl'                " glsl hightlight
+    Plug 'tikhomirov/vim-glsl'                " glsl highlight
+    Plug 'cespare/vim-toml'                   " toml highlight
 
     " s19 at home
-    Plug 'HappyTramp/vim-42header'              " 42 header
+    Plug 'HappyTramp/vim-42header'            " 42 header
 
     " themes
     " Plug 'joshdick/onedark.vim'             " onedark
diff --git a/.vimrc b/.vimrc
index c5634d7..6a197c3 100644
--- a/.vimrc
+++ b/.vimrc
@@ -24,7 +24,8 @@ set autowrite               " auto write buf on certain events
 set hidden                  " keep change in buffer when quitting window
 set noswapfile              " disable swap files
 set scrolloff=2             " line padding when scrolling
-set textwidth=89            " when line wrap occurs
+set textwidth=0             " when line wrap occurs
+set wrapmargin=0            " disable auto line wrapping
 set encoding=utf-8          " utf-8 encoding
 set formatoptions-=t        " do not auto break line > 89 character
 filetype plugin indent on   " allow to add specific rules for certain type of file
@@ -225,6 +226,8 @@ autocmd Filetype c setlocal noexpandtab
 autocmd Filetype cpp nnoremap <leader>cout istd::cout <<  << std::endl;<ESC>2F<hi
 " vim fold method to marker
 autocmd Filetype vim setlocal foldmethod=marker
+
+autocmd FileType haskell set formatprg=stylish-haskell
 " }}}
 
 """"""""""""
diff --git a/.xinitrc b/.xinitrc
index c3213b0..c3213b0 100644..100755
--- a/.xinitrc
+++ b/.xinitrc
diff --git a/.zsh_aliases b/.zsh_aliases
index 4c4724f..5b5684a 100644
--- a/.zsh_aliases
+++ b/.zsh_aliases
@@ -14,9 +14,11 @@ alias v="vim"
 alias mkdir="mkdir -p"
 alias gdb="gdb -q"     # disable long intro message
 alias sudo="sudo "     # enable color (the search for aliases continues)
+alias doas="doas "     # same for doas
+alias info="info --vi-keys"
 
 # ls
-alias ls='ls --color -F'
+alias ls='ls --color=auto -F'
 alias ll="ls -lh"
 alias la="ls -a"
 alias lla="ls -alh"
@@ -67,8 +69,8 @@ alias gstp="git stash pop"
 alias lpassp="lpass show --password --clip"  # put password in clipboard
 
 # helper to switch between dual and single monitor setup
-alias dual='xrandr --output LVDS-1 --primary --below VGA-1 --output VGA-1 --auto'
-alias single='xrandr --output VGA-1 --off'
+alias dual='xrandr --output LVDS1 --primary --below VGA1 --output VGA1 --auto'
+alias single='xrandr --output VGA1 --off'
 
 # edit config files
 alias zshrc="vim $DOTFILES/.zshrc && source $DOTFILES/.zshrc"
@@ -93,6 +95,7 @@ getrfc() {
 }
 
 # bluetooth
+alias bt='bluetoothctl'
 alias bton='echo power on | bluetoothctl'
 alias btoff='echo power off | bluetoothctl'
 
diff --git a/install.sh b/install.sh
index ff71c27..e6cff50 100755
--- a/install.sh
+++ b/install.sh
@@ -2,8 +2,7 @@
 
 create_dotfile_link()
 {
-    ln -sf $DOTDIR/$1 $HOME/$2
-    echo "Created link for $1 to $HOME/$2"
+    ln -svf $DOTDIR/$1 $HOME/$2
 }
 
 create_dotfile_link_same()
diff --git a/redshift.conf b/redshift.conf
index 32fff4f..1e540e3 100644
--- a/redshift.conf
+++ b/redshift.conf
@@ -1,6 +1,6 @@
 [redshift]
-temp-day=2800
-temp-night=2600
+temp-day=3000
+temp-night=2800
 
 ; transition day/night
 fade=1
diff --git a/xmonad.hs b/xmonad.hs
index c10070b..a0ac671 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -1,15 +1,15 @@
-import XMonad
-import XMonad.Config.Desktop
+import           XMonad
+import           XMonad.Config.Desktop
 
 -- Utilities
-import XMonad.Util.SpawnOnce
-import XMonad.Util.EZConfig(additionalKeysP)
+import           XMonad.Util.EZConfig        (additionalKeysP)
+import           XMonad.Util.SpawnOnce
 
 -- Layouts
-import XMonad.Layout.NoBorders
+import           XMonad.Layout.NoBorders
 
 -- Hooks
-import XMonad.Hooks.InsertPosition
+import           XMonad.Hooks.InsertPosition
 
 -- xmonad :: XConfig -> IO ()
 -- https://hackage.haskell.org/package/xmonad-0.15/docs/XMonad-Core.html#t:XConfig
@@ -34,7 +34,7 @@ myLayouts = tiledBigMaster        -- bigger master for code and smaller slave fo
 
 myStartupHook = do
     spawnOnce "xinput disable 'ETPS/2 Elantech Touchpad' &"        -- disable touchpad
-    -- spawnOnce "redshift -c /home/charles/.config/redshift.conf &"  -- start redshift
+    spawnOnce "redshift -c /home/charles/.config/redshift.conf &"  -- start redshift
 
 myManageHook = insertPosition End Newer  -- insert new window at the end of the current layout