Update some stuff

Deathemonic · Apr 20, 2022 · a993486 · a993486
1 parent d10cbea
commit a993486
Show file tree

Hide file tree

Showing 23 changed files with 272 additions and 152 deletions.
diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc
@@ -64,4 +64,4 @@ br -a sxiv state=floating
 br -a mpv state=floating
 br -a Conky state=floating
 br -a stalonetray state=floating
-br -a Lxappearance state=floating
+br -a Lxappearance state=floating
diff --git a/config/kitty/colors.conf b/config/kitty/colors.conf
@@ -29,6 +29,9 @@ inactive_tab_foreground #D9E0EE
 inactive_tab_background #1E1E2E
 tab_bar_background      #161320
 
+active_tab_font_style normal
+inactive_tab_font_style normal
+
 # Marks
 mark1_foreground        #1E1E2E
 mark1_background        #96CDFB

diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
@@ -1,12 +1,31 @@
 # Fonts
-font_family JetBrains Mono Medium Nerd Font
-bold_font JetBrains Mono Bold
-italic_font JetBrains Mono Italic
-bold_italic_font JetBrains Bold Italic
-font_size 10
+font_family                     JetBrains Mono Nerd Font
+bold_font                       auto
+italic_font                     auto
+bold_italic_font                auto
+font_size                       10
 
-# Colors
-include $HOME/.config/kitty/colors.conf
+# Include
+include                         $HOME/.config/kitty/colors.conf
+include                         $HOME/.config/kitty/tabs.conf
+include                         $HOME/.config/kitty/mappings.conf
 
 # Padding
