commit 0f1ad5de45d2a01a9b418fb63bb2b04b4ce792f7
parent 9ef4c431b47d0ecbf876c1cf5623fff079b78c00
Author: jacobsGit <JacobDoesLinux@protonmail.com>
Date: Wed, 30 Oct 2019 13:31:37 -0700
cleaning up
Diffstat:
14 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/bash/.bashrc-alias b/bash/.bashrc-alias
@@ -13,9 +13,10 @@ function cdict() { curl "dict://dict.org/d:$1"; }
# lsd aliases
+alias ls='lsd --group-dirs last'
alias la='lsd --group-dirs last -A'
-alias ll='ls --group-dirs last -l'
-alias lr='ls --group-dirs last -R'
+alias ll='lsd --group-dirs last -l'
+alias lr='lsd --group-dirs last -R'
# other
diff --git a/htop/.config/htop/htoprc b/htop/.config/htop/htoprc
@@ -1,26 +0,0 @@
-# Beware! This file is rewritten by htop when settings are changed in the interface.
-# The parser is also very primitive, and not human-friendly.
-fields=46 47 0 1
-sort_key=46
-sort_direction=1
-hide_threads=0
-hide_kernel_threads=0
-hide_userland_threads=0
-shadow_other_users=0
-show_thread_names=0
-show_program_path=1
-highlight_base_name=0
-highlight_megabytes=1
-highlight_threads=1
-tree_view=0
-header_margin=1
-detailed_cpu_time=0
-cpu_count_from_zero=1
-update_process_names=0
-account_guest_in_cpu_meter=0
-color_scheme=6
-delay=15
-left_meters=LeftCPUs2 Blank Blank Memory Swap
-left_meter_modes=1 2 2 1 1
-right_meters=RightCPUs2 CPU Blank Tasks LoadAverage Uptime
-right_meter_modes=1 1 2 2 2 2
diff --git a/vim/.vim/.netrwhist b/vim/.vim/.netrwhist
@@ -1,5 +1,6 @@
let g:netrw_dirhistmax =10
-let g:netrw_dirhistcnt =3
+let g:netrw_dirhistcnt =4
+let g:netrw_dirhist_4='/home/jacob/dotfiles/vim'
let g:netrw_dirhist_3='/home/nas/dotfiles/vim'
let g:netrw_dirhist_2='/usr/home/bsd/.dotfiles'
let g:netrw_dirhist_1='/home/jacob-arco/.xmobar/scripts'
@@ -9,4 +10,3 @@ let g:netrw_dirhist_8='/usr/share/Komorebi/tux-parralax'
let g:netrw_dirhist_7='/home/jacob-arco/.sshsms'
let g:netrw_dirhist_6='/home/jacob-arco/.fluxbox/backgrounds'
let g:netrw_dirhist_5='/home/jacob-arco/.fluxbox'
-let g:netrw_dirhist_4='/home/jacob-arco/.config/xfce4/xfconf/xfce-perchannel-xml'
diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim
@@ -0,0 +1 @@
+Subproject commit b255382d6242d7ea3877bf059d2934125e0c4d95
diff --git a/vim/.vim/bundle/edge b/vim/.vim/bundle/edge
@@ -0,0 +1 @@
+Subproject commit 146aa8912f755e7050af6324684833673a3479f6
diff --git a/vim/.vim/bundle/molokai b/vim/.vim/bundle/molokai
@@ -0,0 +1 @@
+Subproject commit c67bdfcdb31415aa0ade7f8c003261700a885476
diff --git a/vim/.vim/bundle/onedark.vim b/vim/.vim/bundle/onedark.vim
@@ -0,0 +1 @@
+Subproject commit fe035976117ba5c2481df3b2cad3bb0a8b045b9f
diff --git a/vim/.vim/bundle/vim-bash b/vim/.vim/bundle/vim-bash
@@ -0,0 +1 @@
+Subproject commit 992d8e5f672fab5ff4a90f5730a9109a51293e0a
diff --git a/vim/.vim/bundle/vim-clang-format b/vim/.vim/bundle/vim-clang-format
@@ -0,0 +1 @@
+Subproject commit 95593b67723f23979cd7344ecfd049f2f917830f
diff --git a/vim/.vim/bundle/vim-css-color b/vim/.vim/bundle/vim-css-color
@@ -0,0 +1 @@
+Subproject commit 1f9fe5c1f9e0a6bfc41b14d070f4d878d445ae96
diff --git a/xmonad-laptop/.xmonad/xmonad-x86_64-linux b/xmonad-laptop/.xmonad/xmonad-x86_64-linux
Binary files differ.
diff --git a/xmonad-laptop/.xmonad/xmonad.errors b/xmonad-laptop/.xmonad/xmonad.errors
@@ -0,0 +1,32 @@
+
+xmonad.hs:22:16: 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."
+ |
+22 | myBaseConfig = defaultConfig
+ | ^^^^^^^^^^^^^
+
+xmonad.hs:80: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_a, xK_s, xK_d, xK_p]]++
+ | ^^^^^^^^^^^^^
+
+xmonad.hs:81: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_a, xK_s, xK_d, xK_p]]++
+ | ^^^^^^^^^^^^^
+
+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."
+ |
+82 | [((mod4Mask .|. shiftMask, k), (windows $ S.shift i )) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_p]
+ | ^^^^^^^^^^^^^
diff --git a/xmonad-laptop/.xmonad/xmonad.hi b/xmonad-laptop/.xmonad/xmonad.hi
Binary files differ.
diff --git a/xmonad-laptop/.xmonad/xmonad.o b/xmonad-laptop/.xmonad/xmonad.o
Binary files differ.