Merge a lot of awesome changings from laptop
This commit is contained in:
		
						commit
						404b809f82
					
				
					 10 changed files with 56 additions and 22 deletions
				
			
		| 
						 | 
				
			
			@ -71,7 +71,7 @@
 | 
			
		|||
(global hostname-handle (io.popen "hostname"))
 | 
			
		||||
(global hostname (hostname-handle:read "a"))
 | 
			
		||||
(hostname-handle:close)
 | 
			
		||||
(local laptop (= hostname "syl"))
 | 
			
		||||
(local laptop true)
 | 
			
		||||
 | 
			
		||||
;; Table of layouts to cover with awful.layout.inc, order matters.
 | 
			
		||||
(set awful.layout.layouts [
 | 
			
		||||
| 
						 | 
				
			
			@ -341,14 +341,26 @@
 | 
			
		|||
                          :right (dpi 10)})
 | 
			
		||||
 | 
			
		||||
     (set s.batterytext (awful.widget.watch "cat /sys/class/power_supply/BAT1/capacity" 30))
 | 
			
		||||
     (set s.batterytext2 (awful.widget.watch "cat /sys/class/power_supply/BAT2/capacity" 30))
 | 
			
		||||
     (set s.batteryicon (wibox.widget.textbox " "))
 | 
			
		||||
     (set s.batteryspace (wibox.widget.textbox "  "))
 | 
			
		||||
 | 
			
		||||
     (set s.batterywidget (wibox.widget {
 | 
			
		||||
     (set s.batterywidget { 1 { 1 { 1 (wibox.widget {
 | 
			
		||||
                                         1 s.batteryicon
 | 
			
		||||
                                         2 s.batterytext
 | 
			
		||||
                                         3 s.batteryspace
 | 
			
		||||
                                         :layout wibox.layout.fixed.horizontal}))
 | 
			
		||||
                                         4 s.batteryicon
 | 
			
		||||
                                         5 s.batterytext2
 | 
			
		||||
                                         6 s.batteryspace
 | 
			
		||||
                                         :layout wibox.layout.fixed.horizontal})
 | 
			
		||||
                                     :widget wibox.container.margin
 | 
			
		||||
                                     :left (dpi 10)}
 | 
			
		||||
                                  :widget wibox.container.background
 | 
			
		||||
                                  :shape gears.shape.rounded_bar
 | 
			
		||||
                                  :bg beautiful.bg_normal
 | 
			
		||||
                                  :fg beautiful.base0C}
 | 
			
		||||
                               :widget wibox.container.margin
 | 
			
		||||
                               :right (dpi 10)})
 | 
			
		||||
 | 
			
		||||
     (set s.cputext (awful.widget.watch "cpu" 5))
 | 
			
		||||
     (set s.cpuicon (wibox.widget.textbox " "))
 | 
			
		||||
