Skip to content

Commit 8e3f86e

Browse files
author
Yann Hoffmann
committed
Update
1 parent 4c11306 commit 8e3f86e

File tree

8 files changed

+827
-22
lines changed

8 files changed

+827
-22
lines changed

src/Makefile Makefile

File renamed without changes.

src/autostart.sh etc/autostart.sh

+9-8
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ redshift -c "$HOME/.config/redshift/redshift.conf" & # Go easy on the eyes
88
nitrogen --restore & # Wallpaper
99
numlockx on & # Numlock (previously in lightdm.conf)
1010
picom -b & # Compositor, transparency
11-
xset r rate 190 8 & # Typematic delays - previously 190 28
11+
xset r rate 190 8 & # Typematic delays - previously 190 28
1212
autokey-gtk & # Rebinds bash bindings in browser
1313
mousetrap -t 5 & # Auto hide mouse after 5s
14-
xmodmap -e "keycode 49 = Caps_Lock NoSymbol Caps_Lock" & # Makes ^2 key act as caps lock (autokey most likely not working)
14+
#xmodmap -e "keycode 49 = Caps_Lock NoSymbol Caps_Lock" & # Makes ^2 key act as caps lock (autokey most likely not working)
1515
copyq & # Clipboard manager
16-
ulauncher --hide-window --no-window-shadow & # Dynamic menu
16+
ulauncher --hide-window --no-window-shadow & # Dynamic menu
1717
firefox & # Firefox
18-
# vim & # Self Q&A
19-
emacs & # The one + Self Q&A
18+
emacs & # The one and only + Self Q&A
19+
ao &
2020

2121
# Synchronize important directories between machines
2222
#gitwatch -r origin -b main $HOME/Org &
@@ -26,13 +26,14 @@ emacs & # The one + Self Q&A
2626

2727

2828
# @Home
29-
if ! [[ $(uname --all) =~ "Ubuntu" ]]; then
29+
if [[ $(uname --all) =~ "arch" ]]; then
3030
ckb-next -b & # Corsair bindings
31-
"$HOME/Code/tools/Pycharm2019/pycharm-2019.3.4/bin/pycharm.sh" &
31+
code &
3232
udiskie & # USB daemon
3333
aw-server & # Windows and time tracker (*)
3434
xscreensaver --no-splash -verbose & # Aerial screensaver
35-
noip2 &
35+
noip2 -c /etc/no-ip2.conf &
36+
bluetooth-autoconnect &
3637
fi
3738

3839
# Record screen (*) we're oom

src/Modules/Keys.hs

