river: add keybind for emacs, switch kitty keybind to alacritty

dot_config/fuzzel/fuzzel.ini

@@ -26,12 +26,22 @@ terminal=kitty
 # launch-prefix=
 
 [colors]
-background=323d43ee
+# Catppuccin Mocha
-text=d8caacff
+background=1e1e2eee
-match=83c092ff
+input=cdd6f4ff
-selection=72b783dd
+text=cdd6f4ff
-selection-text=4a555bff
+match=a6adc8ff
-border=d5b26bff
+selection=a6adc8dd
+selection-text=1e1e2eff
+border=f9e2afff
+
+# Everforest Dark
+#background=323d43ee
+#text=d8caacff
+#match=83c092ff
+#selection=72b783dd
+#selection-text=4a555bff
+#border=d5b26bff
 
 [border]
 width=1

dot_config/gtk-2.0/gtkrc

@@ -1,4 +1,4 @@
 # GTK2 Settings
-gtk-theme-name="Colloid-Dark-Compact-Everforest"
+gtk-theme-name="Colloid-Dark-Compact-Catppuccin"
-gtk-icon-theme-name="Qogir-dark"
+gtk-icon-theme-name="Colloid-Grey-Dark"
 gtk-font-name="DejaVu Sans 10"

dot_config/gtk-3.0/settings.ini

@@ -1,4 +1,4 @@
 [Settings]
-gtk-theme-name = Colloid-Dark-Compact-Everforest
+gtk-theme-name = Colloid-Dark-Compact-Catppuccin
-gtk-icon-theme-name = Qogir-dark
+gtk-icon-theme-name = Colloid-Grey-Dark
 gtk-font-name = DejaVu Sans 10

dot_config/gtk-4.0/settings.ini

@@ -1,5 +1,5 @@
 [Settings]
 gtk-application-preferdark-theme = true
-gtk-theme-name = Colloid-Dark-Compact-Everforest
+gtk-theme-name = Colloid-Dark-Compact-Catppuccin
-gtk-icon-theme-name = Qogir-dark
+gtk-icon-theme-name = Colloid-Grey-Dark
 gtk-font-name = "DejaVu Sans 10"

dot_config/river/executable_init.tmpl

@@ -5,8 +5,11 @@
 #trap 'exec 2>&4 1>&3' 0 1 2 3
 #exec 1>"${XDG_STATE_HOME}"/river.log 2>&1
 
+#Start Emacs
+riverctl map normal Super E spawn emacs
+
 # Start kitty
-riverctl map normal Super Return spawn kitty
+riverctl map normal Super Return spawn alacritty
 
 # Start fuzzel
 riverctl map normal Super Space spawn fuzzel

dot_config/yambar/bar2.yml.tmpl

@@ -1,25 +1,46 @@
 # Colors
