From d4cdc063d7f7b4e60138892021ecb6a116fb09c6 Mon Sep 17 00:00:00 2001 From: starr-dusT Date: Fri, 22 Jan 2021 17:42:11 -0800 Subject: [PATCH] commit before qtile branch --- .config/qtile/autostart.sh | 2 +- .config/qtile/config.org | 178 +++++++++++++++++++++++-------------- .config/qtile/config.py | 176 ++++++++++++++++++++++-------------- .doom.d/+ui.el | 2 +- .doom.d/doomed.org | 6 +- .doom.d/init.el | 4 +- 6 files changed, 227 insertions(+), 141 deletions(-) diff --git a/.config/qtile/autostart.sh b/.config/qtile/autostart.sh index 59e853b1..84ae8697 100755 --- a/.config/qtile/autostart.sh +++ b/.config/qtile/autostart.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -nitrogen --restore & +wal -i ~/media/pictures/wallpapers/random_wallpapers/sierra_red_mountains.jpg lxsession & xsetroot -cursor_name left_ptr imwheel -b 45 diff --git a/.config/qtile/config.org b/.config/qtile/config.org index ee4a0e66..d0431713 100644 --- a/.config/qtile/config.org +++ b/.config/qtile/config.org @@ -17,8 +17,7 @@ from libqtile import bar, layout, widget, hook from libqtile.config import Click, Drag, Group, Key, Match, Screen from libqtile.lazy import lazy from libqtile.utils import guess_terminal -import os -import subprocess +import os, subprocess, json #+end_src * Variables @@ -38,7 +37,7 @@ dgroups_key_binder = None dgroups_app_rules = [] # Set mouse functionality follow_mouse_focus = True -bring_front_click = True +bring_front_click = False cursor_warp = False # Set fullscreen options auto_fullscreen = True @@ -49,6 +48,10 @@ floating_layout = layout.Floating(float_rules=[ {'wmclass': 'Steam'}, ]) +wal_loc = os.path.expanduser('~/.cache/wal/colors.json') +wal = json.load(open(wal_loc)) +spacer_len = 3 + #+end_src * Keys @@ -58,34 +61,65 @@ floating_layout = layout.Floating(float_rules=[ # Start keys block keys = [ # Close focused window - Key([mod], "q", lazy.window.kill(), desc="Kill focused window"), + Key([mod], "q", + lazy.window.kill(), + ), + # Rotate through the available layout algorithms - Key([mod], "Tab", lazy.next_layout(), desc="Toggle between layouts"), + Key([mod], "space", + lazy.next_layout(), + ), + Key([mod, "shift"], "space", + lazy.prev_layout(), + ), # Switch between windows - Key([mod], "h", lazy.layout.left(), desc="Move focus to left"), - Key([mod], "l", lazy.layout.right(), desc="Move focus to right"), - Key([mod], "j", lazy.layout.down(), desc="Move focus down"), - Key([mod], "k", lazy.layout.up(), desc="Move focus up"), - Key([mod], "space", lazy.layout.next(), - desc="Move window focus to other window"), - # Navigate between windows on screen - Key([mod, "shift"], "h", lazy.layout.shuffle_left(), - desc="Move window to the left"), - Key([mod, "shift"], "l", lazy.layout.shuffle_right(), - desc="Move window to the right"), - Key([mod, "shift"], "j", lazy.layout.shuffle_down(), - desc="Move window down"), - Key([mod, "shift"], "k", lazy.layout.shuffle_up(), - desc="Move window up"), + Key([mod], "h", + lazy.layout.left(), + ), + Key([mod], "l", + lazy.layout.right(), + ), + Key([mod], "j", + lazy.layout.down(), + ), + Key([mod], "k", + lazy.layout.up(), + ), + + # Move windows on screen + Key([mod, "shift"], "h", + lazy.layout.shuffle_left(), + lazy.layout.client_to_next(), + lazy.layout.flip_left(), + ), + Key([mod, "shift"], "l", + lazy.layout.shuffle_right(), + lazy.layout.client_to_previous(), + lazy.layout.flip_right(), + ), + Key([mod, "shift"], "j", + lazy.layout.shuffle_down(), + lazy.layout.flip_down(), + ), + Key([mod, "shift"], "k", + lazy.layout.shuffle_up(), + lazy.layout.flip_up(), + ), # Resize windows on screen - Key([mod, "shift"], "h", lazy.layout.grow_left(), - desc="Grow window to the left"), - Key([mod, "shift"], "l", lazy.layout.grow_right(), - desc="Grow window to the right"), - Key([mod, "shift"], "j", lazy.layout.grow_down(), - desc="Grow window down"), - Key([mod, "shift"], "k", lazy.layout.grow_up(), - desc="Grow window up"), + Key([mod, "control"], "h", + lazy.layout.grow_left(), + lazy.layout.shrink() + ), + Key([mod, "control"], "l", + lazy.layout.grow_right(), + lazy.layout.grow() + ), + Key([mod, "control"], "j", + lazy.layout.grow_down(), + ), + Key([mod, "control"], "k", + lazy.layout.grow_up(), + ), # Return sizes to default Key([mod], "n", lazy.layout.normalize(), desc="Reset all window sizes"), @@ -167,17 +201,19 @@ for i in groups: # Key([mod, "shift"], i.name, lazy.window.togroup(i.name), # desc="move focused window to group {}".format(i.name)), ]) + #+end_src * Layouts #+begin_src python layouts = [ - layout.Columns(border_focus_stack='#d75f5f', margin=2), + layout.Columns(border_focus = wal['colors']['color2'], + border_normal = wal['colors']['color0'], margin = 2), layout.Max(), # Try more layouts by unleashing below layouts. - # layout.Stack(num_stacks=2), + layout.Stack(num_stacks=2), # layout.Bsp(), # layout.Matrix(), - # layout.MonadTall(), + layout.MonadTall(), # layout.MonadWide(), # layout.RatioTile(), # layout.Tile(), @@ -189,58 +225,68 @@ layouts = [ * Defaults #+begin_src python + widget_defaults = dict( font='JetBrains Mono Nerd Font', - fontsize=11, + fontsize=10, padding=3, + background = wal['colors']['color0'] ) extension_defaults = widget_defaults.copy() + #+end_src * Screens #+begin_src python -colors = [["#282c34", "#282c34"], # panel background - ["#434758", "#434758"], # background for current screen tab - ["#ffffff", "#ffffff"], # font color for group names - ["#ff5555", "#ff5555"], # border line color for current tab - ["#8d62a9", "#8d62a9"], # border line color for other tab and odd widgets - ["#668bd7", "#668bd7"], # color for the even widgets - ["#e1acff", "#e1acff"]] # window name screens = [ Screen( top=bar.Bar( [ - widget.GroupBox( - fontsize = 9, - margin_y = 3, - margin_x = 0, - padding_y = 5, - padding_x = 3, - borderwidth = 3, - active = colors[2], - inactive = colors[2], - rounded = False, - highlight_color = colors[1], - highlight_method = "line", - this_current_screen_border = colors[3], - this_screen_border = colors [4], - other_current_screen_border = colors[0], - other_screen_border = colors[0], - foreground = colors[2], - background = colors[0], - hide_unused=True), - widget.TextBox('|'), + # Group Box + widget.GroupBox(active = wal['colors']['color0'], + inactive = wal['colors']['color0'], + urgent_text = wal['colors']['color0'], + background = wal['colors']['color1'], + this_current_screen_border = wal['colors']['color2'], + other_screen_border = wal['colors']['color2'], + urgent_border = wal['colors']['color6'], + highlight_method='block', + rounded = False, + hide_unused=True), + widget.TextBox(text='\uE0B0', + fontsize=17, + padding=0, + foreground=wal['colors']['color1']), + # Window Name + widget.Spacer(length = spacer_len, + background = wal['colors']['color0']), widget.WindowName(), + # Prompt widget.Prompt(), - - - widget.TextBox('|'), - widget.CPUGraph(frequency=1, samples=30, type='box'), - widget.TextBox('|'), - widget.Clock(format='%Y-%m-%d %a %I:%M %p'), + # Volume + widget.TextBox(text = '\uE0B2', fontsize = 17, + padding = 0, foreground = wal['colors']['color2'], + background = wal['colors']['color0']), + widget.TextBox(text = ' ', fontsize = 14, + foreground = wal['colors']['color0'], + background = wal['colors']['color2']), + widget.PulseVolume(foreground = wal['colors']['color0'], + background = wal['colors']['color2']), + widget.Spacer(length = spacer_len, + background = wal['colors']['color2']), + # Clock + widget.TextBox(text = '\uE0B2', fontsize = 17, + padding = 0, foreground = wal['colors']['color1'], + background = wal['colors']['color2']), + widget.Clock(format='%Y-%m-%d %a %I:%M %p', + background = wal['colors']['color1'], + foreground = wal['colors']['color0']), + widget.Spacer(length = spacer_len, + background = wal['colors']['color1']), + widget.CurrentLayout(scale=0.6), ], - 24, + 20, ), ), ] diff --git a/.config/qtile/config.py b/.config/qtile/config.py index c1ef22a6..9405ec99 100644 --- a/.config/qtile/config.py +++ b/.config/qtile/config.py @@ -3,8 +3,7 @@ from libqtile import bar, layout, widget, hook from libqtile.config import Click, Drag, Group, Key, Match, Screen from libqtile.lazy import lazy from libqtile.utils import guess_terminal -import os -import subprocess +import os, subprocess, json # Use the "Windows" key for mod mod = "mod4" @@ -18,7 +17,7 @@ dgroups_key_binder = None dgroups_app_rules = [] # Set mouse functionality follow_mouse_focus = True -bring_front_click = True +bring_front_click = False cursor_warp = False # Set fullscreen options auto_fullscreen = True @@ -29,37 +28,72 @@ floating_layout = layout.Floating(float_rules=[ {'wmclass': 'Steam'}, ]) +wal_loc = os.path.expanduser('~/.cache/wal/colors.json') +wal = json.load(open(wal_loc)) +spacer_len = 3 + # Start keys block keys = [ # Close focused window - Key([mod], "q", lazy.window.kill(), desc="Kill focused window"), + Key([mod], "q", + lazy.window.kill(), + ), + # Rotate through the available layout algorithms - Key([mod], "Tab", lazy.next_layout(), desc="Toggle between layouts"), + Key([mod], "space", + lazy.next_layout(), + ), + Key([mod, "shift"], "space", + lazy.prev_layout(), + ), # Switch between windows - Key([mod], "h", lazy.layout.left(), desc="Move focus to left"), - Key([mod], "l", lazy.layout.right(), desc="Move focus to right"), - Key([mod], "j", lazy.layout.down(), desc="Move focus down"), - Key([mod], "k", lazy.layout.up(), desc="Move focus up"), - Key([mod], "space", lazy.layout.next(), - desc="Move window focus to other window"), - # Navigate between windows on screen - Key([mod, "shift"], "h", lazy.layout.shuffle_left(), - desc="Move window to the left"), - Key([mod, "shift"], "l", lazy.layout.shuffle_right(), - desc="Move window to the right"), - Key([mod, "shift"], "j", lazy.layout.shuffle_down(), - desc="Move window down"), - Key([mod, "shift"], "k", lazy.layout.shuffle_up(), - desc="Move window up"), + Key([mod], "h", + lazy.layout.left(), + ), + Key([mod], "l", + lazy.layout.right(), + ), + Key([mod], "j", + lazy.layout.down(), + ), + Key([mod], "k", + lazy.layout.up(), + ), + + # Move windows on screen + Key([mod, "shift"], "h", + lazy.layout.shuffle_left(), + lazy.layout.client_to_next(), + lazy.layout.flip_left(), + ), + Key([mod, "shift"], "l", + lazy.layout.shuffle_right(), + lazy.layout.client_to_previous(), + lazy.layout.flip_right(), + ), + Key([mod, "shift"], "j", + lazy.layout.shuffle_down(), + lazy.layout.flip_down(), + ), + Key([mod, "shift"], "k", + lazy.layout.shuffle_up(), + lazy.layout.flip_up(), + ), # Resize windows on screen - Key([mod, "shift"], "h", lazy.layout.grow_left(), - desc="Grow window to the left"), - Key([mod, "shift"], "l", lazy.layout.grow_right(), - desc="Grow window to the right"), - Key([mod, "shift"], "j", lazy.layout.grow_down(), - desc="Grow window down"), - Key([mod, "shift"], "k", lazy.layout.grow_up(), - desc="Grow window up"), + Key([mod, "control"], "h", + lazy.layout.grow_left(), + lazy.layout.shrink() + ), + Key([mod, "control"], "l", + lazy.layout.grow_right(), + lazy.layout.grow() + ), + Key([mod, "control"], "j", + lazy.layout.grow_down(), + ), + Key([mod, "control"], "k", + lazy.layout.grow_up(), + ), # Return sizes to default Key([mod], "n", lazy.layout.normalize(), desc="Reset all window sizes"), @@ -131,13 +165,14 @@ for i in groups: ]) layouts = [ - layout.Columns(border_focus_stack='#d75f5f', margin=2), + layout.Columns(border_focus = wal['colors']['color2'], + border_normal = wal['colors']['color0'], margin = 2), layout.Max(), # Try more layouts by unleashing below layouts. - # layout.Stack(num_stacks=2), + layout.Stack(num_stacks=2), # layout.Bsp(), # layout.Matrix(), - # layout.MonadTall(), + layout.MonadTall(), # layout.MonadWide(), # layout.RatioTile(), # layout.Tile(), @@ -148,53 +183,60 @@ layouts = [ widget_defaults = dict( font='JetBrains Mono Nerd Font', - fontsize=11, + fontsize=10, padding=3, + background = wal['colors']['color0'] ) extension_defaults = widget_defaults.copy() -colors = [["#282c34", "#282c34"], # panel background - ["#434758", "#434758"], # background for current screen tab - ["#ffffff", "#ffffff"], # font color for group names - ["#ff5555", "#ff5555"], # border line color for current tab - ["#8d62a9", "#8d62a9"], # border line color for other tab and odd widgets - ["#668bd7", "#668bd7"], # color for the even widgets - ["#e1acff", "#e1acff"]] # window name - screens = [ Screen( top=bar.Bar( [ - widget.GroupBox( - fontsize = 9, - margin_y = 3, - margin_x = 0, - padding_y = 5, - padding_x = 3, - borderwidth = 3, - active = colors[2], - inactive = colors[2], - rounded = False, - highlight_color = colors[1], - highlight_method = "line", - this_current_screen_border = colors[3], - this_screen_border = colors [4], - other_current_screen_border = colors[0], - other_screen_border = colors[0], - foreground = colors[2], - background = colors[0], - hide_unused=True), - widget.TextBox('|'), + # Group Box + widget.GroupBox(active = wal['colors']['color0'], + inactive = wal['colors']['color0'], + urgent_text = wal['colors']['color0'], + background = wal['colors']['color1'], + this_current_screen_border = wal['colors']['color2'], + other_screen_border = wal['colors']['color2'], + urgent_border = wal['colors']['color6'], + highlight_method='block', + rounded = False, + hide_unused=True), + widget.TextBox(text='\uE0B0', + fontsize=17, + padding=0, + foreground=wal['colors']['color1']), + # Window Name + widget.Spacer(length = spacer_len, + background = wal['colors']['color0']), widget.WindowName(), + # Prompt widget.Prompt(), - - - widget.TextBox('|'), - widget.CPUGraph(frequency=1, samples=30, type='box'), - widget.TextBox('|'), - widget.Clock(format='%Y-%m-%d %a %I:%M %p'), + # Volume + widget.TextBox(text = '\uE0B2', fontsize = 17, + padding = 0, foreground = wal['colors']['color2'], + background = wal['colors']['color0']), + widget.TextBox(text = ' ', fontsize = 14, + foreground = wal['colors']['color0'], + background = wal['colors']['color2']), + widget.PulseVolume(foreground = wal['colors']['color0'], + background = wal['colors']['color2']), + widget.Spacer(length = spacer_len, + background = wal['colors']['color2']), + # Clock + widget.TextBox(text = '\uE0B2', fontsize = 17, + padding = 0, foreground = wal['colors']['color1'], + background = wal['colors']['color2']), + widget.Clock(format='%Y-%m-%d %a %I:%M %p', + background = wal['colors']['color1'], + foreground = wal['colors']['color0']), + widget.Spacer(length = spacer_len, + background = wal['colors']['color1']), + widget.CurrentLayout(scale=0.6), ], - 24, + 20, ), ), ] diff --git a/.doom.d/+ui.el b/.doom.d/+ui.el index cadbd521..7b11a50f 100644 --- a/.doom.d/+ui.el +++ b/.doom.d/+ui.el @@ -15,7 +15,7 @@ ;; There are two ways to load a theme. Both assume the theme is installed and ;; available. You can either set `doom-theme' or manually load a theme with the ;; `load-theme' function. This is the default: -(setq doom-theme 'doom-gruvbox) +(setq doom-theme 'doom-dracula) ;; This determines the style of line numbers in effect. If set to `nil', line ;; numbers are disabled. For relative line numbers, set this to `relative'. diff --git a/.doom.d/doomed.org b/.doom.d/doomed.org index a437b62c..b7eadf33 100644 --- a/.doom.d/doomed.org +++ b/.doom.d/doomed.org @@ -1,6 +1,4 @@ -#+TITLE: Doomed Config -#+PROPERTY: header-args:emacs-lisp - +#+TITLE: Doomed Config #+PROPERTY: header-args:emacs-lisp * Table of Contents :PROPERTIES: :TOC: :include all :depth 3 @@ -366,7 +364,7 @@ Load modules with external configs. ;; There are two ways to load a theme. Both assume the theme is installed and ;; available. You can either set `doom-theme' or manually load a theme with the ;; `load-theme' function. This is the default: -(setq doom-theme 'doom-gruvbox) +(setq doom-theme 'doom-dracula) ;; This determines the style of line numbers in effect. If set to `nil', line ;; numbers are disabled. For relative line numbers, set this to `relative'. diff --git a/.doom.d/init.el b/.doom.d/init.el index d655af66..ac215ba2 100644 --- a/.doom.d/init.el +++ b/.doom.d/init.el @@ -36,7 +36,7 @@ ;;hydra ;;indent-guides ; highlighted indent columns ;;ligatures ; ligatures and symbols to make your code pretty again - ;;minimap ; show a map of the code on the side + minimap ; show a map of the code on the side modeline ; snazzy, Atom-inspired modeline, plus API ;;nav-flash ; blink cursor line after big motions ;;neotree ; a project drawer, like NERDTree for vim @@ -55,7 +55,7 @@ (evil +everywhere); come to the dark side, we have cookies file-templates ; auto-snippets for empty files fold ; (nigh) universal code folding - ;;(format +onsave) ; automated prettiness + (format +onsave) ; automated prettiness ;;god ; run Emacs commands without modifier keys ;;lispy ; vim for lisp, for people who don't like vim ;;multiple-cursors ; editing in many places at once