Merge branch 'master' of github.com:augustogunsch/dotfiles

config/alacritty.yml

@@ -175,12 +175,62 @@ font:
 # If `true`, bold text is drawn using the bright color variants.
 #draw_bold_text_with_bright_colors: false
 
-# Colors (Tomorrow Night)
+# Colors (Hyper)
+#colors:
+  #primary:
+    #background: '0x000000'
+    #foreground: '0xffffff'
+  #cursor:
+    #text: '0xF81CE5'
+    #cursor: '0xffffff'
+  #normal:
+    #black:   '0x000000'
+    #red:     '0xfe0100'
+    #green:   '0x33ff00'
+    #yellow:  '0xfeff00'
+    #blue:    '0x0066ff'
+    #magenta: '0xcc00ff'
+    #cyan:    '0x00ffff'
+    #white:   '0xd0d0d0'
+  #bright:
+    #black:   '0x808080'
+    #red:     '0xfe0100'
+    #green:   '0x33ff00'
+    #yellow:  '0xfeff00'
+    #blue:    '0x0066ff'
+    #magenta: '0xcc00ff'
+    #cyan:    '0x00ffff'
+    #white:   '0xFFFFFF'
+
+# XTerm's default colors
 colors:
-  # Default colors
   primary:
+    background: '0x000000'
+    foreground: '0xffffff'
+  normal:
+    black:   '0x000000'
+    red:     '0xcd0000'
+    green:   '0x00cd00'
+    yellow:  '0xcdcd00'
+    blue:    '0x0000ee'
+    magenta: '0xcd00cd'
+    cyan:    '0x00cdcd'
+    white:   '0xe5e5e5'
+  bright:
+    black:   '0x7f7f7f'
+    red:     '0xff0000'
+    green:   '0x00ff00'
+    yellow:  '0xffff00'
+    blue:    '0x5c5cff'
+    magenta: '0xff00ff'
+    cyan:    '0x00ffff'
+    white:   '0xffffff'
+
+# Colors (Tomorrow Night)
+#colors:
+  # Default colors
+  #primary:
   #  background: '#1d1f21'
-    background: '#000000'
   #  foreground: '#c5c8c6'
 
     # Bright and dim foreground colors
@@ -268,16 +318,15 @@ colors:
   #  background: CellForeground
 
   # Normal colors
-  normal:
+  #normal:
-    black:   '#000000'
+  #  black:   '#000000'
-    red:     '#ff1111'
+  #  red:     '#ff1111'
-    green:   '#11ff11'
+  #  green:   '#11ff11'
   #  yellow:  '#f0c674'
   #  blue:    '#81a2be'
-    blue:    '#1111ff'
   #  magenta: '#b294bb'
   #  cyan:    '#8abeb7'
-    white:   '#ffffff'
+  #  white:   '#ffffff'
 
   # Bright colors
   #bright:
@@ -721,7 +770,8 @@ colors:
 #
 # If the same trigger is assigned to multiple actions, all of them are executed
 # in the order they were defined in.
-#key_bindings:
+key_bindings:
+  - { key: Return,   mods: Control|Shift, action: SpawnNewInstance }
   #- { key: Paste,                                       action: Paste          }
   #- { key: Copy,                                        action: Copy           }
   #- { key: L,         mods: Control,                    action: ClearLogNotice }

config/awesome/rc.lua

@@ -269,11 +269,11 @@ awful.screen.connect_for_each_screen(function(s)
                 program = 'brightnessctl',
                 percentage = false
             },
-        volume_widget{
+            volume_widget{
-            widget_type = 'icon_and_text',
+                widget_type = 'icon_and_text',
-            with_icon = true,
+                with_icon = true,
-            mute_color = beautiful.bg_urgent
+                mute_color = beautiful.bg_urgent
-        },
+            },
             mytextclock,
             s.mylayoutbox,
         },
@@ -292,7 +292,7 @@ root.buttons(gears.table.join(
 -- {{{ Key bindings
 globalkeys = gears.table.join(
 
-    awful.key({ }, "Print", function () awful.util.spawn("flameshot gui -p ~/shots", false) end),
+    awful.key({ }, "Print", function () awful.util.spawn("flameshot gui", false) end),
 
     -- Volume widget
     awful.key({ }, "XF86AudioRaiseVolume", function() volume_widget:inc(5) end, {description = "increase volume", group = "custom"}),
@@ -406,7 +406,7 @@ globalkeys = gears.table.join(
               {description = "show the menubar", group = "launcher"}),
 
     -- Lock Screen
-    awful.key({ modkey, "Shift" }, "l", function() awful.spawn(scrlocker) end,
+    awful.key({ }, "XF86Display", function() awful.spawn(scrlocker) end,
               {description = "lock the screen", group = "custom"})
 )