| 
						 | 
				
			
			@ -420,10 +432,10 @@
 | 
			
		|||
                        :expand "outside"
 | 
			
		||||
                        1 { ;; Left widgets
 | 
			
		||||
                           1 {
 | 
			
		||||
                              :layout wibox.layout.fixed.horizontal
 | 
			
		||||
                              :layout wibox.layout.align.horizontal
 | 
			
		||||
                              1 s.mytaglist
 | 
			
		||||
                              2 s.mypromptbox
 | 
			
		||||
                              3 s.mytasklist ;; Middle widget
 | 
			
		||||
                              2 s.mytasklist ;; Middle widget
 | 
			
		||||
                              3 s.myemptywidget
 | 
			
		||||
                              }
 | 
			
		||||
                           :left (dpi 10)
 | 
			
		||||
                           :right (dpi 10)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -128,7 +128,7 @@
 | 
			
		|||
                     ;; Programs
 | 
			
		||||
                     (awful.key [ modkey ] "d" (fn [] (awful.spawn "emacsclient -c -e '(dired-jump)'"))
 | 
			
		||||
                                {:description "launch dired in new emacs frame" :group "apps" })
 | 
			
		||||
                     (awful.key [ modkey ] "x" (fn [] (awful.spawn "org-capture"))
 | 
			
		||||
                     (awful.key [ modkey ] "x" (fn [] (awful.spawn "emacsclient -c -e '(org-capture)'"))
 | 
			
		||||
                                {:description "launch scratchpad in new emacs frame" :group "apps" })
 | 
			
		||||
                     (awful.key [ modkey ] "'" (fn [] (awful.spawn "emacsclient -e '(org-agenda-list)'"
 | 
			
		||||
{:name "*Org Agenda(a)*"}))
 | 
			
		||||
| 
						 | 
				
			
			@ -306,6 +306,13 @@
 | 
			
		|||
                                    (when tag
 | 
			
		||||
                                      (awful.tag.viewtoggle tag))))
 | 
			
		||||
                                {:description "toggle tag #4" :group "tag"})
 | 
			
		||||
                     (awful.key [ modkey ] "0"
 | 
			
		||||
                                (fn []
 | 
			
		||||
                                  (let [screen (awful.screen.focused)
 | 
			
		||||
                                        tag    (. screen.tags 10)]
 | 
			
		||||
                                    (when tag
 | 
			
		||||
                                      (awful.tag.viewtoggle tag))))
 | 
			
		||||
                                {:description "toggle scratchpad" :group "tag"})
 | 
			
		||||
                     ;; Toggle tag on focused client.
 | 
			
		||||
                     (awful.key [ modkey ctrl shift ] "1"
 | 
			
		||||
                                (fn []
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -16,10 +16,10 @@
 | 
			
		|||
                             :raise true
 | 
			
		||||
                             ;; :keys keys
 | 
			
		||||
                             ;; :buttons clientbuttons
 | 
			
		||||
                             ;; :screen awful.screen.preferred
 | 
			
		||||
                             :screen awful.screen.preferred
 | 
			
		||||
                             :size_hints_honor false
 | 
			
		||||
                             :placement (+ awful.placement.no_overlap awful.placement.no_offscreen)
 | 
			
		||||
                             ;; :shape gears.shape.rounded_rect
 | 
			
		||||
                             :placement awful.placement.no_overlap
 | 
			
		||||
                             :shape gears.shape.rounded_rect
 | 
			
		||||
                             }
 | 
			
		||||
               }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -71,6 +71,22 @@
 | 
			
		|||
                            :placement (+ awful.placement.no_offscreen awful.placement.centered)
 | 
			
		||||
                            }
 | 
			
		||||
               }
 | 
			
		||||
              ;; Org Capture
 | 
			
		||||
              {
 | 
			
		||||
               :rule_any {
 | 
			
		||||
                          :name [
 | 
			
		||||
                                 "org-capture"
 | 
			
		||||
                                 ]
 | 
			
		||||
                          }
 | 
			
		||||
               :properties {
 | 
			
		||||
                            :floating true
 | 
			
		||||
                            :raise true
 | 
			
		||||
                            :screen 1
 | 
			
		||||
                            :width (dpi 900)
 | 
			
		||||
                            :height (dpi 600)
 | 
			
		||||
                            :placement (+ awful.placement.no_offscreen awful.placement.centered)
 | 
			
		||||
                            }
 | 
			
		||||
               }
 | 
			
		||||
              ;; Pulsemixer center and smaller
 | 
			
		||||
              {
 | 
			
		||||
               :rule_any {
 | 
			
		||||
| 
						 | 
				
			
			@ -83,9 +99,9 @@
 | 
			
		|||
                            :raise true
 | 
			
		||||
                            :ontop true
 | 
			
		||||
                            :screen awful.screen.preferred
 | 
			
		||||
                            ;; :width (dpi 600)
 | 
			
		||||
                            :height (dpi 300)
 | 
			
		||||
                            :placement (+ awful.placement.no_offscreen awful.placement.centered)
 | 
			
		||||
                            :width (dpi 600)
 | 
			
		||||
                            :height (dpi 200)
 | 
			
		||||
                            :placement awful.placement.centered
 | 
			
		||||
                            }
 | 
			
		||||
               }
 | 
			
		||||
              ;; Tell qb to open primarily on the secondary monitor
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -22,7 +22,7 @@ proc_update_mult=2
 | 
			
		|||
 | 
			
		||||
#* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu responsive",
 | 
			
		||||
#* "cpu lazy" updates top process over time, "cpu responsive" updates top process directly.
 | 
			
		||||
proc_sorting="memory"
 | 
			
		||||
proc_sorting="cpu responsive"
 | 
			
		||||
 | 
			
		||||
#* Reverse sorting order, True or False.
 | 
			
		||||
proc_reversed=False
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -169,8 +169,8 @@ end
 | 
			
		|||
    # visual mode, but due to fish_cursor_default, is redundant here
 | 
			
		||||
    set fish_cursor_visual block
 | 
			
		||||
 | 
			
		||||
    ### BANG BANG FUNCTIONS
 | 
			
		||||
    function __history_previous_command
 | 
			
		||||
### BANG BANG FUNCTIONS
 | 
			
		||||
function __history_previous_command
 | 
			
		||||
    switch (commandline -t)
 | 
			
		||||
        case "!"
 | 
			
		||||
            commandline -t $history[1]
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
[FileDialog]
 | 
			
		||||
history=file:///home/chris, file:///home/chris/Documents/TFC Stuff/newsletterpics, file:///home/chris/Videos/vimeo, file:///home/chris/Pictures/tfc, file:///home/chris/Pictures, file:///home/chris/Videos
 | 
			
		||||
lastVisited=file:///home/chris/Videos
 | 
			
		||||
history=file:///home/chris/Videos/vimeo, file:///home/chris/Pictures/tfc, file:///home/chris/Pictures, file:///home/chris/Videos, file:///home/chris
 | 
			
		||||
lastVisited=file:///home/chris
 | 
			
		||||
qtVersion=5.15.2
 | 
			
		||||
shortcuts=file:, file:///home/chris
 | 
			
		||||
sidebarWidth=116
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,5 +9,6 @@ configuration {
 | 
			
		|||
  sidebar-mode:       true;
 | 
			
		||||
  run-command:        "fish -c {cmd}";
 | 
			
		||||
  run-list-command:   "fish -c functions";
 | 
			
		||||
  display-keys:       true;
 | 
			
		||||
}
 | 
			
		||||
@import "/home/chris/.dotfiles/rofi/launchers-git/laptop.rasi"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,6 +10,6 @@
 | 
			
		|||
 | 
			
		||||
 | 
			
		||||
configuration {
 | 
			
		||||
    font:                           "VictorMono Nerd Font 12.0";
 | 
			
		||||
    font:                           "VictorMono Nerd Font 30.0";
 | 
			
		||||
}
 | 
			
		||||
@import "/home/chris/.dotfiles/rofi/launchers-git/blurry.rasi"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -7,7 +7,7 @@
 | 
			
		|||
# License: https://www.gitlab.com/dwt1/dmscripts/LICENSE
 | 
			
		||||
# Contributors: Derek Taylor
 | 
			
		||||
 | 
			
		||||
if [ $(hostname) = "chris-linuxlaptop" ]; then
 | 
			
		||||
if [ $(hostname) = "syl" ]; then
 | 
			
		||||
    style="laptop"
 | 
			
		||||
    #echo "this is hidpi"
 | 
			
		||||
else 
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -20,10 +20,8 @@
 | 
			
		|||
# variable.
 | 
			
		||||
 | 
			
		||||
if [ $(hostname) = 'syl' ]; then
 | 
			
		||||
    echo laptop
 | 
			
		||||
    size=2300x1500
 | 
			
		||||
else
 | 
			
		||||
    echo desktop
 | 
			
		||||
    size=1500x900
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue