diff --git a/dotfiles/X11/xinitrc b/dotfiles/X11/xinitrc index f6e74f6..745892f 100755 --- a/dotfiles/X11/xinitrc +++ b/dotfiles/X11/xinitrc @@ -1,4 +1,3 @@ -export TERM="xterm-256color" xrdb -load $HOME/.Xresources export SHELL="/bin/zsh" @@ -8,6 +7,7 @@ export LANG="en_US.UTF-8" export LANGUAGE="en_US.UTF-8" {%@@ if profile == "work" @@%} +export TERM="xterm-256color" /share/bin/isda ~/bin/.keyboard.scm & xrandr --output HDMI-2 --auto --right-of HDMI-1 diff --git a/dotfiles/fonts/IPAGothic.ttf b/dotfiles/fonts/IPAGothic.ttf new file mode 100644 index 0000000..586b502 Binary files /dev/null and b/dotfiles/fonts/IPAGothic.ttf differ diff --git a/dotfiles/fonts/Inconsolata-Regular/Inconsolata-Regular.ttf b/dotfiles/fonts/Inconsolata-Regular.ttf similarity index 100% rename from dotfiles/fonts/Inconsolata-Regular/Inconsolata-Regular.ttf rename to dotfiles/fonts/Inconsolata-Regular.ttf diff --git a/dotfiles/i3/config b/dotfiles/i3/config index 04b2bb4..5e55fe7 100644 --- a/dotfiles/i3/config +++ b/dotfiles/i3/config @@ -220,12 +220,7 @@ bindsym $mod+Ctrl+2 move workspace to output $monitor2 bindsym $mod+Shift+BackSpace exec "~/scripts/lock-laptop" # Custom Workspaces -for_window [class="Thunderbird"] move container to workspace 6 -# doesnt work -# for_window [class="spotify"] move container to workspace 7 -#for_window [class="telegram"] move container to workspace 8 for_window [class="discord"] move container to workspace 8 -for_window [class="Chromium"] move container to workspace 9 for_window [class="Firefox"] move container to workspace 9 # Monitors diff --git a/dotfiles/polybar/config b/dotfiles/polybar/config index e5115ed..eda1897 100644 --- a/dotfiles/polybar/config +++ b/dotfiles/polybar/config @@ -1,5 +1,5 @@ ; vim: ft=dosini -############################################################################### + [colors] nord_red = #BF616A nord_orange = #D08770 @@ -15,37 +15,39 @@ nord_blue3 = #5E81AC nord0 = #2E3440 nord3 = #4C566A -nord0_trans = #f02E3440 - frost2 = #ECEFF4 -# Set colors + accent = ${colors.nord_green} - modules_fg = ${colors.frost2} - background = ${colors.nord0} foreground = ${colors.frost2} ############################################################################### -[font] -inconsolata = "Inconsolata:pixelsize=11;2" -inconsolata_nerd = "InconsolataLGC Nerd Font Mono:pixelsize=14;4" +[settings] +format-foreground = ${colors.foreground} +format-background = ${colors.background} +format-padding = 0 +format-margin = 0 +screenchange-reload = true ############################################################################### [bar/laptop] monitor = "eDP-1" enable-ipc = false -font-0 = ${font.inconsolata} -font-1 = ${font.inconsolata_nerd} +font-0 = "Inconsolata:pixelsize=11;2" +font-1 = "InconsolataLGC Nerd Font Mono:pixelsize=14;4" +font-2 = "IPAGothic:fontformat=truetype:antialias=false:pixelsize=11" bottom = false fixed-center = true -#padding-left = 0.5 +padding-left = 0 padding-right = 1 +radius = 0.0 + foreground = ${colors.foreground} background = ${colors.background} @@ -62,8 +64,8 @@ override-redirect = true module-margin = 1 modules-left = i3tabs title -modules-center = -modules-right = backlight volume battery date time powermenu +modules-center = spotify_current +modules-right = firefox spotify discord pipe backlight volume battery pipe date time pipe separator = wm-name = i3 @@ -78,8 +80,8 @@ tray-position = monitor = ${env:MONITOR:} modules-left = i3tabs title -modules-center = -modules-right = volume battery date time +modules-center = spotify_current +modules-right = firefox spotify discord pipe volume battery date time separator = ############################################################################### @@ -113,12 +115,12 @@ label-focused-background = ${colors.accent} label-focused-padding = 1 label-unfocused = %index% -label-unfocused-foreground = ${colors.frost2} +label-unfocused-foreground = ${colors.foreground} label-unfocused-background = ${self.background} label-unfocused-padding = 1 label-visible = %index% -label-visible-foreground = #ffffff +label-visible-foreground = ${colors.foreground} label-visible-background = ${self.background} label-visible-padding = 1 @@ -141,10 +143,7 @@ interval = 1.0 date = %Y-%m-%d% date-alt = %A, %d %B %Y -label-underline = ${colors.frost2} -label-foreground = ${colors.modules_fg} - -label = [ 冀 %date% ] +label = 冀 %date% ############################################################################### [module/time] @@ -154,9 +153,7 @@ interval = 1.0 time = %H:%M -label = [  %time% ] -label-font = 0 -label-foreground = ${colors.modules_fg} +label =  %time% ############################################################################### [module/title] @@ -166,7 +163,6 @@ format =