diff --git a/.Xresources b/.Xresources index 377b190..13db850 100644 --- a/.Xresources +++ b/.Xresources @@ -15,3 +15,6 @@ URxvt.perl-ext-common: default,clipboard ! font URxvt.font: xft:DejaVu Sans Mono:size=10,xft:Source Code Pro for Powerline:size=10 URxvt.boldFont: xft:DejaVu Sans Mono:size=10,xft:Source Code Pro for Powerline:bold:size=10 + +! rofi +rofi.case-sensitive: false diff --git a/.zshrc b/.zshrc index cc486b4..a645b3c 100644 --- a/.zshrc +++ b/.zshrc @@ -1,4 +1,3 @@ - # Start configuration added by Zim install {{{ # # User configuration sourced by interactive shells diff --git a/i3/conf/client/zahnrad/assignments b/i3/conf/client/zahnrad/assignments index 05c4b83..cff8ac5 100644 --- a/i3/conf/client/zahnrad/assignments +++ b/i3/conf/client/zahnrad/assignments @@ -13,6 +13,7 @@ workspace $wsF2 gaps inner 0 for_window [class="zoom"] floating enable + for_window [class="JidePopup"] floating enable for_window [class="zoom" title="Zoom - Licensed Account"] floating disable for_window [class="zoom" title="Zoom Meeting"] floating disable @@ -21,7 +22,8 @@ bindsym $mod+m move workspace to output right bindsym $mod+Shift+m move workspace to output up -bindsym $mod+Shift+n exec --no-startup-id /usr/bin/networkmanager_dmenu +bindsym $mod+Shift+n exec --no-startup-id /usr/bin/networkmanager_dmenu --rofi -i bindsym $mod+Shift+x exec --no-startup-id ~/.config/rofi/bin/menu_powermenu bindsym $mod+Shift+b exec --no-startup-id rofi-bluetooth +bindsym $mod+Shift+e exec --no-startup-id rofimoji diff --git a/i3/conf/client/zahnrad/header b/i3/conf/client/zahnrad/header index 85d9a8f..9156669 100644 --- a/i3/conf/client/zahnrad/header +++ b/i3/conf/client/zahnrad/header @@ -34,8 +34,8 @@ set $TERMINAL alacritty # gaps - set $gap_outer 15 - set $gap_inner 10 + set $gap_outer 0 + set $gap_inner 0 set $ws1 "1" set $ws2 "2" diff --git a/i3/conf/common/base b/i3/conf/common/base index 028e028..7845af3 100644 --- a/i3/conf/common/base +++ b/i3/conf/common/base @@ -121,8 +121,6 @@ floating_modifier $mod # restart i3 inplace (preserves your layout/session, can be used to upgrade i3) bindsym $mod+Shift+r restart - # exit i3 (logs you out of your X session) - bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" # Urgent window bindsym $mod+x [urgent=latest] focus diff --git a/vim/.vimrc b/vim/.vimrc index a71d0ac..3312d28 100755 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -22,6 +22,8 @@ filetype plugin indent on set encoding=utf-8 set signcolumn=number +set mouse=n + set foldmethod=syntax if exists('+termguicolors') @@ -103,3 +105,8 @@ hi Normal guibg=NONE ctermbg=NONE autocmd BufRead *.orig set readonly autocmd BufRead *.pacnew set readonly set nofoldenable + +if exists("$LIGHTMODE") + set bg=light + colorscheme onehalflight +endif diff --git a/vim/coc-settings.json b/vim/coc-settings.json index 3159c5a..76c84d0 100644 --- a/vim/coc-settings.json +++ b/vim/coc-settings.json @@ -19,5 +19,12 @@ "git.addGBlameToVirtualText": false, "gitignore.enable": true, "diagnostic.errorSign": "✘", - "diagnostic.warningSign": "⚠" + "diagnostic.warningSign": "⚠", + "diagnostic.infoSign": "ⓘ", + "diagnostic.hintSign": "ℹ", + "diagnostic.showUnused": true, + "ltex.languageToolHttpServerUri": "http://localhost:8081/", + "coc.source.vimtex.filetypes": [ + "tex" + ] } diff --git a/vim/config/filetypes.vim b/vim/config/filetypes.vim index 3bd098d..190acc1 100644 --- a/vim/config/filetypes.vim +++ b/vim/config/filetypes.vim @@ -16,3 +16,4 @@ au BufNewFile,BufRead *.bu set filetype=yaml au BufNewFile,BufRead .latexmkrc set filetype=perl +au BufNewFile,BufRead .tex set filetype=latex diff --git a/vim/config/pluginconfig.vim b/vim/config/pluginconfig.vim index 90f2727..b967cac 100644 --- a/vim/config/pluginconfig.vim +++ b/vim/config/pluginconfig.vim @@ -98,6 +98,7 @@ set nowritebackup set cmdheight=2 set updatetime=300 set shortmess+=c +let g:coc_filetype_map = {'tex': 'latex'} " Use tab for trigger completion with characters ahead and navigate. " Use command ':verbose imap ' to make sure tab is not mapped by other plugin. inoremap @@ -223,50 +224,50 @@ autocmd BufEnter * if bufname('#') =~ 'NERD_tree_\d\+' && bufname('%') !~ 'NERD_ \ let buf=bufnr() | buffer# | execute "normal! \w" | execute 'buffer'.buf | endif " Blame -lua << EOF -require("blame_line").setup { - -- whether the blame line should be shown in visual modes - show_in_visual = true, - - -- whether the blame line should be shown in insert mode - show_in_insert = true, - - -- the string to prefix the blame line with - prefix = " ", - - -- String specifying the the blame line format. - -- Any combination of the following specifiers, along with any additional text. - -- - `""` - the author of the change. - -- - `""` - the email of the author. - -- - `""` - the time the author made the change. - -- - `""` - the person who committed the change to the repository. - -- - `""` - the email of the committer. - -- - `""` - the time the change was committed to the repository. - -- - `""` - the commit summary/message. - -- - `""` - short portion of the commit hash. - -- - `""` - the full commit hash. - template = " • • ", - - -- The date format settings, for `""` and `""` - date = { - -- whether the date should be relative instead of precise - -- (I.E. "3 days ago" instead of "09-06-2022". - relative = true, - - -- `strftime` compatible format string. - -- Only used if `date.relative == false` - format = "%d-%m-%y", - }, - - -- The highlight group to highlight the blame line with. - -- The highlight of this group defaults to `Comment`. - hl_group = "BlameLineNvim", - - -- The delay in milliseconds between a cursor movement and - -- when the blame line should appear/update - delay = 0, -} -EOF +" lua << EOF +" require("blame_line").setup { +" -- whether the blame line should be shown in visual modes +" show_in_visual = true, +" +" -- whether the blame line should be shown in insert mode +" show_in_insert = true, +" +" -- the string to prefix the blame line with +" prefix = " ", +" +" -- String specifying the the blame line format. +" -- Any combination of the following specifiers, along with any additional text. +" -- - `""` - the author of the change. +" -- - `""` - the email of the author. +" -- - `""` - the time the author made the change. +" -- - `""` - the person who committed the change to the repository. +" -- - `""` - the email of the committer. +" -- - `""` - the time the change was committed to the repository. +" -- - `""` - the commit summary/message. +" -- - `""` - short portion of the commit hash. +" -- - `""` - the full commit hash. +" template = " • • ", +" +" -- The date format settings, for `""` and `""` +" date = { +" -- whether the date should be relative instead of precise +" -- (I.E. "3 days ago" instead of "09-06-2022". +" relative = true, +" +" -- `strftime` compatible format string. +" -- Only used if `date.relative == false` +" format = "%d-%m-%y", +" }, +" +" -- The highlight group to highlight the blame line with. +" -- The highlight of this group defaults to `Comment`. +" hl_group = "BlameLineNvim", +" +" -- The delay in milliseconds between a cursor movement and +" -- when the blame line should appear/update +" delay = 0, +" } +" EOF " Vim-markdown diff --git a/vim/config/plugins.vim b/vim/config/plugins.vim index b4c029e..c47a2a4 100644 --- a/vim/config/plugins.vim +++ b/vim/config/plugins.vim @@ -66,7 +66,7 @@ Plug 'tpope/vim-endwise' Plug 'hdima/python-syntax' Plug 'fs111/pydoc.vim' Plug 'Vimjas/vim-python-pep8-indent' -Plug 'tmhedberg/SimpylFold' +" Plug 'tmhedberg/SimpylFold' Plug 'vim-scripts/javacomplete' Plug 'udalov/kotlin-vim' @@ -86,12 +86,12 @@ Plug 'pedrohdz/vim-yaml-folds' " KIT-Color-Scheme Plug 'rad4day/kit.vim' " Original by taDachs <3 if you read this I may owe you a kœri - Plug 'altercation/vim-colors-solarized' +Plug 'sonph/onehalf', { 'rtp': 'vim' } " Git integration -Plug 'braxtons12/blame_line.nvim' +" Plug 'braxtons12/blame_line.nvim' Plug 'airblade/vim-gitgutter' Plug 'tpope/vim-fugitive' @@ -104,7 +104,7 @@ Plug 'rad4day/vim-ripgrep' Plug 'github/copilot.vim' " Fancy buffer handling -Plug 'akinsho/bufferline.nvim', { 'tag': 'v2.2.1' } +Plug 'akinsho/bufferline.nvim', { 'tag': 'v2.3.0' } Plug 'johann2357/nvim-smartbufs'