From 9e1a7787d4a58754a9c54e3a3ada4be4565b40ec Mon Sep 17 00:00:00 2001
From: Juni Kim <junikimm717@gmail.com>
Date: Tue, 7 Mar 2023 13:07:19 -0500
Subject: [PATCH] xorg setup fixes

---
 install.sh                    |   5 ++
 term/.config/kitty/kitty.conf | 119 +++++++++++++++++++++-------------
 wm/.config/berry/autostart    |   3 -
 wm/.config/bspwm/bspwmrc      |   2 -
 4 files changed, 80 insertions(+), 49 deletions(-)

diff --git a/install.sh b/install.sh
index 7d0e26a..4cf7eb5 100755
--- a/install.sh
+++ b/install.sh
@@ -117,6 +117,7 @@ neovim_fonts() {
 }
 
 wm() {
+  sudo apt install -y xorg xinit pulseaudio
   sudo add-apt-repository -y ppa:papirus/papirus
   sudo apt update && sudo apt install -y i3 polybar nitrogen feh picom rofi stow papirus-icon-theme conky dmenu scrot kitty
   # installing siji
@@ -153,6 +154,10 @@ Name=berry
 Comment=berry - a small window manager
 Exec=berry
 Type=XSession
+EOF
+  cat <<EOF | tee ~/.xinitrc
+xrandr -s 1920x1080
+exec berry
 EOF
 }
 
diff --git a/term/.config/kitty/kitty.conf b/term/.config/kitty/kitty.conf
index 18e2566..0649280 100644
--- a/term/.config/kitty/kitty.conf
+++ b/term/.config/kitty/kitty.conf
@@ -14,52 +14,83 @@ cursor_shape block
 
 enable_audio_bell no
 
+# vim:ft=kitty
 
-##me:     Catppuccin Kitty Diff Mocha
+## name:     Catppuccin Kitty Mocha
 ## author:   Catppuccin Org
 ## license:  MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/diff-mocha.conf
+## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf
 ## blurb:    Soothing pastel theme for the high-spirited!
 
-# text
-foreground           #CDD6F4
-# base
-background           #1E1E2E
-# subtext0
-title_fg             #A6ADC8
-
-# mantle
-title_bg             #181825
-margin_bg            #181825
-
-# subtext1
-margin_fg            #A6ADC8
-# mantle
-filler_bg            #181825
-
-# 30% red, 70% base
-removed_bg           #5E3F53
-# 50% red, 50% base
-highlight_removed_bg #89556B
-# 40% red, 60% base
-removed_margin_bg    #734A5F
-
-# 30% green, 70% base
-added_bg             #475951
-# 50% green, 50% base
-highlight_added_bg   #628168
-# 40% green, 60% base
-added_margin_bg      #546D5C
-
-# mantle
-hunk_margin_bg       #181825
-hunk_bg              #181825
-
-# 40% yellow, 60% base
-search_bg            #A1937B
-# text
-search_fg            #CDD6F4
-# 30% sky, 70% base
-select_bg            #45475A
-# text
-select_fg            #CDD6F4
+
+
+# The basic colors
+foreground              #CDD6F4
+background              #1E1E2E
+selection_foreground    #1E1E2E
+selection_background    #F5E0DC
+
+# Cursor colors
+cursor                  #F5E0DC
+cursor_text_color       #1E1E2E
+
+# URL underline color when hovering with mouse
+url_color               #F5E0DC
+
+# Kitty window border colors
+active_border_color     #B4BEFE
+inactive_border_color   #6C7086
+bell_border_color       #F9E2AF
+
+# OS Window titlebar colors
+wayland_titlebar_color system
+macos_titlebar_color system
+
+# Tab bar colors
+active_tab_foreground   #11111B
+active_tab_background   #CBA6F7
+inactive_tab_foreground #CDD6F4
+inactive_tab_background #181825
+tab_bar_background      #11111B
+
+# Colors for marks (marked text in the terminal)
+mark1_foreground #1E1E2E
+mark1_background #B4BEFE
+mark2_foreground #1E1E2E
+mark2_background #CBA6F7
+mark3_foreground #1E1E2E
+mark3_background #74C7EC
+
+# The 16 terminal colors
+
+# black
+color0 #45475A
+color8 #585B70
+
+# red
+color1 #F38BA8
+color9 #F38BA8
+
+# green
+color2  #A6E3A1
+color10 #A6E3A1
+
+# yellow
+color3  #F9E2AF
+color11 #F9E2AF
+
+# blue
+color4  #89B4FA
+color12 #89B4FA
+
+# magenta
+color5  #F5C2E7
+color13 #F5C2E7
+
+# cyan
+color6  #94E2D5
+color14 #94E2D5
+
+# white
+color7  #BAC2DE
+color15 #A6ADC8
diff --git a/wm/.config/berry/autostart b/wm/.config/berry/autostart
index 5792751..383914d 100755
--- a/wm/.config/berry/autostart
+++ b/wm/.config/berry/autostart
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-xrandr -s 1920x1080
-#xrandr -s 1600x900
-
 pgrep -x sxhkd 2> /dev/null || sxhkd -c ~/.config/berry/sxhkdrc &
 
 pkill conky; conky -d
diff --git a/wm/.config/bspwm/bspwmrc b/wm/.config/bspwm/bspwmrc
index d2cfa24..750fef3 100755
--- a/wm/.config/bspwm/bspwmrc
+++ b/wm/.config/bspwm/bspwmrc
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-xrandr -s 1920x1080
-
 pgrep -x sxhkd > /dev/null || sxhkd -c ~/.config/bspwm/sxhkdrc &
 pkill conky; conky -d
 feh --bg-fill ~/wallpaper/nick-nazzaro-underwater.png