Change font

6 files changed, 39 insertions, 34 deletions

diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml
index 0355c86..5c83523 100644
--- a/.config/alacritty/alacritty.toml
+++ b/.config/alacritty/alacritty.toml
@@ -3,10 +3,10 @@ dynamic_padding = true
 opacity = 1.0
 
 [font]
-normal      = {family="JetBrainsMono Nerd Font", style="Regular"}
-bold        = {family="JetBrainsMono Nerd Font", style="Bold"}
-italic      = {family="JetBrainsMono Nerd Font", style="Italic"}
-bold_italic = {family="JetBrainsMono Nerd Font", style="Bold Italic"}
+normal      = {family="MartianMono Nerd Font Mono", style="Medium"}
+bold        = {family="MartianMono Nerd Font Mono", style="Bold"}
+italic      = {family="MartianMono Nerd Font Mono", style="Medium Italic"}
+bold_italic = {family="MartianMono Nerd Font Mono", style="Bold Italic"}
 
 offset.x = 0
 offset.y = 0
@@ -21,21 +21,21 @@ foreground = "#FFFFFF"
 background = "#111111"
 
 [colors.normal]
-black = "#444444"
-red = "#CC2233"
-green = "#11CC22"
+black = "#333333"
+red = "#990911"
+green = "#099911"
 yellow = "#CC9900"
-blue = "#3020CC"
-magenta = "#CC2288"
-cyan = "#11AADD"
-white = "#C0C0D3"
+blue = "#5511CC"
+magenta = "#990966"
+cyan = "#0077AA"
+white = "#999999"
 
 [colors.bright]
-black = "#222222"
+black = "#666666"
 red = "#ff2222"
 green = "#22ff44"
 yellow = "#ffff00"
-blue = "#3f30ff"
+blue = "#8833FF"
 magenta = "#ff4499"
 cyan = "#22ccff"
 white = "#FFFFFF"
diff --git a/.config/i3/config b/.config/i3/config
index 8671d1f..a4e1a61 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -4,7 +4,7 @@ set $down j
 set $up k
 set $right l
 
-font pango:JetBrainsMono Nerd Font 9
+font pango:MartianMono Nerd Font Medium 9
 
 exec --no-startup-id dex --autostart --environment i3
 exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
@@ -31,8 +31,11 @@ bindsym Print exec --no-startup-id flameshot gui
 for_window [class="love"] floating enable
 for_window [instance="Godot_Engine"] floating enable
 
-gaps outer 2
-gaps inner 6
+gaps outer 0
+gaps inner 2
+
+# default_border pixel 2
+# default_floating_border pixel 2
 
 floating_modifier $mod
 
@@ -57,7 +60,7 @@ bindsym $mod+Shift+$right move right
 bindsym $mod+g split h
 bindsym $mod+v split v
 
-bindsym $mod+f fullscreen toggle
+bindsym $mod+a fullscreen toggle
 
 bindsym $mod+y layout stacking
 bindsym $mod+w layout tabbed
@@ -67,7 +70,7 @@ bindsym $mod+Shift+space floating toggle
 
 bindsym $mod+space focus mode_toggle
 
-bindsym $mod+b focus parent
+bindsym $mod+i focus parent
 
 set $ws1 "1"
 set $ws2 "2"
@@ -91,7 +94,6 @@ bindsym $mod+8 workspace number $ws8
 bindsym $mod+9 workspace number $ws9
 bindsym $mod+0 workspace number $ws10
 
-bindsym $mod+c workspace number $ws8
 bindsym $mod+z workspace number $ws9
 bindsym $mod+x workspace number $ws10
 
@@ -106,7 +108,6 @@ bindsym $mod+Shift+8 move container to workspace number $ws8
 bindsym $mod+Shift+9 move container to workspace number $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10
 
-bindsym $mod+Shift+c move container to workspace number $ws8
 bindsym $mod+Shift+z move container to workspace number $ws9
 bindsym $mod+Shift+x move container to workspace number $ws10
 
