diff --git a/.bashrc b/.bashrc index a0650ad..1a79776 100644 --- a/.bashrc +++ b/.bashrc @@ -152,6 +152,7 @@ alias cp="cp -i" # confirm before overwriting something alias df='df -h' # human-readable sizes alias free='free -m' # show sizes in MB alias lynx='lynx -cfg=~/.lynx/lynx.cfg -lss=~/.lynx/lynx.lss -vikeys' +alias vifm='./.config/vifm/scripts/vifmrun' # the terminal rickroll alias rr='curl -s -L https://raw.githubusercontent.com/keroserene/rickrollrc/master/roll.sh | bash' diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 0e5e33e..b527d87 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -10,7 +10,7 @@ --]] --- {{{ Required libraries +-- {{{ libraries local awesome, client, mouse, screen, tag = awesome, client, mouse, screen, tag local ipairs, string, os, table, tostring, tonumber, type = ipairs, string, os, table, tostring, tonumber, type diff --git a/.config/qtile/config.py b/.config/qtile/config.py index 2f852ef..230e355 100644 --- a/.config/qtile/config.py +++ b/.config/qtile/config.py @@ -162,7 +162,7 @@ def init_keys(): ### Dmenu Run Launcher Key( ["mod1", "control"], "Return", - lazy.spawn("dmenu_run -fn 'UbuntuMono Nerd Font:size=10' -nb '#292d3e' -nf '#bbc5ff' -sb '#82AAFF' -sf '#292d3e' -p 'dmenu:'") + lazy.spawn("dmenu_run -fn 'UbuntuMono Nerd Font:size=10' -nb '#282a36' -nf '#ffffff' -sb '#bd93f9' -sf '#282a36' -p 'dmenu:'") ), ### Dmenu scripts launched with ALT + CTRL + KEY @@ -246,15 +246,15 @@ def init_keys(): ##### BAR COLORS ##### def init_colors(): - return [["#292D3E", "#292D3E"], # panel background + return [["#282a36", "#282a36"], # panel background ["#434758", "#434758"], # background for current screen tab - ["#D0D0D0", "#D0D0D0"], # font color for group names - ["#F07178", "#F07178"], # background color for layout widget + ["#ffffff", "#ffffff"], # font color for group names + ["#ff5555", "#ff5555"], # background color for layout widget ["#000000", "#000000"], # background for other screen tabs - ["#AD69AF", "#AD69AF"], # dark green gradiant for other screen tabs - ["#C3E88D", "#C3E88D"], # background color for network widget - ["#C792EA", "#C792EA"], # background color for pacman widget - ["#9CC4FF", "#9CC4FF"], # background color for cmus widget + ["#A77AC4", "#A77AC4"], # dark green gradiant for other screen tabs + ["#50fa7b", "#50fa7b"], # background color for network widget + ["#7197E7", "#7197E7"], # background color for pacman widget + ["#9AEDFE", "#9AEDFE"], # background color for cmus widget ["#000000", "#000000"], # background color for clock widget ["#434758", "#434758"]] # background color for systray widget @@ -281,7 +281,7 @@ def init_floating_layout(): def init_layout_theme(): return {"border_width": 2, - "margin": 10, + "margin": 4, "border_focus": "AD69AF", "border_normal": "1D2330" } @@ -325,7 +325,7 @@ def init_layouts(): def init_widgets_defaults(): return dict(font="Ubuntu Mono", - fontsize = 11, + fontsize = 12, padding = 2, background=colors[2]) @@ -349,8 +349,8 @@ def init_widgets_list(): inactive = colors[2], rounded = False, highlight_method = "block", - this_current_screen_border = colors[1], - this_screen_border = colors [4], + this_current_screen_border = colors[5], + this_screen_border = colors [1], other_current_screen_border = colors[0], other_screen_border = colors[0], foreground = colors[2], @@ -375,118 +375,123 @@ def init_widgets_list(): background = colors[0], padding = 5 ), - widget.Image( - scale = True, - filename = "~/.config/qtile/bar06.png", - background = colors[6] + widget.TextBox( + text='', + background = colors[0], + foreground = colors[5], + padding=0, + fontsize=37 ), widget.Systray( background=colors[10], padding = 5 ), - widget.Image( - scale = True, - filename = "~/.config/qtile/bar02-b.png", - background = colors[6] - ), widget.TextBox( text=" ↯", - foreground=colors[0], - background=colors[6], + foreground=colors[2], + background=colors[5], padding = 0, fontsize=14 ), widget.Net( - interface = "enp3s0", - foreground = colors[0], - background = colors[6], + interface = "enp4s0", + foreground = colors[2], + background = colors[5], padding = 5 ), - widget.Image( - scale = True, - filename = "~/.config/qtile/bar03.png", - background = colors[3] + widget.TextBox( + text='', + background = colors[5], + foreground = colors[7], + padding=0, + fontsize=37 ), widget.TextBox( font="Ubuntu Bold", text=" ☵", padding = 5, - foreground=colors[0], - background=colors[3], + foreground=colors[2], + background=colors[7], fontsize=14 ), widget.CurrentLayout( - foreground = colors[0], - background = colors[3], + foreground = colors[2], + background = colors[7], padding = 5 ), - widget.Image( - scale = True, - filename = "~/.config/qtile/bar04.png", - background = colors[7] + widget.TextBox( + text='', + background = colors[7], + foreground = colors[5], + padding=0, + fontsize=37 ), widget.TextBox( font="Ubuntu Bold", text=" ⟳", padding = 5, - foreground=colors[0], - background=colors[7], + foreground=colors[2], + background=colors[5], fontsize=14 ), widget.Pacman( execute = "urxvtc", update_interval = 1800, - foreground = colors[0], - background = colors[7] + foreground = colors[2], + background = colors[5] ), widget.TextBox( text="Updates", padding = 5, - foreground=colors[0], - background=colors[7] + foreground=colors[2], + background=colors[5] ), - widget.Image( - scale = True, - filename = "~/.config/qtile/bar05.png", - background = colors[8] + widget.TextBox( + text='', + background = colors[5], + foreground = colors[7], + padding=0, + fontsize=37 ), widget.TextBox( font="Ubuntu Bold", text=" ♫", padding = 5, - foreground=colors[0], - background=colors[8], + foreground=colors[2], + background=colors[7], fontsize=14 ), widget.Cmus( max_chars = 40, update_interval = 0.5, - foreground=colors[0], - background = colors[8] + foreground=colors[2], + background = colors[7] ), - widget.Image( - scale = True, - filename = "~/.config/qtile/bar07.png", - background = colors[9] + widget.TextBox( + text='', + background = colors[7], + foreground = colors[5], + padding=0, + fontsize=37 ), widget.TextBox( font="Ubuntu Bold", text=" 🕒", foreground=colors[2], - background=colors[9], + background=colors[5], padding = 5, fontsize=14 ), widget.Clock( foreground = colors[2], - background = colors[9], + background = colors[5], format="%A, %B %d - %H:%M" ), widget.Sep( linewidth = 0, padding = 5, foreground = colors[0], - background = colors[9] + background = colors[5] ), ] return widgets_list diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 36ad738..b5a2a23 100755 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -9,6 +9,13 @@ (require 'package) (require 'erc) +(add-to-list 'load-path "~/.emacs.d/evil") +(setq evil-want-integration t) ;; This is optional since it's already set to t by default. +(setq evil-want-keybinding nil) +(require 'evil) +(evil-mode 1) +(add-to-list 'load-path "~/emacs-libvterm") +(require 'vterm) (custom-set-variables ;; custom-set-variables was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -27,21 +34,48 @@ ("melpa-stable" . "http://stable.melpa.org/packages/")))) '(package-selected-packages (quote - (multi-term org-bullets undo-tree rainbow-mode pdf-tools emojify minimap lua-mode haskell-mode ##))) + (ipython-shell-send evil-collection goto-chg multi-term org-bullets undo-tree rainbow-mode pdf-tools emojify minimap lua-mode haskell-mode ##))) '(scroll-bar-mode nil) + '(send-mail-function (quote mailclient-send-it)) '(tool-bar-mode nil) '(tooltip-mode nil)) (package-initialize) (add-to-list 'load-path "/home/dt/.emacs.d/elpa/which-key-3.3.0/which-key.el") (require 'which-key) (which-key-mode) +(add-to-list 'load-path "/usr/local/share/emacs/site-lisp/mu4e") +(require 'mu4e) + +;; Fields that are auto-filled in email +(setq + user-mail-address "derek@distrotube.com" + user-full-name "Derek Taylor" + mu4e-compose-signature + (concat + "Derek Taylor\n" + "http://www.youtube.com/DistroTube\n")) + +;; sending mail -- replace USERNAME with your gmail username +;; also, make sure the gnutls command line utils are installed +;; package 'gnutls-bin' in Debian/Ubuntu +(require 'smtpmail) +(setq message-send-mail-function 'smtpmail-send-it + starttls-use-gnutls t + smtpmail-starttls-credentials '(("smtp.1and1.com" 587 nil nil)) + smtpmail-auth-credentials + '(("smtp.1and1.com" 587 "derek@distrotube.com" nil)) + smtpmail-default-smtp-server "smtp.1and1.com" + smtpmail-smtp-server "smtp.1and1.com" + smtpmail-smtp-service 587) +;; don't keep message buffers around +(setq message-kill-buffer-on-exit t) + (require 'rainbow-mode) (use-package rainbow-mode :ensure t :config (setq rainbow-x-colors nil) (add-hook 'prog-mode-hook 'rainbow-mode)) - (add-to-list 'custom-theme-load-path "~/.emacs.d/themes") (load-theme 'dracula t) (add-hook 'after-init-hook #'global-emojify-mode) @@ -50,8 +84,9 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(default ((t (:family "mononoki Nerd Font Mono" :foundry "UKWN" :slant normal :weight normal :height 120 :width normal))))) - + '(default ((t (:family "Mononoki Nerd Font Mono" :foundry "UKWN" :slant normal :weight normal :height 120 :width normal))))) +(when (require 'evil-collection nil t) + (evil-collection-init)) (require 'org-bullets) ;; (setq org-bullets-bullet-list '("☯" "○" "✸" "✿" "~")) (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))) @@ -63,3 +98,5 @@ ;;; Keybindings (global-set-key (kbd "C->") 'indent-rigidly-right-to-tab-stop) ; Indent selection by one tab length (global-set-key (kbd "C-<") 'indent-rigidly-left-to-tab-stop) ; De-indent selection by one tab length +(put 'upcase-region 'disabled nil) +(put 'downcase-region 'disabled nil) diff --git a/.vimrc b/.vimrc index 9e80c4b..559ecad 100644 --- a/.vimrc +++ b/.vimrc @@ -1,4 +1,3 @@ - """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => Vundle For Managing Plugins """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -17,6 +16,7 @@ Plugin 'vim-airline/vim-airline-themes' " Airline Themes Plugin 'scrooloose/nerdtree' " added nerdtree Plugin 'tiagofumo/vim-nerdtree-syntax-highlight' Plugin 'ryanoasis/vim-devicons' +Plugin 'dracula/vim', { 'name': 'dracula' } Plugin 'vim-python/python-syntax' Plugin 'jreybert/vimagit' Plugin 'severin-lemaignan/vim-minimap' @@ -70,7 +70,7 @@ set laststatus=2 " Use 256 colours (Use this setting only if your terminal supports 256 colours) " set t_Co=256 -syntax on +syntax enable set relativenumber let g:rehash256 = 1 let g:Powerline_symbols='unicode' @@ -149,3 +149,8 @@ syntax on au! BufRead,BufWrite,BufWritePost,BufNewFile *.org au BufEnter *.org call org#SetOrgFileType() + +set guioptions-=m "remove menu bar +set guioptions-=T "remove toolbar +set guioptions-=r "remove right-hand scroll bar +set guioptions-=L "remove left-hand scroll bar diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index 649955b..3df7a1b 100755 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -73,7 +73,7 @@ import XMonad.Prompt (defaultXPConfig, XPConfig(..), XPPosition(Top), Direction1 myFont = "xft:Mononoki Nerd Font:regular:pixelsize=12" myModMask = mod4Mask -- Sets modkey to super/windows key myTerminal = "st" -- Sets default terminal -myTextEditor = "vim" -- Sets default text editor +myTextEditor = "emacsclient -c" -- Sets default text editor myBorderWidth = 2 -- Sets border width for windows windowCount = gets $ Just . show . length . W.integrate' . W.stack . W.workspace . W.current . windowset diff --git a/new.sh b/new.sh index 8bb9698..3a42061 100755 --- a/new.sh +++ b/new.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +!/usr/bin/env bash # ____ _____ # | _ \_ _| Derek Taylor (DistroTube) # | | | || | http://www.youtube.com/c/DistroTube