-.everforest:
+.catppuccin_mocha:
-  0:  &foreground   d8caacff
+  0: &foreground cdd6f4ff
-  1:  &background   323d43dd
+  1: &background 1e1e2edd
-  2:  &black        4a555bff
+  2: &black 45475aff
-  3:  &dark_grey    525c62ff
+  3: &dark_grey 45475aff
-  4:  &dark_red     e26c6eff
+  4: &dark_red f38ba8ff
-  5:  &red          e68183ff
+  5: &red f38ba8ff
-  6:  &dark_green   9bb86fff
+  6: &dark_green a6e3a1ff
-  7:  &green        a7c080ff
+  7: &green a6e3a1ff
-  8:  &dark_yellow  d5b26bff
+  8: &dark_yellow f9e2afff
-  9:  &yellow       dbbc7fff
+  9: &yellow f9e2afff
-  10: &dark_blue    6eb2a9ff
+  10: &dark_blue 89b4faff
-  11: &blue         7fbbb3ff
+  11: &blue 89b4faff
-  12: &dark_magenta cf87a9ff
+  12: &dark_magenta f5c2e7ff
-  13: &magenta      d699b6ff
+  13: &magenta f5c2e7ff
-  14: &dark_cyan    72b783ff
+  14: &dark_cyan 94e2d5ff
-  15: &cyan         83c092ff
+  15: &cyan 94e2d5ff
-  16: &light_grey   d0bf9bff
+  16: &light_grey bac2deff
-  17: &white        d8caacff
+  17: &white a6adc8ff
-transparent_light_grey: &transparent_light_grey d0bf9b99
+transparent_light_grey: &transparent_light_grey bac2deaa
-transparent_black: &transparent_black 4a555b99
+transparent_black: &transparent_black 45475aaa
+# .everforest:
+#   0:  &foreground   d8caacff
+#   1:  &background   323d43dd
+#   2:  &black        4a555bff
+#   3:  &dark_grey    525c62ff
+#   4:  &dark_red     e26c6eff
+#   5:  &red          e68183ff
+#   6:  &dark_green   9bb86fff
+#   7:  &green        a7c080ff
+#   8:  &dark_yellow  d5b26bff
+#   9:  &yellow       dbbc7fff
+#   10: &dark_blue    6eb2a9ff
+#   11: &blue         7fbbb3ff
+#   12: &dark_magenta cf87a9ff
+#   13: &magenta      d699b6ff
+#   14: &dark_cyan    72b783ff
+#   15: &cyan         83c092ff
+#   16: &light_grey   d0bf9bff
+#   17: &white        d8caacff
+# transparent_light_grey: &transparent_light_grey d0bf9b99
+# transparent_black: &transparent_black 4a555b99
 # Fonts
 {{- if eq .chezmoi.hostname "helix" }}
 hack: &hack Hack:pixelsize=28
@@ -29,7 +50,8 @@ hack: &hack Hack:pixelsize=13
 awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=12
 {{- end }}
 # Labels
-separator: &separator {string: {text: "  ", font: *hack, foreground: *light_grey}}
+separator:
+  &separator { string: { text: "  ", font: *hack, foreground: *light_grey } }
 
 bar:
 {{- if eq .chezmoi.hostname "helix" }}
@@ -122,39 +144,88 @@ bar:
               urgent:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *dark_red}}, {border: {size: 2, color: *black}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *dark_red } },
+                          { border: { size: 2, color: *black } },
+                        ],
+                    }
                   foreground: *black
               focused:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *light_grey}}, {underline: {size: 1, color: *transparent_black}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *light_grey } },
+                          { underline: { size: 1, color: *transparent_black } },
+                        ],
+                    }
                   foreground: *dark_grey
               visible && occupied:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 1, color: *transparent_black}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *transparent_light_grey } },
+                          { underline: { size: 1, color: *transparent_black } },
+                        ],
+                    }
                   foreground: *light_grey
               visible && ~occupied:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 1, color: *transparent_black}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *transparent_light_grey } },
+                          { underline: { size: 1, color: *transparent_black } },
+                        ],
+                    }
                   foreground: *light_grey
               ~visible && occupied:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 1, color: *transparent_light_grey}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *dark_grey } },
+                          {
+                            underline:
+                              { size: 1, color: *transparent_light_grey },
+                          },
+                        ],
+                    }
                   foreground: *light_grey
               ~focused && occupied:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 1, color: *transparent_light_grey}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *dark_grey } },
+                          {
+                            underline:
+                              { size: 1, color: *transparent_light_grey },
+                          },
+                        ],
+                    }
                   foreground: *light_grey
               id < 10 && ~visible && ~occupied:
                 string:
                   <<: *river_base
-                  deco: {underline: {size: 1, color: *transparent_light_grey}}
+                  deco:
+                    { underline: { size: 1, color: *transparent_light_grey } }
                   foreground: *light_grey
