From 4c4db7cfdbf030ddd8b63ae49bc5d552b14f79bc Mon Sep 17 00:00:00 2001 From: tactonbishop Date: Sat, 2 Jul 2022 13:39:56 +0100 Subject: [PATCH] Changes --- kitty/kitty.conf | 3 ++- nvim/init.vim | 13 ++++--------- polybar/config.ini | 24 ++++++++++++++++++------ vscode/settings.json | 12 ++++++------ zsh/zshrc | 7 ++++++- 5 files changed, 36 insertions(+), 23 deletions(-) diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 7d01ae1..dea2694 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -1,5 +1,6 @@ include ./theme.conf -font_family LigaLiberationMono +font_family JetbrainsMono font_size 10 window_padding_width 12 wayland_titlebar_color #000e07 +enabled_layouts tall diff --git a/nvim/init.vim b/nvim/init.vim index cc14a88..e39482e 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -1,6 +1,6 @@ " --- Standard Vim settings ---" -set number +"set number set showmatch set ignorecase set hlsearch @@ -19,7 +19,7 @@ set clipboard=unnamedplus " set cursorline set ttyfast set hidden -set t_Co=256 +set background=dark "--- Plugins --- " @@ -29,13 +29,8 @@ Plug 'sheerun/vim-polyglot' Plug 'jiangmiao/auto-pairs' Plug 'ap/vim-css-color' Plug 'plasticboy/vim-markdown' -Plug 'vim-airline/vim-airline' -Plug 'vim-airline/vim-airline-themes' Plug 'psliwka/vim-smoothie' call plug#end() -" --- Airline settings --- " - -let g:airline_theme='minimalist' -let g:airline_powerline_fonts = 1 -let g:airline#extensions#tabline#enabled = 1 +syntax on +"colorscheme greenisgood diff --git a/polybar/config.ini b/polybar/config.ini index e96576b..e72e9c3 100644 --- a/polybar/config.ini +++ b/polybar/config.ini @@ -16,7 +16,7 @@ ; ;========================================================== [colors] -background = #112615 +background = #0f1610 foreground = #637d75 foreground-alt = #717f24 primary = #2f7e25 @@ -56,8 +56,8 @@ font-3 = SymbolsNerdFont:size=15;3 modules-left = my-text-label -;modules-center = -modules-right = filesystem memory cpu battery temperature backlight pulseaudio bluetooth wlan wakatime date time +modules-center = +modules-right = filesystem1 filesystem2 memory cpu battery temperature backlight pulseaudio bluetooth wlan wakatime date time tray-position = right tray-padding = 2 @@ -90,17 +90,29 @@ label-empty-padding = 3 type = internal/xwindow label = %title:0:60:...% -[module/filesystem] +[module/filesystem1] type = internal/fs interval = 25 mount-0 = / #label-mounted = %{F#2f7e25}  %{F-} %percentage_used%% (%used%/%free%) -label-mounted = %{F#2f7e25}  %{F-} %percentage_used%% +label-mounted = %{F#2f7e25}  %{F-} %percentage_used%% label-mounted-underline = #2f7e25 label-unmounted = %mountpoint% not mounted label-unmounted-foreground = ${colors.disabled} +[module/filesystem2] +type = internal/fs +interval = 25 + +mount-0 = /home +#label-mounted = %{F#2f7e25}  %{F-} %percentage_used%% (%used%/%free%) +label-mounted = %{F#2f7e25}  %{F-} %percentage_used%% +label-mounted-underline = #2f7e25 +label-unmounted = %mountpoint% not mounted +label-unmounted-foreground = ${colors.disabled} + + [module/pulseaudio] type = internal/pulseaudio format-volume-prefix = " " @@ -290,4 +302,4 @@ label-padding = 1 [settings] screenchange-reload = true -pseudo-transparency = true +pseudo-transparency = false diff --git a/vscode/settings.json b/vscode/settings.json index 478e393..6d2feef 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -1,19 +1,19 @@ { - "editor.fontFamily": "Liga Liberation Mono", + "editor.fontFamily": "Jetbrains Mono", "editor.fontLigatures": true, - "editor.fontSize": 12, - "editor.fontWeight": 400, + "editor.fontSize": 13, + "editor.fontWeight": 300, "editor.formatOnPaste": false, "editor.wordWrap": "on", "editor.cursorBlinking": "smooth", "editor.smoothScrolling": true, "editor.formatOnSave": true, "editor.bracketPairColorization.enabled": true, - "terminal.integrated.fontFamily": "Liga Liberation Mono", + "terminal.integrated.fontFamily": "Jetbrains Mono", "terminal.integrated.fontSize": 11, "terminal.integrated.fontWeight": "400", "terminal.integrated.tabs.enabled": true, - "debug.console.fontFamily": "Liga Liberation Mono", + "debug.console.fontFamily": "Jetbrains Mono", "debug.console.fontSize": 12, "explorer.confirmDelete": false, "workbench.list.smoothScrolling": true, @@ -42,7 +42,7 @@ { "scope": "comment", "settings": { - "fontStyle": "" + "fontStyle": "italic" } } ] diff --git a/zsh/zshrc b/zsh/zshrc index e7b46ca..cb31e7f 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -22,6 +22,7 @@ case "$OSTYPE" in SPACESHIP_TIME_SHOW=true SPACESHIP_NODE_SHOW=true SPACESHIP_PACKAGE_SYMBOL="" + SPACESHIP_NODE_SYMBOL="" SPACESHIP_PACKAGE_COLOR="#e08009" SPACESHIP_GIT_BRANCH_COLOR="#00aae0" SPACESHIP_DIR_COLOR="#18e000" @@ -35,7 +36,11 @@ case "$OSTYPE" in SPACESHIP_PACKAGE_SHOW=true SPACESHIP_TIME_SHOW=true SPACESHIP_NODE_SHOW=true - + SPACESHIP_PACKAGE_SHOW=true + SPACESHIP_TIME_SHOW=true + SPACESHIP_NODE_SHOW=true + SPACESHIP_PACKAGE_SYMBOL="" + SPACESHIP_NODE_SYMBOL="" ;; esac