From c0e29a2c67df239e3beac12f87e4a51af6c3f95c Mon Sep 17 00:00:00 2001 From: Derek Taylor Date: Wed, 21 Apr 2021 14:32:19 -0500 Subject: [PATCH] Minor edits to config. --- .config/conky/xmonad.conkyrc | 19 ++++--------------- .config/doom/config.el | 5 ++++- .config/doom/config.org | 2 +- .xmonad/README.org | 22 ++++++---------------- .xmonad/xmonad.hs | 24 +++++++----------------- 5 files changed, 22 insertions(+), 50 deletions(-) diff --git a/.config/conky/xmonad.conkyrc b/.config/conky/xmonad.conkyrc index b80dfdd..e247efd 100644 --- a/.config/conky/xmonad.conkyrc +++ b/.config/conky/xmonad.conkyrc @@ -2,7 +2,6 @@ #===================================================================================== # XMonad Conky #====================================================================================== - ]] conky.config = { @@ -24,8 +23,8 @@ conky.config = { --Placement -- settings for my triple monitor setup; conky on the middle monitor - alignment = 'top_left', -- top_left,top_middle,top_right,bottom_left,bottom_middle,bottom_right, - gap_x = 3550, -- pixels between right or left border + alignment = 'top_left', -- top_left,top_middle,top_right,bottom_left,bottom_middle,bottom_right, + gap_x = 3550, -- pixels between right or left border -- settings for single monitor setups. --alignment = 'top_right', -- top_left,top_middle,top_right,bottom_left,bottom_middle,bottom_right, @@ -98,33 +97,23 @@ conky.config = { color7 = '#1F7411', --green color8 = '#FFA726', --orange color9 = '#F1544B', --firebrick - - - --Lua - }; conky.text = [[ ${alignc}${color0}${font Ubuntu:size=24}${time %H:%M}${font} ${voffset 4}${alignc}${color0}${font Ubuntu:size=16}${time %b %d, %Y}${font}${color} - -Packages installed:${alignr}${execi 3600 pacman -Q | wc -l} -Updates available:${alignr}${execi 3600 checkupdates | wc -l} -Last update:${alignr}${execi 3600 grep "starting full system upgrade" /var/log/pacman.log | tail -n1| cut --bytes=2-17} -${voffset 10}${goto 12}${color3}CPU${goto 50}$cpu% +${voffset 18}${goto 12}${color3}CPU${goto 50}$cpu% ${color2}${goto 12}${cpubar 8,254}${color} ${voffset 5}${goto 12}$font${top name 1}$alignr$color${top cpu 1}% ${goto 12}${top name 2}$alignr$color${top cpu 2}% ${goto 12}${top name 3}$alignr$color${top cpu 3}% -${goto 12}${top name 4}$alignr$color${top cpu 4}% # ${voffset 10}${goto 12}${color3}RAM${goto 50}$mem/$memmax ${color2}${goto 12}${membar 8,254}${color} ${goto 12}${voffset 5}${top_mem name 1}$alignr$color${top_mem mem_res 1} ${goto 12}${top_mem name 2}$alignr$color${top_mem mem_res 2} ${goto 12}${top_mem name 3}$alignr$color${top_mem mem_res 3} -${goto 12}${top_mem name 4}$alignr$color${top_mem mem_res 4} -${voffset 8}${color1}${alignc}XMONAD KEYBINDINGS${color} +${voffset 18}${color1}${alignc}XMONAD KEYBINDINGS${color} ${color1}${hr}${color} ${color1}[S]+[RET]${alignr}${color2}opens terminal${color} ${color1}[S]+[SPC]+[RET]${alignr}${color2}run prompt${color} diff --git a/.config/doom/config.el b/.config/doom/config.el index 563ac25..5586174 100644 --- a/.config/doom/config.el +++ b/.config/doom/config.el @@ -24,7 +24,7 @@ (setq dashboard-set-file-icons t) (setq dashboard-banner-logo-title "Emacs Is More Than A Text Editor!") ;;(setq dashboard-startup-banner 'logo) ;; use standard emacs logo as banner - (setq dashboard-startup-banner "~/.config/doom/emacs-dash.png") ;; use custom image as banner + (setq dashboard-startup-banner "~/.config/doom/doom-emacs-dash.png") ;; use custom image as banner (setq dashboard-center-content nil) ;; set to 't' for centered content (setq dashboard-items '((recents . 5) (agenda . 5 ) @@ -69,6 +69,9 @@ (map! :leader :desc "Load new theme" "h t" #'counsel-load-theme) +(use-package emojify + :hook (after-init . global-emojify-mode)) + (use-package! elfeed-goodies) (elfeed-goodies/setup) (setq elfeed-goodies/entry-pane-size 0.5) diff --git a/.config/doom/config.org b/.config/doom/config.org index 8705802..d5a0959 100644 --- a/.config/doom/config.org +++ b/.config/doom/config.org @@ -92,7 +92,7 @@ Emacs Dashboard is an extensible startup screen showing you recent files, bookma (setq dashboard-set-file-icons t) (setq dashboard-banner-logo-title "Emacs Is More Than A Text Editor!") ;;(setq dashboard-startup-banner 'logo) ;; use standard emacs logo as banner - (setq dashboard-startup-banner "~/.config/doom/emacs-dash.png") ;; use custom image as banner + (setq dashboard-startup-banner "~/.config/doom/doom-emacs-dash.png") ;; use custom image as banner (setq dashboard-center-content nil) ;; set to 't' for centered content (setq dashboard-items '((recents . 5) (agenda . 5 ) diff --git a/.xmonad/README.org b/.xmonad/README.org index 7cf3b23..7395a27 100644 --- a/.xmonad/README.org +++ b/.xmonad/README.org @@ -89,7 +89,6 @@ import XMonad.Layout.ShowWName import XMonad.Layout.Simplest import XMonad.Layout.Spacing import XMonad.Layout.SubLayouts -import XMonad.Layout.WindowNavigation import XMonad.Layout.WindowArranger (windowArrange, WindowArrangerMsg(..)) import qualified XMonad.Layout.ToggleLayouts as T (toggleLayouts, ToggleLayout(Toggle)) import qualified XMonad.Layout.MultiToggle as MT (Toggle(..)) @@ -267,7 +266,6 @@ mySpacing' i = spacingRaw True (Border i i i i) True (Border i i i i) True -- limitWindows n sets maximum number of windows displayed for layout. -- mySpacing n sets the gap size around the windows. tall = renamed [Replace "tall"] - $ windowNavigation $ smartBorders $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) @@ -275,7 +273,6 @@ tall = renamed [Replace "tall"] $ mySpacing 8 $ ResizableTall 1 (3/100) (1/2) [] magnify = renamed [Replace "magnify"] - $ windowNavigation $ smartBorders $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) @@ -284,19 +281,14 @@ magnify = renamed [Replace "magnify"] $ mySpacing 8 $ ResizableTall 1 (3/100) (1/2) [] monocle = renamed [Replace "monocle"] - $ windowNavigation $ smartBorders $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) $ limitWindows 20 Full floats = renamed [Replace "floats"] - $ windowNavigation $ smartBorders - $ addTabs shrinkText myTabTheme - $ subLayout [] (smartBorders Simplest) $ limitWindows 20 simplestFloat grid = renamed [Replace "grid"] - $ windowNavigation $ smartBorders $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) @@ -305,21 +297,18 @@ grid = renamed [Replace "grid"] $ mkToggle (single MIRROR) $ Grid (16/10) spirals = renamed [Replace "spirals"] - $ windowNavigation $ smartBorders $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) $ mySpacing' 8 $ spiral (6/7) threeCol = renamed [Replace "threeCol"] - $ windowNavigation $ smartBorders $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) $ limitWindows 7 $ ThreeCol 1 (3/100) (1/2) threeRow = renamed [Replace "threeRow"] - $ windowNavigation $ smartBorders $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) @@ -565,7 +554,8 @@ myKeys = , ("M-u ", spawn "mocp --toggle-pause") -- Emacs (CTRL-e followed by a key) - , ("C-e e", spawn myEmacs) -- start emacs + -- , ("C-e e", spawn myEmacs) -- start emacs + , ("C-e e", spawn (myEmacs ++ ("--eval '(dashboard-refresh-buffer)'"))) -- emacs dashboard , ("C-e b", spawn (myEmacs ++ ("--eval '(ibuffer)'"))) -- list buffers , ("C-e d", spawn (myEmacs ++ ("--eval '(dired nil)'"))) -- dired , ("C-e i", spawn (myEmacs ++ ("--eval '(erc)'"))) -- erc irc client @@ -573,10 +563,10 @@ myKeys = , ("C-e n", spawn (myEmacs ++ ("--eval '(elfeed)'"))) -- elfeed rss , ("C-e s", spawn (myEmacs ++ ("--eval '(eshell)'"))) -- eshell , ("C-e t", spawn (myEmacs ++ ("--eval '(mastodon)'"))) -- mastodon.el - , ("C-e v", spawn (myEmacs ++ ("--eval '(vterm nil)'"))) -- vterm if on GNU Emacs - -- , ("C-e v", spawn (myEmacs ++ ("--eval '(+vterm/here nil)'"))) -- vterm if on Doom Emacs - , ("C-e w", spawn (myEmacs ++ ("--eval '(eww \"distrotube.com\")'"))) -- eww browser if on GNU Emacs - -- , ("C-e w", spawn (myEmacs ++ ("--eval '(doom/window-maximize-buffer(eww \"distrotube.com\"))'"))) -- eww browser if on Doom Emacs + -- , ("C-e v", spawn (myEmacs ++ ("--eval '(vterm nil)'"))) -- vterm if on GNU Emacs + , ("C-e v", spawn (myEmacs ++ ("--eval '(+vterm/here nil)'"))) -- vterm if on Doom Emacs + -- , ("C-e w", spawn (myEmacs ++ ("--eval '(eww \"distrotube.com\")'"))) -- eww browser if on GNU Emacs + , ("C-e w", spawn (myEmacs ++ ("--eval '(doom/window-maximize-buffer(eww \"distrotube.com\"))'"))) -- eww browser if on Doom Emacs -- emms is an emacs audio player. I set it to auto start playing in a specific directory. , ("C-e a", spawn (myEmacs ++ ("--eval '(emms)' --eval '(emms-play-directory-tree \"~/Music/Non-Classical/70s-80s/\")'"))) diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index 54ef9f8..6cdece9 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -1,4 +1,4 @@ --- Base + -- Base import XMonad import System.Directory import System.IO (hPutStrLn) @@ -54,7 +54,6 @@ import XMonad.Layout.ShowWName import XMonad.Layout.Simplest import XMonad.Layout.Spacing import XMonad.Layout.SubLayouts -import XMonad.Layout.WindowNavigation import XMonad.Layout.WindowArranger (windowArrange, WindowArrangerMsg(..)) import qualified XMonad.Layout.ToggleLayouts as T (toggleLayouts, ToggleLayout(Toggle)) import qualified XMonad.Layout.MultiToggle as MT (Toggle(..)) @@ -207,7 +206,6 @@ mySpacing' i = spacingRaw True (Border i i i i) True (Border i i i i) True -- limitWindows n sets maximum number of windows displayed for layout. -- mySpacing n sets the gap size around the windows. tall = renamed [Replace "tall"] - $ windowNavigation $ smartBorders $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) @@ -215,7 +213,6 @@ tall = renamed [Replace "tall"] $ mySpacing 8 $ ResizableTall 1 (3/100) (1/2) [] magnify = renamed [Replace "magnify"] - $ windowNavigation $ smartBorders $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) @@ -224,19 +221,14 @@ magnify = renamed [Replace "magnify"] $ mySpacing 8 $ ResizableTall 1 (3/100) (1/2) [] monocle = renamed [Replace "monocle"] - $ windowNavigation $ smartBorders $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) $ limitWindows 20 Full floats = renamed [Replace "floats"] - $ windowNavigation $ smartBorders - $ addTabs shrinkText myTabTheme - $ subLayout [] (smartBorders Simplest) $ limitWindows 20 simplestFloat grid = renamed [Replace "grid"] - $ windowNavigation $ smartBorders $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) @@ -245,21 +237,18 @@ grid = renamed [Replace "grid"] $ mkToggle (single MIRROR) $ Grid (16/10) spirals = renamed [Replace "spirals"] - $ windowNavigation $ smartBorders $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) $ mySpacing' 8 $ spiral (6/7) threeCol = renamed [Replace "threeCol"] - $ windowNavigation $ smartBorders $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) $ limitWindows 7 $ ThreeCol 1 (3/100) (1/2) threeRow = renamed [Replace "threeRow"] - $ windowNavigation $ smartBorders $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) @@ -465,7 +454,8 @@ myKeys = , ("M-u ", spawn "mocp --toggle-pause") -- Emacs (CTRL-e followed by a key) - , ("C-e e", spawn myEmacs) -- start emacs + -- , ("C-e e", spawn myEmacs) -- start emacs + , ("C-e e", spawn (myEmacs ++ ("--eval '(dashboard-refresh-buffer)'"))) -- emacs dashboard , ("C-e b", spawn (myEmacs ++ ("--eval '(ibuffer)'"))) -- list buffers , ("C-e d", spawn (myEmacs ++ ("--eval '(dired nil)'"))) -- dired , ("C-e i", spawn (myEmacs ++ ("--eval '(erc)'"))) -- erc irc client @@ -473,10 +463,10 @@ myKeys = , ("C-e n", spawn (myEmacs ++ ("--eval '(elfeed)'"))) -- elfeed rss , ("C-e s", spawn (myEmacs ++ ("--eval '(eshell)'"))) -- eshell , ("C-e t", spawn (myEmacs ++ ("--eval '(mastodon)'"))) -- mastodon.el - , ("C-e v", spawn (myEmacs ++ ("--eval '(vterm nil)'"))) -- vterm if on GNU Emacs - -- , ("C-e v", spawn (myEmacs ++ ("--eval '(+vterm/here nil)'"))) -- vterm if on Doom Emacs - , ("C-e w", spawn (myEmacs ++ ("--eval '(eww \"distrotube.com\")'"))) -- eww browser if on GNU Emacs - -- , ("C-e w", spawn (myEmacs ++ ("--eval '(doom/window-maximize-buffer(eww \"distrotube.com\"))'"))) -- eww browser if on Doom Emacs + -- , ("C-e v", spawn (myEmacs ++ ("--eval '(vterm nil)'"))) -- vterm if on GNU Emacs + , ("C-e v", spawn (myEmacs ++ ("--eval '(+vterm/here nil)'"))) -- vterm if on Doom Emacs + -- , ("C-e w", spawn (myEmacs ++ ("--eval '(eww \"distrotube.com\")'"))) -- eww browser if on GNU Emacs + , ("C-e w", spawn (myEmacs ++ ("--eval '(doom/window-maximize-buffer(eww \"distrotube.com\"))'"))) -- eww browser if on Doom Emacs -- emms is an emacs audio player. I set it to auto start playing in a specific directory. , ("C-e a", spawn (myEmacs ++ ("--eval '(emms)' --eval '(emms-play-directory-tree \"~/Music/Non-Classical/70s-80s/\")'")))