-              id >= 10 && ~visible && ~occupied: {empty: {}}
+              id >= 10 && ~visible && ~occupied: { empty: {} }
 {{ end }}
   center:
     - foreign-toplevel:
@@ -162,8 +233,8 @@ bar:
           map:
             conditions:
               activated:
-                - string: {text: "{app-id}: {title}"}
+                - string: { text: "{app-id}: {title}" }
-              ~activated: {empty: {}}
+              ~activated: { empty: {} }
 
   right:
 {{- if eq .chezmoi.hostname "hydrus" }}
@@ -172,40 +243,52 @@ bar:
     - network:
         content:
           map:
-            default: {empty: {}}
+            default: { empty: {} }
             conditions:
               name >= wlan0 && name <= wlan9:
                 map:
                   conditions:
-                    ~carrier: {empty: {}}
+                    ~carrier: { empty: {} }
                     carrier:
                       map:
                         default:
-                          - string: {text: , font: *awesome}
+                          - string: { text: , font: *awesome }
-                          - string: {text: " {name}: {dl-speed:mb} mb/s down - {ul-speed:mb} mb/s up"}
+                          - string:
+                              {
+                                text: " {name}: {dl-speed:mb} mb/s down - {ul-speed:mb} mb/s up",
+                              }
                         conditions:
                           ipv4 == "":
-                            - string: {text: , font: *awesome}
+                            - string: { text: , font: *awesome }
-                            - string: {text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up"}
+                            - string:
+                                {
+                                  text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up",
+                                }
     - network:
         content:
           map:
-            default: {empty: {}}
+            default: { empty: {} }
             conditions:
               name >= eth0 && name <= eth9:
                 map:
                   conditions:
-                    ~carrier: {empty: {}}
+                    ~carrier: { empty: {} }
                     carrier:
                       map:
                         default:
-                          - string: {text: , font: *awesome}
+                          - string: { text: , font: *awesome }
-                          - string: {text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up"}
+                          - string:
+                              {
+                                text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up",
+                              }
                         conditions:
-                          state == down: {string: {text: , font: *awesome}}
+                          state == down: { string: { text: , font: *awesome } }
                           ipv4 == "":
-                            - string: {text: , font: *awesome}
+                            - string: { text: , font: *awesome }
-                            - string: {text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up"}
+                            - string:
+                                {
+                                  text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up",
+                                }
     - label:
         content: *separator
 {{- end }}
@@ -215,13 +298,12 @@ bar:
           map:
             conditions:
               id == -1:
-                - string: {text: , font: *awesome}
+                - string: { text: , font: *awesome }
-                - string: {text: " {cpu}%"}
+                - string: { text: " {cpu}%" }
     - label:
         content: *separator
     - mem:
         poll-interval: 5000
         content:
-          - string: {text: , font: *awesome}
+          - string: { text: , font: *awesome }
-          - string: {text: " {used:mb} MiB ({percent_used}% Used)"}
+          - string: { text: " {used:mb} MiB ({percent_used}% Used)" }
-

dot_config/yambar/config.yml.tmpl

@@ -1,25 +1,46 @@
 # Colors
-.everforest:
+.catppuccin_mocha:
-  0:  &foreground   d3c6aaff
+  0: &foreground cdd6f4ff
-  1:  &background   272e33dd
+  1: &background 1e1e2edd
-  2:  &black        4a555bff
+  2: &black 45475aff
-  3:  &dark_grey    525c62ff
+  3: &dark_grey 45475aff
-  4:  &dark_red     e26c6eff
+  4: &dark_red f38ba8ff
-  5:  &red          e68183ff
+  5: &red f38ba8ff
-  6:  &dark_green   9bb86fff
+  6: &dark_green a6e3a1ff
-  7:  &green        a7c080ff
+  7: &green a6e3a1ff
-  8:  &dark_yellow  d5b26bff
+  8: &dark_yellow f9e2afff
-  9:  &yellow       dbbc7fff
+  9: &yellow f9e2afff
-  10: &dark_blue    6eb2a9ff
+  10: &dark_blue 89b4faff
-  11: &blue         7fbbb3ff
+  11: &blue 89b4faff
-  12: &dark_magenta cf87a9ff
+  12: &dark_magenta f5c2e7ff
-  13: &magenta      d699b6ff
+  13: &magenta f5c2e7ff
-  14: &dark_cyan    72b783ff
+  14: &dark_cyan 94e2d5ff
-  15: &cyan         83c092ff
+  15: &cyan 94e2d5ff
-  16: &light_grey   d0bf9bff
+  16: &light_grey bac2deff
-  17: &white        d8caacff
+  17: &white a6adc8ff
-transparent_light_grey: &transparent_light_grey d0bf9baa
+transparent_light_grey: &transparent_light_grey bac2deaa
-transparent_black: &transparent_black 4a555baa
+transparent_black: &transparent_black 45475aaa
+# .everforest:
+#   0:  &foreground   d8caacff
+#   1:  &background   323d43dd
+#   2:  &black        4a555bff
+#   3:  &dark_grey    525c62ff
+#   4:  &dark_red     e26c6eff
+#   5:  &red          e68183ff
+#   6:  &dark_green   9bb86fff
+#   7:  &green        a7c080ff
+#   8:  &dark_yellow  d5b26bff
+#   9:  &yellow       dbbc7fff
+#   10: &dark_blue    6eb2a9ff
+#   11: &blue         7fbbb3ff
+#   12: &dark_magenta cf87a9ff
+#   13: &magenta      d699b6ff
+#   14: &dark_cyan    72b783ff
+#   15: &cyan         83c092ff
+#   16: &light_grey   d0bf9bff
+#   17: &white        d8caacff
+# transparent_light_grey: &transparent_light_grey d0bf9baa
+# transparent_black: &transparent_black 4a555baa
 # Fonts
 {{- if eq .chezmoi.hostname "helix" }}
 hack: &hack Hack:pixelsize=28
@@ -29,7 +50,8 @@ hack: &hack Hack:pixelsize=13
 awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=12
 {{- end }}
 # Labels
-separator: &separator {string: {text: "  ", font: *hack, foreground: *light_grey}}
+separator:
+  &separator { string: { text: "  ", font: *hack, foreground: *light_grey } }
 
 bar:
 {{- if eq .chezmoi.hostname "helix" }}
@@ -85,32 +107,80 @@ bar:
               urgent:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *dark_red}}, {border: {size: 6, color: *black}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *dark_red } },
