Browse Source

Merge branch 'master' of github.com:WolfeCub/dotfiles

pull/2/head
Josh Wolfe 5 years ago
parent
commit
b17a279143
  1. 1
      .gitmodules
  2. 13
      emacs/.emacs.d/README.org
  3. 3
      i3/.config/i3/config

1
.gitmodules vendored

@ -4,3 +4,4 @@ @@ -4,3 +4,4 @@
[submodule "emacs/.emacs.d/lisp/meme"]
path = emacs/.emacs.d/lisp/meme
url = https://github.com/larsmagne/meme.git
ignore = untracked

13
emacs/.emacs.d/README.org

@ -90,7 +90,12 @@ If you don't care about these [[Startup][click here to skip over them]]. @@ -90,7 +90,12 @@ If you don't care about these [[Startup][click here to skip over them]].
"Path to my org files inside dropbox")
#+END_SRC
** Light Check
** Theme Checks
#+BEGIN_SRC emacs-lisp :tangle yes
(defvar wolfe/using-dark t
"Indicates whether we're using my dark theme")
#+END_SRC
#+BEGIN_SRC emacs-lisp :tangle yes
(defvar wolfe/using-light nil
@ -133,8 +138,10 @@ This should be run regardless of whether I'm in terminal vs gui or dark vs light @@ -133,8 +138,10 @@ This should be run regardless of whether I'm in terminal vs gui or dark vs light
#+BEGIN_SRC emacs-lisp :tangle yes
(setq custom-theme-directory "~/.emacs.d/themes")
(setq wolfe/using-light (member "-light" command-line-args))
(setq command-line-args (delete "-light" command-line-args))
(when (member "-light" command-line-args)
(setq wolfe/using-dark nil)
(setq wolfe/using-light t)
(setq command-line-args (delete "-light" command-line-args)))
#+END_SRC
** Dark

3
i3/.config/i3/config

@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
exec "xinput set-button-map 14 1 2 3 5 4 6 7 8 9 10 11 12"
exec "setxkbmap -option 'caps:ctrl_modifier'"
exec "setxkbmap -option compose:ralt"
exec "xcape -e 'Caps_Lock=Escape'"
exec "xsetroot -cursor_name left_ptr"
exec --no-startup-id dropbox start
@ -8,7 +9,6 @@ exec --no-startup-id ~/bin/battery_notify @@ -8,7 +9,6 @@ exec --no-startup-id ~/bin/battery_notify
exec --no-startup-id powertop --auto-tune
exec --no-startup-id tlp start
exec --no-startup-id xset r rate 225 30
#exec --no-startup-id ~/.config/i3/fibonacci.py
# Disable window borders
for_window [class="^.*"] border pixel 2
@ -80,6 +80,7 @@ floating_modifier $mod @@ -80,6 +80,7 @@ floating_modifier $mod
# start a terminal
bindsym $mod+Return exec urxvt
bindsym $mod+backslash exec emacs
bindsym $mod+Shift+backslash exec emacs -light
# kill focused window
bindsym $mod+Shift+q kill

Loading…
Cancel
Save