From 6e264da6dd497f6689d588290c186b35adec6a57 Mon Sep 17 00:00:00 2001
From: Elias Almqvist <elalmqvist@gmail.com>
Date: Sun, 18 Sep 2022 22:11:11 +0200
Subject: [PATCH] Merge fix

---
 nvim/.config/nvim/init.vim                           | 4 ++--
 oh-my-zsh/.oh-my-zsh/aliases.sh                      | 5 ++++-
 oh-my-zsh/.oh-my-zsh/custom/themes/minimal.zsh-theme | 4 ++--
 polybar/.config/polybar/config                       | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 9895161..2df836a 100644
--- a/nvim/.config/nvim/init.vim
+++ b/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,6 @@ set nu
 
 hi Normal guibg=NONE ctermbg=NONE
 hi StatusLine ctermbg=NONE ctermfg=NONE
-"
 highlight clear LineNr
 highlight LineNr ctermfg=NONE ctermbg=NONE
 
diff --git a/oh-my-zsh/.oh-my-zsh/aliases.sh b/oh-my-zsh/.oh-my-zsh/aliases.sh
index f68d784..157505d 100644
--- a/oh-my-zsh/.oh-my-zsh/aliases.sh
+++ b/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"
diff --git a/oh-my-zsh/.oh-my-zsh/custom/themes/minimal.zsh-theme b/oh-my-zsh/.oh-my-zsh/custom/themes/minimal.zsh-theme
index a3ec405..28b64e4 100644
--- a/oh-my-zsh/.oh-my-zsh/custom/themes/minimal.zsh-theme
+++ b/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]%})"
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index 4707847..8228192 100644
--- a/polybar/.config/polybar/config
+++ b/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>