+                          { border: { size: 2, color: *black } },
+                        ],
+                    }
                   foreground: *black
               focused:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *light_grey}}, {underline: {size: 6, color: *transparent_black}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *light_grey } },
+                          { underline: { size: 1, color: *transparent_black } },
+                        ],
+                    }
                   foreground: *dark_grey
               visible && occupied:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 6, color: *transparent_black}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *transparent_light_grey } },
+                          { underline: { size: 1, color: *transparent_black } },
+                        ],
+                    }
                   foreground: *light_grey
               visible && ~occupied:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 6, color: *transparent_black}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *transparent_light_grey } },
+                          { underline: { size: 1, color: *transparent_black } },
+                        ],
+                    }
                   foreground: *light_grey
               ~visible && occupied:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 6, color: *transparent_light_grey}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *dark_grey } },
+                          {
+                            underline:
+                              { size: 1, color: *transparent_light_grey },
+                          },
+                        ],
+                    }
                   foreground: *light_grey
               ~focused && occupied:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 6, color: *transparent_light_grey}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *dark_grey } },
+                          {
+                            underline:
+                              { size: 1, color: *transparent_light_grey },
+                          },
+                        ],
+                    }
                   foreground: *light_grey
               id < 10 && ~visible && ~occupied:
                 string:
@@ -122,39 +192,88 @@ bar:
               urgent:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *dark_red}}, {border: {size: 2, color: *black}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *dark_red } },
