diff --git a/.bashrc b/.bashrc index b4f2338..d203f2d 100644 --- a/.bashrc +++ b/.bashrc @@ -8,7 +8,7 @@ PATH="$HOME/.local/bin${PATH:+:${PATH}}" EDITOR="nvim" -export TERM="st" +export TERM="st-256color" [[ $- != *i* ]] && return @@ -145,8 +145,8 @@ ex () alias doas="doas --" # navigation -alias ..='cd ..' \ - ...='cd ../..' +alias ..='cd ..' +alias ...='cd ../..' # vim alias vim=nvim diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index e2c89ea..7a07df0 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,34 +1,52 @@ -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Vundle For Managing Plugins -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" ____ _____ +" | _ \_ _| 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 +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + " 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 +"{{ The Basics }} + Plugin 'gmarik/Vundle.vim' " Vundle + Plugin 'itchyny/lightline.vim' " Lightline statusbar + Plugin 'suan/vim-instant-markdown', {'rtp': 'after'} " Markdown Preview + Plugin 'frazrepo/vim-rainbow' +"{{ File management }} + Plugin 'vifm/vifm.vim' " Vifm + Plugin 'scrooloose/nerdtree' " Nerdtree + Plugin 'tiagofumo/vim-nerdtree-syntax-highlight' " Highlighting Nerdtree + Plugin 'ryanoasis/vim-devicons' " Icons for Nerdtree +"{{ Productivity }} + Plugin 'vimwiki/vimwiki' " VimWiki + Plugin 'jreybert/vimagit' " Magit-like plugin for vim +"{{ Tim Pope Plugins }} + Plugin 'tpope/vim-surround' " Change surrounding marks +"{{ Syntax Highlighting and Colors }} + Plugin 'PotatoesMaster/i3-vim-syntax' " i3 config highlighting + Plugin 'kovetskiy/sxhkd-vim' " sxhkd highlighting + Plugin 'vim-python/python-syntax' " Python highlighting + Plugin 'ap/vim-css-color' " Color previews for CSS +"{{ Junegunn Choi Plugins }} + Plugin 'junegunn/goyo.vim' " Distraction-free viewing + Plugin 'junegunn/limelight.vim' " Hyperfocus on a range + Plugin 'junegunn/vim-emoji' " Vim needs emojis! 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 +" filetype plugin on " Brief help " :PluginList - lists configured plugins @@ -46,8 +64,9 @@ filetype plugin indent on " required :imap ii """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Powerline +" => Status Line """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" The lightline.vim theme let g:lightline = { \ 'colorscheme': 'darcula', \ } @@ -92,25 +111,25 @@ let NERDTreeMinimalUI = 1 let g:NERDTreeWinSize=38 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Colors +" => 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=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 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 @@ -138,6 +157,8 @@ let g:NERDTreeWinSize=38 " highlight htmlEndTag ctermfg=114 ctermbg=none cterm=none " highlight xmlEndTag ctermfg=114 ctermbg=none cterm=none +" Removes pipes | that act as seperators on splits +set fillchars+=vert:\ """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => Vifm @@ -154,6 +175,19 @@ map tv :TabVifm 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://bash + """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => Mouse Scrolling """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -170,8 +204,6 @@ set incsearch set nobackup set noswapfile -let g:minimap_highlight='Visual' - let g:python_highlight_all = 1 au! BufRead,BufWrite,BufWritePost,BufNewFile *.org @@ -182,9 +214,3 @@ 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:\ - diff --git a/.config/qtile/black-purple.png b/.config/qtile/black-purple.png new file mode 100644 index 0000000..82532e7 Binary files /dev/null and b/.config/qtile/black-purple.png differ diff --git a/.config/qtile/blue-black.png b/.config/qtile/blue-black.png new file mode 100644 index 0000000..2333f1d Binary files /dev/null and b/.config/qtile/blue-black.png differ diff --git a/.config/qtile/blue-purple.png b/.config/qtile/blue-purple.png new file mode 100644 index 0000000..7eae101 Binary files /dev/null and b/.config/qtile/blue-purple.png differ diff --git a/.config/qtile/config.py b/.config/qtile/config.py index 0b65af2..a99fbf8 100644 --- a/.config/qtile/config.py +++ b/.config/qtile/config.py @@ -39,186 +39,186 @@ myConfig = "/home/dt/.config/qtile/config.py" # The Qtile config file locatio ##### KEYBINDINGS ##### keys = [ - ### The essentials - Key( - [mod], "Return", - lazy.spawn(myTerm) # Open terminal - ), - Key( - [mod, "shift"], "Return", # Dmenu Run Launcher - lazy.spawn("dmenu_run -p 'Run: '") - ), - Key( - [mod], "Tab", - lazy.next_layout() # Toggle through layouts - ), - Key( - [mod, "shift"], "c", - lazy.window.kill() # Kill active window - ), - Key( - [mod, "shift"], "r", - lazy.restart() # Restart Qtile - ), - Key( - [mod, "shift"], "q", - lazy.shutdown() # Shutdown Qtile - ), - ### Switch focus to specific monitor (out of three) - Key([mod], "w", - lazy.to_screen(0) # Keyboard focus to screen(0) - ), - Key([mod], "e", - lazy.to_screen(1) # Keyboard focus to screen(1) - ), - Key([mod], "r", - lazy.to_screen(2) # Keyboard focus to screen(2) - ), - ### Switch focus of monitors - Key([mod], "period", - lazy.next_screen() # Move monitor focus to next screen - ), - Key([mod], "comma", - lazy.prev_screen() # Move monitor focus to prev screen - ), - ### Treetab controls - Key([mod, "control"], "k", - lazy.layout.section_up() # Move up a section in treetab - ), - Key([mod, "control"], "j", - lazy.layout.section_down() # Move down a section in treetab - ), - ### Window controls - Key( - [mod], "k", - lazy.layout.down() # Switch between windows in current stack pane - ), - Key( - [mod], "j", - lazy.layout.up() # Switch between windows in current stack pane - ), - Key( - [mod, "shift"], "k", - lazy.layout.shuffle_down() # Move windows down in current stack - ), - Key( - [mod, "shift"], "j", - lazy.layout.shuffle_up() # Move windows up in current stack - ), - Key( - [mod], "h", - lazy.layout.grow(), # Grow size of current window (XmonadTall) - lazy.layout.increase_nmaster(), # Increase number in master pane (Tile) - ), - Key( - [mod], "l", - lazy.layout.shrink(), # Shrink size of current window (XmonadTall) - lazy.layout.decrease_nmaster(), # Decrease number in master pane (Tile) - ), - Key( - [mod], "n", - lazy.layout.normalize() # Restore all windows to default size ratios - ), - Key( - [mod], "m", - lazy.layout.maximize() # Toggle a window between minimum and maximum sizes - ), - Key( - [mod, "shift"], "f", - lazy.window.toggle_floating() # Toggle floating - ), - ### Stack controls - Key( - [mod, "shift"], "space", - lazy.layout.rotate(), # Swap panes of split stack (Stack) - lazy.layout.flip() # Switch which side main pane occupies (XmonadTall) - ), - Key( - [mod], "space", - lazy.layout.next() # Switch window focus to other pane(s) of stack - ), - Key( - [mod, "control"], "Return", - lazy.layout.toggle_split() # Toggle between split and unsplit sides of stack - ), - ### Dmenu scripts launched with ALT + CTRL + KEY - Key( - ["mod1", "control"], "e", - lazy.spawn("./.dmenu/dmenu-edit-configs.sh") - ), - Key( - ["mod1", "control"], "m", - lazy.spawn("./.dmenu/dmenu-sysmon.sh") - ), - Key( - ["mod1", "control"], "p", - lazy.spawn("passmenu") - ), - Key( - ["mod1", "control"], "r", - lazy.spawn("./.dmenu/dmenu-reddio.sh") - ), - Key( - ["mod1", "control"], "s", - lazy.spawn("./.dmenu/dmenu-surfraw.sh") - ), - Key( - ["mod1", "control"], "t", - lazy.spawn("./.dmenu/dmenu-trading.sh") - ), - Key( - ["mod1", "control"], "i", - lazy.spawn("./.dmenu/dmenu-scrot.sh") - ), - ### My applications launched with SUPER + ALT + KEY - Key( - [mod, "mod1"], "l", - lazy.spawn(myTerm+" -e lynx gopher://distro.tube") - ), - Key( - [mod, "mod1"], "n", - lazy.spawn(myTerm+" -e newsboat") - ), - Key( - [mod, "mod1"], "r", - lazy.spawn(myTerm+" -e rtv") - ), - Key( - [mod, "mod1"], "e", - lazy.spawn(myTerm+" -e neomutt") - ), - Key( - [mod, "mod1"], "m", - lazy.spawn(myTerm+" -e sh ./scripts/toot.sh") - ), - Key( - [mod, "mod1"], "t", - lazy.spawn(myTerm+" -e sh ./scripts/tig-script.sh") - ), - Key( - [mod, "mod1"], "f", - lazy.spawn(myTerm+" -e sh ./.config/vifm/scripts/vifmrun") - ), - Key( - [mod, "mod1"], "j", - lazy.spawn(myTerm+" -e joplin") - ), - Key( - [mod, "mod1"], "c", - lazy.spawn(myTerm+" -e cmus") - ), - Key( - [mod, "mod1"], "i", - lazy.spawn(myTerm+" -e irssi") - ), - Key( - [mod, "mod1"], "y", - lazy.spawn(myTerm+" -e youtube-viewer") - ), - Key( - [mod, "mod1"], "a", - lazy.spawn(myTerm+" -e ncpamixer") - ), + ### The essentials + Key( + [mod], "Return", + lazy.spawn(myTerm) # Open terminal + ), + Key( + [mod, "shift"], "Return", # Dmenu Run Launcher + lazy.spawn("dmenu_run -p 'Run: '") + ), + Key( + [mod], "Tab", + lazy.next_layout() # Toggle through layouts + ), + Key( + [mod, "shift"], "c", + lazy.window.kill() # Kill active window + ), + Key( + [mod, "shift"], "r", + lazy.restart() # Restart Qtile + ), + Key( + [mod, "shift"], "q", + lazy.shutdown() # Shutdown Qtile + ), + ### Switch focus to specific monitor (out of three) + Key([mod], "w", + lazy.to_screen(0) # Keyboard focus to screen(0) + ), + Key([mod], "e", + lazy.to_screen(1) # Keyboard focus to screen(1) + ), + Key([mod], "r", + lazy.to_screen(2) # Keyboard focus to screen(2) + ), + ### Switch focus of monitors + Key([mod], "period", + lazy.next_screen() # Move monitor focus to next screen + ), + Key([mod], "comma", + lazy.prev_screen() # Move monitor focus to prev screen + ), + ### Treetab controls + Key([mod, "control"], "k", + lazy.layout.section_up() # Move up a section in treetab + ), + Key([mod, "control"], "j", + lazy.layout.section_down() # Move down a section in treetab + ), + ### Window controls + Key( + [mod], "k", + lazy.layout.down() # Switch between windows in current stack pane + ), + Key( + [mod], "j", + lazy.layout.up() # Switch between windows in current stack pane + ), + Key( + [mod, "shift"], "k", + lazy.layout.shuffle_down() # Move windows down in current stack + ), + Key( + [mod, "shift"], "j", + lazy.layout.shuffle_up() # Move windows up in current stack + ), + Key( + [mod], "h", + lazy.layout.grow(), # Grow size of current window (XmonadTall) + lazy.layout.increase_nmaster(), # Increase number in master pane (Tile) + ), + Key( + [mod], "l", + lazy.layout.shrink(), # Shrink size of current window (XmonadTall) + lazy.layout.decrease_nmaster(), # Decrease number in master pane (Tile) + ), + Key( + [mod], "n", + lazy.layout.normalize() # Restore all windows to default size ratios + ), + Key( + [mod], "m", + lazy.layout.maximize() # Toggle a window between minimum and maximum sizes + ), + Key( + [mod, "shift"], "f", + lazy.window.toggle_floating() # Toggle floating + ), + ### Stack controls + Key( + [mod, "shift"], "space", + lazy.layout.rotate(), # Swap panes of split stack (Stack) + lazy.layout.flip() # Switch which side main pane occupies (XmonadTall) + ), + Key( + [mod], "space", + lazy.layout.next() # Switch window focus to other pane(s) of stack + ), + Key( + [mod, "control"], "Return", + lazy.layout.toggle_split() # Toggle between split and unsplit sides of stack + ), + ### Dmenu scripts launched with ALT + CTRL + KEY + Key( + ["mod1", "control"], "e", + lazy.spawn("./.dmenu/dmenu-edit-configs.sh") + ), + Key( + ["mod1", "control"], "m", + lazy.spawn("./.dmenu/dmenu-sysmon.sh") + ), + Key( + ["mod1", "control"], "p", + lazy.spawn("passmenu") + ), + Key( + ["mod1", "control"], "r", + lazy.spawn("./.dmenu/dmenu-reddio.sh") + ), + Key( + ["mod1", "control"], "s", + lazy.spawn("./.dmenu/dmenu-surfraw.sh") + ), + Key( + ["mod1", "control"], "t", + lazy.spawn("./.dmenu/dmenu-trading.sh") + ), + Key( + ["mod1", "control"], "i", + lazy.spawn("./.dmenu/dmenu-scrot.sh") + ), + ### My applications launched with SUPER + ALT + KEY + Key( + [mod, "mod1"], "l", + lazy.spawn(myTerm+" -e lynx gopher://distro.tube") + ), + Key( + [mod, "mod1"], "n", + lazy.spawn(myTerm+" -e newsboat") + ), + Key( + [mod, "mod1"], "r", + lazy.spawn(myTerm+" -e rtv") + ), + Key( + [mod, "mod1"], "e", + lazy.spawn(myTerm+" -e neomutt") + ), + Key( + [mod, "mod1"], "m", + lazy.spawn(myTerm+" -e sh ./scripts/toot.sh") + ), + Key( + [mod, "mod1"], "t", + lazy.spawn(myTerm+" -e sh ./scripts/tig-script.sh") + ), + Key( + [mod, "mod1"], "f", + lazy.spawn(myTerm+" -e sh ./.config/vifm/scripts/vifmrun") + ), + Key( + [mod, "mod1"], "j", + lazy.spawn(myTerm+" -e joplin") + ), + Key( + [mod, "mod1"], "c", + lazy.spawn(myTerm+" -e cmus") + ), + Key( + [mod, "mod1"], "i", + lazy.spawn(myTerm+" -e irssi") + ), + Key( + [mod, "mod1"], "y", + lazy.spawn(myTerm+" -e youtube-viewer") + ), + Key( + [mod, "mod1"], "a", + lazy.spawn(myTerm+" -e ncpamixer") + ), ] ##### GROUPS ##### @@ -236,8 +236,7 @@ groups = [Group(name, **kwargs) for name, kwargs in group_names] for i, (name, kwargs) in enumerate(group_names, 1): keys.append(Key([mod], str(i), lazy.group[name].toscreen())) # Switch to another group - keys.append(Key([mod, "shift"], str(i), lazy.window.togroup(name))) # Send current window to another group - + keys.append(Key([mod, "shift"], str(i), lazy.window.togroup(name))) # Send current window to another group ##### DEFAULT THEME SETTINGS FOR LAYOUTS ##### layout_theme = {"border_width": 2, @@ -248,19 +247,18 @@ layout_theme = {"border_width": 2, ##### THE LAYOUTS ##### layouts = [ - layout.Max(), - layout.Stack(num_stacks=2), - #layout.MonadWide(**layout_theme), + #layout.MonadWide(**layout_theme), #layout.Bsp(**layout_theme), #layout.Stack(stacks=2, **layout_theme), #layout.Columns(**layout_theme), #layout.RatioTile(**layout_theme), #layout.VerticalTile(**layout_theme), - #layout.Tile(shift_windows=True, **layout_theme), #layout.Matrix(**layout_theme), #layout.Zoomy(**layout_theme), layout.MonadTall(**layout_theme), layout.Max(**layout_theme), + layout.Tile(shift_windows=True, **layout_theme), + layout.Stack(num_stacks=2), layout.TreeTab( font = "Ubuntu", fontsize = 10, @@ -282,13 +280,14 @@ layouts = [ colors = [["#282a36", "#282a36"], # panel background ["#434758", "#434758"], # background for current screen tab ["#ffffff", "#ffffff"], # font color for group names - ["#ff5555", "#ff5555"], # background color for layout widget - ["#A77AC4", "#A77AC4"], # dark green gradiant for other screen tabs - ["#7197E7", "#7197E7"]] # background color for pacman widget + ["#ff5555", "#ff5555"], # border line color for current tab + ["#8d62a9", "#8d62a9"], # border line color for other tab and odd widgets + ["#668bd7", "#668bd7"], # color for the even widgets + ["#e1acff", "#e1acff"]] # window name ##### PROMPT ##### prompt = "{0}@{1}: ".format(os.environ["USER"], socket.gethostname()) - + ##### DEFAULT WIDGET SETTINGS ##### widget_defaults = dict( font="Ubuntu Mono", @@ -310,17 +309,18 @@ def init_widgets_list(): ), widget.GroupBox(font="Ubuntu Bold", fontsize = 9, - margin_y = 0, + margin_y = 1, margin_x = 0, padding_y = 5, padding_x = 5, - borderwidth = 1, + borderwidth = 3, active = colors[2], inactive = colors[2], rounded = False, - highlight_method = "block", - this_current_screen_border = colors[4], - this_screen_border = colors [1], + highlight_color = colors[1], + highlight_method = "line", + this_current_screen_border = colors[3], + this_screen_border = colors [4], other_current_screen_border = colors[0], other_screen_border = colors[0], foreground = colors[2], @@ -335,25 +335,64 @@ def init_widgets_list(): ), widget.Sep( linewidth = 0, - padding = 10, + padding = 40, foreground = colors[2], background = colors[0] ), widget.WindowName( - foreground = colors[4], + foreground = colors[6], background = colors[0], + padding = 0 + ), + widget.Systray( + background=colors[0], padding = 5 ), - widget.TextBox( - text='', + widget.Image( + filename='/home/dt/.config/qtile/black-purple.png', background = colors[0], - foreground = colors[4], padding=0, - fontsize=37 + scale=0.7 + ), + widget.TextBox( + text=" ₿", + padding = 0, + foreground=colors[2], + background=colors[4], + fontsize=12 + ), + widget.BitcoinTicker( + foreground=colors[2], + background=colors[4], + padding = 5 + ), + widget.Image( + filename='/home/dt/.config/qtile/purple-blue.png', + background = colors[0], + padding=0, + scale=0.7 + ), + widget.TextBox( + text=" 🌡", + padding = 2, + foreground=colors[2], + background=colors[5], + fontsize=11 + ), + widget.ThermalSensor( + foreground=colors[2], + background=colors[5], + padding = 5 + ), + widget.Image( + filename='/home/dt/.config/qtile/blue-purple.png', + background = colors[0], + padding=0, + scale=0.7 ), widget.TextBox( text=" ⟳", - padding = 5, + padding = 2, foreground=colors[2], background=colors[4], fontsize=14 @@ -370,12 +409,11 @@ def init_widgets_list(): foreground=colors[2], background=colors[4] ), - widget.TextBox( - text='', - background = colors[4], - foreground = colors[5], + widget.Image( + filename='/home/dt/.config/qtile/purple-blue.png', + background = colors[0], padding=0, - fontsize=37 + scale=0.7 ), widget.TextBox( text=" 🖬", @@ -389,19 +427,11 @@ def init_widgets_list(): background = colors[5], padding = 5 ), - widget.TextBox( - text='', - background = colors[5], - foreground = colors[4], + widget.Image( + filename='/home/dt/.config/qtile/blue-purple.png', + background = colors[0], padding=0, - fontsize=37 - ), - widget.TextBox( - text=" ↯", - foreground=colors[2], - background=colors[4], - padding = 0, - fontsize=14 + scale=0.7 ), widget.Net( interface = "enp6s0", @@ -409,93 +439,63 @@ def init_widgets_list(): background = colors[4], padding = 5 ), - widget.TextBox( - text='', - background = colors[4], - foreground = colors[5], + widget.Image( + filename='/home/dt/.config/qtile/purple-blue.png', + background = colors[0], padding=0, - fontsize=37 + scale=0.7 ), widget.TextBox( - text=" ♫", - padding = 5, + text=" Vol:", foreground=colors[2], background=colors[5], - fontsize=14 - ), - widget.Cmus( - max_chars = 40, - update_interval = 0.5, - background=colors[5], - play_color = colors[2], - noplay_color = colors[2] - ), - widget.TextBox( - text='', - background = colors[5], - foreground = colors[4], - padding=0, - fontsize=37 - ), - widget.TextBox( - text=" 🔊", - foreground=colors[2], - background=colors[4], - padding = 0, - fontsize=14 + padding = 0 ), widget.Volume( foreground = colors[2], - background = colors[4], + background = colors[5], padding = 5 ), - widget.TextBox( - text='', - background = colors[4], - foreground = colors[5], + widget.Image( + filename='/home/dt/.config/qtile/blue-purple.png', + background = colors[0], padding=0, - fontsize=37 + scale=0.7 ), - widget.TextBox( - text=" ☵", - padding = 5, - foreground=colors[2], - background=colors[5], - fontsize=14 + widget.CurrentLayoutIcon( + custom_icon_paths=[os.path.expanduser("~/.config/qtile/icons")], + foreground = colors[0], + background = colors[4], + padding = 0, + scale=0.7 ), widget.CurrentLayout( foreground = colors[2], - background = colors[5], + background = colors[4], padding = 5 ), - widget.TextBox( - text='', - background = colors[5], - foreground = colors[4], + widget.Image( + filename='/home/dt/.config/qtile/purple-black.png', + background = colors[0], padding=0, - fontsize=37 - ), - widget.TextBox( - text=" 🕒", - foreground=colors[2], - background=colors[4], - padding = 5, - fontsize=14 - ), - widget.Clock( - foreground = colors[2], - background = colors[4], - format="%A, %B %d - %H:%M" + scale=0.7 ), widget.Sep( linewidth = 0, - padding = 5, + padding = 8, foreground = colors[0], - background = colors[4] + background = colors[0] ), - widget.Systray( - background=colors[0], - padding = 5 + widget.Clock( + foreground = colors[2], + background = colors[0], + format="%A, %B %d - [ %H:%M ]" + ), + widget.Sep( + linewidth = 0, + padding = 10, + foreground = colors[0], + background = colors[0] ), ] return widgets_list @@ -572,3 +572,4 @@ def start_once(): # We choose LG3D to maximize irony: it is a 3D non-reparenting WM written in # java that happens to be on java's whitelist. wmname = "LG3D" + diff --git a/.config/qtile/purple-black.png b/.config/qtile/purple-black.png new file mode 100644 index 0000000..cde8b14 Binary files /dev/null and b/.config/qtile/purple-black.png differ diff --git a/.config/qtile/purple-blue.png b/.config/qtile/purple-blue.png new file mode 100644 index 0000000..c853b68 Binary files /dev/null and b/.config/qtile/purple-blue.png differ diff --git a/.config/vifm/colors/Default.vifm b/.config/vifm/colors/distrotube.vifm similarity index 100% rename from .config/vifm/colors/Default.vifm rename to .config/vifm/colors/distrotube.vifm diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index 5c2cf22..ac5d5f1 100755 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -1,5 +1,8 @@ +" ____ _____ +" | _ \_ _| Derek Taylor (DistroTube) " | | | || | http://www.youtube.com/c/DistroTube " | |_| || | http://www.gitlab.com/dwt1/ +" |____/ |_| " |____/ |_| " vim: filetype=vifm : @@ -11,8 +14,7 @@ " Since emacs is a GUI app and not a terminal app like vim, append the command " with an ampersand (&). -" set vicmd=emacsclient\ -c\ & -set vicmd=vim +set vicmd=nvim " This makes vifm perform file operations on its own instead of relying on " standard utilities like `cp`. While using `cp` and alike is a more universal @@ -62,8 +64,9 @@ set novimhelp set norunexec " Selected color scheme - -colorscheme Default +" The following line will cause issues if using vifm.vim with regular vim. +" Either use neovim or comment out the following line. +colorscheme distrotube " Format for displaying time in file list. For example: " TIME_STAMP_FORMAT=%m/%d-%H:%M diff --git a/.dmenu/dmenu-edit-configs.sh b/.dmenu/dmenu-edit-configs.sh index 3ef8455..8112dae 100755 --- a/.dmenu/dmenu-edit-configs.sh +++ b/.dmenu/dmenu-edit-configs.sh @@ -21,14 +21,18 @@ dwm emacs.d/init.el herbstluftwm i3 +neovim polybar qtile st stumpwm +surf sxhkd +tabbed termite vifm vim +vimb xmobar xmonad xresources @@ -69,7 +73,7 @@ case "$choice" in choice="$HOME/.config/dunst/dunstrc" ;; dwm) - choice="$HOME/dwm/config.h" + choice="$HOME/dwm-distrotube/config.h" ;; emacs.d/init.el) choice="$HOME/.emacs.d/init.el" @@ -80,6 +84,9 @@ case "$choice" in i3) choice="$HOME/.i3/config" ;; + neovim) + choice="$HOME/.config/nvim/init.vim" + ;; polybar) choice="$HOME/.config/polybar/config" ;; @@ -87,14 +94,20 @@ case "$choice" in choice="$HOME/.config/qtile/config.py" ;; st) - choice="$HOME/st/config.h" + choice="$HOME/st-distrotube/config.h" ;; stumpwm) choice="$HOME/.config/stumpwm/config" ;; + surf) + choice="$HOME/surf-distrotube/config.h" + ;; sxhkd) choice="$HOME/.config/sxhkd/sxhkdrc" ;; + tabbed) + choice="$HOME/tabbed-distrotube/config.h" + ;; termite) choice="$HOME/.config/termite/config" ;; @@ -104,6 +117,9 @@ case "$choice" in vim) choice="$HOME/.vimrc" ;; + vimb) + choice="$HOME/.config/vimb/config" + ;; xmobar) choice="$HOME/.config/xmobar/xmobarrc2" ;; diff --git a/.vimrc b/.vimrc index e4331c8..7977f88 100644 --- a/.vimrc +++ b/.vimrc @@ -1,4 +1,3 @@ - """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => Vundle For Managing Plugins """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -13,16 +12,17 @@ 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 'vimwiki/vimwiki' " Vim wiki Plugin 'ap/vim-css-color' " Color previews for CSS Plugin 'tpope/vim-surround' " Change surrounding marks -"Plugin 'klen/python-mode' " Python Mode call vundle#end() " required, all plugins must appear before this line. @@ -59,7 +59,7 @@ set laststatus=2 set t_Co=256 syntax enable -set relativenumber +set number relativenumber let g:rehash256 = 1 " Uncomment to prevent non-normal modes showing in powerline and below powerline. @@ -84,18 +84,76 @@ set tabstop=4 " Uncomment to autostart the NERDTree " autocmd vimenter * NERDTree map :NERDTreeToggle -let g:NERDTreeDirArrowExpandable = '▸' -let g:NERDTreeDirArrowCollapsible = '▾' +let g:NERDTreeDirArrowExpandable = '►' +let g:NERDTreeDirArrowCollapsible = '▼' let NERDTreeShowLineNumbers=1 let NERDTreeShowHidden=1 let NERDTreeMinimalUI = 1 +let g:NERDTreeWinSize=38 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => Colors """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -colo default + 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 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -124,13 +182,10 @@ set guioptions-=T "remove toolbar set guioptions-=r "remove right-hand scroll bar set guioptions-=L "remove left-hand scroll bar -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Fixes mouse issues using Alacritty terminal -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -set ttymouse=sgr - """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => Removes pipes | that act as seperators on splits """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -:set fillchars+=vert:\ +set fillchars+=vert:\ + + diff --git a/.zshrc b/.zshrc index 449993a..8165b5c 100644 --- a/.zshrc +++ b/.zshrc @@ -4,6 +4,8 @@ # | |_| || | http://www.gitlab.com/dwt1/ # |____/ |_| +PATH="$HOME/.local/bin${PATH:+:${PATH}}" +EDITOR="nvim" export TERM="st-256color" # If you come from bash you might have to change your $PATH. @@ -16,18 +18,18 @@ ZSH=/usr/share/oh-my-zsh/ # load a random theme each time oh-my-zsh is loaded, in which case, # to know which specific one was loaded, run: echo $RANDOM_THEME # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes -# ZSH_THEME="powerlevel9k" -POWERLEVEL9K_CONTEXT_DEFAULT_BACKGROUND='5' -POWERLEVEL9K_CONTEXT_DEFAULT_FOREGROUND='0' -POWERLEVEL9K_STATUS_OK_BACKGROUND='8' -POWERLEVEL9K_VCS_CLEAN_BACKGROUND='11' -POWERLEVEL9K_VCS_UNTRACKED_BACKGROUND='8' -POWERLEVEL9K_VCS_MODIFIED_BACKGROUND='10' -POWERLEVEL9K_VCS_MAX_SYNC_LATENCY_SECONDS='0.05' -POWERLEVEL9K_VI_INSERT_MODE_STRING='INSERT' -POWERLEVEL9K_VI_COMMAND_MODE_STRING='NORMAL' +ZSH_THEME="distrotube" +# POWERLEVEL9K_CONTEXT_DEFAULT_BACKGROUND='5' +# POWERLEVEL9K_CONTEXT_DEFAULT_FOREGROUND='0' +# POWERLEVEL9K_STATUS_OK_BACKGROUND='8' +# POWERLEVEL9K_VCS_CLEAN_BACKGROUND='11' +# POWERLEVEL9K_VCS_UNTRACKED_BACKGROUND='8' +# POWERLEVEL9K_VCS_MODIFIED_BACKGROUND='10' +# POWERLEVEL9K_VCS_MAX_SYNC_LATENCY_SECONDS='0.05' +# POWERLEVEL9K_VI_INSERT_MODE_STRING='INSERT' +# POWERLEVEL9K_VI_COMMAND_MODE_STRING='NORMAL' # POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status history time) -POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=() +# POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=() ZLE_RPROMPT_INDENT=0 # Set list of themes to pick from when loading at random @@ -122,13 +124,23 @@ if [[ ! -d $ZSH_CACHE_DIR ]]; then fi source $ZSH/oh-my-zsh.sh -source ~/powerlevel10k/powerlevel10k.zsh-theme +# source ~/powerlevel10k/powerlevel10k.zsh-theme -# terminal rickroll! -alias rr='curl -s -L https://raw.githubusercontent.com/keroserene/rickrollrc/master/roll.sh | bash' +### ALIASES ### -# dotfile git alias -alias config='/usr/bin/git --git-dir=/home/dt/dotfiles --work-tree=/home/dt' +# root privileges +alias doas="doas --" + +# navigation +alias ..='cd ..' +alias ...='cd ../..' + +# vim +alias vim=nvim + +# broot +alias br='br -dhp' +alias bs='br --sizes' # Changing "ls" to "exa" alias ls='exa -al --color=always --group-directories-first' # my preferred listing @@ -136,24 +148,41 @@ alias la='exa -a --color=always --group-directories-first' # all files and dirs alias ll='exa -l --color=always --group-directories-first' # long format alias lt='exa -aT --color=always --group-directories-first' # tree listing +# adding flags alias cp="cp -i" # confirm before overwriting something alias df='df -h' # human-readable sizes -alias grep='grep --colour=auto' +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' -#alias lynx='lynx -cfg=~/.lynx/lynx.cfg -lss=~/.lynx/lynx.lss -vikeys' +# the terminal rickroll +alias rr='curl -s -L https://raw.githubusercontent.com/keroserene/rickrollrc/master/roll.sh | bash' -zstyle ':completion:*' completer _expand_alias _complete _ignored +# bare git repo alias for dotfiles +alias config="/usr/bin/git --git-dir=$HOME/dotfiles --work-tree=$HOME" + +# termbin alias tb="nc termbin.com 9999" -# alt+<- | alt+-> -bindkey "^[f" forward-word # deletes everything right of the prompt. -bindkey "^[b" backward-word # deletes characters one at a time, backwards. -# bindkey -v -bindkey '^R' history-incremental-search-backward +### SET VI MODE IN BASH SHELL +set -o vi +### SET VIM AS MANPAGER ### export MANPAGER="/bin/sh -c \"col -b | vim --not-a-term -c 'set ft=man ts=8 nomod nolist noma' -\"" -source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +### BASH POWERLINE ### +source ~/.bash-powerline.sh + +### BROOT ### source /home/dt/.config/broot/launcher/bash/br +### BASH INSULTER ### +if [ -f /etc/bash.command-not-found ]; then + . /etc/bash.command-not-found +fi + +### RANDOM COLOR SCRIPT ### +/opt/shell-color-scripts/colorscript.sh random + +### SETS VI MODE ### bindkey -v diff --git a/dwmblocks/blocks.h b/dwmblocks/blocks.h index db328c9..df3855f 100644 --- a/dwmblocks/blocks.h +++ b/dwmblocks/blocks.h @@ -3,7 +3,7 @@ static const Block blocks[] = { /*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/ {" 🐧 ", "kernel", 360, 2}, - {" ▲ ", "upt", 60, 2}, + {" 🔺 ", "upt", 60, 2}, {" 📦 ", "pacupdate", 360, 9}, diff --git a/dwmblocks/dwmblocks b/dwmblocks/dwmblocks index 304cd07..e8ec78a 100755 Binary files a/dwmblocks/dwmblocks and b/dwmblocks/dwmblocks differ