Snoooopy/dtos-dotfiles
1
0
Fork 0
mirror of https://gitlab.com/dwt1/dotfiles.git synced 2026-08-11 02:21:14 +10:00
Code Issues Packages Projects Releases Wiki Activity

Minor edits to config.

Browse Source
This commit is contained in:
Derek Taylor
2021-04-21 14:32:19 -05:00
parent a930e13b0a
commit c0e29a2c67
5 changed files with 22 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.config/conky/xmonad.conkyrc
+2 -13
View File
@@ -2,7 +2,6 @@
#===================================================================================== #=====================================================================================
# XMonad Conky # XMonad Conky
#====================================================================================== #======================================================================================
]] ]]
conky.config = { conky.config = {
@@ -98,33 +97,23 @@ conky.config = {
color7 = '#1F7411', --green color7 = '#1F7411', --green
color8 = '#FFA726', --orange color8 = '#FFA726', --orange
color9 = '#F1544B', --firebrick color9 = '#F1544B', --firebrick
--Lua
}; };
conky.text = [[ conky.text = [[
${alignc}${color0}${font Ubuntu:size=24}${time %H:%M}${font} ${alignc}${color0}${font Ubuntu:size=24}${time %H:%M}${font}
${voffset 4}${alignc}${color0}${font Ubuntu:size=16}${time %b %d, %Y}${font}${color} ${voffset 4}${alignc}${color0}${font Ubuntu:size=16}${time %b %d, %Y}${font}${color}
${voffset 18}${goto 12}${color3}CPU${goto 50}$cpu%
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%
${color2}${goto 12}${cpubar 8,254}${color} ${color2}${goto 12}${cpubar 8,254}${color}
${voffset 5}${goto 12}$font${top name 1}$alignr$color${top cpu 1}% ${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 2}$alignr$color${top cpu 2}%
${goto 12}${top name 3}$alignr$color${top cpu 3}% ${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 ${voffset 10}${goto 12}${color3}RAM${goto 50}$mem/$memmax
${color2}${goto 12}${membar 8,254}${color} ${color2}${goto 12}${membar 8,254}${color}
${goto 12}${voffset 5}${top_mem name 1}$alignr$color${top_mem mem_res 1} ${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 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 3}$alignr$color${top_mem mem_res 3}
${goto 12}${top_mem name 4}$alignr$color${top_mem mem_res 4} ${voffset 18}${color1}${alignc}XMONAD KEYBINDINGS${color}
${voffset 8}${color1}${alignc}XMONAD KEYBINDINGS${color}
${color1}${hr}${color} ${color1}${hr}${color}
${color1}[S]+[RET]${alignr}${color2}opens terminal${color} ${color1}[S]+[RET]${alignr}${color2}opens terminal${color}
${color1}[S]+[SPC]+[RET]${alignr}${color2}run prompt${color} ${color1}[S]+[SPC]+[RET]${alignr}${color2}run prompt${color}
.config/doom/config.el
+4 -1
View File
@@ -24,7 +24,7 @@
(setq dashboard-set-file-icons t) (setq dashboard-set-file-icons t)
(setq dashboard-banner-logo-title "Emacs Is More Than A Text Editor!") (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 '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-center-content nil) ;; set to 't' for centered content
(setq dashboard-items '((recents . 5) (setq dashboard-items '((recents . 5)
(agenda . 5 ) (agenda . 5 )
@@ -69,6 +69,9 @@
(map! :leader (map! :leader
:desc "Load new theme" "h t" #'counsel-load-theme) :desc "Load new theme" "h t" #'counsel-load-theme)
(use-package emojify
:hook (after-init . global-emojify-mode))
(use-package! elfeed-goodies) (use-package! elfeed-goodies)
(elfeed-goodies/setup) (elfeed-goodies/setup)
(setq elfeed-goodies/entry-pane-size 0.5) (setq elfeed-goodies/entry-pane-size 0.5)
.config/doom/config.org
+1 -1
View File
@@ -92,7 +92,7 @@ Emacs Dashboard is an extensible startup screen showing you recent files, bookma
(setq dashboard-set-file-icons t) (setq dashboard-set-file-icons t)
(setq dashboard-banner-logo-title "Emacs Is More Than A Text Editor!") (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 '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-center-content nil) ;; set to 't' for centered content
(setq dashboard-items '((recents . 5) (setq dashboard-items '((recents . 5)
(agenda . 5 ) (agenda . 5 )
.xmonad/README.org
+6 -16
View File
@@ -89,7 +89,6 @@ import XMonad.Layout.ShowWName
import XMonad.Layout.Simplest import XMonad.Layout.Simplest
import XMonad.Layout.Spacing import XMonad.Layout.Spacing
import XMonad.Layout.SubLayouts import XMonad.Layout.SubLayouts
import XMonad.Layout.WindowNavigation
import XMonad.Layout.WindowArranger (windowArrange, WindowArrangerMsg(..)) import XMonad.Layout.WindowArranger (windowArrange, WindowArrangerMsg(..))
import qualified XMonad.Layout.ToggleLayouts as T (toggleLayouts, ToggleLayout(Toggle)) import qualified XMonad.Layout.ToggleLayouts as T (toggleLayouts, ToggleLayout(Toggle))
import qualified XMonad.Layout.MultiToggle as MT (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. -- limitWindows n sets maximum number of windows displayed for layout.
-- mySpacing n sets the gap size around the windows. -- mySpacing n sets the gap size around the windows.
tall = renamed [Replace "tall"] tall = renamed [Replace "tall"]
$ windowNavigation
$ smartBorders $ smartBorders
$ addTabs shrinkText myTabTheme $ addTabs shrinkText myTabTheme
$ subLayout [] (smartBorders Simplest) $ subLayout [] (smartBorders Simplest)
@@ -275,7 +273,6 @@ tall = renamed [Replace "tall"]
$ mySpacing 8 $ mySpacing 8
$ ResizableTall 1 (3/100) (1/2) [] $ ResizableTall 1 (3/100) (1/2) []
magnify = renamed [Replace "magnify"] magnify = renamed [Replace "magnify"]
$ windowNavigation
$ smartBorders $ smartBorders
$ addTabs shrinkText myTabTheme $ addTabs shrinkText myTabTheme
$ subLayout [] (smartBorders Simplest) $ subLayout [] (smartBorders Simplest)
@@ -284,19 +281,14 @@ magnify = renamed [Replace "magnify"]
$ mySpacing 8 $ mySpacing 8
$ ResizableTall 1 (3/100) (1/2) [] $ ResizableTall 1 (3/100) (1/2) []
monocle = renamed [Replace "monocle"] monocle = renamed [Replace "monocle"]
$ windowNavigation
$ smartBorders $ smartBorders
$ addTabs shrinkText myTabTheme $ addTabs shrinkText myTabTheme
$ subLayout [] (smartBorders Simplest) $ subLayout [] (smartBorders Simplest)
$ limitWindows 20 Full $ limitWindows 20 Full
floats = renamed [Replace "floats"] floats = renamed [Replace "floats"]
$ windowNavigation
$ smartBorders $ smartBorders
$ addTabs shrinkText myTabTheme
$ subLayout [] (smartBorders Simplest)
$ limitWindows 20 simplestFloat $ limitWindows 20 simplestFloat
grid = renamed [Replace "grid"] grid = renamed [Replace "grid"]
$ windowNavigation
$ smartBorders $ smartBorders
$ addTabs shrinkText myTabTheme $ addTabs shrinkText myTabTheme
$ subLayout [] (smartBorders Simplest) $ subLayout [] (smartBorders Simplest)
@@ -305,21 +297,18 @@ grid = renamed [Replace "grid"]
$ mkToggle (single MIRROR) $ mkToggle (single MIRROR)
$ Grid (16/10) $ Grid (16/10)
spirals = renamed [Replace "spirals"] spirals = renamed [Replace "spirals"]
$ windowNavigation
$ smartBorders $ smartBorders
$ addTabs shrinkText myTabTheme $ addTabs shrinkText myTabTheme
$ subLayout [] (smartBorders Simplest) $ subLayout [] (smartBorders Simplest)
$ mySpacing' 8 $ mySpacing' 8
$ spiral (6/7) $ spiral (6/7)
threeCol = renamed [Replace "threeCol"] threeCol = renamed [Replace "threeCol"]
$ windowNavigation
$ smartBorders $ smartBorders
$ addTabs shrinkText myTabTheme $ addTabs shrinkText myTabTheme
$ subLayout [] (smartBorders Simplest) $ subLayout [] (smartBorders Simplest)
$ limitWindows 7 $ limitWindows 7
$ ThreeCol 1 (3/100) (1/2) $ ThreeCol 1 (3/100) (1/2)
threeRow = renamed [Replace "threeRow"] threeRow = renamed [Replace "threeRow"]
$ windowNavigation
$ smartBorders $ smartBorders
$ addTabs shrinkText myTabTheme $ addTabs shrinkText myTabTheme
$ subLayout [] (smartBorders Simplest) $ subLayout [] (smartBorders Simplest)
@@ -565,7 +554,8 @@ myKeys =
, ("M-u <Space>", spawn "mocp --toggle-pause") , ("M-u <Space>", spawn "mocp --toggle-pause")
-- Emacs (CTRL-e followed by a key) -- 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 b", spawn (myEmacs ++ ("--eval '(ibuffer)'"))) -- list buffers
, ("C-e d", spawn (myEmacs ++ ("--eval '(dired nil)'"))) -- dired , ("C-e d", spawn (myEmacs ++ ("--eval '(dired nil)'"))) -- dired
, ("C-e i", spawn (myEmacs ++ ("--eval '(erc)'"))) -- erc irc client , ("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 n", spawn (myEmacs ++ ("--eval '(elfeed)'"))) -- elfeed rss
, ("C-e s", spawn (myEmacs ++ ("--eval '(eshell)'"))) -- eshell , ("C-e s", spawn (myEmacs ++ ("--eval '(eshell)'"))) -- eshell
, ("C-e t", spawn (myEmacs ++ ("--eval '(mastodon)'"))) -- mastodon.el , ("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 nil)'"))) -- vterm if on GNU Emacs
-- , ("C-e v", spawn (myEmacs ++ ("--eval '(+vterm/here nil)'"))) -- vterm if on Doom 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 '(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 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. -- 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/\")'"))) , ("C-e a", spawn (myEmacs ++ ("--eval '(emms)' --eval '(emms-play-directory-tree \"~/Music/Non-Classical/70s-80s/\")'")))
.xmonad/xmonad.hs
+6 -16
View File
@@ -54,7 +54,6 @@ import XMonad.Layout.ShowWName
import XMonad.Layout.Simplest import XMonad.Layout.Simplest
import XMonad.Layout.Spacing import XMonad.Layout.Spacing
import XMonad.Layout.SubLayouts import XMonad.Layout.SubLayouts
import XMonad.Layout.WindowNavigation
import XMonad.Layout.WindowArranger (windowArrange, WindowArrangerMsg(..)) import XMonad.Layout.WindowArranger (windowArrange, WindowArrangerMsg(..))
import qualified XMonad.Layout.ToggleLayouts as T (toggleLayouts, ToggleLayout(Toggle)) import qualified XMonad.Layout.ToggleLayouts as T (toggleLayouts, ToggleLayout(Toggle))
import qualified XMonad.Layout.MultiToggle as MT (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. -- limitWindows n sets maximum number of windows displayed for layout.
-- mySpacing n sets the gap size around the windows. -- mySpacing n sets the gap size around the windows.
tall = renamed [Replace "tall"] tall = renamed [Replace "tall"]
$ windowNavigation
$ smartBorders $ smartBorders
$ addTabs shrinkText myTabTheme $ addTabs shrinkText myTabTheme
$ subLayout [] (smartBorders Simplest) $ subLayout [] (smartBorders Simplest)
@@ -215,7 +213,6 @@ tall = renamed [Replace "tall"]
$ mySpacing 8 $ mySpacing 8
$ ResizableTall 1 (3/100) (1/2) [] $ ResizableTall 1 (3/100) (1/2) []
magnify = renamed [Replace "magnify"] magnify = renamed [Replace "magnify"]
$ windowNavigation
$ smartBorders $ smartBorders
$ addTabs shrinkText myTabTheme $ addTabs shrinkText myTabTheme
$ subLayout [] (smartBorders Simplest) $ subLayout [] (smartBorders Simplest)
@@ -224,19 +221,14 @@ magnify = renamed [Replace "magnify"]
$ mySpacing 8 $ mySpacing 8
$ ResizableTall 1 (3/100) (1/2) [] $ ResizableTall 1 (3/100) (1/2) []
monocle = renamed [Replace "monocle"] monocle = renamed [Replace "monocle"]
$ windowNavigation
$ smartBorders $ smartBorders
$ addTabs shrinkText myTabTheme $ addTabs shrinkText myTabTheme
$ subLayout [] (smartBorders Simplest) $ subLayout [] (smartBorders Simplest)
$ limitWindows 20 Full $ limitWindows 20 Full
floats = renamed [Replace "floats"] floats = renamed [Replace "floats"]
$ windowNavigation
$ smartBorders $ smartBorders
$ addTabs shrinkText myTabTheme
$ subLayout [] (smartBorders Simplest)
$ limitWindows 20 simplestFloat $ limitWindows 20 simplestFloat
grid = renamed [Replace "grid"] grid = renamed [Replace "grid"]
$ windowNavigation
$ smartBorders $ smartBorders
$ addTabs shrinkText myTabTheme $ addTabs shrinkText myTabTheme
$ subLayout [] (smartBorders Simplest) $ subLayout [] (smartBorders Simplest)
@@ -245,21 +237,18 @@ grid = renamed [Replace "grid"]
$ mkToggle (single MIRROR) $ mkToggle (single MIRROR)
$ Grid (16/10) $ Grid (16/10)
spirals = renamed [Replace "spirals"] spirals = renamed [Replace "spirals"]
$ windowNavigation
$ smartBorders $ smartBorders
$ addTabs shrinkText myTabTheme $ addTabs shrinkText myTabTheme
$ subLayout [] (smartBorders Simplest) $ subLayout [] (smartBorders Simplest)
$ mySpacing' 8 $ mySpacing' 8
$ spiral (6/7) $ spiral (6/7)
threeCol = renamed [Replace "threeCol"] threeCol = renamed [Replace "threeCol"]
$ windowNavigation
$ smartBorders $ smartBorders
$ addTabs shrinkText myTabTheme $ addTabs shrinkText myTabTheme
$ subLayout [] (smartBorders Simplest) $ subLayout [] (smartBorders Simplest)
$ limitWindows 7 $ limitWindows 7
$ ThreeCol 1 (3/100) (1/2) $ ThreeCol 1 (3/100) (1/2)
threeRow = renamed [Replace "threeRow"] threeRow = renamed [Replace "threeRow"]
$ windowNavigation
$ smartBorders $ smartBorders
$ addTabs shrinkText myTabTheme $ addTabs shrinkText myTabTheme
$ subLayout [] (smartBorders Simplest) $ subLayout [] (smartBorders Simplest)
@@ -465,7 +454,8 @@ myKeys =
, ("M-u <Space>", spawn "mocp --toggle-pause") , ("M-u <Space>", spawn "mocp --toggle-pause")
-- Emacs (CTRL-e followed by a key) -- 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 b", spawn (myEmacs ++ ("--eval '(ibuffer)'"))) -- list buffers
, ("C-e d", spawn (myEmacs ++ ("--eval '(dired nil)'"))) -- dired , ("C-e d", spawn (myEmacs ++ ("--eval '(dired nil)'"))) -- dired
, ("C-e i", spawn (myEmacs ++ ("--eval '(erc)'"))) -- erc irc client , ("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 n", spawn (myEmacs ++ ("--eval '(elfeed)'"))) -- elfeed rss
, ("C-e s", spawn (myEmacs ++ ("--eval '(eshell)'"))) -- eshell , ("C-e s", spawn (myEmacs ++ ("--eval '(eshell)'"))) -- eshell
, ("C-e t", spawn (myEmacs ++ ("--eval '(mastodon)'"))) -- mastodon.el , ("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 nil)'"))) -- vterm if on GNU Emacs
-- , ("C-e v", spawn (myEmacs ++ ("--eval '(+vterm/here nil)'"))) -- vterm if on Doom 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 '(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 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. -- 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/\")'"))) , ("C-e a", spawn (myEmacs ++ ("--eval '(emms)' --eval '(emms-play-directory-tree \"~/Music/Non-Classical/70s-80s/\")'")))