From a8a3ee798c6a4687f89b0ad1dd974b04d570f057 Mon Sep 17 00:00:00 2001 From: Derek Taylor Date: Mon, 8 Mar 2021 20:16:01 -0600 Subject: [PATCH] Fixing broken qtile config. --- .config/nitrogen/bg-saved.cfg | 10 ++++---- .config/nitrogen/nitrogen.cfg | 6 ++--- .config/qtile/README.org | 11 +++------ .config/qtile/config.py | 11 +++------ .doom.d/config.el | 19 +++++++++++++-- .doom.d/config.org | 44 +++++++++++++++++++++++++++-------- .doom.d/init.el | 2 +- 7 files changed, 66 insertions(+), 37 deletions(-) diff --git a/.config/nitrogen/bg-saved.cfg b/.config/nitrogen/bg-saved.cfg index 8bb1c36..ff3c149 100644 --- a/.config/nitrogen/bg-saved.cfg +++ b/.config/nitrogen/bg-saved.cfg @@ -1,14 +1,14 @@ -[xin_2] -file=/home/dt/wallpapers/0004.jpg +[xin_0] +file=/home/dt/wallpapers/0213.jpg mode=0 bgcolor=#000000 [xin_1] -file=/home/dt/wallpapers/0004.jpg +file=/home/dt/wallpapers/0213.jpg mode=0 bgcolor=#000000 -[xin_0] -file=/home/dt/wallpapers/0004.jpg +[xin_2] +file=/home/dt/wallpapers/0213.jpg mode=0 bgcolor=#000000 diff --git a/.config/nitrogen/nitrogen.cfg b/.config/nitrogen/nitrogen.cfg index b838327..244c29e 100644 --- a/.config/nitrogen/nitrogen.cfg +++ b/.config/nitrogen/nitrogen.cfg @@ -1,8 +1,8 @@ [geometry] posx=1920 -posy=0 -sizex=1918 -sizey=1033 +posy=21 +sizex=1920 +sizey=1059 [nitrogen] view=icon diff --git a/.config/qtile/README.org b/.config/qtile/README.org index a2d31c6..f4c1da0 100644 --- a/.config/qtile/README.org +++ b/.config/qtile/README.org @@ -514,19 +514,14 @@ def init_widgets_list(): background = colors[4], fontsize = 14 ), - widget.Pacman( + widget.CheckUpdates( update_interval = 1800, + distro = "Arch_checkupdates", + display_format = "{updates} Updates", foreground = colors[2], mouse_callbacks = {'Button1': lambda qtile: qtile.cmd_spawn(myTerm + ' -e sudo pacman -Syu')}, background = colors[4] ), - widget.TextBox( - text = "Updates", - padding = 5, - mouse_callbacks = {'Button1': lambda qtile: qtile.cmd_spawn(myTerm + ' -e sudo pacman -Syu')}, - foreground = colors[2], - background = colors[4] - ), widget.TextBox( text = '', background = colors[4], diff --git a/.config/qtile/config.py b/.config/qtile/config.py index 40f2192..acff11d 100644 --- a/.config/qtile/config.py +++ b/.config/qtile/config.py @@ -389,19 +389,14 @@ def init_widgets_list(): background = colors[4], fontsize = 14 ), - widget.Pacman( + widget.CheckUpdates( update_interval = 1800, + distro = "Arch_checkupdates", + display_format = "{updates} Updates", foreground = colors[2], mouse_callbacks = {'Button1': lambda qtile: qtile.cmd_spawn(myTerm + ' -e sudo pacman -Syu')}, background = colors[4] ), - widget.TextBox( - text = "Updates", - padding = 5, - mouse_callbacks = {'Button1': lambda qtile: qtile.cmd_spawn(myTerm + ' -e sudo pacman -Syu')}, - foreground = colors[2], - background = colors[4] - ), widget.TextBox( text = '', background = colors[4], diff --git a/.doom.d/config.el b/.doom.d/config.el index 6dae012..9d8befb 100644 --- a/.doom.d/config.el +++ b/.doom.d/config.el @@ -13,8 +13,11 @@ centaur-tabs-style "bar" centaur-tabs-modified-marker "•") (map! :leader - :desc "Toggle tabs on/off" - "t c" #'centaur-tabs-local-mode) + :desc "Toggle tabs globally" + "t c" #'centaur-tabs-mode + :leader + :desc "Toggle tabs local display" + "t C" #'centaur-tabs-local-mode) (evil-define-key 'normal centaur-tabs-mode-map (kbd "g ") 'centaur-tabs-forward ; default Doom binding is 'g t' (kbd "g ") 'centaur-tabs-backward ; default Doom binding is 'g T' (kbd "g ") 'centaur-tabs-forward-group @@ -165,6 +168,18 @@ (setq display-line-numbers-type t) (map! :leader + :desc "Comment or uncomment lines" + "TAB TAB" #'comment-line + :leader + :desc "Toggle line numbers" + "t l" #'doom/toggle-line-numbers + :leader + :desc "Toggle line highlight in frame" + "t h" #'hl-line-mode + :leader + :desc "Toggle line highlight globally" + "t H" #'global-hl-line-mode + :leader :desc "Toggle truncate lines" "t t" #'toggle-truncate-lines) diff --git a/.doom.d/config.org b/.doom.d/config.org index b255b43..51cf1ea 100644 --- a/.doom.d/config.org +++ b/.doom.d/config.org @@ -50,13 +50,14 @@ Doom Emacs uses 'SPC b' for keybindings related to bookmarks and buffers. Bookm * 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, 'SPC t' is used for "toggle" keybindings, so I choose 'SPC t c' to toggle centaur-tabs. The "g" prefix for keybindings is used for a bunch of evil keybindings in Doom, but "g" plus the arrow keys were not used, so I thought I would bind those for tab navigation. But I did leave the default "g t" and "g T" intact if you prefer to use those for centaur-tabs-forward/backward. -| COMMAND | DESCRIPTION | KEYBINDING | -|-----------------------------+----------------------+------------------| -| centaur-tabs-local-mode | /Toggle tabs on/off/ | SPC t c | -| centaur-tabs-forward | /Next tab/ | g or g t | -| centaur-tabs-backward | /Previous tab/ | g or g T | -| centaur-tabs-forward-group | /Next tab group/ | g | -| centaur-tabs-backward-group | /Previous tab group/ | g | +| COMMAND | DESCRIPTION | KEYBINDING | +|-----------------------------+---------------------------+------------------| +| centaur-tabs-mode | /Toggle tabs globally/ | SPC t c | +| centaur-tabs-local-mode | /Toggle tabs local display/ | SPC t C | +| centaur-tabs-forward | /Next tab/ | g or g t | +| centaur-tabs-backward | /Previous tab/ | g or g T | +| centaur-tabs-forward-group | /Next tab group/ | g | +| centaur-tabs-backward-group | /Previous tab group/ | g | #+BEGIN_SRC emacs-lisp (setq centaur-tabs-set-bar 'over @@ -67,8 +68,11 @@ To use tabs in Doom Emacs, be sure to uncomment "tabs" in Doom's init.el. Displ centaur-tabs-style "bar" centaur-tabs-modified-marker "•") (map! :leader - :desc "Toggle tabs on/off" - "t c" #'centaur-tabs-local-mode) + :desc "Toggle tabs globally" + "t c" #'centaur-tabs-mode + :leader + :desc "Toggle tabs local display" + "t C" #'centaur-tabs-local-mode) (evil-define-key 'normal centaur-tabs-mode-map (kbd "g ") 'centaur-tabs-forward ; default Doom binding is 'g t' (kbd "g ") 'centaur-tabs-backward ; default Doom binding is 'g T' (kbd "g ") 'centaur-tabs-forward-group @@ -312,11 +316,31 @@ By default, Doom Emacs does not use 'SPC v', so the format I use for these bindi #+END_SRC * LINE SETTINGS -I have toggled display-line-numbers-type so I have line numbers displayed. Doom Emacs uses 'SPC t' for "toggle" commands, so I choose 'SPC t t' for toggle-truncate-lines. +I set comment-line to 'SPC TAB TAB' which is a rather comfortable keybinding for me on my ErgoDox EZ keyboard. The standard Emacs keybinding for comment-line is 'C-x C-;'. The other keybindings are for commands that toggle on/off various line-related settings. Doom Emacs uses 'SPC t' for "toggle" commands, so I choose 'SPC t' plus 'key' for those bindings. + +| COMMAND | DESCRIPTION | KEYBINDING | +|--------------------------+-------------------------------------------+-------------| +| comment-line | /Comment or uncomment lines/ | SPC TAB TAB | +| hl-line-mode | /Toggle line highlighting in current frame/ | SPC t h | +| global-hl-line-mode | /Toggle line highlighting globally/ | SPC t H | +| doom/toggle-line-numbers | /Toggle line numbers/ | SPC t l | +| toggle-truncate-lines | /Toggle truncate lines/ | SPC t t | #+BEGIN_SRC emacs-lisp (setq display-line-numbers-type t) (map! :leader + :desc "Comment or uncomment lines" + "TAB TAB" #'comment-line + :leader + :desc "Toggle line numbers" + "t l" #'doom/toggle-line-numbers + :leader + :desc "Toggle line highlight in frame" + "t h" #'hl-line-mode + :leader + :desc "Toggle line highlight globally" + "t H" #'global-hl-line-mode + :leader :desc "Toggle truncate lines" "t t" #'toggle-truncate-lines) #+END_SRC diff --git a/.doom.d/init.el b/.doom.d/init.el index 1e6632c..4d16955 100644 --- a/.doom.d/init.el +++ b/.doom.d/init.el @@ -93,7 +93,7 @@ (eval +overlay) ; run code, run (also, repls) ;;gist ; interacting with github gists lookup ; navigate your code and its documentation - lsp + ;;lsp magit ; a git porcelain for Emacs ;;make ; run make tasks from Emacs ;;pass ; password manager for nerds