+                          { border: { size: 2, color: *black } },
+                        ],
+                    }
                   foreground: *black
               focused:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *light_grey}}, {underline: {size: 1, color: *transparent_black}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *light_grey } },
+                          { underline: { size: 1, color: *transparent_black } },
+                        ],
+                    }
                   foreground: *dark_grey
               visible && occupied:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 1, color: *transparent_black}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *transparent_light_grey } },
+                          { underline: { size: 1, color: *transparent_black } },
+                        ],
+                    }
                   foreground: *light_grey
               visible && ~occupied:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 1, color: *transparent_black}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *transparent_light_grey } },
+                          { underline: { size: 1, color: *transparent_black } },
+                        ],
+                    }
                   foreground: *light_grey
               ~visible && occupied:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 1, color: *transparent_light_grey}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *dark_grey } },
+                          {
+                            underline:
+                              { size: 1, color: *transparent_light_grey },
+                          },
+                        ],
+                    }
                   foreground: *light_grey
               ~focused && occupied:
                 string:
                   <<: *river_base
-                  deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 1, color: *transparent_light_grey}}]}
+                  deco:
+                    {
+                      stack:
+                        [
+                          { background: { color: *dark_grey } },
+                          {
+                            underline:
+                              { size: 1, color: *transparent_light_grey },
+                          },
+                        ],
+                    }
                   foreground: *light_grey
               id < 10 && ~visible && ~occupied:
                 string:
                   <<: *river_base
-                  deco: {underline: {size: 1, color: *transparent_light_grey}}
+                  deco:
+                    { underline: { size: 1, color: *transparent_light_grey } }
                   foreground: *light_grey
-              id >= 10 && ~visible && ~occupied: {empty: {}}
+              id >= 10 && ~visible && ~occupied: { empty: {} }
 {{ end }}
   center:
     - foreign-toplevel:
@@ -162,8 +281,8 @@ bar:
           map:
             conditions:
               activated:
-                - string: {text: "{app-id}: {title}"}
+                - string: { text: "{app-id}: {title}" }
-              ~activated: {empty: {}}
+              ~activated: { empty: {} }
 
   right:
     - pulse:
@@ -175,16 +294,25 @@ bar:
               wheel-down: sh -c "pactl set-sink-volume @DEFAULT_SINK@ -5%"
             conditions:
               sink_muted:
-                - string: {text: , font: *awesome, foreground: *transparent_light_grey}
+                - string:
-                - string: {text: " {sink_percent}% ({sink_port})", foreground: *transparent_light_grey}
+                    {
+                      text: ,
+                      font: *awesome,
+                      foreground: *transparent_light_grey,
+                    }
+                - string:
+                    {
+                      text: " {sink_percent}% ({sink_port})",
+                      foreground: *transparent_light_grey,
+                    }
               ~sink_muted:
                 - ramp:
                     tag: sink_percent
                     items:
-                      - string: {text: , font: *awesome}
+                      - string: { text: , font: *awesome }
-                      - string: {text: , font: *awesome}
+                      - string: { text: , font: *awesome }
-                      - string: {text: , font: *awesome}
+                      - string: { text: , font: *awesome }
-                - string: {text: " {sink_percent}% ({sink_port})"}
+                - string: { text: " {sink_percent}% ({sink_port})" }
 {{- if ne .chezmoi.hostname "hydrus" }}
     - label:
         content: *separator
@@ -277,7 +405,7 @@ bar:
         date-format: "%a %b %d"
         time-format: "%R"
         content:
-          - string: {text: , font: *awesome}
+          - string: { text: , font: *awesome }
-          - string: {text: " {date}  "}
+          - string: { text: " {date}  " }
-          - string: {text: , font: *awesome}
+          - string: { text: , font: *awesome }
-          - string: {text: " {time} "}
+          - string: { text: " {time} " }