commit 4521d3cc2931665c549e0ccbd8fad00a698d449f
parent e293e15df72fd44775b134fee10e2c0b5b3bb10f
Author: Szymon Mikulicz <szymon.mikulicz@posteo.net>
Date: Fri, 17 Feb 2023 12:59:30 +0100
Old changes
Diffstat:
8 files changed, 77 insertions(+), 132 deletions(-)
diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
@@ -46,30 +46,30 @@ draw_bold_text_with_bright_colors: false
font:
# The normal (roman) font face to use.
normal:
- family: Code New Roman # should be "Menlo" or something on macOS.
+ family: CodeNewRoman Nerd Font # should be "Menlo" or something on macOS.
# Style can be specified to pick a specific face.
- style: Regular
+ style: Book
# The bold font face
bold:
- family: Code New Roman # # should be "Menlo" or something on macOS.
+ family: CodeNewRoman Nerd Font # # should be "Menlo" or something on macOS.
# Style can be specified to pick a specific face.
style: Bold
# The italic font face
italic:
- family: Code New Roman # should be "Menlo" or something on macOS.
+ family: CodeNewRoman Nerd Font # should be "Menlo" or something on macOS.
# Style can be specified to pick a specific face.
style: Italic
# Point size of the font
- size: 14.0
+ size: 11.0
# Offset is the extra space around each character. offset.y can be thought of
# as modifying the linespacing, and offset.x as modifying the letter spacing.
offset:
x: 0
- y: -2
+ y: 0
# Glyph offset determines the locations of the glyphs within their cells with
# the default being at the bottom. Increase the x offset to move the glyph to
@@ -78,40 +78,51 @@ font:
x: 0
y: 0
- # OS X only: use thin stroke font rendering. Thin strokes are suitable
- # for retina displays, but for non-retina you probably want this set to
- # false.
- use_thin_strokes: false
-
# Should display the render timer
debug:
render_timer: false
colors:
primary:
- background: '0x282c34'
- foreground: '0xdcdfe4'
-
- normal:
- black: '0x282c34'
- red: '0xe06c75'
- green: '0x98c379'
- yellow: '0xe5c07b'
- blue: '0x61afef'
- magenta: '0xc678dd'
- cyan: '0x56b6c2'
- white: '0xdcdfe4'
-
- bright:
- black: '0x282c34'
- red: '0xe06c75'
- green: '0x98c379'
- yellow: '0xe5c07b'
- blue: '0x61afef'
- magenta: '0xc678dd'
- cyan: '0x56b6c2'
- white: '0xdcdfe4'
-
+ background: "0x191724"
+ foreground: "0xe0def4"
+cursor:
+ text: "0xe0def4"
+ cursor: "0x524f67"
+vi_mode_cursor:
+ text: "0xe0def4"
+ cursor: "0x524f67"
+line_indicator:
+ foreground: None
+ background: None
+selection:
+ text: "0xe0def4"
+ background: "0x403d52"
+normal:
+ black: "0x26233a"
+ red: "0xeb6f92"
+ green: "0x31748f"
+ yellow: "0xf6c177"
+ blue: "0x9ccfd8"
+ magenta: "0xc4a7e7"
+ cyan: "0xebbcba"
+ white: "0xe0def4"
+bright:
+ black: "0x6e6a86"
+ red: "0xeb6f92"
+ green: "0x31748f"
+ yellow: "0xf6c177"
+ blue: "0x9ccfd8"
+ magenta: "0xc4a7e7"
+ cyan: "0xebbcba"
+ white: "0xe0def4"
+hints:
+ start:
+ foreground: "#908caa"
+ background: "#1f1d2e"
+ end:
+ foreground: "#6e6a86"
+ background: "#1f1d2e"
# Visual Bell
#
# Any time the BEL code is received, Alacritty "rings" the visual bell. Once
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
@@ -8,7 +8,7 @@ alias bash 'env FISH_RAMP_DISABLE=1 bash'
alias psgr 'ps aux | grep'
if test -n "$NVIM"
- alias nvim nvr
+ alias nvim 'nvr -s'
end
alias vim nvim
@@ -24,7 +24,7 @@ alias wine32tricks 'env WINEPREFIX=/home/shyman/.wine32 WINEARCH=win32 winetrick
alias cmus='tmux attach-session -t cmus || tmux new-session -A -D -s cmus /usr/bin/cmus'
alias :q exit
-alias :e nvr
+alias :e 'nvr -s'
if test "$XDG_SESSION_TYPE" = "x11"
alias :split 'i3-msg split v\; exec alacritty > /dev/null'
alias :vsplit 'i3-msg split h\; exec alacritty > /dev/null'
diff --git a/i3/.i3/config.d/execs b/i3/.i3/config.d/execs
@@ -1,5 +1,5 @@
// vim: filetype=i3config
-exec --no-startup-id picom --experimental-backends
+exec --no-startup-id picom
exec --no-startup-id xss-lock -l -- ~/.i3/lock.sh
exec --no-startup-id nm-applet
exec --no-startup-id /usr/lib/geoclue-2.0/demos/agent
diff --git a/i3/.i3/config.d/windows b/i3/.i3/config.d/windows
@@ -5,7 +5,8 @@ client.unfocused #282c34e6 #282c34e6 #dcdfe4 #282c34e6
client.focused_inactive #282c34e6 #282c34e6 #dcdfe4 #282c34e6
client.urgent #383a3be6 #383a3be6 #e06c75 #383a3be6
-new_window pixel 2
+default_border pixel 1
+default_floating_border pixel 1
gaps inner 10
for_window [instance="polybar"] gaps inner 0
diff --git a/nvim/.config/nvim/ginit.vim b/nvim/.config/nvim/ginit.vim
@@ -14,5 +14,4 @@ endif
set guifont=Fira\ Code:h12
nnoremap <silent> <C-ScrollWheelUp> :set guifont=+<CR>
nnoremap <silent> <C-ScrollWheelDown> :set guifont=-<CR>
-colorscheme onehalfdark
let g:neovide_transparency=0.9
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
@@ -1,7 +1,3 @@
-if &shell =~# 'fish$'
- set shell=bash
-endif
-
if &compatible
set nocompatible
endif
@@ -21,10 +17,10 @@ function! PackInit() abort
call minpac#add('lervag/vimtex', {'type': 'opt'})
call minpac#add('PietroPate/vim-tex-conceal', {'type': 'opt'})
- call minpac#add('davisdude/vim-love-docs', {'type': 'opt', 'branch': 'build'})
-
call minpac#add('rust-lang/rust.vim', {'type': 'opt'})
+ call minpac#add('ziglang/zig.vim')
+
call minpac#add('dag/vim-fish', {'type': 'opt'})
call minpac#add('jalvesaq/Nvim-R', {'type': 'opt'})
@@ -33,16 +29,12 @@ function! PackInit() abort
call minpac#add('paretje/deoplete-notmuch', {'type': 'opt'})
- call minpac#add('rasjani/robotframework-vim', {'type': 'opt', 'subdir': 'after'})
-
call minpac#add('stephpy/vim-yaml', {'type': 'opt', 'subdir': 'after'})
- call minpac#add('burnettk/vim-jenkins', {'type': 'opt'})
-
call minpac#add('godlygeek/tabular')
call minpac#add('plasticboy/vim-markdown', {'type': 'opt'})
- call minpac#add('jackguo380/vim-lsp-cxx-highlight', {'type': 'opt'})
+ call minpac#add('nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'})
call minpac#add('sonph/onehalf', {'subdir': 'vim'})
@@ -55,11 +47,12 @@ function! PackInit() abort
call minpac#add('chaoren/vim-wordmotion')
- call minpac#add("williamboman/nvim-lsp-installer")
call minpac#add('neovim/nvim-lspconfig')
call minpac#add('Shougo/deoplete-lsp')
- call minpac#add('grafi-tt/lunajson', {'name': 'lunajson/lua', 'subdir': 'src'})
+ call minpac#add('folke/lsp-colors.nvim')
+ call minpac#add('kyazdani42/nvim-web-devicons')
+ call minpac#add('folke/trouble.nvim')
endfunction
command! PackUpdate call PackInit() | call minpac#update()
@@ -97,60 +90,24 @@ let g:vimtex_compiler_latexmk = {
"NERDTree
map <C-k> :NERDTreeToggle<CR>
-"Jenkins
-let g:jenkins_url = 'http://krk-sb13-19.soc-mgt.krk-lab.nsn-rdnet.net:8080'
-let g:jenkins_username = 'admin'
-let g:jenkins_password = 'egenrules'
-
" nvim-lsp
-lua << EOF
-
-function nil2em(str)
- if str == nil then
- return ""
- else
- return str
- end
-end
-
-require("nvim-lsp-installer").setup {}
-
-local clang = io.popen('clang -print-resource-dir')
-local lspconfig = require'lspconfig'
-local json = require'lunajson'
-local compc = io.open("compile_commands.json","r")
-local gccp = "gcc"
-
-if compc ~= nil then
- gccp = json.decode(compc:read("*a"))[1].arguments[1]
-end
-
-local gccs = io.popen(gccp .. " -print-sysroot")
-local gcct = io.popen(gccp .. " -dumpmachine")
-
-lspconfig.ccls.setup {
- init_options = {
- clang = {
- resourceDir = clang:read("*l");
- extraArgs = {
- "--sysroot="..nil2em(gccs:read("*l")).."/",
- "-target="..gcct:read("*l")
- };
- };
- highlight = {
- lsRanges = true;
- };
- };
- };
-
-gcct:close()
-clang:close()
-EOF
-
lua require'lspconfig'.rust_analyzer.setup{}
lua require'lspconfig'.jedi_language_server.setup{}
-" lua require'lspconfig'.sumneko_lua.setup{cmd={"lua-language-server"}}
+lua require'lspconfig'.serve_d.setup{}
lua require'lspconfig'.texlab.setup{}
+lua require'lspconfig'.zls.setup{}
+
+" Trouble
+lua require("trouble").setup{}
+
+" Zig
+let g:zig_fmt_autosave = 0
+
+" treesitter
+lua require'nvim-treesitter.configs'.setup {
+ \ highlight = { enable = true },
+ \ incremental_selection = { enable = true }
+ \ }
" Deoplete
inoremap <expr><C-h> deoplete#smart_close_popup()."\<C-h>"
@@ -163,8 +120,6 @@ endfunction"}}}
imap <silent><expr> <TAB>
\ pumvisible() ? "\<C-n>" :
\ <SID>check_back_space() ? "\<TAB>" :
- \ neosnippet#expandable_or_jumpable() ?
- \ "\<Plug>(neosnippet_expand_or_jump)" :
\ deoplete#manual_complete()
call deoplete#custom#option('omni_patterns', {
@@ -191,28 +146,6 @@ autocmd Filetype tex call SetTeXOptions()
function SetTeXOptions()
packadd vim-tex-conceal
packadd vimtex
- let g:vimteplete = '\\(?:'
- \ . '\w*cite\w*(?:\s*\[[^]]*\]){0,2}\s*{[^}]*'
- \ . '|(text|block)cquote\*?(?:\s*\[[^]]*\]){0,2}\s*{[^}]*'
- \ . '|(for|hy)\w*cquote\*?{[^}]*}(?:\s*\[[^]]*\]){0,2}\s*{[^}]*'
- \ . '|\w*ref(?:\s*{[^}]*|range\s*{[^,}]*(?:}{)?)'
- \ . '|hyperref\s*\[[^]]*'
- \ . '|includegraphics\*?(?:\s*\[[^]]*\]){0,2}\s*{[^}]*'
- \ . '|(?:include(?:only)?|input|subfile)\s*{[^}]*'
- \ . '|([cpdr]?(gls|Gls|GLS)|acr|Acr|ACR)[a-zA-Z]*\s*{[^}]*'
- \ . '|(ac|Ac|AC)\s*{[^}]*'
- \ . '|includepdf(\s*\[[^]]*\])?\s*{[^}]*'
- \ . '|includestandalone(\s*\[[^]]*\])?\s*{[^}]*'
- \ . '|(usepackage|RequirePackage|PassOptionsToPackage)(\s*\[[^]]*\])?\s*{[^}]*'
- \ . '|documentclass(\s*\[[^]]*\])?\s*{[^}]*'
- \ . '|begin(\s*\[[^]]*\])?\s*{[^}]*'
- \ . '|end(\s*\[[^]]*\])?\s*{[^}]*'
- \ . '|\w*'
- \ .')'
- " \ 'tex': g:vimtex#re#deoplete,
- call deoplete#custom#option('omni_patterns', {
- \ 'tex': g:vimteplete,
- \})
setlocal sw=2
setlocal textwidth=79
setlocal iskeyword+=:
@@ -300,7 +233,6 @@ autocmd CompleteDone * silent! pclose
" vim settings
set hidden
-" set lazyredraw
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
set termguicolors
@@ -321,8 +253,10 @@ filetype plugin indent on
syntax on
colorscheme onehalfdark
-hi Normal guibg=none
-hi LineNr guibg=none
+if !exists('g:neovide')
+ hi Normal guibg=none
+ hi LineNr guibg=none
+endif
nmap ,d :b#<bar>bd#<CR>
tnoremap <Esc> <C-\><C-n>
diff --git a/picom/.config/picom.conf b/picom/.config/picom.conf
@@ -245,7 +245,6 @@ detect-client-opacity = true;
# try detecting this with X RandR extension.
#
# refresh-rate = 60
-refresh-rate = 0
# Limit picom to repaint at most once every 1 / 'refresh_rate' second to
# boost performance. This should not be used with
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
@@ -59,7 +59,7 @@ font-2 = "Siji:pixelsize=10;1"
modules-left = i3
modules-center = cmus
-modules-right = filesystem memory cpu backlight-acpi volume eth wlan battery xkeyboard date
+modules-right = filesystem memory cpu volume eth xkeyboard date
tray-position = left
tray-padding = 2
@@ -101,6 +101,7 @@ type = internal/fs
interval = 25
mount-0 = /
+mount-1 = /data
label-mounted = %{F#0a81f5}%mountpoint%%{F-}: %percentage_used%%
label-unmounted = %mountpoint% not mounted
@@ -247,7 +248,7 @@ ramp-signal-foreground = ${colors.foreground}
[module/eth]
type = internal/network
-interface = enp0s31f6
+interface = enp4s0
interval = 3.0
format-connected-underline = #55aa55
