Skip to content

Commit

Permalink
switch to picom and update some configs
Browse files Browse the repository at this point in the history
  • Loading branch information
kimond committed May 26, 2023
1 parent 9ad05d5 commit 8e1f172
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 16 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ xmonad/*.hi
xmonad/*.errors
xmonad/prompt-history
xmonad/xmonad-x86_64-linux
xmonad/build-x86_64-linux
4 changes: 2 additions & 2 deletions bin/reload-compton
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pkill compton
compton &
pkill picom
picom &
7 changes: 5 additions & 2 deletions bin/rofi-xrandr
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
# logout dialog

cmd=$(echo -e "Single\nDouble\nTriple" | rofi -width 350 -dmenu -p system:)
cmd=$(echo -e "Single\nDouble\nTriple\nLaptop" | rofi -width 350 -dmenu -p system:)
case $cmd in
Single)
xrandr --output HDMI2 --auto --off
Expand All @@ -10,6 +10,9 @@ case $cmd in
xrandr --output HDMI2 --auto --right-of eDP1
;;
Triple)
echo "test"
~/.screenlayout/mainsetup.sh
;;
Laptop)
~/.screenlayout/laptoponly.sh
;;
esac
2 changes: 1 addition & 1 deletion bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ config_files="
fish
nvim
i3
compton.conf
picom.conf
rofi
termite
wal
Expand Down
3 changes: 2 additions & 1 deletion compton.conf → picom.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
opacity-rule = [
"85:class_g= 'Xfce4-terminal'",
"85:class_g= 'Termite'",
"85:class_g= 'Alacritty' && focused",
"80:class_g= 'Alacritty' && !focused",
"85:class_g= 'Rofi'",
"97:class_g= 'jetbrains-idea'"
];
2 changes: 1 addition & 1 deletion rofi/config.rasi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
configuration {
font: "Hack Bold 12";
theme: "~/.cache/wal/colors-rofi-dark.rasi";
}
@theme "~/.cache/wal/colors-rofi-light.rasi"
4 changes: 2 additions & 2 deletions xmonad/polybar-launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ killall -q polybar
while pgrep -x polybar >/dev/null; do sleep 1; done

# Launch bar1 and bar2
MONITOR=eDP1 polybar mybar -c ~/.xmonad/polybar.conf &
MONITOR=HDMI2 polybar mybartwo -c ~/.xmonad/polybar.conf &
MONITOR=eDP-1 polybar mybar -c ~/.xmonad/polybar.conf &
MONITOR=DP-1 polybar mybartwo -c ~/.xmonad/polybar.conf &

echo "Bars launched..."
11 changes: 6 additions & 5 deletions xmonad/xmonad.hs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ main = do
$ addDescrKeys ((myModMask, xK_F1), showKeybindings) myKeys
$ docks
$ ewmh
$ ewmhFullscreen
$ myConfig

myConfig = def
Expand All @@ -42,7 +43,7 @@ myConfig = def
, focusedBorderColor = myFocusedBorderColor
, modMask = myModMask
, manageHook = myManageHook
, handleEventHook = myHandleEventHook
-- , handleEventHook = myHandleEventHook
, layoutHook = myLayoutHook
, startupHook = myStartupHook
, terminal = myTerminal
Expand Down Expand Up @@ -70,7 +71,7 @@ myWorkspaces = [wsDev, wsBrowser, wsSocial, wsMusic, wsFile, wsMisc, wsGame, wsM
-- Applications
----------------

myTerminal = "termite"
myTerminal = "alacritty"
myBrowser = "google-chrome-stable"
myBrowserClass = "Google-chrome-stable"
myStatusBar = "~/.xmonad/polybar-launch.sh"
Expand Down Expand Up @@ -210,7 +211,7 @@ myKeys conf = let

myStartupHook = do
setWMName "LG3D"
spawnOnce "compton"
spawnOnce "picom"
spawnOnce "redshift-gtk"
spawnOnce "nm-applet"
spawnOnce "google-chrome-stable"
Expand Down Expand Up @@ -251,5 +252,5 @@ myManageHook =
-- X Event Actions
---------------------------------------------------------------------------

myHandleEventHook = def
<+> XMonad.Hooks.EwmhDesktops.fullscreenEventHook
-- myHandleEventHook = def
-- <+> XMonad.Hooks.EwmhDesktops.fullscreenEventHook
5 changes: 3 additions & 2 deletions zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,9 @@ fi

test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"


[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
# fzf
[ -f /usr/share/fzf/key-bindings.zsh ] && source /usr/share/fzf/key-bindings.zsh
[ -f /usr/share/fzf/completion.zsh ] && source /usr/share/fzf/completion.zsh

setopt EXTENDED_HISTORY
setopt HIST_EXPIRE_DUPS_FIRST
Expand Down

0 comments on commit 8e1f172

Please sign in to comment.