From 55a4496b201c9491d2fc8ac18fb3b96b05286fc3 Mon Sep 17 00:00:00 2001 From: tactonbishop Date: Sun, 15 May 2022 14:45:38 +0100 Subject: [PATCH] Cleanup --- .zshrc | 37 -------- fontconfig/fonts.conf | 2 +- i3/config | 31 +++---- polybar/config.ini | 125 +++++++++------------------- .prettierrc => prettier/.prettierrc | 0 vscode/settings.json | 2 +- 6 files changed, 60 insertions(+), 137 deletions(-) delete mode 100644 .zshrc rename .prettierrc => prettier/.prettierrc (100%) diff --git a/.zshrc b/.zshrc deleted file mode 100644 index 6086c9a..0000000 --- a/.zshrc +++ /dev/null @@ -1,37 +0,0 @@ -export ZSH="/home/thomas/.oh-my-zsh" - -alias vim="nvim" -alias cat="bat" - -ZSH_THEME=spaceship - -SPACESHIP_PACKAGE_SHOW=true -SPACESHIP_TIME_SHOW=true -SPACESHIP_NODE_SHOW=true -SPACESHIP_PACKAGE_SYMBOL="" -SPACESHIP_PACKAGE_COLOR="#e08009" -SPACESHIP_GIT_BRANCH_COLOR="#00aae0" -SPACESHIP_DIR_COLOR="#18e000" -SPACESHIP_TIME_COLOR="#bde000" -SPACESHIP_EXEC_TIME_SHOW=true - -plugins=(git npm zsh-syntax-highlighting) - -# User configuration - -# Prompt on new line -prompt_end() { - if [[ -n $CURRENT_BG ]]; then - echo -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR" - else - echo -n "%{%k%}" - fi - echo -n "\n%{%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR%{%f%}" - CURRENT_BG='' -} - -BROWSER=/usr/bin/google-chrome-stable - -source $ZSH/oh-my-zsh.sh -export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" diff --git a/fontconfig/fonts.conf b/fontconfig/fonts.conf index c121c18..f6e7961 100644 --- a/fontconfig/fonts.conf +++ b/fontconfig/fonts.conf @@ -5,7 +5,7 @@ sans-serif - Roboto + Inter diff --git a/i3/config b/i3/config index 55710e7..5f9f89d 100644 --- a/i3/config +++ b/i3/config @@ -60,10 +60,11 @@ bindsym $mod+d exec --no-startup-id dmenu_run # bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop # change focus -bindsym $mod+j focus left -bindsym $mod+k focus down -bindsym $mod+l focus up -bindsym $mod+semicolon focus right + +bindsym $mod+h focus left +bindsym $mod+j focus down +bindsym $mod+k focus up +bindsym $mod+l focus right # alternatively, you can use the cursor keys: bindsym $mod+Left focus left @@ -78,16 +79,17 @@ bindsym $mod+Shift+l move up bindsym $mod+Shift+semicolon move right # alternatively, you can use the cursor keys: -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right +# bindsym $mod+Shift+Left move left +# bindsym $mod+Shift+Down move down +# bindsym $mod+Shift+Up move up +# bindsym $mod+Shift+Right move right + # split in horizontal orientation -bindsym $mod+h split h +bindsym $mod+Shift+Right split h # split in vertical orientation -bindsym $mod+v split v +bindsym $mod+Shift+Down split v # enter fullscreen mode for the focused container bindsym $mod+f fullscreen toggle @@ -161,10 +163,11 @@ mode "resize" { # Pressing right will grow the window’s width. # Pressing up will shrink the window’s height. # Pressing down will grow the window’s height. - bindsym j resize shrink width 10 px or 10 ppt - bindsym k resize grow height 10 px or 10 ppt - bindsym l resize shrink height 10 px or 10 ppt - bindsym semicolon resize grow width 10 px or 10 ppt + + bindsym $mod+h resize shrink width 10 px or 10 ppt + bindsym $mod+j resize grow height 10 px or 10 ppt + bindsym $mod+k resize shrink height 10 px or 10 ppt + bindsym $mod+l resize grow width 10 px or 10 ppt # same bindings, but for the arrow keys bindsym Left resize shrink width 10 px or 10 ppt diff --git a/polybar/config.ini b/polybar/config.ini index d4ce913..3a66e0d 100644 --- a/polybar/config.ini +++ b/polybar/config.ini @@ -17,61 +17,40 @@ ;========================================================== [colors] background = #112615 -background-alt = #444 foreground = #637d75 foreground-alt = #717f24 primary = #2f7e25 secondary = #2f6a7f alert = #7f2b26 disabled = #707880 -; [colors] -; background = #282A2E -; background-alt = #373B41 -; foreground = #C5C8C6 -; primary = #F0C674 -; secondary = #8ABEB7 -; alert = #A54242 -; disabled = #707880 + [bar/example] - width = 100% height = 27 radius = 0 - ; dpi = 96 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 -<<<<<<< HEAD module-margin-right =3 -======= -module-margin-right =2 ->>>>>>> 45fd1a21da0ed93fa3ec4e7cec22c48e1ab754cb ;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 = siji:pixelsize=10;1 -<<<<<<< HEAD +font-2 = FontAwesome:size=10;1" font-3 = SymbolsNerdFont:size=15;3 -======= -font-3 = SymbolsNerdFont:size=14;5 ->>>>>>> 45fd1a21da0ed93fa3ec4e7cec22c48e1ab754cb + + modules-left = my-text-label xworkspaces xwindow modules-right = filesystem memory cpu battery temperature wlan date ; modules-right = filesystem pulseaudio xkeyboard memory cpu wlan eth date @@ -84,21 +63,11 @@ cursor-scroll = ns-resize enable-ipc = true -; tray-position = right - -; wm-restack = generic -; wm-restack = bspwm -; wm-restack = i3 - -; override-redirect = true - [module/xworkspaces] type = internal/xworkspaces - label-active = %name% label-active-foreground = #0f1610 label-active-background = #2f7e25 -;label-active-underline= #18e000 label-active-padding = 3 label-occupied = %name% @@ -116,37 +85,31 @@ label-empty-padding = 3 [module/xwindow] type = internal/xwindow label = %title:0:60:...% -;format-foreground = #717f24 + [module/filesystem] type = internal/fs interval = 25 mount-0 = / - -label-mounted = %{F#18e000}%mountpoint%%{F-} %percentage_used%% (%used%/%free%) +label-mounted = %{F#2f7e25}  %{F-} %percentage_used%% (%used%/%free%) label-mounted-underline = #2f7e25 label-unmounted = %mountpoint% not mounted label-unmounted-foreground = ${colors.disabled} [module/pulseaudio] type = internal/pulseaudio - format-volume-prefix = "VOL " format-volume-prefix-foreground = ${colors.primary} format-volume = - label-volume = %percentage%% - label-muted = muted label-muted-foreground = ${colors.disabled} [module/xkeyboard] type = internal/xkeyboard blacklist-0 = num lock - label-layout = %layout% label-layout-foreground = ${colors.primary} - label-indicator-padding = 2 label-indicator-margin = 1 label-indicator-foreground = ${colors.background} @@ -155,16 +118,15 @@ label-indicator-background = ${colors.secondary} [module/memory] type = internal/memory interval = 2 -format-prefix = "" +format-prefix = "" format-underline = #707f23 format-prefix-foreground = ${colors.primary} -;format-prefix-foreground = ${colors.primary} -label = %percentage_used:2% (%gb_used%/%gb_free%) - +label = %percentage_used:2%% (%gb_used%/%gb_free%) +label-padding = 1 [module/cpu] type = internal/cpu interval = 2 -format-prefix = "" +format-prefix = "" format-underline = #df8008 format-prefix-foreground = ${colors.primary} label = %percentage:2%% @@ -179,18 +141,16 @@ label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected [module/wlan] inherit = network-base interface-type = wireless -;label-connected = %{F#F0C674}%ifname%%{F-} %essid% - interval = 3.0 - format-connected = format-connected-underline = #47577e label-connected = %essid% -ramp-signal-0 =  -ramp-signal-1 =  -ramp-signal-2 =  -ramp-signal-3 =  -ramp-signal-4 =  +label-connected-padding = 1 +ramp-signal-0 =  +ramp-signal-1 =  +ramp-signal-2 =  +ramp-signal-3 =  +ramp-signal-4 =  ramp-signal-foreground = ${colors.primary} [module/eth] @@ -201,82 +161,79 @@ label-connected = %{F#F0C674}%ifname%%{F-} %local_ip% [module/date] type = internal/date interval = 1 - format-underline = #2f697f format-prefix-foreground = ${colors.primary} -format-prefix = " " +format-prefix = "" date = %a %d %b %Y date-alt = %Y-%m-%d %H:%M:%S time = %H:%M time-alt = %H:%M:%S label = %date% %{F#717f24}%time% -; label-foreground = ${colors.primary} +label-padding = 2 [module/temperature] type = internal/temperature thermal-zone = 0 warn-temperature = 60 - format =