commit 6ff696e6d09e28ddecc2a9ef23d10a708c218c32
parent c5e4e38d6647b68ee0294aab751d06accb856e50
Author: jacob <jacobdoeslinux@protonmail.com>
Date: Mon, 4 Nov 2019 20:25:52 -0800
Merge branch 'master' of https://github.com/jacobsGit/dotfiles
Diffstat:
10 files changed, 98 insertions(+), 34 deletions(-)
diff --git a/kitty/.config/kitty/edge-dark.conf b/kitty/.config/kitty/edge-dark.conf
@@ -0,0 +1,18 @@
+foreground #b7bec9
+background #262729
+color0 #3e4249
+color8 #3e4249
+color1 #e77171
+color9 #e77171
+color2 #a1bf78
+color10 #a1bf78
+color3 #dbb774
+color11 #dbb774
+color4 #73b3e7
+color12 #73b3e7
+color5 #d390e7
+color13 #d390e7
+color6 #5ebaa5
+color14 #5ebaa5
+color7 #88909f
+color15 #88909f
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
@@ -434,7 +434,7 @@ tab_fade 0.25 0.5 0.75 1
#: can change the number of cells used by adding/removing entries to
#: this list.
-tab_separator " â"
+tab_separator " ÃÂâÃÂÃÂÃÂÃÂ"
#: The separator between tabs in the tab bar when using separator as
#: the tab_bar_style.
@@ -1054,5 +1054,4 @@ map kitty_mod+delete clear_terminal reset active
#: map ctrl+alt+a send_text application Word\x1bOH
#: }}}
-
# }}}
diff --git a/vim/.vimrc b/vim/.vimrc
@@ -8,13 +8,16 @@ call vundle#begin()
Plugin 'VundleVim/Vundle.vim'
" Plugins
-Plugin 'kovetskiy/vim-bash'
+Plugin 'junegunn/limelight.vim'
Plugin 'sainnhe/edge'
-Plugin 'tomasr/molokai'
-Plugin 'joshdick/onedark.vim'
+
Plugin 'rhysd/vim-clang-format'
-Plugin 'ap/vim-css-color'
+Plugin 'kovetskiy/vim-bash'
+Plugin 'plasticboy/vim-markdown'
+Plugin 'suan/vim-instant-markdown'
+Plugin 'ap/vim-css-color'
+"Plugin 'tomasr/molokai'
call vundle#end() " required
filetype plugin indent on " required
@@ -29,13 +32,12 @@ set number
set clipboard=unnamedplus
set mouse=""
-set tabstop=4
-set shiftwidth=4
-
-colo edge
+set tabstop=2
+set shiftwidth=2
set hlsearch
set incsearch
set ignorecase
set nowrap
-autocmd BufNewFile,BufRead ~/.xmobarrc set syntax=sh
+
+colorscheme desert
diff --git a/xmobar-laptop/.xmobar/xmobar.errors b/xmobar-laptop/.xmobar/xmobar.errors
@@ -0,0 +1,9 @@
+
+xmobar.hs:1:1: error:
+ Could not find module `Prelude'
+ There are files missing in the `base-4.12.0.0' package,
+ try running 'ghc-pkg check'.
+ Use -v to see a list of the files searched for.
+ |
+1 | -- xmobar config used by Vic Fryzel
+ | ^
diff --git a/xmonad-laptop/.xmonad/.xmobarrc b/xmonad-laptop/.xmonad/.xmobarrc
@@ -0,0 +1,48 @@
+Config {
+ --apearence
+ font = "xft:Bitstream Vera Sans Mono:size=10:bold:antialias=true"
+ , bgColor = "#000000"
+ , fgColor = "#ffffff"
+ , alpha = 255
+
+ --border
+ , border = NoBorder
+ , borderWidth = 0
+ , borderColor = "00ff00"
+
+
+ --positioning
+ , position = Top
+ , persistent = False
+ , lowerOnStart = True
+ , hideOnStart = False
+
+ --options
+ , textOffset = -1
+ , wmClass = "xmonad"
+ , wmName = "xmobar"
+ , pickBroadest = False
+ , iconRoot = "."
+ , allDesktops = True
+ , overrideRedirect = True
+
+ --launch
+ , commands = [
+ Run StdinReader
+ , Run Date "%R <fc=#545454>%A %b /%e</fc>" "date" 100
+ , Run BatteryP ["BAT0"]
+ [ "-t", "<fc=#545454><acstatus></fc> <fc=#ff8f8f><left></fc>%"
+ , "--", "-O", "AC"
+ , "-o", ""
+ , "-a", "systemctl suspend"
+ , "-A", "5"
+ ] 600
+ , Run ComX "XMBspotify" [""] "N/A" "spotify" 10
+ , Run ComX "XMBlastBackup" [""] "N/A" "backup" 300
+ , Run ComX "XMBpackages" [""] "N/A" "packages" 100
+ ]
+ , sepChar = "%"
+ , alignSep = "||"
+ , template = "%date% %StdinReader% | <fc=#1DB954>%spotify%</fc> | <fc=#787878>Backup</fc><fc=#454545> %backup%</fc> <fc=#787878>Packages</fc><fc=#454545> %packages%</fc> %battery% "
+ }
+
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
@@ -1,32 +1,32 @@
-xmonad.hs:22:16: warning: [-Wdeprecations]
+xmonad.hs:21: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
+21 | myBaseConfig = defaultConfig
| ^^^^^^^^^^^^^
-xmonad.hs:83:101: warning: [-Wdeprecations]
+xmonad.hs:74: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."
|
-83 | [((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]]++
+74 | [((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:84:131: warning: [-Wdeprecations]
+xmonad.hs:75: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."
|
-84 | [((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]]++
+75 | [((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:85:101: warning: [-Wdeprecations]
+xmonad.hs:76: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."
|
-85 | [((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]
+76 | [((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.hs b/xmonad-laptop/.xmonad/xmonad.hs
@@ -18,37 +18,29 @@ import XMonad.Layout.ThreeColumns
import qualified Data.Map as M
import qualified XMonad.StackSet as S
------------------------------------------
-
myBaseConfig = defaultConfig
myModMask = mod1Mask
--- Borders
myBorderWidth = 1
myNormalBorderColor = "#000000"
-myFocusedBorderColor = "#f3c300"
+myFocusedBorderColor = "#333333"
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))
-
-
-
myKeys conf = M.fromList $
--
-- Spawns
[ ((myModMask .|. shiftMask , xK_Return), spawn "kitty")
- , ((myModMask .|. shiftMask , xK_h ), spawn "kitty htop")
- , ((myModMask .|. shiftMask , xK_v ), spawn "kitty vim")
- , ((myModMask .|. shiftMask , xK_w ), spawn "kitty w3m")
, ((myModMask .|. shiftMask , xK_s ), spawn "spotify")
- , ((myModMask .|. shiftMask , xK_f ), spawn "firefox")
- , ((myModMask .|. shiftMask , xK_a ), spawn "pcmanfm")
+ , ((myModMask .|. shiftMask , xK_f ), spawn "qutebrowser")
, ((myModMask .|. shiftMask , xK_r ), spawn "dmenu_run -sf red -sb white -nf gray -nb black")
, ((myModMask .|. shiftMask , xK_q ), kill)
--
@@ -78,7 +70,6 @@ myKeys conf = M.fromList $
, ((myModMask , xK_q ), restart "xmonad" True)
]++
--
-
-- Workspaces
[((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]]++
[((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]]++
@@ -86,9 +77,6 @@ myKeys conf = M.fromList $
]
-
-
-
main = xmonad =<< xmobar myBaseConfig
{ modMask = myModMask
, borderWidth = myBorderWidth
diff --git a/xmonad-laptop/.xmonad/xmonad.o b/xmonad-laptop/.xmonad/xmonad.o
Binary files differ.
