config

commit dd269922233a46dca6e00dfecaf8767033a8d2ea
parent d33affb3f704c33c68cc2aaf4e7e8ae0295e297e
Author: jacobsGit <JacobDoesLinux@protonmail.com>
Date:   Sat, 23 Nov 2019 19:52:00 -0800

Merge branch 'master' of https://github.com/jacobsGit/dotfiles

Diffstat:
M
alias/.shell-alias
 | 
3
++-
M
kitty/.config/kitty/kitty.conf
 | 
4
++--
M
vim/.vimrc
 | 
7
++++++-
M
xmonad/.xmonad/xmonad-x86_64-linux
 | 
0

M
xmonad/.xmonad/xmonad.hs
 | 
32
++++++++++++++++----------------
M
xmonad/.xmonad/xmonad.o
 | 
0

M
zsh/.zshrc
 | 
3
+--

7 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/alias/.shell-alias b/alias/.shell-alias
@@ -33,4 +33,5 @@ function tar-gz() { tar -xvzf $1;}
 function tar-xz() { tar -xvJf $1;}
 alias tmux='tmux -u'
 
-alias meta='exiv2'
+alias meta-img='exiv2'
+alias meta='exiftool'
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
@@ -460,7 +460,7 @@ inactive_tab_font_style normal
 #: Color scheme {{{
 
 foreground #c4c4c4
-background #111111
+background #101010
 
 #: The foreground and background colors
 
@@ -482,7 +482,7 @@ background_opacity 1
 #: change transparency of windows set dynamic_background_opacity to
 #: yes (this is off by default as it has a performance cost)
 
-dynamic_background_opacity yes
+dynamic_background_opacity no
 
 #: Allow changing of the background_opacity dynamically, using either
 #: keyboard shortcuts (increase_background_opacity and
diff --git a/vim/.vimrc b/vim/.vimrc
@@ -18,6 +18,10 @@ Plugin 'kovetskiy/vim-bash'
 
 Plugin 'ap/vim-css-color'
 Plugin 'm1foley/vim-expresso'
+" Plugin 'vim-airline/vim-airline'
+
+Plugin 'mbbill/undotree'
+Plugin 'severin-lemaignan/vim-minimap'
 call vundle#end()            " required
 filetype plugin indent on    " required
 
@@ -38,5 +42,6 @@ set incsearch
 set ignorecase
 set nowrap
 
+
 let &t_ut=''
-colorscheme edge  
+colorscheme edge
diff --git a/xmonad/.xmonad/xmonad-x86_64-linux b/xmonad/.xmonad/xmonad-x86_64-linux
Binary files differ.
diff --git a/xmonad/.xmonad/xmonad.hs b/xmonad/.xmonad/xmonad.hs
@@ -23,17 +23,14 @@ myModMask = mod1Mask
 
 
 myBorderWidth = 1
-myNormalBorderColor = "#000000"
-myFocusedBorderColor = "#333333"
+myNormalBorderColor =  "#000000"
+myFocusedBorderColor = "#252525"
 
 
 myWorkspaces = ["1:term","2:web","3:code","4:vm","5:media"] ++ map show [6..9]
 
 
 
-
-
-
 myLayoutHook = avoidStruts (
      Tall 1 (3/100) (1/2) |||
      noBorders (fullscreenFull Full)
@@ -43,7 +40,9 @@ myKeys conf = M.fromList $
     --
     -- Spawns
     [ ((myModMask .|. shiftMask     , xK_Return), spawn "kitty")
-    , ((myModMask .|. shiftMask     , xK_s     ), spawn "spotify")
+    , ((myModMask .|. shiftMask     , xK_s     ), spawn "kitty ncmpcpp")
+    , ((myModMask .|. shiftMask     , xK_h     ), spawn "kitty htop")
+--    , ((myModMask .|. shiftMask     , xK_s     ), spawn "spotify")
     , ((myModMask .|. shiftMask     , xK_f     ), spawn "firefox")
     , ((myModMask .|. shiftMask     , xK_r     ), spawn "dmenu_run -sf red -sb white -nf gray -nb black")
     , ((myModMask .|. shiftMask     , xK_q     ), kill)
@@ -51,24 +50,25 @@ myKeys conf = M.fromList $
     -- Basic Keys
     , ((controlMask, xK_Home), spawn "/home/jacob/bin/xbacklight-script inc")
     , ((controlMask, xK_End), spawn "/home/jacob/bin/xbacklight-script dec")
+    , ((myModMask .|. shiftMask    , xK_l      ), spawn "systemctl suspend")
     , ((0, 0x1008ff16), spawn "playerctl previous") 
     , ((0, 0x1008ff14), spawn "playerctl play-pause")
     , ((0, 0x1008ff17), spawn "playerctl next")
     --
     -- Window Controls
-    , ((myModMask                  , xK_space  ), sendMessage NextLayout)
     , ((myModMask .|. shiftMask    , xK_space  ), setLayout $ XMonad.layoutHook conf)
-    , ((myModMask                  , xK_n      ), refresh)
+    , ((myModMask                  , xK_space  ), sendMessage NextLayout)
+    , ((myModMask                  , xK_m      ), windows S.focusMaster)
+    , ((myModMask                  , xK_Return ), windows S.swapMaster)
     , ((myModMask                  , xK_Tab    ), windows S.focusDown)
-    , ((myModMask .|. shiftMask    , xK_Tab    ), windows S.focusUp)
     , ((myModMask                  , xK_j      ), windows S.focusDown)
-    , ((myModMask                  , xK_k      ), windows S.focusUp  )
-    , ((myModMask                  , xK_m      ), windows S.focusMaster  )
-    , ((myModMask                  , xK_Return ), windows S.swapMaster)
-    , ((myModMask .|. shiftMask    , xK_h      ), windows S.swapDown            )
-    , ((myModMask .|. shiftMask    , xK_l      ), windows S.swapUp              )
-    , ((myModMask                  , xK_j      ), sendMessage Shrink            )
-    , ((myModMask                  , xK_k      ), sendMessage Expand            )
+    , ((myModMask .|. shiftMask    , xK_Tab    ), windows S.focusUp)
+    , ((myModMask                  , xK_k      ), windows S.focusUp)
+--    , ((myModMask .|. shiftMask    , xK_h      ), windows S.swapDown)
+--    , ((myModMask .|. shiftMask    , xK_l      ), windows S.swapUp)
+    , ((myModMask                  , xK_j      ), sendMessage Shrink)
+    , ((myModMask                  , xK_k      ), sendMessage Expand)
+    , ((myModMask                  , xK_n      ), refresh)
     , ((myModMask                  , xK_t      ), withFocused $ windows . S.sink)
     , ((myModMask                  , xK_comma  ), sendMessage (IncMasterN 1))
     , ((myModMask                  , xK_period ), sendMessage (IncMasterN (-1)))
diff --git a/xmonad/.xmonad/xmonad.o b/xmonad/.xmonad/xmonad.o
Binary files differ.
diff --git a/zsh/.zshrc b/zsh/.zshrc
@@ -37,8 +37,7 @@ SAVEHIST=1000
 RPROMPT='%F{236}%T %F{237}%n@%M%f'
 
 # ext ansi
-PROMPT='
-%?%F{4}────[%f%F{109}%~%F{4}]%f
+PROMPT='%?%F{4}────[%f%F{109}%~%F{4}]%f
 %F{4}└──%f'
 
 # ansi