From ab560d1cf953b98baba3ff399bf97c10db52f767 Mon Sep 17 00:00:00 2001 From: Derek Taylor Date: Tue, 12 May 2020 01:04:10 -0500 Subject: [PATCH] Pushing some dotfile edits. --- .Xresources | 9 +-- .config/awesome/rc.lua | 6 +- .config/nvim/init.vim | 4 +- .config/polybar/config | 35 ++++++------ .config/qtile/config.py | 6 +- .config/xmobar/xmobarrc0 | 14 +++-- .config/xmobar/xmobarrc1 | 14 +++-- .config/xmobar/xmobarrc2 | 14 +++-- .dmenu/dmenu-edit-configs.sh | 8 +++ .dmenu/dmenu-sysmon.sh | 6 +- .spectrwm.conf | 2 +- .xmonad/xmonad.hs | 7 ++- org-mode-basics-in-doom-emacs.org | 92 ------------------------------- 13 files changed, 70 insertions(+), 147 deletions(-) mode change 100755 => 100644 .xmonad/xmonad.hs delete mode 100644 org-mode-basics-in-doom-emacs.org diff --git a/.Xresources b/.Xresources index 51b3d37..569fc4c 100644 --- a/.Xresources +++ b/.Xresources @@ -37,13 +37,8 @@ URxvt*imLocale: en_US.UTF-8 URxvt*termName: rxvt-unicode-256color Urxvt*buffered: false URxvt.intensityStyles: false -URxvt.font: xft:UbuntuMono Nerd Font:size=13, \ - xft:Inconsolata Nerd Font Mono:size=13, \ - xft:DejaVuSansMono Nerd Font:size=13, \ - xft:DroidSansMono Nerd Font:size=13, \ - xft:FuraMono Nerd Font:size=13, \ - xft:RobotoMono Nerd Font:size=13, \ - xft:Noto Sans Mono:size=13, \ +URxvt.font: xft:Mononoki Nerd Font:size=13, \ + xft:JoyPixels:size=13, \ xft:Monospace:style=Medium:size=13 URxvt.saveLines: 2000 URxvt.scrollBar: false diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 7b872c0..9ff6d68 100755 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -110,7 +110,7 @@ local filemanager = "thunar" local mailclient = "geary" local mediaplayer = "vlc" local scrlocker = "slimlock" -local terminal = "st" +local terminal = "alacritty" local virtualmachine = "virtualbox" -- awesome variables @@ -477,8 +477,8 @@ globalkeys = my_table.join( {description = "delete tag", group = "tag"}), -- Standard program - awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end, - {description = terminal, group = "super"}), + awful.key({ modkey, }, "Return", function () awful.spawn( terminal.." -e fish" ) end, + {description = "terminal with fish shell", group = "super"}), awful.key({ modkey, "Shift" }, "r", awesome.restart, {description = "reload awesome", group = "awesome"}), awful.key({ modkey, "Shift" }, "q", function () awful.spawn.with_shell( '~/.dmenu/prompt "are you sure?" "killall awesome"' ) end, diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 95b4988..784198c 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -63,10 +63,12 @@ filetype plugin indent on " required 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 @@ -184,7 +186,7 @@ map ms :InstantMarkdownStop " Kills the preview """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => Open terminal inside Vim """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -map tt :vnew term://bash +map tt :vnew term://fish """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => Mouse Scrolling diff --git a/.config/polybar/config b/.config/polybar/config index 4723914..07c0928 100755 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -371,13 +371,13 @@ monitor = ${env:MONITOR} monitor-strict = false override-redirect = false width = 100% -height = 30 +height = 20 ;offset-x = 1% ;offset-y = 1% radius = 0.0 fixed-center = true bottom = false -separator = | +separator = background = ${colors.background} foreground = ${colors.foreground} @@ -395,23 +395,23 @@ border-color = #00000000 padding-left = 0 padding-right = 1 -module-margin-left = 3 -module-margin-right = 3 +module-margin-left = 0 +module-margin-right = 0 ; Enable support for inter-process messaging ; See the Messaging wiki page for more details. enable-ipc = true ;https://github.com/jaagr/polybar/wiki/Fonts -font-0 = "Noto Sans:size=10;0" -font-1 = "FontAwesome:size=13;0" -font-2 = "Noto Sans:size=10;0" -font-3 = "Noto Sans Mono:size=10;0" -font-4 = "FontAwesome5Brands:size=13;0" +font-0 = "UbuntuMono Nerd Font:size=10;2" +font-1 = "UbuntuMono Nerd Font:size=16;3" +font-2 = "Font Awesome 5 Free:style=Regular:pixelsize=8;1" +font-3 = "Font Awesome 5 Free:style=Solid:pixelsize=8;1" +font-4 = "Font Awesome 5 Brands:pixelsize=8;1" -modules-left = ewmh title-xmonad -modules-center = kernel -modules-right = pavolume memory2 cpu2 date +modules-left = xmonad +modules-center = +modules-right = arrow1 networkspeedup networkspeeddown arrow2 memory2 arrow3 cpu2 arrow2 pavolume arrow3 arch-aur-updates arrow2 date tray-detached = false tray-offset-x = 0 @@ -1201,7 +1201,7 @@ type = internal/network ;interface = wlp3s0 ;interface = enp14s0 ;interface = enp0s31f6 -interface = enp4s0 +interface = enp6s0 label-connected = "%upspeed:7%" format-connected = format-connected-prefix = " " @@ -1217,7 +1217,7 @@ type = internal/network ;interface = wlp3s0 ;interface = enp14s0 ;interface = enp0s31f6 -interface = enp4s0 +interface = enp6s0 label-connected = "%downspeed:7%" format-connected = format-connected-prefix = "  " @@ -1361,11 +1361,12 @@ label =  %output:0:150:% ################################################################################ -[module/title-xmonad] +[module/xmonad] type = custom/script -exec = tail -F /tmp/.xmonad-title-log -exec-if = [ -p /tmp/.xmonad-title-log ] +exec = xmonad-log tail = true +format-background = ${colors.background} +format-foreground = ${colors.foreground} ################################################################################ diff --git a/.config/qtile/config.py b/.config/qtile/config.py index 583aa41..8e2cc76 100644 --- a/.config/qtile/config.py +++ b/.config/qtile/config.py @@ -34,7 +34,7 @@ from typing import List # noqa: F401 ##### DEFINING SOME VARIABLES ##### mod = "mod4" # Sets mod key to SUPER/WINDOWS -myTerm = "st" # My terminal of choice +myTerm = "alacritty" # My terminal of choice myConfig = "/home/dt/.config/qtile/config.py" # The Qtile config file location ##### KEYBINDINGS ##### @@ -42,8 +42,8 @@ keys = [ ### The essentials Key( [mod], "Return", - lazy.spawn(myTerm), - desc='Launches Terminal' + lazy.spawn(myTerm+" -e fish"), + desc='Launches My Terminal With Fish Shell' ), Key( [mod, "shift"], "Return", diff --git a/.config/xmobar/xmobarrc0 b/.config/xmobar/xmobarrc0 index cca44ab..36ae26a 100755 --- a/.config/xmobar/xmobarrc0 +++ b/.config/xmobar/xmobarrc0 @@ -12,14 +12,16 @@ Config { font = "xft:Mononoki Nerd Font:pixelsize=12:antialias=true:hinting=t , allDesktops = True , persistent = True , iconRoot = "/home/dt/.xmonad/xpm/" -- default: "." - , commands = [ Run Date "%a, %b %d %Y, %H:%M:%S" "date" 10 - , Run Network "enp6s0" ["-t", "up dn "] 10 - , Run Cpu ["-t", " cpu (%)","-H","50","--high","red"] 10 - , Run Memory ["-t", " mem (%)"] 10 - , Run DiskU [("/", " hdd ()")] [] 3600 + , commands = [ Run Date "\xf133 %b %d %Y (%H:%M)" "date" 10 + , Run Network "enp6s0" ["-t", "\xf0aa kb \xf0ab kb"] 10 + , Run Cpu ["-t", "\xf108 cpu: (%)","-H","50","--high","red"] 10 + , Run Memory ["-t", "\xf233 mem: M (%)"] 10 + , Run DiskU [("/", "\xf0c7 hdd: free")] [] 3600 + , Run Com "pacupdate" [] "" 3600 + , Run Com "kernel" [] "" 3600 , Run UnsafeStdinReader ] , sepChar = "%" , alignSep = "}{" - , template = " | %UnsafeStdinReader% }{ %cpu% %memory% %disku% %enp6s0% %date% " + , template = " | %UnsafeStdinReader% }{  %kernel%| %cpu% | %memory% | %disku% | %enp6s0% |  %pacupdate%| %date% " } diff --git a/.config/xmobar/xmobarrc1 b/.config/xmobar/xmobarrc1 index cca44ab..36ae26a 100755 --- a/.config/xmobar/xmobarrc1 +++ b/.config/xmobar/xmobarrc1 @@ -12,14 +12,16 @@ Config { font = "xft:Mononoki Nerd Font:pixelsize=12:antialias=true:hinting=t , allDesktops = True , persistent = True , iconRoot = "/home/dt/.xmonad/xpm/" -- default: "." - , commands = [ Run Date "%a, %b %d %Y, %H:%M:%S" "date" 10 - , Run Network "enp6s0" ["-t", "up dn "] 10 - , Run Cpu ["-t", " cpu (%)","-H","50","--high","red"] 10 - , Run Memory ["-t", " mem (%)"] 10 - , Run DiskU [("/", " hdd ()")] [] 3600 + , commands = [ Run Date "\xf133 %b %d %Y (%H:%M)" "date" 10 + , Run Network "enp6s0" ["-t", "\xf0aa kb \xf0ab kb"] 10 + , Run Cpu ["-t", "\xf108 cpu: (%)","-H","50","--high","red"] 10 + , Run Memory ["-t", "\xf233 mem: M (%)"] 10 + , Run DiskU [("/", "\xf0c7 hdd: free")] [] 3600 + , Run Com "pacupdate" [] "" 3600 + , Run Com "kernel" [] "" 3600 , Run UnsafeStdinReader ] , sepChar = "%" , alignSep = "}{" - , template = " | %UnsafeStdinReader% }{ %cpu% %memory% %disku% %enp6s0% %date% " + , template = " | %UnsafeStdinReader% }{  %kernel%| %cpu% | %memory% | %disku% | %enp6s0% |  %pacupdate%| %date% " } diff --git a/.config/xmobar/xmobarrc2 b/.config/xmobar/xmobarrc2 index cca44ab..36ae26a 100755 --- a/.config/xmobar/xmobarrc2 +++ b/.config/xmobar/xmobarrc2 @@ -12,14 +12,16 @@ Config { font = "xft:Mononoki Nerd Font:pixelsize=12:antialias=true:hinting=t , allDesktops = True , persistent = True , iconRoot = "/home/dt/.xmonad/xpm/" -- default: "." - , commands = [ Run Date "%a, %b %d %Y, %H:%M:%S" "date" 10 - , Run Network "enp6s0" ["-t", "up dn "] 10 - , Run Cpu ["-t", " cpu (%)","-H","50","--high","red"] 10 - , Run Memory ["-t", " mem (%)"] 10 - , Run DiskU [("/", " hdd ()")] [] 3600 + , commands = [ Run Date "\xf133 %b %d %Y (%H:%M)" "date" 10 + , Run Network "enp6s0" ["-t", "\xf0aa kb \xf0ab kb"] 10 + , Run Cpu ["-t", "\xf108 cpu: (%)","-H","50","--high","red"] 10 + , Run Memory ["-t", "\xf233 mem: M (%)"] 10 + , Run DiskU [("/", "\xf0c7 hdd: free")] [] 3600 + , Run Com "pacupdate" [] "" 3600 + , Run Com "kernel" [] "" 3600 , Run UnsafeStdinReader ] , sepChar = "%" , alignSep = "}{" - , template = " | %UnsafeStdinReader% }{ %cpu% %memory% %disku% %enp6s0% %date% " + , template = " | %UnsafeStdinReader% }{  %kernel%| %cpu% | %memory% | %disku% | %enp6s0% |  %pacupdate%| %date% " } diff --git a/.dmenu/dmenu-edit-configs.sh b/.dmenu/dmenu-edit-configs.sh index fb12867..21d2762 100755 --- a/.dmenu/dmenu-edit-configs.sh +++ b/.dmenu/dmenu-edit-configs.sh @@ -24,6 +24,8 @@ i3 neovim polybar qtile +quickmarks +qutebrowser spectrwm st stumpwm @@ -94,6 +96,12 @@ case "$choice" in qtile) choice="$HOME/.config/qtile/config.py" ;; + quickmarks) + choice="$HOME/.config/qutebrowser/quickmarks" + ;; + qutebrowser) + choice="$HOME/.config/qutebrowser/autoconfig.yml" + ;; spectrwm) choice="$HOME/.spectrwm.conf" ;; diff --git a/.dmenu/dmenu-sysmon.sh b/.dmenu/dmenu-sysmon.sh index a318906..b43a8ca 100755 --- a/.dmenu/dmenu-sysmon.sh +++ b/.dmenu/dmenu-sysmon.sh @@ -8,9 +8,10 @@ # Dmenu script for launching system monitoring programs. -declare -a options=("htop +declare -a options=("bashtop glances gtop +htop iftop iotop iptraf-ng @@ -24,9 +25,10 @@ case $choice in quit) echo "Program terminated." && exit 1 ;; - htop| \ + bashtop| \ glances| \ gtop| \ + htop| \ nmon| \ s-tui) exec st -e $choice diff --git a/.spectrwm.conf b/.spectrwm.conf index 6eb66e3..061fd4f 100644 --- a/.spectrwm.conf +++ b/.spectrwm.conf @@ -258,7 +258,7 @@ bind[ws_prior] = MOD+a ### PROGRAM KEYBINDINGS ### -program[alacritty] = alacritty +program[alacritty] = alacritty -e fish bind[alacritty] = MOD+Return program[dmenu_run] = dmenu_run diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs old mode 100755 new mode 100644 index c8c1c14..aec8ec6 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -92,7 +92,7 @@ main = do , ppHidden = xmobarColor "#82AAFF" "" . wrap "*" "" -- Hidden workspaces in xmobar , ppHiddenNoWindows = xmobarColor "#F07178" "" -- Hidden workspaces (no windows) , ppTitle = xmobarColor "#d0d0d0" "" . shorten 80 -- Title of active window in xmobar - , ppSep = " : " -- Separators in xmobar + , ppSep = " | " -- Separators in xmobar , ppUrgent = xmobarColor "#C45500" "" . wrap "!" "!" -- Urgent workspace , ppExtras = [windowCount] -- # of windows current workspace , ppOrder = \(ws:l:t:ex) -> [ws,l]++ex++[t] @@ -243,8 +243,9 @@ myKeys = , ("M-C-", namedScratchpadAction myScratchPads "terminal") , ("M-C-c", namedScratchpadAction myScratchPads "cmus") - -- Open Terminal - , ("M-", spawn myTerminal) + -- Open My Preferred Terminal. I also run the FISH shell. Setting FISH as my default shell + -- breaks some things so I prefer to just launch "fish" when I open a terminal. + , ("M-", spawn (myTerminal ++ " -e fish")) --- Dmenu Scripts (Alt+Ctr+Key) , ("M-S-", spawn "dmenu_run -fn 'UbuntuMono Nerd Font:size=10' -nb '#292d3e' -nf '#bbc5ff' -sb '#82AAFF' -sf '#292d3e' -p 'dmenu:'") diff --git a/org-mode-basics-in-doom-emacs.org b/org-mode-basics-in-doom-emacs.org deleted file mode 100644 index 8c88433..0000000 --- a/org-mode-basics-in-doom-emacs.org +++ /dev/null @@ -1,92 +0,0 @@ -#+TITLE: Org Mode Basics In Doom Emacs -#+DESCRIPTION: An org document to help you follow along with the video of the same name. -#+AUTHOR: Derek Taylor - -* Getting Started with Org Mode -Read org mode manual with M-x org-info. -M-RET to insert new headline at current level. -** org-toggle-heading : SPC-m-h -** org-toggle-item : SPC-m-i -+ Unordered list item one -+ Unordered list item two - - You can use dash instead of + - - Another list item. - 1. Ordered list item one. - 2. Ordered list item two. -* A new headline -** Level 2 -*** Level 3 -**** Level 4 -***** Level 5 -****** Level 6 -** Rotate current subtree between states: TAB -** Rotate entire buffer between states : S-TAB -** close (fold) the tree : zc -** open (unfold) the tree : zo -** fold everything : zM -** unfold everything : zR -* Motion -** move left/down/up/right : h/j/k/l -** next/prev heading : gj/gk OR CTR-j/k -** move parent/child element : gh/gl -* Structure Editing -** insert new heading/item at current level : M-RET -** insert new heading after subtree : C-RET -** promote/demote heading : M-h/l OR M-LEFT/RIGHT -** promote/demote current subtree : M-S-h/l OR M-S-LEFT/RIGHT -** move subtree/list item up/down : M-j/k -** move list item up/down but not subtree : M-S-j/k -* Some advanced editing thanks to Evil Mode! -** select an element : vae -** delete an element : dae -** select a subtree : vaR -** delete subtree : daR -** yank subtree : yiR -* Insert Snippets -** SPACE-i-s -** bang : #!/usr/bin/env bash -** Insert a license : pick a free license -** current time : Sun Feb 9 20:06:29 2020 -** pi : -# -*- mode: snippet -*- -3.141592654 -* TODO Set TAGS with : SPC-m-q :TODO: -** TODO example one -** TODO example two : S-RIGHT -** To remove TODO : S-LEFT -** toggle the todo state : SPC-m-t -** org-schedule : SPC-m-s -SCHEDULED: <2020-02-10 Mon 14:00-15:30> -** [#A] org-priority : SPC-m-p -** To create checkbox : - [ ] [1/3] [33%] -DEADLINE: <2020-02-22 Sat 01:00-03:00> -- [ ] eggs -- [ ] milk -- [X] beer : C-c C-c OR RET -** Move this file to front of agenda : C-c-[ -** Org-agenda : SPC-o-a -** Tag search : SPC-o-a-m -* Tables -** Creating a table -*** just start typing, e.g.|Name|Phone|Age RET |- TAB -*** convert region to table : C-c | -*** Go to forward/backward by cell : TAB/S-TAB -*** ... separator at least 3 spaces : C-3 C-c | -*** Make org table headline : SPC m b - -*** Duplicate a field in the cell below : S-RET -| ONE | TWO | THREE | FOUR | -|--------------------+------------+-------+----------| -| This is a sentence | Some stuff | More | ffffffff | -| This is a sentence | Some stuff | | | -| | Some stuff | | | -*** Move current row UP : M-k -*** Move current row DOWN : M-j -*** Move current column LEFT : M-h -*** Move current column RIGHT : M-l -*** Insert new column : M-S-l -*** Delete current column : M-S-h -*** Insert new row : M-S-j -*** Delete current row : M-S-k -** Commands available inside tables -The following commands work when the cursor isinside a table. -Outside of tables, the same keys may have other functionality.