diff --git a/.config/nvim/colors/mine.vim b/.config/nvim/colors/mine.vim
index 7e5ca45..6e067bd 100644
--- a/.config/nvim/colors/mine.vim
+++ b/.config/nvim/colors/mine.vim
@@ -44,6 +44,7 @@ hi Operator     guifg=#AAAABB guibg=NONE    gui=NONE
 
 hi PreProc      guifg=#FF4499 guibg=NONE    gui=NONE
 
+hi Typedef      guifg=#997FFF guibg=NONE    gui=italic
 hi Type         guifg=#997FFF guibg=NONE    gui=italic
 hi StorageClass guifg=#4499FF guibg=NONE    gui=italic
 hi Structure    guifg=#4499FF guibg=NONE    gui=bold,italic
@@ -54,3 +55,7 @@ hi SpecialChar  guifg=#ffffff guibg=NONE    gui=bold,italic
 hi Error        guifg=#ff4444 guibg=NONE    gui=bold,undercurl
 
 hi Todo         guifg=#ffffff guibg=NONE    gui=bold,italic,underline
+
+hi Added        guifg=#44FF44 guibg=NONE    gui=NONE
+hi Changed      guifg=#FFFF44 guibg=NONE    gui=NONE
+hi Removed      guifg=#FF4444 guibg=NONE    gui=NONE
diff --git a/.config/nvim/lua/plugin/setup.lua b/.config/nvim/lua/plugin/setup.lua
index 69a80da..2eaeee8 100644
--- a/.config/nvim/lua/plugin/setup.lua
+++ b/.config/nvim/lua/plugin/setup.lua
@@ -57,8 +57,8 @@ local theme = {
 require("lualine").setup {
   options = {
     theme = theme,
-    component_separators = { left = "", right = ""  },
-    section_separators = { left = "", right = ""  },
+    component_separators = { left = "", right = ""  },
+    section_separators = { left = "", right = ""  },
   },
 }
 
diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf
index 1dcff65..52d1587 100644
--- a/.config/picom/picom.conf
+++ b/.config/picom/picom.conf
@@ -22,11 +22,6 @@ rounded-corners-exclude = [
   "window_type = 'desktop'"
 ];
 
-blur: {
-  method = "dual_kawase";
-  strength = 4;
-}
-
 backend = "glx";
 dithered-present = false;
 vsync = true;
@@ -39,9 +34,7 @@ use-damage = true;
 log-level = "warn";
 wintypes:
 {
-  tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; full-shadow = false; };
+  tooltip = { fade = true; shadow = true; focus = true; full-shadow = false; };
   dock = { shadow = false; clip-shadow-above = true; }
   dnd = { shadow = false; }
-  popup_menu = { opacity = 0.8; }
-  dropdown_menu = { opacity = 0.8; }
 };
diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini
index f444bac..90abf2b 100644
--- a/.config/polybar/config.ini
+++ b/.config/polybar/config.ini
@@ -49,9 +49,9 @@ bottom = true
 separator = :
 separator-foreground = ${colors.disabled}
 
-font-0 = JetBrainsMono Nerd Font;2
+font-0 = MartianMono Nerd Font:size=11:weight=Medium;1
 
-modules-left = xworkspaces
+modules-left = user xworkspaces
 modules-center = xwindow
 modules-right = pulseaudio memory cpu date time
 
@@ -60,6 +60,12 @@ cursor-scroll = ns-resize
 
 enable-ipc = true
 
+[module/user]
+type = custom/script
+exec = "echo `whoami`@`hostname`"
+
+label-foreground = ${colors.primary}
+
 [module/systray]
 type = internal/tray
 
@@ -146,10 +152,10 @@ label-connected = %{F#FFFFFF}%ifname%%{F-} %essid%
 
 [module/time]
 type = internal/date
-interval = 10
+interval = 1
 
 time = %I:%M%p
-time-alt = %H:%M
+time-alt = %H:%M:%S
 
 label = %time%
 label-foreground = ${colors.primary}