From 45486bac887a31725e135dde053925d8ff28cb78 Mon Sep 17 00:00:00 2001 From: Derek Taylor Date: Sat, 20 Mar 2021 13:06:31 -0500 Subject: [PATCH] Updating qtile config and the README. --- .config/alacritty/alacritty.yml | 34 ++++++++--------- .config/nitrogen/nitrogen.cfg | 2 +- .config/qtile/README.org | 66 ++++++++++++++++++++------------- .config/qtile/autostart.sh | 6 ++- .config/qtile/config.py | 58 ++++++++++++++++++----------- .config/qutebrowser/config.py | 2 +- .config/qutebrowser/quickmarks | 19 ++++++++-- .config/stumpwm/config | 36 +++++++++++++----- .doom.d/config.el | 5 +++ .doom.d/config.org | 18 ++++++++- .doom.d/init.el | 16 ++++---- .doom.d/packages.el | 4 +- .xmonad/README.org | 4 +- .xmonad/xmonad.hs | 4 +- 14 files changed, 179 insertions(+), 95 deletions(-) diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 6a56d6c..94eb370 100755 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -564,20 +564,20 @@ background_opacity: 1.0 # a no-op if you do not wish to receive input characters for that binding. key_bindings: # (Windows, Linux, and BSD only) - - { key: V, mods: Control|Shift, action: Paste } - - { key: C, mods: Control|Shift, action: Copy } - - { key: Insert, mods: Shift, action: PasteSelection } - - { key: Key0, mods: Control, action: ResetFontSize } - - { key: Equals, mods: Control, action: IncreaseFontSize } - - { key: Plus, mods: Control, action: IncreaseFontSize } - - { key: Minus, mods: Control, action: DecreaseFontSize } - - { key: Minus, mods: Control, action: DecreaseFontSize } - - - { key: Paste, action: Paste } - - { key: Copy, action: Copy } - - { key: L, mods: Control, action: ClearLogNotice } - - { key: L, mods: Control, chars: "\x0c" } - - { key: PageUp, mods: Shift, action: ScrollPageUp, mode: ~Alt } - - { key: PageDown, mods: Shift, action: ScrollPageDown, mode: ~Alt } - - { key: Home, mods: Shift, action: ScrollToTop, mode: ~Alt } - - { key: End, mods: Shift, action: ScrollToBottom, mode: ~Alt } + - { key: V, mods: Control|Shift, action: Paste } + - { key: C, mods: Control|Shift, action: Copy } + - { key: Insert, mods: Shift, action: PasteSelection } + - { key: Key0, mods: Control, action: ResetFontSize } + - { key: Equals, mods: Control, action: IncreaseFontSize } + - { key: Plus, mods: Control, action: IncreaseFontSize } + - { key: Minus, mods: Control, action: DecreaseFontSize } + - { key: Minus, mods: Control, action: DecreaseFontSize } + - { key: F11, mods: None, action: ToggleFullscreen } + - { key: Paste, mods: None, action: Paste } + - { key: Copy, mods: None, action: Copy } + - { key: L, mods: Control, action: ClearLogNotice } + - { key: L, mods: Control, chars: "\x0c" } + - { key: PageUp, mods: None, action: ScrollPageUp, mode: ~Alt } + - { key: PageDown, mods: None, action: ScrollPageDown, mode: ~Alt } + - { key: Home, mods: Shift, action: ScrollToTop, mode: ~Alt } + - { key: End, mods: Shift, action: ScrollToBottom, mode: ~Alt } diff --git a/.config/nitrogen/nitrogen.cfg b/.config/nitrogen/nitrogen.cfg index edcb2ce..4468f86 100644 --- a/.config/nitrogen/nitrogen.cfg +++ b/.config/nitrogen/nitrogen.cfg @@ -1,5 +1,5 @@ [geometry] -posx=1928 +posx=3848 posy=28 sizex=1900 sizey=1040 diff --git a/.config/qtile/README.org b/.config/qtile/README.org index c014073..abd7d37 100644 --- a/.config/qtile/README.org +++ b/.config/qtile/README.org @@ -88,10 +88,10 @@ These are the keybindings for qtile. | MODKEY + SHIFT + q | quits qtile | | MODKEY + 1-9 | switch focus to workspace (1-9) | | MODKEY + SHIFT + 1-9 | send focused window to workspace (1-9) | -| MODKEY + j | lazy layout up (switches focus between windows in the stack) | -| MODKEY + k | lazy layout down (switches focus between windows in the stack) | -| MODKEY + SHIFT + j | lazy layout shuffle_up (rotates the windows in the stack) | -| MODKEY + SHIFT + k | lazy layout shuffle_down (rotates the windows in the stack) | +| MODKEY + j | lazy layout down (switches focus between windows in the stack) | +| MODKEY + k | lazy layout up (switches focus between windows in the stack) | +| MODKEY + SHIFT + j | lazy layout shuffle_down (rotates the windows in the stack) | +| MODKEY + SHIFT + k | lazy layout shuffle_up (rotates the windows in the stack) | | MODKEY + h | shrink size of window (MondadTall layout) | | MODKEY + l | expand size of window (MondadTall layout) | | MODKEY + w | switch focus to monitor 1 | @@ -155,29 +155,31 @@ keys = [ desc='Move focus to prev monitor' ), ### Treetab controls - Key([mod, "control"], "k", - lazy.layout.section_up(), + Key([mod, "shift"], "h", + lazy.layout.move_left(), desc='Move up a section in treetab' ), - Key([mod, "control"], "j", - lazy.layout.section_down(), + Key([mod, "shift"], "l", + lazy.layout.move_right(), desc='Move down a section in treetab' ), ### Window controls Key([mod], "k", - lazy.layout.down(), + lazy.layout.up(), desc='Move focus down in current stack pane' ), Key([mod], "j", - lazy.layout.up(), + lazy.layout.down(), desc='Move focus up in current stack pane' ), - Key([mod, "shift"], "k", + Key([mod, "shift"], "j", lazy.layout.shuffle_down(), + lazy.layout.section_down(), desc='Move windows down in current stack' ), - Key([mod, "shift"], "j", + Key([mod, "shift"], "k", lazy.layout.shuffle_up(), + lazy.layout.section_up(), desc='Move windows up in current stack' ), Key([mod], "h", @@ -202,21 +204,21 @@ keys = [ lazy.window.toggle_floating(), desc='toggle floating' ), - Key([mod, "shift"], "m", + Key([mod], "f", lazy.window.toggle_fullscreen(), desc='toggle fullscreen' ), ### Stack controls - Key([mod, "shift"], "space", + Key([mod, "shift"], "Tab", lazy.layout.rotate(), lazy.layout.flip(), desc='Switch which side main pane occupies (XmonadTall)' ), - Key([mod], "space", + Key([mod], "space", lazy.layout.next(), desc='Switch window focus to other pane(s) of stack' ), - Key([mod, "control"], "Return", + Key([mod, "shift"], "space", lazy.layout.toggle_split(), desc='Toggle between split and unsplit sides of stack' ), @@ -277,6 +279,10 @@ keys = [ lazy.spawn("./dmscripts/dman"), desc='Search manpages in dmenu' ), + Key([], "o", + lazy.spawn("./dmscripts/dmqute"), + desc='Search your qutebrowser bookmarks and quickmarks' + ), Key([], "r", lazy.spawn("./dmscripts/dmred"), desc='Search reddit via dmenu' @@ -335,26 +341,33 @@ layouts = [ #layout.Stack(stacks=2, **layout_theme), #layout.Columns(**layout_theme), #layout.RatioTile(**layout_theme), + #layout.Tile(shift_windows=True, **layout_theme), #layout.VerticalTile(**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.RatioTile(**layout_theme), layout.TreeTab( font = "Ubuntu", fontsize = 10, - sections = ["FIRST", "SECOND"], - section_fontsize = 11, - bg_color = "141414", - active_bg = "90C435", + sections = ["FIRST", "SECOND", "THIRD", "FOURTH"], + section_fontsize = 10, + border_width = 2, + bg_color = "1c1f24", + active_bg = "c678dd", active_fg = "000000", - inactive_bg = "384323", - inactive_fg = "a0a0a0", + inactive_bg = "a9a1e1", + inactive_fg = "1c1f24", + padding_left = 0, + padding_x = 0, padding_y = 5, section_top = 10, - panel_width = 320 + section_bottom = 20, + level_shift = 8, + vspace = 3, + panel_width = 200 ), layout.Floating(**layout_theme) ] @@ -370,7 +383,8 @@ colors = [["#282c34", "#282c34"], # panel background ["#ff5555", "#ff5555"], # border line color for current tab ["#74438f", "#74438f"], # border line color for 'other tabs' and color for 'odd widgets' ["#4f76c7", "#4f76c7"], # color for the 'even widgets' - ["#e1acff", "#e1acff"]] # window name + ["#e1acff", "#e1acff"], # window name + ["#ecbbfb", "#ecbbfb"]] # backbround for inactive screens #+END_SRC * Prompt @@ -426,7 +440,7 @@ def init_widgets_list(): padding_x = 3, borderwidth = 3, active = colors[2], - inactive = colors[2], + inactive = colors[7], rounded = False, highlight_color = colors[1], highlight_method = "line", diff --git a/.config/qtile/autostart.sh b/.config/qtile/autostart.sh index 8a5185a..71f9125 100755 --- a/.config/qtile/autostart.sh +++ b/.config/qtile/autostart.sh @@ -1,4 +1,8 @@ -#! /bin/bash +#!/usr/bin/env bash +# +# Using bash in the shebang rather than /bin/sh, which should +# be avoided as non-POSIX shell users (fish) may experience errors. + lxsession & picom --experimental-backends & nitrogen --restore & diff --git a/.config/qtile/config.py b/.config/qtile/config.py index cab8592..d192b66 100644 --- a/.config/qtile/config.py +++ b/.config/qtile/config.py @@ -67,29 +67,31 @@ keys = [ desc='Move focus to prev monitor' ), ### Treetab controls - Key([mod, "control"], "k", - lazy.layout.section_up(), + Key([mod, "shift"], "h", + lazy.layout.move_left(), desc='Move up a section in treetab' ), - Key([mod, "control"], "j", - lazy.layout.section_down(), + Key([mod, "shift"], "l", + lazy.layout.move_right(), desc='Move down a section in treetab' ), ### Window controls Key([mod], "k", - lazy.layout.down(), + lazy.layout.up(), desc='Move focus down in current stack pane' ), Key([mod], "j", - lazy.layout.up(), + lazy.layout.down(), desc='Move focus up in current stack pane' ), - Key([mod, "shift"], "k", + Key([mod, "shift"], "j", lazy.layout.shuffle_down(), + lazy.layout.section_down(), desc='Move windows down in current stack' ), - Key([mod, "shift"], "j", + Key([mod, "shift"], "k", lazy.layout.shuffle_up(), + lazy.layout.section_up(), desc='Move windows up in current stack' ), Key([mod], "h", @@ -114,21 +116,21 @@ keys = [ lazy.window.toggle_floating(), desc='toggle floating' ), - Key([mod, "shift"], "m", + Key([mod], "f", lazy.window.toggle_fullscreen(), desc='toggle fullscreen' ), ### Stack controls - Key([mod, "shift"], "space", + Key([mod, "shift"], "Tab", lazy.layout.rotate(), lazy.layout.flip(), desc='Switch which side main pane occupies (XmonadTall)' ), - Key([mod], "space", + Key([mod], "space", lazy.layout.next(), desc='Switch window focus to other pane(s) of stack' ), - Key([mod, "control"], "Return", + Key([mod, "shift"], "space", lazy.layout.toggle_split(), desc='Toggle between split and unsplit sides of stack' ), @@ -189,6 +191,10 @@ keys = [ lazy.spawn("./dmscripts/dman"), desc='Search manpages in dmenu' ), + Key([], "o", + lazy.spawn("./dmscripts/dmqute"), + desc='Search your qutebrowser bookmarks and quickmarks' + ), Key([], "r", lazy.spawn("./dmscripts/dmred"), desc='Search reddit via dmenu' @@ -232,26 +238,33 @@ layouts = [ #layout.Stack(stacks=2, **layout_theme), #layout.Columns(**layout_theme), #layout.RatioTile(**layout_theme), + #layout.Tile(shift_windows=True, **layout_theme), #layout.VerticalTile(**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.RatioTile(**layout_theme), layout.TreeTab( font = "Ubuntu", fontsize = 10, - sections = ["FIRST", "SECOND"], - section_fontsize = 11, - bg_color = "141414", - active_bg = "90C435", + sections = ["FIRST", "SECOND", "THIRD", "FOURTH"], + section_fontsize = 10, + border_width = 2, + bg_color = "1c1f24", + active_bg = "c678dd", active_fg = "000000", - inactive_bg = "384323", - inactive_fg = "a0a0a0", + inactive_bg = "a9a1e1", + inactive_fg = "1c1f24", + padding_left = 0, + padding_x = 0, padding_y = 5, section_top = 10, - panel_width = 320 + section_bottom = 20, + level_shift = 8, + vspace = 3, + panel_width = 200 ), layout.Floating(**layout_theme) ] @@ -262,7 +275,8 @@ colors = [["#282c34", "#282c34"], # panel background ["#ff5555", "#ff5555"], # border line color for current tab ["#74438f", "#74438f"], # border line color for 'other tabs' and color for 'odd widgets' ["#4f76c7", "#4f76c7"], # color for the 'even widgets' - ["#e1acff", "#e1acff"]] # window name + ["#e1acff", "#e1acff"], # window name + ["#ecbbfb", "#ecbbfb"]] # backbround for inactive screens prompt = "{0}@{1}: ".format(os.environ["USER"], socket.gethostname()) @@ -303,7 +317,7 @@ def init_widgets_list(): padding_x = 3, borderwidth = 3, active = colors[2], - inactive = colors[2], + inactive = colors[7], rounded = False, highlight_color = colors[1], highlight_method = "line", diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py index 9c78add..b552eda 100755 --- a/.config/qutebrowser/config.py +++ b/.config/qutebrowser/config.py @@ -21,7 +21,7 @@ config.load_autoconfig(False) c.aliases = {'q': 'quit', 'w': 'session-save', 'wq': 'quit --save'} # Setting dark mode -# config.set("colors.webpage.darkmode.enabled", True) +config.set("colors.webpage.darkmode.enabled", True) # Which cookies to accept. With QtWebEngine, this setting also controls diff --git a/.config/qutebrowser/quickmarks b/.config/qutebrowser/quickmarks index a436fe8..a9b9483 100755 --- a/.config/qutebrowser/quickmarks +++ b/.config/qutebrowser/quickmarks @@ -1,20 +1,31 @@ +4g https://boards.4channel.org/g/ am https://www.amazon.com/ arch https://www.archlinux.org/ aws https://aws.amazon.com/ +bx https://bittrex.com/ di https://diasp.org/stream +do https://www.digitalocean.com/ dt https://www.distrotube.com/ dw https://www.distrowatch.com/ +eff http://eff.org/ +fsf http://fsf.org/ +gnu http://gnu.org/ goog https://www.google.com hoog https://hoogle.haskell.org lab https://gitlab.com/dwt1 lbry https://lbry.tv/@DistroTube:2 -mast https://mastodon.technology/web/accounts/85897 +mail https://www.mailgun.com/ +mast https://distrotoot.com/ +nf https://www.netflix.com/browse pa http://www.patreon.com/distrotube/ +py https://www.paypal.com/ sb https://socialblade.com/youtube/c/distrotube +sky https://www.skysilk.com/ +sp file:///home/dt/.surf/html/homepage.html suck https://suckless.org/ +tee https://teespring.com/stores/distrotube +tt https://www.tastytrade.com/ +tw https://trade.tastyworks.com/ ub https://www.urbandictionary.com/ wiki https://www.wikipedia.org/ yt https://www.youtube.com/DistroTube/?view_as=subscriber -sp file:///home/dt/.surf/html/homepage.html -4g https://boards.4channel.org/g/ -tt https://www.tastytrade.com/ diff --git a/.config/stumpwm/config b/.config/stumpwm/config index 59e5fad..514df6c 100755 --- a/.config/stumpwm/config +++ b/.config/stumpwm/config @@ -15,6 +15,7 @@ (run-shell-command "nitrogen --restore") (run-shell-command "picom") (run-shell-command "xmodmap ~/.Xmodmap") +(run-shell-command "./.config/herbstluftwm/panel.sh") (defun show-kernel () (let ((ip (run-shell-command "uname -r" t))) @@ -31,23 +32,39 @@ (defvar color1 "#ff92d0") (defvar color2 "#282a36") +(load-module "swm-gaps") +(if (not swm-gaps:*gaps-on*) + (swm-gaps:toggle-gaps)) +(setf swm-gaps:*inner-gaps-size* 8 + swm-gaps:*outer-gaps-size* 8 + swm-gaps:*head-gaps-size* 8) + +(setf *message-window-gravity* :center + *input-window-gravity* :center + *window-border-style* :thin + *message-window-padding* 10 + *maxsize-border-width* 2 + *normal-border-width* 2 + *transient-border-width* 2 + stumpwm::*float-window-border* 2 + stumpwm::*float-window-title-height* 5 + *mouse-focus-policy* :click) + (setf - stumpwm:*mode-line-background-color* color2 + stumpwm:*mode-line-background-color* color2 stumpwm:*mode-line-foreground-color* color1 stumpwm:*mode-line-border-color* "#333333" - stumpwm:*screen-mode-line-format* (list "%g | %v ^>^7 | " '(:eval (show-hostname)) "| " '(:eval (show-kernel)) "| " '(:eval (show-package-count)) "packages | %d ") + stumpwm:*screen-mode-line-format* (list " ") + ;; stumpwm:*screen-mode-line-format* (list "%g | %v ^>^7 | " '(:eval (show-hostname)) "| " '(:eval (show-kernel)) "| " '(:eval (show-package-count)) "packages | %d ") stumpwm:*mode-line-border-width* 1 stumpwm:*mode-line-pad-x* 6 - stumpwm:*mode-line-pad-y* 1 + stumpwm:*mode-line-pad-y* 2 stumpwm:*mode-line-timeout* 5 - stumpwm:*mouse-focus-policy* :click stumpwm:*group-format* "%n·%t" stumpwm:*time-modeline-string* "%a, %b %d, %Y %l:%M%p" stumpwm:*window-format* "^b^(:fg \"#9aedfe\")<%25t>" - stumpwm:*window-border-style* :tight - stumpwm:*normal-border-width* 1 ) -(stumpwm:set-focus-color "#7799CC") +(stumpwm:set-focus-color "#7798CC") (stumpwm:grename "One") (stumpwm:gnewbg "Two") (stumpwm:gnewbg "Three") @@ -56,6 +73,7 @@ (stumpwm:gnewbg "Six") (stumpwm:gnewbg "Seven") (stumpwm:gnewbg "Eight") +(stumpwm:gnewbg "Nine") (stumpwm:toggle-mode-line (stumpwm:current-screen) (stumpwm:current-head)) ;; I change the prefix key to something else besides a keychord. @@ -111,11 +129,11 @@ (define-key *root-map* (kbd "C-S") "exec ./.dmenu/dmenu-surfraw.sh") (define-key *root-map* (kbd "C-T") "exec ./.dmenu/dmenu-trading.sh") ;; Browse somewhere -(define-key *root-map* (kbd "b") "colon1 exec firefox http://www.") +(define-key *root-map* (kbd "b") "colon1 exec brave http://www.") ;; Ssh somewhere (define-key *root-map* (kbd "C-s") "colon1 exec xterm -e ssh ") ;; Lock screen -(define-key *root-map* (kbd "C-l") "exec xlock") +(define-key *root-map* (kbd "C-l") "exec slock") ;; Web jump (works for Google and Imdb) (defmacro make-web-jump (name prefix) diff --git a/.doom.d/config.el b/.doom.d/config.el index 9d8befb..0fecf90 100644 --- a/.doom.d/config.el +++ b/.doom.d/config.el @@ -131,6 +131,8 @@ :desc "Search web for text between BEG/END" "s w" #'eww-search-words) +(setq ispell-dictionary "english") + (setq doom-font (font-spec :family "Mononoki Nerd Font" :size 15) doom-variable-pitch-font (font-spec :family "Ubuntu" :size 15) doom-big-font (font-spec :family "Mononoki Nerd Font" :size 24)) @@ -404,6 +406,9 @@ eshell-visual-commands'("bash" "fish" "htop" "ssh" "top" "zsh") vterm-max-scrollback 5000) (map! :leader + :desc "Eshell" + "e s" #'eshell + :leader :desc "Counsel eshell history" "e h" #'counsel-esh-history) diff --git a/.doom.d/config.org b/.doom.d/config.org index 51cf1ea..b8710a8 100644 --- a/.doom.d/config.org +++ b/.doom.d/config.org @@ -13,6 +13,7 @@ - [[#emms][EMMS]] - [[#evaluate-elisp-expressions][EVALUATE ELISP EXPRESSIONS]] - [[#eww][EWW]] +- [[#flyspellispellaspell][FLYSPELL/ISPELL/ASPELL]] - [[#fonts][FONTS]] - [[#ivy][IVY]] - [[#ivy-posframe][IVY-POSFRAME]] @@ -229,7 +230,7 @@ Changing some keybindings from their defaults to better fit with Doom Emacs, and #+END_SRC * EWW -EWW is the Emacs Web Wowser, the builtin browser in Emacs. Below I set urls to open in a specific browser (eww) with browse-url-browser-function. By default, Doom Emacs does not use 'SPC e' for anything, so I choose to use the format 'SPC e' plus 'key' for these (I also use 'SPC e' for 'eval' keybindings). I chose to use 'SPC s w' for eww-search-words because Doom Emacs uses 'SPC s' for 'search' commands. +EWW is the Emacs Web Wowser, the builtin browser in Emacs. Below I set URLs to open in a specific browser (eww) with browse-url-browser-function. By default, Doom Emacs does not use 'SPC e' for anything, so I choose to use the format 'SPC e' plus 'key' for these (I also use 'SPC e' for 'eval' keybindings). I chose to use 'SPC s w' for eww-search-words because Doom Emacs uses 'SPC s' for 'search' commands. #+BEGIN_SRC emacs-lisp (setq browse-url-browser-function 'eww-browse-url) @@ -244,6 +245,18 @@ EWW is the Emacs Web Wowser, the builtin browser in Emacs. Below I set urls to "s w" #'eww-search-words) #+END_SRC +* FLYSPELL/ISPELL/ASPELL +I installed 'aspell' and 'aspell-en' from the Arch Linux repos to get spellchecking to work. I also made a table listing some of the default Doom Emac's keybindings for flycheck/flyspell. They are listed here for reference. + +| COMMAND | DESCRIPTION | KEYBINDING | +|---------------+--------------------------------+------------| +| flycheck-mode | /Toggle enable/disable flycheck/ | SPC t f | +| flyspell-mode | /Toggle enable/disable flyspell/ | SPC t s | + +#+BEGIN_SRC emacs-lisp +(setq ispell-dictionary "english") +#+END_SRC + * FONTS Settings related to fonts within Doom Emacs: + 'doom-font' -- standard monospace font that is used for most things in Emacs. @@ -662,6 +675,9 @@ Settings for the various shells and terminal emulators within Emacs. eshell-visual-commands'("bash" "fish" "htop" "ssh" "top" "zsh") vterm-max-scrollback 5000) (map! :leader + :desc "Eshell" + "e s" #'eshell + :leader :desc "Counsel eshell history" "e h" #'counsel-esh-history) #+END_SRC diff --git a/.doom.d/init.el b/.doom.d/init.el index 392a404..4b77103 100644 --- a/.doom.d/init.el +++ b/.doom.d/init.el @@ -29,7 +29,7 @@ ;;deft ; notational velocity for Emacs doom ; what makes DOOM look the way it does doom-dashboard ; a nifty splash screen for Emacs - doom-quit ; DOOM quit-message prompts when you quit Emacs + ;;doom-quit ; DOOM quit-message prompts when you quit Emacs (emoji +unicode) ; 🙂 ;;fill-column ; a `fill-column' indicator hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW @@ -66,9 +66,9 @@ ;;word-wrap ; soft wrapping with language-aware indent :emacs - dired ; making dired pretty [functional] + (dired +icons) ; making dired pretty [functional] electric ; smarter, keyword-based electric-indent - ibuffer ; interactive buffer management + (ibuffer +icons) ; interactive buffer management undo ; persistent, smarter undo for your inevitable mistakes vc ; version-control and Emacs, sitting in a tree @@ -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 @@ -129,7 +129,7 @@ ;;fstar ; (dependent) types and (monadic) effects and Z3 ;;gdscript ; the language you waited for ;;(go +lsp) ; the hipster dialect - (haskell +dante) ; a language that's lazier than I am + (haskell +dante +lsp) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python ;;idris ; a language you can depend on json ; At least it ain't XML @@ -150,7 +150,7 @@ php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional - python ; beautiful is better than ugly + (python +lsp) ; beautiful is better than ugly ;;qt ; the 'cutest' gui framework ever ;;racket ; a DSL for DSLs ;;raku ; the artist formerly known as perl6 @@ -160,7 +160,7 @@ ;;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good ;;scheme ; a fully conniving family of lisps - sh ; she sells {ba,z,fi}sh shells on the C xor + (sh +fish +lsp) ; she sells {ba,z,fi}sh shells on the C xor ;;sml ;;solidity ; do you need a blockchain? No. ;;swift ; who asked for emoji variables? @@ -189,5 +189,5 @@ emms-mode-line :config - ;;literate + literate (default +bindings +smartparens)) diff --git a/.doom.d/packages.el b/.doom.d/packages.el index 5b3b889..b605949 100644 --- a/.doom.d/packages.el +++ b/.doom.d/packages.el @@ -49,7 +49,6 @@ ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) ;(unpin! t) (package! all-the-icons-dired) -(package! flycheck-aspell) (package! async) (package! dired-open) (package! dmenu) @@ -58,7 +57,10 @@ (package! emms) (package! emojify) (package! evil-tutor) +(package! flycheck-aspell) (package! ivy-posframe) +(package! lsp-haskell) +(package! lsp-python-ms) (package! mastodon) (package! org-bullets) (package! org-ql) diff --git a/.xmonad/README.org b/.xmonad/README.org index 9e4d085..1f34ef4 100644 --- a/.xmonad/README.org +++ b/.xmonad/README.org @@ -697,7 +697,7 @@ myScratchPads = [ NS "terminal" spawnTerm findTerm manageTerm , NS "mocp" spawnMocp findMocp manageMocp ] where - spawnTerm = myTerminal ++ " -n scratchpad 'fish'" + spawnTerm = myTerminal ++ " -n scratchpad" findTerm = resource =? "scratchpad" manageTerm = customFloating $ W.RationalRect l t w h where @@ -916,7 +916,7 @@ myKeys = , ("M-p x", xmonadPrompt dtXPConfig) -- xmonadPrompt -- Useful programs to have a keybinding for launch - , ("M-", spawn (myTerminal ++ " -e fish")) + , ("M-", spawn (myTerminal)) , ("M-b", spawn (myBrowser ++ " www.youtube.com/c/DistroTube/")) , ("M-M1-h", spawn (myTerminal ++ " -e htop")) diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index 33d8fb9..ad42924 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -589,7 +589,7 @@ myScratchPads = [ NS "terminal" spawnTerm findTerm manageTerm , NS "mocp" spawnMocp findMocp manageMocp ] where - spawnTerm = myTerminal ++ " -n scratchpad 'fish'" + spawnTerm = myTerminal ++ " -n scratchpad" findTerm = resource =? "scratchpad" manageTerm = customFloating $ W.RationalRect l t w h where @@ -758,7 +758,7 @@ myKeys = , ("M-p x", xmonadPrompt dtXPConfig) -- xmonadPrompt -- Useful programs to have a keybinding for launch - , ("M-", spawn (myTerminal ++ " -e fish")) + , ("M-", spawn (myTerminal)) , ("M-b", spawn (myBrowser ++ " www.youtube.com/c/DistroTube/")) , ("M-M1-h", spawn (myTerminal ++ " -e htop"))