-window_padding_width 15
+window_padding_width            15
+
+# Cursors
+cursor_shape                    beam
+cursor_beam_thickness           1
+
+# Size
+remember_window_size            yes
+initial_window_width            640
+initial_window_height           400
+
+# Layouts
+enabled_layouts                 horizontal,splits,grid,fat
+window_resize_step_cells        1
+window_resize_step_lines        1
+
+# Border
+window_border_width             0
diff --git a/config/kitty/mappings.conf b/config/kitty/mappings.conf
@@ -0,0 +1,82 @@
+# General
+kitty_mod                       ctrl+shift
+map kitty_mod+c                 copy_to_clipboard
+map kitty_mod+v                 paste_from_clipboard
+map kitty_mod+s                 paste_from_selection
+map shift+insert                paste_from_selection
+map kitty_mod+o                 pass_selection_to_program
+map kitty_mod+up                scroll_line_up
+map kitty_mod+k                 scroll_line_up
+map kitty_mod+down              scroll_line_down
+map kitty_mod+j                 scroll_line_down
+map kitty_mod+page_up           scroll_page_up
+map kitty_mod+page_down         scroll_page_down
+# map kitty_mod+home            scroll_home
+# map kitty_mod+end             scroll_end
+map kitty_mod+h                 show_scrollback
+
+# Window management
+map kitty_mod+enter             new_window
+map kitty_mod+w                 close_window
+map kitty_mod+]                 next_window
+map kitty_mod+[                 previous_window
+map kitty_mod+f                 move_window_forward
+map kitty_mod+b                 move_window_backward
+map kitty_mod+`                 move_window_to_top
+map kitty_mod+r                 start_resizing_window
+map kitty_mod+1                 first_window
+map kitty_mod+2                 second_window
+map kitty_mod+3                 third_window
+map kitty_mod+4                 fourth_window
+map kitty_mod+5                 fifth_window
+map kitty_mod+6                 sixth_window
+map kitty_mod+7                 seventh_window
+map kitty_mod+8                 eighth_window
+map kitty_mod+9                 ninth_window
+map kitty_mod+0                 tenth_window
+map kitty_mod+alt+l             resize_window narrower
+map kitty_mod+alt+h             resize_window wider
+map kitty_mod+alt+k             resize_window taller
+map kitty_mod+alt+j             resize_window shorter
+
+# Tab management
+map kitty_mod+right             next_tab
+map kitty_mod+left              previous_tab
+map kitty_mod+t                 new_tab
+map kitty_mod+q                 close_tab
+map kitty_mod+.                 move_tab_forward
+map kitty_mod+,                 move_tab_backward
+map kitty_mod+alt+t             set_tab_title
+map ctrl+alt+1                  goto_tab 1
+map ctrl+alt+2                  goto_tab 2
+
+# Layout management
+map kitty_mod+l                 next_layout
+map ctrl+alt+t                  goto_layout tall
+map ctrl+alt+s                  goto_layout splits
+map kitty_mod+alt+g             goto_layout grid
+map ctrl+alt+p                  last_used_layout
+
+#: Font sizes
+map kitty_mod+equal             change_font_size all +1.0
+map kitty_mod+minus             change_font_size all -1.0
+map kitty_mod+backspace         change_font_size all 0
+map kitty_mod+f6                change_font_size all 10.0
+map kitty_mod+f6                change_font_size current 10.0
+
+# Select and act on visible text
+map kitty_mod+e                 kitten hints
+
+# Misc
+map kitty_mod+f11               toggle_fullscreen
+map kitty_mod+f10               toggle_maximized
+map kitty_mod+u                 kitten unicode_input
+map kitty_mod+f2                edit_config_file
+map kitty_mod+escape            kitty_shell window
+map kitty_mod+a>m               set_background_opacity +0.1
+map kitty_mod+a>l               set_background_opacity -0.1
+map kitty_mod+a>1               set_background_opacity 1
+map kitty_mod+a>d               set_background_opacity default
+map kitty_mod+delete            clear_terminal reset active
+
+# Taken From mf-dots
diff --git a/config/kitty/tabs.conf b/config/kitty/tabs.conf
@@ -0,0 +1,18 @@
+# Edge
+tab_bar_edge                        top
+
+# Margin
+tab_bar_margin_width                5.0
+
+# Tab bar style
+tab_bar_style                       fade
+
+# The separator between tabs in the tab bar when using separator.
+# tab_separator                     " "
+tab_fade                            0 
+
+# Tab Title
+active_tab_title_template           {fmt.fg._afc3fb}{fmt.bg.default}{fmt.fg._1d2030}{fmt.bg._afc3fb} {title} {fmt.fg._afc3fb}{fmt.bg.default}
+tab_title_template                  {fmt.fg._3c414c}{fmt.bg.default}{fmt.fg._626b7e}{fmt.bg._3c414c} {title} {fmt.fg._3c414c}{fmt.bg.default}
+
+# Taken from mf-dots
diff --git a/config/polybar/config.ini b/config/polybar/config.ini
@@ -1,6 +1,7 @@
 [global/wm]
-include-file = ~/.config/polybar/colors.ini
-include-file = ~/.config/polybar/modules.ini
+include-file = $HOME/.config/polybar/colors.ini
+include-file = $HOME/.config/polybar/modules.ini
+include-file = $HOME/.config/polybar/system.ini
 
 [bar/main]
 wm-restack = bspwm
@@ -11,9 +12,9 @@ background = ${color.background}
 foreground = ${color.foreground}
 font-0 = "JetBrains Mono Medium:size=9.5;3"
 font-1 = "Iosevka Nerd Font:size=12;3"
-modules-left = menu cpu memory filesystem updates
+modules-left = menu cpu memory temperature filesystem updates
 modules-center = workspaces
-modules-right = network bluetooth backlight alsa date sysmenu
+modules-right = network ethernet bluetooth backlight alsa date sysmenu
 height = 40
 width = 95%
 offset-x = 35

diff --git a/config/polybar/modules.ini b/config/polybar/modules.ini
@@ -5,7 +5,7 @@ type = custom/text
 content = 
 content-padding = 2
 content-foreground = ${color.blue}
-click-left = ~/.config/rofi/bin/launcher
+click-left = $HOME/.config/rofi/bin/launcher
 
 [module/cpu]
 type = internal/cpu
@@ -217,7 +217,7 @@ ramp-9 = 
 
 [module/updates]
 type = custom/script
-exec = sh ~/.config/polybar/updates.sh
+exec = sh $HOME/.config/polybar/updates.sh
 interval = 180
 format = <label>
 label = %output%
@@ -229,4 +229,4 @@ type = custom/text
 content = 
 content-padding = 2
 content-foreground = ${color.red}
-click-left = ~/.config/rofi/bin/powermenu
+click-left = $HOME/.config/rofi/bin/powermenu
diff --git a/config/rofi/bin/runner b/config/rofi/bin/runner
@@ -2,5 +2,5 @@
 rofi \
 	-show run \
 	-scroll-method 0 \
-	-terminal alacritty \
+	-terminal kitty \
 	-theme "$HOME"/.config/rofi/config/runner.rasi
diff --git a/config/rofi/config/askpass.rasi b/config/rofi/config/askpass.rasi
@@ -12,7 +12,7 @@ window {
     border:		            0px 0px 2px 0px;
     border-radius:          8px;
     border-color:           @BDR;
-    location:               center;
+    location:               0;
     x-offset:               0;
     y-offset:               -4%;
 }

diff --git a/config/rofi/config/bluetooth.rasi b/config/rofi/config/bluetooth.rasi
@@ -17,7 +17,7 @@ window {
     border:                         2px;
     border-color:                   @BDR;
     border-radius:                  10px;
-    width:                          400px;
+    width:                          300px;
     anchor:                         center;
     x-offset:                       0;
     y-offset:                       0;

diff --git a/config/rofi/config/confirm.rasi b/config/rofi/config/confirm.rasi
@@ -7,18 +7,18 @@
 }
 
 window {
-    width:      	    200px;
+    width:      	        200px;
     padding:                20px;
-    border:		    0px 0px 2px 0px;
+    border:		            0px 0px 2px 0px;
     border-radius:          8px;
     border-color:           @BDR;
-    location:               center;
+    location:               0;
     x-offset:               0;
     y-offset:               -4%;
 }
 
 entry {
-    expand: 		    true;
-    width: 		    150px;
-    text-color:		    @BDR;
+    expand: 		        true;
+    width: 		            150px;
+    text-color:		        @BDR;
 }
diff --git a/config/rofi/config/font.rasi b/config/rofi/config/font.rasi
@@ -1,8 +1,3 @@
-/* Copyright (C) 2020-2021 Aditya Shakya <[email protected]> */
-/* Everyone is permitted to copy and distribute copies of this file under GNU-GPL3 */
-
-/* Text Font */
-
 * {
     font:				 	"Iosevka 10";
 }
diff --git a/config/rofi/config/launcher.rasi b/config/rofi/config/launcher.rasi
@@ -1,9 +1,10 @@
 configuration {
     show-icons:                     true;
-    display-drun: 		    "";
+    display-drun: 		            "";
     drun-display-format:            "{icon} {name}";
     disable-history:                false;
-    click-to-exit: 		    true;
+    click-to-exit: 		            true;
+    location:                       0;
 }
 
 @import "font.rasi"
@@ -17,27 +18,26 @@ window {
     border-color:                   @BDR;
     border-radius:                  10px;
     width:                          500px;
-    location:                       center;
     anchor:                         center;
     x-offset:                       0;
     y-offset:                       0;
 }
 
 prompt {
-    enabled: 			    true;
-    padding: 			    8px;
-    background-color: 		    @BG;
-    text-color: 		    @IMG;
+    enabled: 			            true;
+    padding: 			            8px;
+    background-color: 		        @BG;
+    text-color: 		            @IMG;
 }
 
 textbox-prompt-colon {
-    expand: 			    false;
-    str: 			    "";
+    expand: 			            false;
+    str: 			                "";
     border-radius:                  100%;
     background-color:               @SEL;
     text-color:                     @FG;
     padding:                        8px 12px 8px 12px;
-    font:			    "Iosevka Nerd Font 10";
+    font:			                "Iosevka Nerd Font 10";
 }
 
 entry {
@@ -55,7 +55,7 @@ entry {
 }
 
 inputbar {
-	children: 		    [ textbox-prompt-colon, prompt, entry ];
+	children: 		                [ textbox-prompt-colon, prompt, entry ];
     background-color:               @BG;
     text-color:                     @FG;
     expand:                         false;
@@ -77,7 +77,7 @@ case-indicator {
 listview {
     background-color:               @BG;
     columns:                        1;
-    lines:			    7;
+    lines:			                7;
     spacing:                        4px;
     cycle:                          false;
     dynamic:                        true;
@@ -101,16 +101,16 @@ element {
 
 element-icon {
     background-color: 	            inherit;
-    text-color:       		    inherit;
+    text-color:       		        inherit;
     horizontal-align:               0.5;
     vertical-align:                 0.5;
     size:                           24px;
     border:                         0px;
 }
 
 element-text {
-    background-color: 		    inherit;
-    text-color:       		    inherit;
+    background-color: 		        inherit;
+    text-color:       		        inherit;
     expand:                         true;
     horizontal-align:               0;
     vertical-align:                 0.5;