From 937ead86837349e04dc70b7c47ca2a8ffe3a7e70 Mon Sep 17 00:00:00 2001 From: tactonbishop Date: Fri, 3 Jun 2022 23:32:56 +0100 Subject: [PATCH] Changes too numerable to mention --- fontconfig/fonts.conf | 8 +++--- i3/config | 9 ++++--- kitty/kitty.conf | 4 +-- polybar/config.ini | 31 +++++++++++++---------- rofi/alien-blood-rofi/alien-blood.rasi | 4 +-- rofi/alien-blood-rofi/rounded-common.rasi | 2 +- rofi/config.rasi | 2 +- spotifyd/spotifyd.conf | 2 +- vscode/settings.json | 2 +- x/Xresources | 2 +- x/xinitrc | 16 ++++++++++-- 11 files changed, 50 insertions(+), 32 deletions(-) diff --git a/fontconfig/fonts.conf b/fontconfig/fonts.conf index fdb0ef9..1171c46 100644 --- a/fontconfig/fonts.conf +++ b/fontconfig/fonts.conf @@ -5,28 +5,28 @@ sans-serif - Roboto-Regular + Inter-Regular system-ui - Roboto-Regular + Inter-Regular serif - Roboto + Literation Serif monospace - Fira Code + LigaLiberationMono diff --git a/i3/config b/i3/config index d6233e4..973d4b2 100644 --- a/i3/config +++ b/i3/config @@ -46,7 +46,7 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU floating_modifier $mod # start a terminal -#bindsym $mod+Return exec i3-sensible-terminal +#bindsym $mod+Return exec kitty bindsym $mod+Return exec kitty # kill focused window @@ -195,10 +195,11 @@ bindsym $mod+Tab exec rofi -show window # Rofi window-switcher # THEMING -gaps inner 5 -gaps outer 8 +border_radius 6 +gaps inner 4 +gaps outer 3 -for_window [class="^.*"] border pixel 2 # Remove header on windows +for_window [class="^.*"] border pixel 0 # Remove header on windows set $yellow #717f24 set $green #2f7e25 diff --git a/kitty/kitty.conf b/kitty/kitty.conf index b4295f4..b6dd31b 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -1,4 +1,4 @@ include ./theme.conf font_family LigaLiberationMono -font_size 9.0 -background_opacity: 0.2 +font_size 10.5 +window_padding_width 12 diff --git a/polybar/config.ini b/polybar/config.ini index 70700c1..42c12f9 100644 --- a/polybar/config.ini +++ b/polybar/config.ini @@ -28,27 +28,30 @@ disabled = #707880 [bar/example] width = 100% -height = 27 -radius = 0 -; dpi = 96 - +height = 30 +radius = 6 +dpi = 96 +border-top = 5 +border-left = 5 +border-right = 5 monitor = ${env:MONITOR:} background = ${colors.background} foreground = ${colors.foreground} line-size = 2 border-size = 0 border-color = #00000000 -padding-left = 2 -padding-right = 2 -module-margin-left = 1 -module-margin-right =3 +;margin-left = 10 +padding-left = 3 +padding-right = 1 +module-margin-left = 2 +module-margin-right = 2 ;separator = | ;separator-foreground = ${colors.disabled} -font-0 = Roboto:pixelsize=11:style=Medium; 2 -font-1 = unicode:fontformat=truetype:size=8:antialias=false;0 -font-2 = FontAwesome:size=10;1" +font-0 = Inter:pixelsize=11:style=Medium; 2 +font-1 = FontAwesome:size=12;1" +font-2 = unicode:fontformat=truetype:size=8:antialias=false;0 font-3 = SymbolsNerdFont:size=15;3 @@ -211,7 +214,7 @@ label-full-padding = 1 format-charging-underline = #637d75 format-discharging = format-discharging-underline = ${self.format-charging-underline} -format-full-prefix = "" +format-full-prefix = " " format-full-prefix-foreground = ${colors.primary} format-full-underline = ${self.format-charging-underline} @@ -251,6 +254,8 @@ click-left = exec ~/.config/polybar/polybar_scripts/toggle_bluetooth.sh format-padding = 1 format-foreground = ${colors.primary} format-underline = ${colors.primary} + + [settings] screenchange-reload = true -pseudo-transparency = false +pseudo-transparency = true diff --git a/rofi/alien-blood-rofi/alien-blood.rasi b/rofi/alien-blood-rofi/alien-blood.rasi index 1fb908f..ecf9b97 100644 --- a/rofi/alien-blood-rofi/alien-blood.rasi +++ b/rofi/alien-blood-rofi/alien-blood.rasi @@ -8,10 +8,10 @@ bg0: #000e07; bg1: #0f1610; bg2: #637d75; - bg3: #2f7e25; + bg3: #18e000; fg0: #637d75; fg1: #637d75; - fg2: #717f24; + fg2: #73fa91; fg3: #637d75; } diff --git a/rofi/alien-blood-rofi/rounded-common.rasi b/rofi/alien-blood-rofi/rounded-common.rasi index d798cfb..cf63f5b 100644 --- a/rofi/alien-blood-rofi/rounded-common.rasi +++ b/rofi/alien-blood-rofi/rounded-common.rasi @@ -5,7 +5,7 @@ *******************************************************************************/ * { - font: "Roboto Medium 10"; + font: "Inter Medium 11"; background-color: transparent; text-color: @fg0; diff --git a/rofi/config.rasi b/rofi/config.rasi index 14f8733..f8bb015 100644 --- a/rofi/config.rasi +++ b/rofi/config.rasi @@ -1,6 +1,6 @@ configuration { modi: "window,run,ssh,drun"; - font: "Roboto 11"; + font: "Inter Medium 12"; /* location: 0;*/ /* yoffset: 0;*/ /* xoffset: 0;*/ diff --git a/spotifyd/spotifyd.conf b/spotifyd/spotifyd.conf index 0479df6..26ea10c 100644 --- a/spotifyd/spotifyd.conf +++ b/spotifyd/spotifyd.conf @@ -1,7 +1,7 @@ username = "tactonbishop" password = "7HQcmXADwE9QQD7" backend = "pulseaudio" -device_name = "spotifyd_arch" +device_name = "ThinkPad-T15" device_type = "computer" bitrate = 320 diff --git a/vscode/settings.json b/vscode/settings.json index 4fc63ee..6c72c96 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -2,7 +2,7 @@ "editor.fontFamily": "Liga Liberation Mono", "editor.fontLigatures": true, "editor.fontSize": 12, - "editor.fontWeight": 500, + "editor.fontWeight": 400, "editor.formatOnPaste": false, "editor.wordWrap": "on", "editor.cursorBlinking": "smooth", diff --git a/x/Xresources b/x/Xresources index 26f3929..1f4ee5e 100644 --- a/x/Xresources +++ b/x/Xresources @@ -1,2 +1,2 @@ cursor.theme: Breeze_Default -Xcursor.size: 16 +Xcursor.size: 6 diff --git a/x/xinitrc b/x/xinitrc index 2f6732c..82a5d2e 100644 --- a/x/xinitrc +++ b/x/xinitrc @@ -49,9 +49,11 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then fi -#### Custom ######## +# CUSTOM # Set external monitor config (dependent on monitor connected) + +# For ThinkPad X220 if [[ "$(xrandr | awk '/^VGA/ { print $2 }')" == "connected" ]]; then xrandr --output VGA1 --primary --above LVDS1 elif [[ "$(xrandr | awk '/^DP1/ { print $2 }')" == "connected" ]];then @@ -59,6 +61,16 @@ elif [[ "$(xrandr | awk '/^DP1/ { print $2 }')" == "connected" ]];then else : fi +# For ThinkPad T15 +if [[ "$(xrandr | awk '/^VGA/ { print $2 }')" == "connected" ]]; then + xrandr --output VGA1 --primary --above eDP1 +elif [[ "$(xrandr | awk '/^DP1/ { print $2 }')" == "connected" ]];then + xrandr --output DP1 --primary --above eDP1 +elif [[ "$(xrandr | awk '/^HDMI1/ { print $2 }')" == "connected" ]];then + xrandr --output HDMI1 --primary --above eDP1 +else : +fi + # Set UK keyboard setxkbmap gb @@ -67,7 +79,7 @@ setxkbmap gb xmodmap ~/.Xmodmap # Set background -feh --bg-fill /home/thomas/wallpapers/arpanet_wallpaper/svg/blue.svg +feh --bg-fill /home/thomas/wallpapers/arpanet_wallpaper/svg/green.svg # Start i3 window manager exec i3