+18-13
Original file line numberDiff line numberDiff line change
@@ -55,26 +55,28 @@ shiftWindow dir
5555
emacsKeys :: [(String, X())]
5656
emacsKeys = [
5757
------------------------------- Programs ----------------------------------------
58-
--("M-S-m" , spawn "ulauncher") -- already built into ulauncher
5958
("C-M1-S-f", spawn "firefox-developer-edition" )
6059
, ("C-M1-a" , spawn "atom" )
60+
, ("C-M1-b" , spawn "blueberry" )
6161
, ("C-M1-c" , spawn "calibre" )
6262
, ("C-M1-e" , spawn "emacs" )
6363
, ("C-M1-f" , spawn "firefox" )
64-
, ("C-M1-g" , spawn "geogebra" )
65-
, ("C-M1-i" , spawn "idea" )
64+
, ("C-M1-g" , spawn "gimp" )
6665
, ("C-M1-k" , spawn "anki" )
67-
, ("C-M1-n" , spawn "nautilus" )
66+
, ("C-M1-i" , spawn "idea-ce" )
67+
, ("C-M1-n" , spawn "nautilus" )
68+
, ("C-M1-m" , spawn "thunderbird" )
6869
-- Isn't Alt+= the align code
6970
--, ("C-M1-l" , spawn "libreoffice" ) -- conflict with intellij align code
70-
, ("C-M1-p" , spawn "$HOME/Code/tools/Pycharm2019/pycharm-2019.3.4/bin/pycharm.sh" )
71-
, ("C-M1-r" , spawn "rstudio-bin" )
72-
, ("C-M1-t" , spawn "alacritty" )
73-
, ("C-M1-v" , spawn "virtualbox" )
71+
--, ("C-M1-p" , spawn "$HOME/Code/tools/Pycharm2019/pycharm-2019.3.4/bin/pycharm.sh" )
72+
, ("C-M1-v" , spawn "code" ) -- vscode
73+
, ("C-M1-r" , spawn "rstudio-bin" )
74+
, ("C-M1-t" , spawn "xterm" )
75+
, ("C-M1-w" , spawn "nxplayer" )
7476

7577
------------------------------- Scratchpads ----------------------------------------
7678
, ("C-M-<Space>", scratchpadAction exclusiveSps "xterm" )
77-
, ("C-M-b", scratchpadAction exclusiveSps "todoist" ) -- b
79+
, ("C-M-b", scratchpadAction exclusiveSps "blueberry" ) -- b
7880
, ("C-M-c", scratchpadAction exclusiveSps "cal" ) -- [c]alendar
7981
, ("C-M-d", scratchpadAction exclusiveSps "stardict") -- [d]ictionary
8082
, ("C-M-e", scratchpadAction exclusiveSps "virt-manager" ) -- [e]mulator
@@ -144,8 +146,8 @@ emacsKeys = [
144146
, ("<XF86AudioNext>", spawn "xterm")
145147
, ("<XF86AudioPlay>", spawn "cplay")
146148
, ("<XF86AudioMute>", spawn "pulsemixer --toggle-mute")
147-
, ("<XF86AudioLowerVolume>", spawn "pulsemixer --change-volume -15")
148-
, ("<XF86AudioRaiseVolume>", spawn "pulsemixer --change-volume +15")
149+
, ("<XF86AudioLowerVolume>", spawn "pulsemixer --change-volume -10")
150+
, ("<XF86AudioRaiseVolume>", spawn "pulsemixer --change-volume +10")
149151

150152
------------------------------- Yeelight ----------------------------------------
151153
-- TODO: scripts use directory structure
@@ -180,7 +182,7 @@ exclusiveSps = mkXScratchpads [
180182
, ("anki" , "anki", resource =? "anki")
181183
, ("cal" , "google-calendar-nativefier", resource =? "googlecalendar-nativefier-e22938")
182184
, ("cmus", "xterm -name cmus cmus", resource =? "cmus")
183-
, ("thunderbird" , "thunderbird", resource =? "Mail")
185+
--, ("thunderbird" , "thunderbird", resource =? "Mail")
184186
, ("nvtop", "xterm -name nvtop nvtop", resource =? "nvtop")
185187
, ("htop", "xterm -bg black -name htop htop", resource =? "htop")
186188
, ("hardinfo", "hardinfo", resource =? "hardinfo")
@@ -210,8 +212,11 @@ shiftMouse direction
210212

211213
mouseKeys :: [((ButtonMask, Button), Window -> X ())]
212214
mouseKeys = [
213-
((0, 6), \w -> moveToIndependent Prev )
215+
-- button4 = scroll up, button3 = right click, button 5 = scroll down
216+
((0, 6), \w -> moveToIndependent Prev )
217+
-- , ((0, button3), \w -> spawn "exec xdotool key ctrl+return")
214218
, ((0, 7), \w -> moveToIndependent Next )
219+
-- Middle mouse button: annotate label (0, 3) or button2
215220
, ((mod4Mask, button2), (\w -> focus w >> mouseResizeWindow w >> windows W.shiftMaster))
216221
]
217222

src/xmonad.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,6 @@ addEWMHFullscreen = do
133133
------------------------------------------------------------------------
134134
myStartupHook :: X ()
135135
myStartupHook = do
136-
spawnOnce "~/.xmonad/src/autostart.sh"
136+
spawnOnce "~/.xmonad/etc/autostart.sh"
137137
setWMName "xmonad"
138138
-- setWMName "LG3D" --for the JVM

xpm/tmp/AWS_logo.png

56.9 KB
Loading

0 commit comments

Comments
 (0)