commit 5c08a2cd7286c47d08c2e738f8a4e1b37a8e516d
parent 120839199a2ffda28c7e7803ba5e5001e72e1a5b
Author: jacobsGit <JacobDoesLinux@protonmail.com>
Date: Wed, 18 Dec 2019 14:14:59 -0800
dotfiles
Diffstat:
9 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/dunst/.config/dunst/dunstrc b/dunst/.config/dunst/dunstrc
@@ -5,7 +5,7 @@
# mouse, keyboard or none
follow = mouse
- geometry = "600x5-0+20"
+ geometry = "600x5-0+18"
# Show how many messages are currently hidden (because of geometry).
indicate_hidden = yes
diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc
@@ -1,15 +1,18 @@
# sxkhd config
shift + alt + Return
- kitty
+ "$TERMINAL" -e tmux -2u
+
+shift + alt + k
+ "$TERMINAL"
shift + alt + m
- kitty -e ncmpcpp
+ "$TERMINAL" -e ncmpcpp
shift + alt + s
- kitty -e htop
+ "$TERMINAL" -e htop
shift + alt + f
- firefox
+ "$BROWSER"
shift + alt + r
dmenu_run -p run: -nb black -fn 'xft:Bitstream Vera Sans Mono:size=11:normal:antialias=true'
@@ -35,10 +38,11 @@ XF86AudioMute
alt + F{1,2,3,4}
sudo chvt {1,2,3,4}
-{Menu,alt + i}
- wallpaper
+Menu
+ sxiv -tb "${WALLPAPERS}"/*
super + s
screenshot && flash
+
alt + shift + q
wmctrl -c :ACTIVE:
diff --git a/vim/.vimrc b/vim/.vimrc
@@ -60,6 +60,11 @@ noremap <Down> <nop>
noremap <Left> <nop>
noremap <Right> <nop>
+noremap <PageUp> <nop>
+noremap <PageDown> <nop>
+noremap <Home> <nop>
+noremap <End> <nop>
+
inoremap <Up> <nop>
inoremap <Down> <nop>
inoremap <Left> <nop>
diff --git a/xinitrc-laptop/.xinitrc b/xinitrc-laptop/.xinitrc
@@ -36,7 +36,7 @@ export PATH
#}}}
$HOME/bin/color-sync #14
xsetroot -xcf ~/.icons/Quintom/cursors/left_ptr 1 & # cursor
-xwallpaper --zoom $HOME/media/wallpaper/wallpaper.* # wallpaper
+xwallpaper --zoom $HOME/.wallpaper # wallpaper
# xcompmgr & # compositing
dunst & # notifications
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.errors b/xmonad/.xmonad/xmonad.errors
@@ -14,26 +14,26 @@ xmonad.hs:41:42: warning: [-Wdeprecations]
41 | gaps [(L,0), (R,0), (U,0), (D,0)] $ spacing 0 $ Tall 1 (3/100) (1/2) |||
| ^^^^^^^
-xmonad.hs:80:101: warning: [-Wdeprecations]
+xmonad.hs:82:101: warning: [-Wdeprecations]
In the use of `defaultConfig'
(imported from XMonad, but defined in XMonad.Config):
Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
|
-80 | [((myModMask , k), (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_o, xK_p ]]++
+82 | [((myModMask , k), (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_o, xK_p ]]++
| ^^^^^^^^^^^^^
-xmonad.hs:81:131: warning: [-Wdeprecations]
+xmonad.hs:83:131: warning: [-Wdeprecations]
In the use of `defaultConfig'
(imported from XMonad, but defined in XMonad.Config):
Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
|
-81 | [((mod4Mask , k), (windows $ S.shift i ) >> (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_o, xK_p ]
+83 | [((mod4Mask , k), (windows $ S.shift i ) >> (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_o, xK_p ]
| ^^^^^^^^^^^^^
-xmonad.hs:97:78: warning: [-Wdeprecations]
+xmonad.hs:99:78: warning: [-Wdeprecations]
In the use of `defaultConfig'
(imported from XMonad, but defined in XMonad.Config):
Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
|
-97 | myManageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook defaultConfig
+99 | myManageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook defaultConfig
| ^^^^^^^^^^^^^
diff --git a/xmonad/.xmonad/xmonad.hs b/xmonad/.xmonad/xmonad.hs
@@ -32,7 +32,7 @@ myPP = xmobarPP { ppCurrent = xmobarColor "#000000" "#dddddd" . wrap " " " "
, ppWsSep = " "
, ppSep = ""
, ppTitle = xmobarColor "#000000" "" . shorten 0
- , ppLayout = xmobarColor "#000000" ""}
+ , ppLayout = xmobarColor "#000000" "" . shorten 0}
@@ -66,15 +66,17 @@ myKeys conf = M.fromList $
-- gaps --
, ((myModMask .|. controlMask, xK_minus), (incWindowSpacing 8))
, ((myModMask .|. controlMask, xK_equal), (decWindowSpacing 8))
- , ((mod4Mask .|. myModMask .|. controlMask, xK_minus), (incWindowSpacing 8) >> (sendMessage $ IncGap 45 R) >> (sendMessage $ IncGap 45 L))
- , ((mod4Mask .|. myModMask .|. controlMask, xK_equal), (decWindowSpacing 8) >> (sendMessage $ DecGap 45 R) >> (sendMessage $ DecGap 45 L))
- , ((myModMask .|. controlMask, xK_0), (sendMessage $ ToggleGaps) >> (toggleWindowSpacingEnabled))
+ , ((mod4Mask .|. myModMask .|. controlMask, xK_minus), (incWindowSpacing 8) >> (sendMessage $ IncGap 25 R) >> (sendMessage $ IncGap 25 L))
+ , ((mod4Mask .|. myModMask .|. controlMask, xK_equal), (decWindowSpacing 8) >> (sendMessage $ DecGap 25 R) >> (sendMessage $ DecGap 25 L))
-- left/right --
, ((myModMask .|. controlMask, xK_bracketleft), (sendMessage $ IncGap 150 R) >> (sendMessage $ DecGap 150 L))
, ((myModMask .|. controlMask, xK_bracketright), (sendMessage $ DecGap 150 R) >> (sendMessage $ IncGap 150 L))
, ((myModMask .|. controlMask, xK_bracketright), (sendMessage $ DecGap 150 R) >> (sendMessage $ IncGap 150 L))
-- reset --
+ , ((mod4Mask .|. myModMask .|. controlMask, xK_0 ), (sendMessage $ ToggleGaps) >> (toggleWindowSpacingEnabled))
+ , ((myModMask .|. controlMask, xK_0), (sendMessage $ ToggleGaps) >> (toggleWindowSpacingEnabled))
, ((myModMask .|. controlMask, xK_backslash), (setScreenWindowSpacing 0) >> (sendMessage $ setGaps [(L,0), (R,0), (U,0), (D,0)]))
+ , ((mod4Mask .|. myModMask .|. controlMask, xK_backslash), (setScreenWindowSpacing 0) >> (sendMessage $ setGaps [(L,0), (R,0), (U,0), (D,0)]))
]++
-- workspaces --
[((myModMask , k), (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_o, xK_p ]]++
diff --git a/xmonad/.xmonad/xmonad.o b/xmonad/.xmonad/xmonad.o
Binary files differ.
diff --git a/zsh/.zshrc b/zsh/.zshrc
@@ -1,5 +1,5 @@
# vim: foldmethod=marker
-
+source "$HOME/.profile"
#> completion {{{
alias ls='ls --color=always --group-directories-first'
autoload
@@ -16,12 +16,12 @@ compinit
# }}}
#> global variables {{{
-[[ -f ~/.shell-alias ]] && . ~/.shell-alias
PATH=$HOME/bin:$PATH
PATH=$HOME/projects/projects.bin:$PATH
PATH=$HOME/.xmobar:$PATH
export PATH
+export TERMINAL='st'
export EDITOR='vim'
# }}}
@@ -63,8 +63,7 @@ key[ShiftTab]="${terminfo[kcbt]}"
[[ -n "${key[Ctrl+Backspace]}" ]] && bindkey -- "${key[Crtl+Backspace]}" delete-word
[[ -n "${key[Ctrl+Backspace]}" ]] && bindkey -- "${key[Crtl+Backspace]}" delete-word
-# Finally, make sure the terminal is in application mode, when zle is
-# active. Only then are the values from $terminfo valid.
+
if (( ${+terminfo[smkx]} && ${+terminfo[rmkx]} )); then
autoload -Uz add-zle-hook-widget
function zle_application_mode_start {
@@ -111,12 +110,14 @@ SAVEHIST=1000
bindkey -M isearch " " magic-space # normal space during searches
# end
-
+ alias mv='mv --no-clobber'
+ alias cp='cp --no-clobber'
+ ealias diff=' diff -Naur'
alias suspend='systemctl suspend'
alias hibernate='systemctl hibernate'
alias restart='sudo systemctl restart'
+ function background() { "$@ &" ; disown }
- alias diff='diff --color'
alias pacman='pacman-colors'
alias ls='ls --color=always --group-directories-first'
@@ -195,3 +196,9 @@ ZSH_HIGHLIGHT_PATTERNS=('sudo' 'fg=white,bold')
zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
# }}}
+
+#>extra {{{
+_trap_exit() { tmux kill-session -t $$; }
+trap _trap_exit EXIT
+
+#}}}
