aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles <sircharlesaze@gmail.com>2020-03-13 18:17:19 +0100
committerCharles <sircharlesaze@gmail.com>2020-03-13 18:17:19 +0100
commitebb061bc953b647bc2944e4f203f2d3fd30d181d (patch)
treefd823835a2cc523edce76aa692f6f2da8fdbd57a
parenta07ae4a5994380a1a5f40823ce40ac8fd4e6644a (diff)
downloaddotfiles-ebb061bc953b647bc2944e4f203f2d3fd30d181d.tar.gz
dotfiles-ebb061bc953b647bc2944e4f203f2d3fd30d181d.tar.bz2
dotfiles-ebb061bc953b647bc2944e4f203f2d3fd30d181d.zip
xmonad fullscreen without borders
-rw-r--r--.vimrc2
-rw-r--r--.zsh_aliases9
-rw-r--r--grep.vim4
-rw-r--r--xmonad.hs32
4 files changed, 27 insertions, 20 deletions
diff --git a/.vimrc b/.vimrc
index ec90935..cc4fdad 100644
--- a/.vimrc
+++ b/.vimrc
@@ -94,6 +94,7 @@ nnoremap <C-J> <C-W><C-J>
nnoremap <C-K> <C-W><C-K>
nnoremap <C-L> <C-W><C-L>
nnoremap <C-H> <C-W><C-H>
+nnoremap <leader>s= <C-W>=
" }}}
" common {{{
@@ -166,6 +167,7 @@ autocmd BufReadPre * :normal zMzi
" filetype {{{
" real tab in c file for school projects
+autocmd BufReadPre,BufNewFile *.h,*.c set filetype=c
autocmd Filetype c setlocal noexpandtab
" vim fold method to marker
autocmd Filetype vim setlocal foldmethod=marker
diff --git a/.zsh_aliases b/.zsh_aliases
index 6644105..72b727f 100644
--- a/.zsh_aliases
+++ b/.zsh_aliases
@@ -18,7 +18,7 @@ alias sudo="sudo " # enable color (the search for aliases continues)
# ls
alias ll="ls -lFh"
alias la="ls -a"
-alias lla="ls -al"
+alias lla="ls -alh"
alias lss="ls -Ssh"
# tree
@@ -65,4 +65,9 @@ alias zshrc="vim $DOTFILES/.zshrc && source $DOTFILES/.zshrc"
alias zshaliasrc="vim $DOTFILES/.zsh_aliases && source $DOTFILES/.zshrc"
alias vimrc="vim $DOTFILES/.vimrc"
alias vimplugrc="vim $DOTFILES/.pluggins.vim"
-alias xmonadrc="vim $DOTFILES/xmonad.hs && cp $DOTFILES/xmonad.hs $HOME/.xmonad/xmonad.hs"
+alias xmonadrc="vim $DOTFILES/xmonad.hs"
+
+# parent directory jump
+alias ..='cd ..'
+alias ...='cd ../..'
+alias ....='cd ../../..'
diff --git a/grep.vim b/grep.vim
index 625dfa1..32181f7 100644
--- a/grep.vim
+++ b/grep.vim
@@ -19,9 +19,5 @@ function! s:GrepOp(type)
let @@ = saved
endfunction
-
-" nnoremap <leader>gw :silent grep -R <cword> .<CR>:copen<CR>
-" nnoremap <leader>gW :silent execute "grep! -R " . shellescape(expand("<cWORD>")) . " ."<CR>:copen<CR>
-
nnoremap <leader>gn :cnext<CR>
nnoremap <leader>gp :cprevious<CR>
diff --git a/xmonad.hs b/xmonad.hs
index d64f95b..99a35e8 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -5,28 +5,32 @@ import XMonad.Config.Desktop
import XMonad.Util.SpawnOnce
import XMonad.Util.EZConfig(additionalKeysP)
-myModMask = mod4Mask
-myTerminal = "konsole"
-myTextEditor = "vim"
-myBorderWidth = 2
+-- Layouts
+import XMonad.Layout.NoBorders
+
main = do
xmonad $ desktopConfig
- { modMask = myModMask
- , terminal = myTerminal
- , startupHook = myStartupHook
- , borderWidth = myBorderWidth
+ { modMask = mod4Mask -- mod key to super
+ , terminal = "konsole"
+ , borderWidth = 1
+ , focusFollowsMouse = False -- don't change window based on mouse position (need to click)
, normalBorderColor = "#292d3e"
, focusedBorderColor = "#bbc5ff"
+ , layoutHook = myLayouts
+ , startupHook = myStartupHook
} `additionalKeysP` myKeys
+myLayouts = tiled ||| Mirror tiled ||| noBorders Full
+ where tiled = Tall 1 (3 / 100) (3 / 5)
+
myStartupHook = do
spawnOnce "redshift -c /home/charles/.config/redshift.conf &"
spawnOnce "xinput disable 'ETPS/2 Elantech Touchpad' &"
-myKeys = [ ("<XF86AudioRaiseVolume>", spawn "pulseaudio-ctl up")
- , ("<XF86AudioLowerVolume>", spawn "pulseaudio-ctl down")
- , ("<XF86AudioMute>", spawn "pulseaudio-ctl mute")
- , ("<XF86MonBrightnessUp>", spawn "xbacklight -inc 5")
- , ("<XF86MonBrightnessDown>", spawn "xbacklight -dec 5")
- ]
+myKeys = [ ("<XF86AudioRaiseVolume>", spawn "pulseaudio-ctl up")
+ , ("<XF86AudioLowerVolume>", spawn "pulseaudio-ctl down")
+ , ("<XF86AudioMute>", spawn "pulseaudio-ctl mute")
+ , ("<XF86MonBrightnessUp>", spawn "xbacklight -inc 5")
+ , ("<XF86MonBrightnessDown>", spawn "xbacklight -dec 5")
+ ]