From 83af63c18e72de564696954d7d580745e69ffa97 Mon Sep 17 00:00:00 2001 From: Derek Taylor Date: Tue, 13 Oct 2020 19:35:02 -0500 Subject: [PATCH] Minor changes. --- .bashrc | 2 + .config/nvim/init.vim | 230 ---------------------------------- .config/qtile/config.py | 3 +- .doom.d/config.el | 72 ++++++++--- .doom.d/config.org | 118 +++++++++++------- .doom.d/packages.el | 6 +- .surf/styles/homepage.css | 3 +- .vimrc | 254 -------------------------------------- 8 files changed, 137 insertions(+), 551 deletions(-) delete mode 100644 .config/nvim/init.vim delete mode 100644 .vimrc diff --git a/.bashrc b/.bashrc index eee4795..107e82e 100644 --- a/.bashrc +++ b/.bashrc @@ -19,6 +19,8 @@ export MANPAGER="/bin/sh -c \"col -b | vim --not-a-term -c 'set ft=man ts=8 nomo ### SET VI MODE IN BASH SHELL set -o vi +bind -m vi-command 'Control-l: clear-screen' +bind -m vi-insert 'Control-l: clear-screen' # If not running interactively, don't do anything [[ $- != *i* ]] && return diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim deleted file mode 100644 index 0e926ea..0000000 --- a/.config/nvim/init.vim +++ /dev/null @@ -1,230 +0,0 @@ -" ____ _____ -" | _ \_ _| Derek Taylor (DistroTube) -" | | | || | http://www.youtube.com/c/DistroTube -" | |_| || | http://www.gitlab.com/dwt1/ -" |____/ |_| -" -" A customized init.vim for neovim (https://neovim.io/) - -set nocompatible " be iMproved, required -filetype off " required - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Vundle For Managing Plugins -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -call plug#begin('~/.vim/plugged') - -"{{ The Basics }} - Plug 'gmarik/Vundle.vim' " Vundle - Plug 'itchyny/lightline.vim' " Lightline statusbar - Plug 'suan/vim-instant-markdown', {'rtp': 'after'} " Markdown Preview - Plug 'frazrepo/vim-rainbow' -"{{ File management }} - Plug 'vifm/vifm.vim' " Vifm - Plug 'scrooloose/nerdtree' " Nerdtree - Plug 'tiagofumo/vim-nerdtree-syntax-highlight' " Highlighting Nerdtree - Plug 'ryanoasis/vim-devicons' " Icons for Nerdtree -"{{ Productivity }} - Plug 'vimwiki/vimwiki' " VimWiki - Plug 'jreybert/vimagit' " Magit-like plugin for vim -"{{ Tim Pope Plugins }} - Plug 'tpope/vim-surround' " Change surrounding marks -"{{ Syntax Highlighting and Colors }} - Plug 'PotatoesMaster/i3-vim-syntax' " i3 config highlighting - Plug 'kovetskiy/sxhkd-vim' " sxhkd highlighting - Plug 'vim-python/python-syntax' " Python highlighting - Plug 'ap/vim-css-color' " Color previews for CSS -"{{ Junegunn Choi Plugins }} - Plug 'junegunn/goyo.vim' " Distraction-free viewing - Plug 'junegunn/limelight.vim' " Hyperfocus on a range - Plug 'junegunn/vim-emoji' " Vim needs emojis! - -call plug#end() - -filetype plugin indent on " required -" To ignore plugin indent changes, instead use: -" filetype plugin on - -" Brief help -" :PluginList - lists configured plugins -" :PluginInstall - installs plugins; append `!` to update or just :PluginUpdate -" :PluginSearch foo - searches for foo; append `!` to refresh local cache -" :PluginClean - confirms removal of unused plugins; append `!` to auto-approve removal - -" see :h vundle for more details or wiki for FAQ -" Put your non-Plugin stuff after this line - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => General Settings -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -set path+=** " Searches current directory recursively. -set wildmenu " Display all matches when tab complete. -set incsearch " Incremental search -set hidden " Needed to keep multiple buffers open -set nobackup " No auto backups -set noswapfile " No swap -set t_Co=256 " Set if term supports 256 colors. -set number relativenumber " Display line numbers -set clipboard=unnamedplus " Copy/paste between vim and other programs. -syntax enable -let g:rehash256 = 1 - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Remap Keys -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Remap ESC to ii -:imap ii - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Status Line -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" The lightline.vim theme -let g:lightline = { - \ 'colorscheme': 'darcula', - \ } - -" Always show statusline -set laststatus=2 - -" Uncomment to prevent non-normal modes showing in powerline and below powerline. -set noshowmode - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Text, tab and indent related -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -set expandtab " Use spaces instead of tabs. -set smarttab " Be smart using tabs ;) -set shiftwidth=4 " One tab == four spaces. -set tabstop=4 " One tab == four spaces. - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => NERDTree -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Uncomment to autostart the NERDTree -" autocmd vimenter * NERDTree -map :NERDTreeToggle -let g:NERDTreeDirArrowExpandable = '►' -let g:NERDTreeDirArrowCollapsible = '▼' -let NERDTreeShowLineNumbers=1 -let NERDTreeShowHidden=1 -let NERDTreeMinimalUI = 1 -let g:NERDTreeWinSize=38 - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Colors and Theming -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -highlight LineNr ctermfg=8 ctermbg=none cterm=none -highlight CursorLineNr ctermfg=7 ctermbg=8 cterm=none -highlight VertSplit ctermfg=0 ctermbg=8 cterm=none -highlight Statement ctermfg=2 ctermbg=none cterm=none -highlight Directory ctermfg=4 ctermbg=none cterm=none -highlight StatusLine ctermfg=7 ctermbg=8 cterm=none -highlight StatusLineNC ctermfg=7 ctermbg=8 cterm=none -highlight NERDTreeClosable ctermfg=2 -highlight NERDTreeOpenable ctermfg=8 -highlight Comment ctermfg=4 ctermbg=none cterm=italic -highlight Constant ctermfg=12 ctermbg=none cterm=none -highlight Special ctermfg=4 ctermbg=none cterm=none -highlight Identifier ctermfg=6 ctermbg=none cterm=none -highlight PreProc ctermfg=5 ctermbg=none cterm=none -highlight String ctermfg=12 ctermbg=none cterm=none -highlight Number ctermfg=1 ctermbg=none cterm=none -highlight Function ctermfg=1 ctermbg=none cterm=none -" highlight WildMenu ctermfg=0 ctermbg=80 cterm=none -" highlight Folded ctermfg=103 ctermbg=234 cterm=none -" highlight FoldColumn ctermfg=103 ctermbg=234 cterm=none -" highlight DiffAdd ctermfg=none ctermbg=23 cterm=none -" highlight DiffChange ctermfg=none ctermbg=56 cterm=none -" highlight DiffDelete ctermfg=168 ctermbg=96 cterm=none -" highlight DiffText ctermfg=0 ctermbg=80 cterm=none -" highlight SignColumn ctermfg=244 ctermbg=235 cterm=none -" highlight Conceal ctermfg=251 ctermbg=none cterm=none -" highlight SpellBad ctermfg=168 ctermbg=none cterm=underline -" highlight SpellCap ctermfg=80 ctermbg=none cterm=underline -" highlight SpellRare ctermfg=121 ctermbg=none cterm=underline -" highlight SpellLocal ctermfg=186 ctermbg=none cterm=underline -" highlight Pmenu ctermfg=251 ctermbg=234 cterm=none -" highlight PmenuSel ctermfg=0 ctermbg=111 cterm=none -" highlight PmenuSbar ctermfg=206 ctermbg=235 cterm=none -" highlight PmenuThumb ctermfg=235 ctermbg=206 cterm=none -" highlight TabLine ctermfg=244 ctermbg=234 cterm=none -" highlight TablineSel ctermfg=0 ctermbg=247 cterm=none -" highlight TablineFill ctermfg=244 ctermbg=234 cterm=none -" highlight CursorColumn ctermfg=none ctermbg=236 cterm=none -" highlight CursorLine ctermfg=none ctermbg=236 cterm=none -" highlight ColorColumn ctermfg=none ctermbg=236 cterm=none -" highlight Cursor ctermfg=0 ctermbg=5 cterm=none -" highlight htmlEndTag ctermfg=114 ctermbg=none cterm=none -" highlight xmlEndTag ctermfg=114 ctermbg=none cterm=none - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Vifm -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -map vv :Vifm -map vs :VsplitVifm -map sp :SplitVifm -map dv :DiffVifm -map tv :TabVifm - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => VimWiki -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let g:vimwiki_list = [{'path': '~/vimwiki/', - \ 'syntax': 'markdown', 'ext': '.md'}] - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Vim-Instant-Markdown -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let g:instant_markdown_autostart = 0 " Turns off auto preview -let g:instant_markdown_browser = "surf" " Uses surf for preview -map md :InstantMarkdownPreview " Previews .md file -map ms :InstantMarkdownStop " Kills the preview - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Open terminal inside Vim -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -map tt :vnew term://fish - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Mouse Scrolling -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -set mouse=nicr - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Splits and Tabbed Files -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -set splitbelow splitright - -" Remap splits navigation to just CTRL + hjkl -nnoremap h -nnoremap j -nnoremap k -nnoremap l - -" Make adjusing split sizes a bit more friendly -noremap :vertical resize +3 -noremap :vertical resize -3 -noremap :resize +3 -noremap :resize -3 - -" Change 2 split windows from vert to horiz or horiz to vert -map th tH -map tk tK - -" Removes pipes | that act as seperators on splits -set fillchars+=vert:\ - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Other Stuff -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let g:python_highlight_all = 1 - -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/.config/qtile/config.py b/.config/qtile/config.py index 5d4af05..6776d62 100644 --- a/.config/qtile/config.py +++ b/.config/qtile/config.py @@ -388,8 +388,9 @@ def init_widgets_list(): background = colors[4], fontsize = 14 ), - widget.Pacman( + widget.CheckUpdates( update_interval = 1800, + distro = 'Arch', foreground = colors[2], mouse_callbacks = {'Button1': lambda qtile: qtile.cmd_spawn(myTerm + ' -e sudo pacman -Syu')}, background = colors[4] diff --git a/.doom.d/config.el b/.doom.d/config.el index bd17666..06b52e6 100644 --- a/.doom.d/config.el +++ b/.doom.d/config.el @@ -1,25 +1,37 @@ (setq doom-font (font-spec :family "SauceCodePro Nerd Font" :size 15) doom-variable-pitch-font (font-spec :family "SauceCodePro Nerd Font" :size 15) - doom-big-font (font-spec :family "SauceCodePro Nerd Font" :size 24) -) + doom-big-font (font-spec :family "SauceCodePro Nerd Font" :size 24)) (setq doom-theme 'doom-one) +(map! :leader + :desc "Load new theme" + "h t" #'counsel-load-theme) (after! org - (setq org-directory "~/Documents/org/") - (setq org-agenda-files '("~/Documents/org/agenda.org")) - ;;(setq org-log-done 'time) - (setq org-log-done 'note) - (setq org-todo-keywords '((sequence "TODO(t)" "PROJ(p)" "VIDEO(v)" "WAIT(w)" "|" "DONE(d)" "CANCELLED(c)" ))) + (setq org-directory "~/Org/" + org-agenda-files '("~/Org/agenda.org") + org-log-done 'time + ;; ex. of org-link-abbrev-alist in action + ;; [[arch-wiki:Name_of_Page][Description]] + org-link-abbrev-alist + '(("google" . "http://www.google.com/search?q=") + ("arch-wiki" . "https://wiki.archlinux.org/index.php/") + ("ddg" . "https://duckduckgo.com/?q=") + ("wiki" . "https://en.wikipedia.org/wiki/")) + org-todo-keywords '((sequence "TODO(t)" "PROJ(p)" "VIDEO(v)" "WAIT(w)" "|" "DONE(d)" "CANCELLED(c)" ))) + ;; Nicer bullets in org-mode (require 'org-bullets) - (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))) -) + (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))) (setq display-line-numbers-type t) -(global-set-key "\C-x\ t" 'toggle-truncate-lines) +(map! :leader + :desc "Toggle truncate lines" + "l t" #'toggle-truncate-lines) (setq neo-window-fixed-size nil) +(require 'ox-groff) + (setq browse-url-browser-function 'eww-browse-url) (defun prefer-horizontal-split () @@ -27,10 +39,37 @@ (set-variable 'split-width-threshold 40 t)) ; make this as low as needed (add-hook 'markdown-mode-hook 'prefer-horizontal-split) +(setq centaur-tabs-set-bar 'over + centaur-tabs-set-icons t + centaur-tabs-gray-out-icons 'buffer + centaur-tabs-height 24 + centaur-tabs-set-modified-marker t + centaur-tabs-style "bar" + centaur-tabs-modified-marker "•") +(map! :leader + :desc "Toggle tabs on/off" + "t o" #'centaur-tabs-local-mode + :leader + :desc "Switch tab groups" + "t s" #'centaur-tabs-counsel-switch-group + :leader + :desc "Toggle tab groups" + "t t" #'centaur-tabs-toggle-groups + :leader + :desc "Kill all buffers in group" + "t k" #'centaur-tabs-kill-all-buffer-in-current-group + :leader + :desc "Next tab" + "t n" #'centaur-tabs-forward + :leader + :desc "Previous tab" + "t p" #'centaur-tabs-backward) + (map! (:after dired (:map dired-mode-map - "C-x i" #'peep-dired + :leader + "l i" #'peep-dired ))) (evil-define-key 'normal peep-dired-mode-map (kbd "j") 'peep-dired-next-file (kbd "k") 'peep-dired-prev-file) @@ -77,8 +116,7 @@ smtpmail-smtp-service 587) (after! mastodon - (setq mastodon-instance-url "https://mastodon.technology/") -) + (setq mastodon-instance-url "https://mastodon.technology/")) (setq md4rd-subs-active '(archlinux commandline DistroTube DoomEmacs emacs freesoftware lbry linux linux4noobs linuxmasterrace linnuxquestions orgmode qutebrowser suckless Ubuntu unixporn UsabilityPorn vim xmonad)) @@ -99,10 +137,4 @@ ("https://www.techrepublic.com/rssfeeds/topic/open-source/" techrepublic linux) ("https://betanews.com/feed" betanews linux) ("http://lxer.com/module/newswire/headlines.rss" lxer linux) - ("https://distrowatch.com/news/dwd.xml" distrowatch linux)))) - '(package-selected-packages - (quote - (mastodon exwm peep-dired nav-flash evil-mu4e emms elfeed)))) - -(custom-set-faces - ) + ("https://distrowatch.com/news/dwd.xml" distrowatch linux))))) diff --git a/.doom.d/config.org b/.doom.d/config.org index eb45070..453c452 100644 --- a/.doom.d/config.org +++ b/.doom.d/config.org @@ -2,60 +2,74 @@ #+AUTHOR: Derek Taylor (DT) #+STARTUP: showeverything -** FONTS +* FONTS Doom exposes five (optional) variables for controlling fonts in Doom. Here are the three important ones: -+ `doom-font' -+ `doom-variable-pitch-font' -+ `doom-big-font' -- used for `doom-big-font-mode'; use this for - presentations or streaming. ++ `doom-font' -- standard monospace font that is used for most things in Emacs. ++ `doom-variable-pitch-font' -- variable font which is useful in some Emacs plugins. ++ `doom-big-font' -- used in `doom-big-font-mode'; useful for presentations. #+BEGIN_SRC emacs-lisp (setq doom-font (font-spec :family "SauceCodePro Nerd Font" :size 15) doom-variable-pitch-font (font-spec :family "SauceCodePro Nerd Font" :size 15) - doom-big-font (font-spec :family "SauceCodePro Nerd Font" :size 24) -) + doom-big-font (font-spec :family "SauceCodePro Nerd Font" :size 24)) #+END_SRC -** DOOM THEME +* DOOM THEME #+BEGIN_SRC emacs-lisp (setq doom-theme 'doom-one) +(map! :leader + :desc "Load new theme" + "h t" #'counsel-load-theme) #+END_SRC -** ORG MODE +* ORG MODE Note that I wrapped everything in (after! org). Without this, my settings might be evaluated too early, which will result in my settings being overwritten by Doom's defaults. #+BEGIN_SRC emacs-lisp (after! org - (setq org-directory "~/Documents/org/") - (setq org-agenda-files '("~/Documents/org/agenda.org")) - ;;(setq org-log-done 'time) - (setq org-log-done 'note) - (setq org-todo-keywords '((sequence "TODO(t)" "PROJ(p)" "VIDEO(v)" "WAIT(w)" "|" "DONE(d)" "CANCELLED(c)" ))) + (setq org-directory "~/Org/" + org-agenda-files '("~/Org/agenda.org") + org-log-done 'time + ;; ex. of org-link-abbrev-alist in action + ;; [[arch-wiki:Name_of_Page][Description]] + org-link-abbrev-alist + '(("google" . "http://www.google.com/search?q=") + ("arch-wiki" . "https://wiki.archlinux.org/index.php/") + ("ddg" . "https://duckduckgo.com/?q=") + ("wiki" . "https://en.wikipedia.org/wiki/")) + org-todo-keywords '((sequence "TODO(t)" "PROJ(p)" "VIDEO(v)" "WAIT(w)" "|" "DONE(d)" "CANCELLED(c)" ))) + ;; Nicer bullets in org-mode (require 'org-bullets) - (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))) -) + (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))) #+END_SRC -** LINE SETTINGS +* LINE SETTINGS #+BEGIN_SRC emacs-lisp (setq display-line-numbers-type t) -(global-set-key "\C-x\ t" 'toggle-truncate-lines) +(map! :leader + :desc "Toggle truncate lines" + "l t" #'toggle-truncate-lines) #+END_SRC -** NEOTREE +* NEOTREE Setting the neotree width to be adjustable. #+BEGIN_SRC emacs-lisp (setq neo-window-fixed-size nil) #+END_SRC -** BROWSER (eww) -Set urls to open in a specific browser. +* MANPAGES +#+BEGIN_SRC emacs-lisp +(require 'ox-groff) +#+END_SRC + +* BROWSER (eww) +Set urls to open in a specific browser. I set this to use Emacs' own browser (eww). #+BEGIN_SRC emacs-lisp (setq browse-url-browser-function 'eww-browse-url) #+END_SRC -** SPLITS +* SPLITS Force splits to open on the right #+BEGIN_SRC emacs-lisp (defun prefer-horizontal-split () @@ -64,20 +78,51 @@ Force splits to open on the right (add-hook 'markdown-mode-hook 'prefer-horizontal-split) #+END_SRC -** FILE MANAGER (dired) +* TABS (centaur-tabs) +To use tabs in Doom Emacs, be sure to uncomment "tabs" in Doom's init.el. Displays tabs at the top of the window similar to tabbed web browsers such as Firefox. I don't actually use tabs in Emacs. I placed this in my config to help others who may want tabs. In the default configuration of Doom Emacs, there are just a few keybindings that use SPC-t, so it wasn't too difficult to find appropriate keybindings using that prefix for "tabs". +#+BEGIN_SRC emacs-lisp +(setq centaur-tabs-set-bar 'over + centaur-tabs-set-icons t + centaur-tabs-gray-out-icons 'buffer + centaur-tabs-height 24 + centaur-tabs-set-modified-marker t + centaur-tabs-style "bar" + centaur-tabs-modified-marker "•") +(map! :leader + :desc "Toggle tabs on/off" + "t o" #'centaur-tabs-local-mode + :leader + :desc "Switch tab groups" + "t s" #'centaur-tabs-counsel-switch-group + :leader + :desc "Toggle tab groups" + "t t" #'centaur-tabs-toggle-groups + :leader + :desc "Kill all buffers in group" + "t k" #'centaur-tabs-kill-all-buffer-in-current-group + :leader + :desc "Next tab" + "t n" #'centaur-tabs-forward + :leader + :desc "Previous tab" + "t p" #'centaur-tabs-backward) +#+END_SRC + +* FILE MANAGER (dired) Image previews in dired #+BEGIN_SRC emacs-lisp (map! (:after dired (:map dired-mode-map - "C-x i" #'peep-dired + :leader + "l i" #'peep-dired ))) (evil-define-key 'normal peep-dired-mode-map (kbd "j") 'peep-dired-next-file (kbd "k") 'peep-dired-prev-file) (add-hook 'peep-dired-hook 'evil-normalize-keymaps) #+END_SRC -** AUDIO PLAYER (emms) +* AUDIO PLAYER (emms) #+BEGIN_SRC emacs-lisp (use-package emms :ensure t @@ -99,7 +144,7 @@ Image previews in dired (emms-playing-time 1)) #+END_SRC -** EMAIL CLIENT (mu4e) +* EMAIL CLIENT (mu4e) Setting up mu4e which is an email client that works within emacs. You must install mu4e and mbsync through your Linux distribution's package manager. Setting up smtp for sending mail. Make sure the gnutls command @@ -128,18 +173,19 @@ Image previews in dired smtpmail-smtp-service 587) #+END_SRC -** MASTODON CLIENT (mastodon) +* MASTODON CLIENT (mastodon) Note that I wrapped my settings with (after! mastodon). Without this, my settings will be overwritten by the default settings for this module, which is "mastodon.social". #+BEGIN_SRC emacs-lisp (after! mastodon - (setq mastodon-instance-url "https://mastodon.technology/") -) + (setq mastodon-instance-url "https://mastodon.technology/")) #+END_SRC +* REDDIT CLIENT (md4rd) #+BEGIN_SRC emacs-lisp (setq md4rd-subs-active '(archlinux commandline DistroTube DoomEmacs emacs freesoftware lbry linux linux4noobs linuxmasterrace linnuxquestions orgmode qutebrowser suckless Ubuntu unixporn UsabilityPorn vim xmonad)) #+END_SRC +* RSS READER (elfeed) #+BEGIN_SRC emacs-lisp (custom-set-variables '(elfeed-feeds @@ -158,17 +204,5 @@ Note that I wrapped my settings with (after! mastodon). Without this, my setting ("https://www.techrepublic.com/rssfeeds/topic/open-source/" techrepublic linux) ("https://betanews.com/feed" betanews linux) ("http://lxer.com/module/newswire/headlines.rss" lxer linux) - ("https://distrowatch.com/news/dwd.xml" distrowatch linux)))) - '(package-selected-packages - (quote - (mastodon exwm peep-dired nav-flash evil-mu4e emms elfeed)))) -#+END_SRC - -custom-set-faces was added by Custom. -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. -#+BEGIN_SRC emacs-lisp -(custom-set-faces - ) + ("https://distrowatch.com/news/dwd.xml" distrowatch linux))))) #+END_SRC diff --git a/.doom.d/packages.el b/.doom.d/packages.el index 764e6b3..6f81b01 100644 --- a/.doom.d/packages.el +++ b/.doom.d/packages.el @@ -48,14 +48,16 @@ ;(unpin! pinned-package another-pinned-package) ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) ;(unpin! t) -(package! evil-tutor) +(package! dmenu) +(package! elfeed) (package! emms) (package! emojify) -(package! elfeed) +(package! evil-tutor) (package! mastodon) (package! md4rd) (package! org-bullets) (package! peep-dired) +(package! rainbow-mode) (package! tldr) (package! treemacs) (package! wc-mode) diff --git a/.surf/styles/homepage.css b/.surf/styles/homepage.css index 1cda254..6f0b59e 100644 --- a/.surf/styles/homepage.css +++ b/.surf/styles/homepage.css @@ -3,7 +3,7 @@ @import url('https://fonts.googleapis.com/css?family=Anton'); body { - background-color: #292d3e; + background-color: #282c34; margin: 0px; } @@ -19,7 +19,6 @@ body { #clock { font-family: sans-serif; font-size: 4.0rem; - font-weight: 600; font-family: "Anton"; color: #fff; margin-bottom: .25em; diff --git a/.vimrc b/.vimrc deleted file mode 100644 index 626d5b1..0000000 --- a/.vimrc +++ /dev/null @@ -1,254 +0,0 @@ -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Vundle For Managing Plugins -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -set nocompatible " be iMproved, required -filetype off " required - -" set the runtime path to include Vundle and initialize -set rtp+=~/.vim/bundle/Vundle.vim - -call vundle#begin() " required, all plugins must appear after this line. - -Plugin 'gmarik/Vundle.vim' " Vundle -Plugin 'itchyny/lightline.vim' " Lightline statusbar -Plugin 'vifm/vifm.vim' -Plugin 'vimwiki/vimwiki' " Vim wiki -Plugin 'scrooloose/nerdtree' " added nerdtree -Plugin 'tiagofumo/vim-nerdtree-syntax-highlight' -Plugin 'ryanoasis/vim-devicons' -Plugin 'frazrepo/vim-rainbow' -Plugin 'vim-python/python-syntax' -Plugin 'jreybert/vimagit' -Plugin 'severin-lemaignan/vim-minimap' -Plugin 'ap/vim-css-color' " Color previews for CSS -Plugin 'tpope/vim-surround' " Change surrounding marks - -call vundle#end() " required, all plugins must appear before this line. - -filetype plugin indent on " required -" To ignore plugin indent changes, instead use: -"filetype plugin on - -" Brief help -" :PluginList - lists configured plugins -" :PluginInstall - installs plugins; append `!` to update or just :PluginUpdate -" :PluginSearch foo - searches for foo; append `!` to refresh local cache -" :PluginClean - confirms removal of unused plugins; append `!` to auto-approve removal - -" see :h vundle for more details or wiki for FAQ -" Put your non-Plugin stuff after this line - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Remap Keys -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -"Remap ESC to ii -:imap ii - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Powerline -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let g:lightline = { - \ 'colorscheme': 'darcula', - \ } - -" Always show statusline -set laststatus=2 - -" Use 256 colours (Use this setting only if your terminal supports 256 colours) -set t_Co=256 - -syntax enable -set number relativenumber -let g:rehash256 = 1 - -" Uncomment to prevent non-normal modes showing in powerline and below powerline. -set noshowmode - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Text, tab and indent related -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Use spaces instead of tabs -set expandtab - -" Be smart when using tabs ;) -set smarttab - -" 1 tab == 4 spaces -set shiftwidth=4 -set tabstop=4 - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => NERDTree -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Uncomment to autostart the NERDTree -" autocmd vimenter * NERDTree -map :NERDTreeToggle -let g:NERDTreeDirArrowExpandable = '►' -let g:NERDTreeDirArrowCollapsible = '▼' -let NERDTreeShowLineNumbers=1 -let NERDTreeShowHidden=1 -let NERDTreeMinimalUI = 1 -let g:NERDTreeWinSize=38 - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Colors -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - highlight LineNr ctermfg=8 ctermbg=none cterm=none - highlight CursorLineNr ctermfg=7 ctermbg=8 cterm=none - highlight VertSplit ctermfg=0 ctermbg=8 cterm=none - highlight Statement ctermfg=2 ctermbg=none cterm=none - highlight Directory ctermfg=4 ctermbg=none cterm=none - highlight StatusLine ctermfg=7 ctermbg=8 cterm=none - highlight StatusLineNC ctermfg=7 ctermbg=8 cterm=none - highlight NERDTreeClosable ctermfg=2 - highlight NERDTreeOpenable ctermfg=8 - highlight Comment ctermfg=4 ctermbg=none cterm=none - highlight Constant ctermfg=12 ctermbg=none cterm=none - highlight Special ctermfg=4 ctermbg=none cterm=none - highlight Identifier ctermfg=6 ctermbg=none cterm=none - highlight PreProc ctermfg=5 ctermbg=none cterm=none - highlight String ctermfg=12 ctermbg=none cterm=none - highlight Number ctermfg=1 ctermbg=none cterm=none - highlight Function ctermfg=1 ctermbg=none cterm=none -" highlight WildMenu ctermfg=0 ctermbg=80 cterm=none -" highlight Folded ctermfg=103 ctermbg=234 cterm=none -" highlight FoldColumn ctermfg=103 ctermbg=234 cterm=none -" highlight DiffAdd ctermfg=none ctermbg=23 cterm=none -" highlight DiffChange ctermfg=none ctermbg=56 cterm=none -" highlight DiffDelete ctermfg=168 ctermbg=96 cterm=none -" highlight DiffText ctermfg=0 ctermbg=80 cterm=none -" highlight SignColumn ctermfg=244 ctermbg=235 cterm=none -" highlight Conceal ctermfg=251 ctermbg=none cterm=none -" highlight SpellBad ctermfg=168 ctermbg=none cterm=underline -" highlight SpellCap ctermfg=80 ctermbg=none cterm=underline -" highlight SpellRare ctermfg=121 ctermbg=none cterm=underline -" highlight SpellLocal ctermfg=186 ctermbg=none cterm=underline -" highlight Pmenu ctermfg=251 ctermbg=234 cterm=none -" highlight PmenuSel ctermfg=0 ctermbg=111 cterm=none -" highlight PmenuSbar ctermfg=206 ctermbg=235 cterm=none -" highlight PmenuThumb ctermfg=235 ctermbg=206 cterm=none -" highlight TabLine ctermfg=244 ctermbg=234 cterm=none -" highlight TablineSel ctermfg=0 ctermbg=247 cterm=none -" highlight TablineFill ctermfg=244 ctermbg=234 cterm=none -" highlight CursorColumn ctermfg=none ctermbg=236 cterm=none -" highlight CursorLine ctermfg=none ctermbg=236 cterm=none -" highlight ColorColumn ctermfg=none ctermbg=236 cterm=none -" highlight Cursor ctermfg=0 ctermbg=5 cterm=none -" highlight htmlEndTag ctermfg=114 ctermbg=none cterm=none -" highlight xmlEndTag ctermfg=114 ctermbg=none cterm=none - - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Vifm -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -map vv :Vifm -map vs :VsplitVifm -map sp :SplitVifm -map dv :DiffVifm -map tv :TabVifm - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => VimWiki -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let g:vimwiki_list = [{'path': '~/vimwiki/', - \ 'syntax': 'markdown', 'ext': '.md'}] - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Mouse Scrolling -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -set mouse=nicr - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Splits and Tabbed Files -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -set splitbelow splitright - -set path+=** " Searches current directory recursively. -set wildmenu " Display all matches when tab complete. -set incsearch -set nobackup -set noswapfile - -let g:minimap_highlight='Visual' - -let g:python_highlight_all = 1 - -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 - - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Removes pipes | that act as seperators on splits -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -set fillchars+=vert:\ - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -"=> Trailing spaces -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -function! CleanExtraSpaces() "Function to clean unwanted spaces - let save_cursor = getpos(".") - let old_query = getreg('/') - silent! %s/\s\+$//e - call setpos('.', save_cursor) - call setreg('/', old_query) -endfun - - -autocmd BufWritePre * :call CleanExtraSpaces() - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -"=> Convert text to UTF-8 -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -setglobal termencoding=utf-8 fileencodings= -scriptencoding utf-8 -set encoding=utf-8 - -autocmd BufNewFile,BufRead * try -autocmd BufNewFile,BufRead * set encoding=utf-8 -autocmd BufNewFile,BufRead * endtry - -"Going over all of this would take too much time -"This basically set everything in utf-8 in every circumtances - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -"=> Convert to UNIX fileformat (avoid CRLF) -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -set fileformat=unix -"Set every files as Unix (LF) as Windows might set CRLF wich is not working -"for unix - - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -"=> Ignore 'useless' extensions for wildmenu -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -set wildignore+=*.a,*.o,*.so,*.pyc,.git -set wildignore+=*.jpg,*.png,*.gif,*.bmp,*.ico,*.pdf -set wildignore+=*.tmp,*.swp - -"Tell NerdTree and Popup windows ignore thoses - - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -"Set Vim Language -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -let $LANG='en' -"Setting env LANG var to english - -set langmenu=en -"Setting menu language to en - -source $VIMRUNTIME/delmenu.vim -source $VIMRUNTIME/menu.vim -"Sourcing evrything ("don't why but you need to do it) -