Merge branch 'master' of github.com:E-Almqvist/dotfiles

nvim/.config/nvim/init.vim

@@ -35,7 +35,8 @@ call plug#begin('~/.config/nvim/plugged')
 "	Plug 'vim-airline/vim-airline-themes'
 	Plug 'projekt0n/github-nvim-theme'
 	Plug 'pantharshit00/vim-prisma'
-	Plug 'neovimhaskell/haskell-vim'
+	Plug 'axelf4/vim-haskell'
+	"Plug 'neovimhaskell/haskell-vim'
 call plug#end() 
 
 set nocompatible
@@ -73,7 +74,7 @@ set nu
 
 hi Normal guibg=NONE ctermbg=NONE
 hi StatusLine ctermbg=NONE ctermfg=NONE
-"
+
 highlight clear LineNr
 highlight LineNr ctermfg=NONE ctermbg=NONE
 

oh-my-zsh/.oh-my-zsh/aliases.sh

@@ -3,9 +3,12 @@
 alias xcopy="xclip -selection c"
 alias xpaste="xclip -selection c -o"
 
-alias ccd="pwd | xcopy"
+alias ccd="pwd | xclip"
 
 # Programs
 alias vidconvert="ffmpeg -i"
 alias vim="nvim"
 alias vi="nvim"
+
+# Laptop stuff
+alias setbri="xrandr --output eDP-1 --brightness"

oh-my-zsh/.oh-my-zsh/custom/themes/minimal.zsh-theme

@@ -2,7 +2,7 @@ function prompt_char {
 	if [ $UID -eq 0 ]; then echo "#"; else echo $; fi
 }
 
-PROMPT='%{$reset_color%}%{$fg_bold[white]%}%c $(prompt_char)$(git_prompt_info)> %{$reset_color%}'
+PROMPT='%{$reset_color%}%{$fg_bold[gray]%}%c $(prompt_char)$(git_prompt_info)> %{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$reset_color%}%{$fg_bold[red]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}%{$fg_bold[white]%})"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}%{$fg_bold[gray]%})"

polybar/.config/polybar/config

@@ -206,7 +206,7 @@ click-left = playerctl next spotify
 
 [module/wlan]
 type = internal/network
-interface = wlp1s0
+interface = wlp0s20f3
 interval = 3.0
 
 format-connected = <ramp-signal> <label-connected>