From fb205b5269157a61e893729fbfc1aeb84b4e71d7 Mon Sep 17 00:00:00 2001 From: CramMK Date: Fri, 17 Jul 2020 23:05:12 +0200 Subject: [PATCH] Update dotfiles --- dotfiles/picom/picom.conf | 10 --- dotfiles/polybar/config | 4 +- dotfiles/rofi/config.rasi.old | 12 --- dotfiles/rofi/nord.rasi | 158 ---------------------------------- dotfiles/scripts/open-pdf | 11 --- dotfiles/scripts/pandoc-comp | 23 ----- dotfiles/vim/vimrc | 67 +++++++------- 7 files changed, 37 insertions(+), 248 deletions(-) delete mode 100644 dotfiles/rofi/config.rasi.old delete mode 100644 dotfiles/rofi/nord.rasi delete mode 100755 dotfiles/scripts/open-pdf delete mode 100755 dotfiles/scripts/pandoc-comp diff --git a/dotfiles/picom/picom.conf b/dotfiles/picom/picom.conf index 7eae5f6..d750378 100644 --- a/dotfiles/picom/picom.conf +++ b/dotfiles/picom/picom.conf @@ -1,14 +1,4 @@ # Opacity opacity-rule = [ - "95:class_g = 'XTerm'", "95:class_g *?= 'Rofi'", ]; - -# Blur -#blur-background = true; -#blur-method = "kawase"; -#blur-strength = 10; -# -## Other -#vsync = true; -#backend = "glx"; diff --git a/dotfiles/polybar/config b/dotfiles/polybar/config index b7e17f1..8f4a677 100644 --- a/dotfiles/polybar/config +++ b/dotfiles/polybar/config @@ -23,8 +23,6 @@ frost0 = #d8dee9 frost1 = #e5e9f0 frost2 = #ECEFF4 -nord0_trans = #dd2E3440 - accent = ${colors.blue3} foreground = ${colors.frost2} @@ -42,7 +40,7 @@ screenchange-reload = true ############################################################################### [bar/main] -monitor = "eDP-1" +monitor = ${env:MONITOR} enable-ipc = false # FONTS PROVIDED WITH DOTFILES diff --git a/dotfiles/rofi/config.rasi.old b/dotfiles/rofi/config.rasi.old deleted file mode 100644 index 05841af..0000000 --- a/dotfiles/rofi/config.rasi.old +++ /dev/null @@ -1,12 +0,0 @@ -configuration { - modi: "drun"; - hide-scrollbar: true; - show-icons: true; - font: "Inconsolata 13"; - lines: 7; - display-drun: ""; - theme: "nord.rasi"; - width: 750; - fullscreen: true; - bw: 0; -} diff --git a/dotfiles/rofi/nord.rasi b/dotfiles/rofi/nord.rasi deleted file mode 100644 index 559eb15..0000000 --- a/dotfiles/rofi/nord.rasi +++ /dev/null @@ -1,158 +0,0 @@ -//---------------------- -// Theme Settings -// from: https://github.com/mbednarek360/dotfiles/blob/master/rofi/nord.rasi -//---------------------- - -//---------------------- -// Colors -//---------------------- - -* { - nord0: #2E3440A0; - nord1: #3B4252; - nord2: #434C5E; - nord3: #4C566A; - nord4: #D8DEE9; - nord5: #E5E9F0; - nord6: #ECEFF4; - nord7: #8FBCBB; - nord8: #88C0D0; - nord9: #81A1C1; - nord10: #5E81AC; - nord11: #BF616A; - nord12: #D08770; - nord13: #EBCB8B; - nord14: #A3BE8C; - nord15: #B48EAD; - background: @nord0; - foreground: @nord4; - selected-normal-foreground: @nord9; - normal-foreground: @foreground; - alternate-normal-background: @nord0; - selected-urgent-foreground: @nord4; - urgent-foreground: @foreground; - alternate-urgent-background: @nord0; - active-foreground: @foreground; - selected-active-foreground: @foreground; - alternate-active-background: @nord0; - bordercolor: @nord9; - alternate-normal-foreground: @foreground; - normal-background: @background; - selected-normal-background: @nord0; - border-color: @nord9; - spacing: 2; - separatorcolor: @nord9; - urgent-background: @background; - selected-urgent-background: @nord3; - alternate-urgent-foreground: @urgent-foreground; - background-color: @background; - alternate-active-foreground: @active-foreground; - active-background: @background; - selected-active-background: @nord0; -} - -//---------------------- -// Style -//---------------------- - -#window { - padding: 40% 40% 40% 42%; -} - -#mainbox { - border: 0; - background-color: #00000000; -} - -#message { - border: 0px 0px 0px ; - border-color: @separatorcolor; - padding: 10; - background-color: #00000000; -} - -#textbox { - text-color: @foreground; - - background-color: #00000000; -} - -#listview { - fixed-height: 0; - spacing: 5px ; - background-color: #00000000; - -} - -#element { - border: 0; - padding: 5px; - background-color: #00000000; -} - -#element.normal.normal { - text-color: @normal-foreground; -} - -#element.normal.urgent { - text-color: @urgent-foreground; -} - -#element.normal.active { - text-color: @active-foreground; -} - -#element.selected.normal { - text-color: @selected-normal-foreground; -} - -#element.selected.urgent { - text-color: @selected-urgent-foreground; -} - -#element.selected.active { - text-color: @selected-active-foreground; -} - -#element.alternate.normal { - text-color: @alternate-normal-foreground; -} - -#element.alternate.urgent { - text-color: @alternate-urgent-foreground; -} - -#element.alternate.active { - text-color: @alternate-active-foreground; -} - -#button.selected { - text-color: @selected-normal-foreground; -} - -#inputbar { - background-color: #00000000; - spacing: 5; - text-color: @normal-foreground; - padding: 0px 0px 10px; - border: 0 0 0; - border-color: @separatorcolor; -} - -#case-indicator { - background-color: #00000000; - spacing: 0; - text-color: @normal-foreground; -} - -#entry { - background-color: #00000000; - spacing: 0; - text-color: @normal-foreground; -} - -#prompt { - background-color: #00000000; - spacing: 0; - text-color: @normal-foreground; -} diff --git a/dotfiles/scripts/open-pdf b/dotfiles/scripts/open-pdf deleted file mode 100755 index b8429d4..0000000 --- a/dotfiles/scripts/open-pdf +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# opout: "open output": A general handler for opening a file's intended output. -# I find this useful especially running from vim. -# Stolen from BrodieRobertson - -basename="$(echo "$1" | sed 's/\.[^\/.]*$//')" - -case "$1" in - *.tex|*.md|*.rmd|*.ms|*.me|*.mom) setsid zathura "$basename".pdf >/dev/null 2>&1 & ;; - *.html) setsid "$BROWSER" --new-window "$basename".html >/dev/null 2>&1 & ;; -esac diff --git a/dotfiles/scripts/pandoc-comp b/dotfiles/scripts/pandoc-comp deleted file mode 100755 index daa541f..0000000 --- a/dotfiles/scripts/pandoc-comp +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# General handler for compiling files -# stolen from BrodieRobertson - -file=$(readlink -f "$1") -base=$(echo "$file" | sed 's/\..*//') - -handlebang() { - bang=$(head -n 1 "$file") - case "$bang" in - *!/bin/sh|*!/bin/bash|*!/bin/zsh) "$file" ;; - *!/bin/perl) perl "$file" ;; - *!/bin/python) python "$file" ;; - *) echo "Can't compile" ;; - esac -} - -case "$1" in - *.md) pandoc "$file" -o "$base".pdf ;; - *.py) python "$file" ;; - *.perl) perl "$file" ;; - *) handlebang ;; -esac diff --git a/dotfiles/vim/vimrc b/dotfiles/vim/vimrc index 647cf54..f444b93 100644 --- a/dotfiles/vim/vimrc +++ b/dotfiles/vim/vimrc @@ -6,34 +6,18 @@ call vundle#begin() Plugin 'VundleVim/Vundle.vim' -" Show git-branch -Plugin 'tpope/vim-fugitive' +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Show git changes +Plugin 'airblade/vim-gitgutter' +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" adjust indents +Plugin 'tpope/vim-sleuth' + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " match parents Plugin 'tmsvg/pear-tree' -" tex helper -Plugin 'lervag/vimtex' - -" manage markdown tables (:TableModeToggle) -Plugin 'dhruvasagar/vim-table-mode' - -" fzf -if executable("fzf") - Plugin 'junegunn/fzf' - Plugin 'junegunn/fzf.vim' -endif - -" Colors -Plugin 'arcticicestudio/nord-vim' -Plugin 'vim-airline/vim-airline' -Plugin 'vim-airline/vim-airline-themes' - -call vundle#end() -filetype plugin indent on - -" ------------------------------------- Plugin Settings ------------------------ -" PearTree let g:pear_tree_smart_openers=1 let g:pear_tree_smart_closers=1 let g:pear_tree_smart_backspace=1 @@ -47,23 +31,44 @@ let g:pear_tree_pairs = { \ '<': {'closer': '>'} \ } -" Airline +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" tex helper +Plugin 'lervag/vimtex' + +let g:vimtex_view_general_viewer = 'zathura' + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" manage markdown tables (:TableModeToggle) +Plugin 'dhruvasagar/vim-table-mode' + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" fzf +if executable("fzf") + Plugin 'junegunn/fzf' + Plugin 'junegunn/fzf.vim' + + nmap :Files +endif + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Colors +Plugin 'arcticicestudio/nord-vim' +Plugin 'vim-airline/vim-airline' +Plugin 'vim-airline/vim-airline-themes' + let g:airline_theme='nord' let g:airline_powerline_fonts = 1 let g:bufferline_echo = 0 - set guifont="InconsolataLGC Nerd Font Mono" -" Nord let g:nord_bold = 0 let g:nord_italic = 1 let g:nord_underline = 1 -" vimtex -let g:vimtex_view_general_viewer = 'zathura' +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +call vundle#end() +filetype plugin indent on -" fzf -nmap :Files " ------------------------------------- Colors --------------------------------- syntax on colorscheme nord