Merge branch 'master' of gitlab.com:chriscochrun/dotfiles

awesome/init.fnl

@@ -72,7 +72,7 @@
                                                 (if (= "syl\n" stdout)
                                                     (global laptop true)
                                                     (global laptop false))))
-(local laptop false)
+(local laptop true)
 
 ;; Table of layouts to cover with awful.layout.inc, order matters.
 (set awful.layout.layouts [
@@ -328,8 +328,8 @@
                                       3 s.tempspace
                                       :layout wibox.layout.fixed.horizontal}))
 
-     (set s.volumetext (awful.widget.watch "pamixer --get-volume-human" 1))
+     (set s.volumetext (awful.widget.watch "pamixer --get-volume-human" 0.5))
-     (set s.mictext (awful.widget.watch "pamixer --source 48 --get-volume-human" 1))
+     (set s.mictext (awful.widget.watch "pamixer --default-source --get-volume-human" 1))
      (set s.volumeicon (wibox.widget.textbox "  "))
      (set s.micicon (wibox.widget.textbox " "))
      (set s.volumespace (wibox.widget.textbox " "))
@@ -355,7 +355,7 @@
      (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.batteryspace (wibox.widget.textbox " "))
 
      (set s.batterywidget { 1 { 1 { 1 (wibox.widget {
                                          1 s.batteryicon

awesome/rules.fnl

@@ -116,16 +116,18 @@
                             }
                }
               ;; Tell qb to open primarily on the secondary monitor
-              ;; {
+              {
-              ;;  :rule_any {
+               :rule_any {
-              ;;             :class [
+                          :class [
-              ;;                     "qutebrowser"
+                                  "qutebrowser"
-              ;;                     ]
+                                  ]
-              ;;             }
+                          }
-              ;;  :properties {
+               :properties {
-              ;;               :screen (screen.count)
+                            :screen (screen.count)
-              ;;               }
+                            :focus awful.client.focus.filter
-              ;;  }
+                            :raise true
+                            }
+               }
               ;; floating windows
               {
                :rule_any {

bpytop/bpytop.conf

@@ -1,4 +1,4 @@
-#? Config file for bpytop v. 1.0.63
+#? Config file for bpytop v. 1.0.65
 
 #* Color theme, looks for a .theme file in "/usr/[local/]share/bpytop/themes" and "~/.config/bpytop/themes", "Default" for builtin default theme.
 #* Prefix name by a plus sign (+) for a theme located in user themes folder, i.e. color_theme="+monokai"
@@ -76,6 +76,9 @@ show_coretemp=True
 #* Which temperature scale to use, available values: "celsius", "fahrenheit", "kelvin" and "rankine"
 temp_scale="celsius"
 
+#* Show CPU frequency, can cause slowdowns on certain systems with some versions of psutil
+show_cpu_freq=True
+
 #* Draw a clock at top of screen, formatting according to strftime, empty string to disable.
 draw_clock="%X"
 

espanso/default.yml

@@ -29,13 +29,13 @@ matches:
         params:
           cmd: "echo Hello from your shell"
 
-  - trigger: "gml"
+  - trigger: ":gml"
     replace: "ccochrun21@gmail.com"
 
-  - trigger: "otl"
+  - trigger: ":otl"
     replace: "chris.cochrun@outlook.com"
 
-  - trigger: "tfcml"
+  - trigger: ":tfcml"
     replace: "chris@tfcconnection.org"
 
   - trigger: ":name"

picom.conf

@@ -94,11 +94,11 @@ fading = true;
 
 # Opacity change between steps while fading in. (0.01 - 1.0, defaults to 0.028)
 # fade-in-step = 0.028
-fade-in-step = 0.01;
+fade-in-step = 0.08;
 
 # Opacity change between steps while fading out. (0.01 - 1.0, defaults to 0.03)
 # fade-out-step = 0.03
-fade-out-step = 0.01;
+fade-out-step = 0.08;
 
 # The time between steps in fade step, in milliseconds. (> 0, defaults to 10)
 # fade-delta = 10

qutebrowser/autoconfig.yml

@@ -11,6 +11,7 @@ settings:
   content.notifications.enabled:
     https://jelly.cochrun.xyz: true
     https://nc.cochrun.xyz: false
+    https://toolbox.iskysoft.com: false
     https://www.facebook.com: false
     https://www.g2a.com: false
     https://www.reddit.com: false

qutebrowser/qsettings/QtProject.conf

@@ -1,7 +1,12 @@
 [FileDialog]
 ="======"
+<<<<<<< HEAD
 history=file:///home/chris/Pictures, file:///home/chris/Videos, file:///home/chris, file:///home/chris/Downloads, file:///home/chris/Documents/TFC Stuff/newsletterpics
 lastVisited=file:///home/chris/Downloads
+=======
+history=file:///home/chris/Pictures/tfc, file:///home/chris/Pictures, file:///home/chris/Videos, file:///home/chris, file:///home/chris/Downloads
+lastVisited=file:///home/chris
+>>>>>>> 17d2a373e69612d8bf761a1f3cec3ff1ee866f2a
 qtVersion=5.15.2
 shortcuts=file:, file:///home/chris
 sidebarWidth=116

rofi/config.rasi

@@ -10,4 +10,4 @@ configuration {
   run-command:        "fish -c {cmd}";
   run-list-command:   "fish -c functions";
 }
-@import "/home/chris/.dotfiles/rofi/launchers-git/blurry.rasi"
+@import "/home/chris/.dotfiles/rofi/launchers-git/laptop.rasi"

rofi/launchers-git/blurry.rasi

@@ -21,7 +21,7 @@ configuration {
 }
 
 * {
-    backgrounkd:                     #12121222;
+    backgrounkd:                    #12121222;
     background-color:               #00222b33;
     background-entry:               #000000;
     background-alt:                 #323232;
@@ -45,7 +45,7 @@ configuration {
     base0D:                         #57c7ff;
     base0E:                         #ff6ac1;
     base0F:                         #b2643c;
-    base00t:                         #282a36BB;
+    base00t:                        #282a3655;
 }
 
 window {

rofi/launchers-git/laptop.rasi

@@ -10,6 +10,6 @@
 
 
 configuration {
-    font:                           "VictorMono Nerd Font 14.0";
+    font:                           "VictorMono Nerd Font 28.0";
 }
 @import "/home/chris/.dotfiles/rofi/launchers-git/blurry.rasi"