From b1030cd57fa8caeceba255b6f07d7cd867a695dc Mon Sep 17 00:00:00 2001 From: CramMK Date: Wed, 3 Jun 2020 15:53:35 +0200 Subject: [PATCH] Changes --- README.md | 5 +- config.yaml | 2 +- dotdrop | 2 +- dotfiles/compton/compton.conf | 4 +- dotfiles/i3/config | 24 ++--- dotfiles/polybar/config | 46 ---------- dotfiles/ranger/rc.conf | 2 +- dotfiles/rofi/config.rasi | 7 +- dotfiles/rofi/config.rasi.dotdropbak | 11 --- dotfiles/rofi/marc.rasi | 131 --------------------------- dotfiles/vim/vimrc | 3 +- dotfiles/zsh/zshrc | 4 +- 12 files changed, 20 insertions(+), 221 deletions(-) delete mode 100644 dotfiles/rofi/config.rasi.dotdropbak delete mode 100644 dotfiles/rofi/marc.rasi diff --git a/README.md b/README.md index 1477800..037cffb 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,9 @@ My personal configurations, managed with the 'dotdrop' submodule. + Audio Visualizer: `cava` + Wallpaper: `teh` + Filebrowser: `ranger (with w3m-img)` -+ pdf-Preview: `zathura` -+ Image-Preview: `feh` ++ pdf-Viewer: `zathura` ++ Image-Viewer: `feh` ++ Movie-Viewer: `mpv` ## Profiles + `laptop`: All of the dotfiles diff --git a/config.yaml b/config.yaml index d199af4..f558f95 100644 --- a/config.yaml +++ b/config.yaml @@ -15,7 +15,7 @@ dotfiles: dst: ~/.bashrc f_zshrc: src: zsh/zshrc - dst: ~/.zshrc + dst: ~/.zshrc d_ohmyzsh: src: zsh/ohmyzsh dst: ~/.ohmyzsh diff --git a/dotdrop b/dotdrop index c29fb58..6474a48 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit c29fb5870010760afa5915cf3ef7dbf8473ccf8d +Subproject commit 6474a48961ef3be0c572b740f2a48834996871b3 diff --git a/dotfiles/compton/compton.conf b/dotfiles/compton/compton.conf index 6a7c3d8..093f941 100644 --- a/dotfiles/compton/compton.conf +++ b/dotfiles/compton/compton.conf @@ -1,8 +1,8 @@ # Opacity opacity-rule = [ "85:class_g = 'XTerm'", - "85:class_g = 'discord'", - "80:class_g *?= 'spotify'", + "95:class_g = 'discord'", + "90:class_g *?= 'spotify'", "90:class_g *?= 'Rofi'", ]; diff --git a/dotfiles/i3/config b/dotfiles/i3/config index 1978e68..7d9e327 100644 --- a/dotfiles/i3/config +++ b/dotfiles/i3/config @@ -36,7 +36,7 @@ bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status -#sound control +# Sound control bindsym XF86AudioPlay exec playerctl play bindsym XF86AudioPause exec playerctl pause bindsym XF86AudioNext exec playerctl next @@ -53,37 +53,25 @@ set $terminal xterm # kill focused window bindsym $mod+Shift+q kill -# start dmenu (a program launcher) -bindsym $mod+Shift+d exec dmenu_run # Rofi bindsym $mod+space exec "rofi -show" -bindsym $mod+d exec "rofi -show run" bindsym $mod+c exec "rofi -show ssh" +# dmenu +bindsym $mod+d exec "dmenu_run -fn 'InconsolataLGC Nerd Font Mono' -nb '#2E3440' -sb '#2E3440' -nf '#ECEFF4' -sf '#A3BE8C' -p 'ﰌ' -l 3" + # change focus 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 -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right - # move focused window bindsym $mod+Shift+h move left bindsym $mod+Shift+j move down bindsym $mod+Shift+k move up bindsym $mod+Shift+l 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 - # Splitting bindsym $mod+Shift+s split v bindsym $mod+Shift+v split h @@ -205,7 +193,7 @@ bar { } # Locking -bindsym $mod+Shift+BackSpace exec "xlock -mode rain -startCmd /share/bin/isweg -endCmd /share/bin/isda -bg '#6843bf' -info ''" +bindsym $mod+Shift+BackSpace exec "xlock -mode grav -startCmd /share/bin/isweg -endCmd /share/bin/isda -bg '#6843bf' -info ''" # Custom Workspaces exec --no-startup-id "firefox" @@ -229,7 +217,7 @@ bindsym $mod+Ctrl+2 move workspace to output $monitor2 {%@@ if profile == "laptop" @@%} # Locking -bindsym $mod+Shift+BackSpace exec "xlock -mode rain -info ''" +bindsym $mod+Shift+BackSpace exec "xlock -mode grav -info ''" # Custom Workspaces # exec --no-startup-id "chromium-browser" diff --git a/dotfiles/polybar/config b/dotfiles/polybar/config index 13ab897..e00eadb 100644 --- a/dotfiles/polybar/config +++ b/dotfiles/polybar/config @@ -304,49 +304,3 @@ click-left = "pkill -n polybar" type = custom/script exec = ~/.config/polybar/scripts/load.sh interval = 5.0 - -############################################################################### -[module/wpchanger] -type = custom/text -content = "WP" -click-left = polybar wallpaper - -[bar/wallpaper] - -width = 200 -height = 27 -radius = 0 - -; 1920 - width - offset-y - mainbar-height -offset-x = 1720 -offset-y = 1020 - -background = ${colors.background} - -separator = %{F#33}| - -font-0 = ${font.inconsolata} - -modules-center = aincrad hp_nord closewpbar - -override-redirect = true - -[module/wpbase] -type = custom/text -content-background = ${colors.background} -content-foreground = ${colors.accent} - -[module/aincrad] -inherit = module/powerbase -content = " Aincrad " -click-left = "feh --bg-scale ~/.wallpaper/aincrad.png; pkill -n polybar" - -[module/hp_nord] -inherit = module/powerbase -content = " HP Nord " -click-left = "feh --bg-scale ~/.wallpaper/hp_nord.png; pkill -n polybar" - -[module/closewpbar] -type = custom/text -content = " Cancel" -click-left = "pkill -n polybar" diff --git a/dotfiles/ranger/rc.conf b/dotfiles/ranger/rc.conf index b76a962..117da92 100644 --- a/dotfiles/ranger/rc.conf +++ b/dotfiles/ranger/rc.conf @@ -4,6 +4,6 @@ set preview_images true default_linemode devicons # separators, outline, both, none -set draw_borders both +set draw_borders none set mouse_enabled true diff --git a/dotfiles/rofi/config.rasi b/dotfiles/rofi/config.rasi index 0eef4a7..b34e6ae 100644 --- a/dotfiles/rofi/config.rasi +++ b/dotfiles/rofi/config.rasi @@ -1,17 +1,12 @@ configuration { - modi: "drun,run,ssh"; + modi: "drun,ssh"; hide-scrollbar: true; separator-style: none; show-icons: true; terminal: "xterm"; font: "Inconsolata 13"; lines: 7; - // Marc theme - // width: 30; - // yoffset: -300; - // NORD display-drun: "理"; - display-run: "ﰌ"; display-ssh: "力"; theme: "nord.rasi"; width: 750; diff --git a/dotfiles/rofi/config.rasi.dotdropbak b/dotfiles/rofi/config.rasi.dotdropbak deleted file mode 100644 index 880c8fd..0000000 --- a/dotfiles/rofi/config.rasi.dotdropbak +++ /dev/null @@ -1,11 +0,0 @@ -configuration { - modi: "drun,run"; - //combi-modi: "drun,ssh,run"; - show-icons: true; - theme: "marc.rasi"; - terminal: "xterm"; - font: "Inconsolata 13"; - lines: 7; - width: 30; - yoffset: -300; -} diff --git a/dotfiles/rofi/marc.rasi b/dotfiles/rofi/marc.rasi deleted file mode 100644 index 73a3dd0..0000000 --- a/dotfiles/rofi/marc.rasi +++ /dev/null @@ -1,131 +0,0 @@ -* { - none: rgba ( 0, 0, 0, 0% ); - nord-green: rgba ( 163, 190, 140, 100% ); - nord0: rgba ( 46, 52, 64, 100% ); - nord3: rgba ( 67, 76, 94, 100% ); - frost0: rgba ( 216, 222, 233, 100% ); - frost2: rgba ( 236, 239, 244, 100% ); - selected-normal-foreground: @frost0; - foreground: @frost2; - normal-foreground: @foreground; - alternate-normal-background: @nord0; - alternate-urgent-background: @nord3; - alternate-active-background: @nord0; - background: @nord0; - alternate-normal-foreground: @foreground; - normal-background: @nord0; - selected-normal-background: @nord3; - border-color: @none; - spacing: 2; - separatorcolor: @none; - urgent-background: @nord0; - alternate-urgent-foreground: @urgent-foreground; - background-color: @none; - alternate-active-foreground: @active-foreground; - active-background: @nord0; -} -#window { - background-color: @background; - border: 5; - padding: 5; -} -#mainbox { - border: 0; - padding: 0; -} -#message { - border: 1px dash 0px 0px ; - border-color: @separatorcolor; - padding: 1px ; -} -#textbox { - text-color: @foreground; -} -#listview { - fixed-height: 0; - border: 2px dash 0px 0px ; - border-color: @separatorcolor; - spacing: 2px ; - scrollbar: true; - padding: 2px 0px 0px ; -} -#element { - border: 0; - padding: 1px ; -} -#element.normal.normal { - background-color: @normal-background; - text-color: @normal-foreground; -} -#element.normal.urgent { - background-color: @urgent-background; - text-color: @urgent-foreground; -} -#element.normal.active { - background-color: @active-background; - text-color: @active-foreground; -} -#element.selected.normal { - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -} -#element.selected.urgent { - background-color: @selected-urgent-background; - text-color: @selected-urgent-foreground; -} -#element.selected.active { - background-color: @selected-active-background; - text-color: @selected-active-foreground; -} -#element.alternate.normal { - background-color: @alternate-normal-background; - text-color: @alternate-normal-foreground; -} -#element.alternate.urgent { - background-color: @alternate-urgent-background; - text-color: @alternate-urgent-foreground; -} -#element.alternate.active { - background-color: @alternate-active-background; - text-color: @alternate-active-foreground; -} -#scrollbar { - width: 4px ; - border: 0; - handle-width: 8px ; - padding: 0; -} -#mode-switcher { - border: 2px dash 0px 0px ; - border-color: @separatorcolor; -} -#button.selected { - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -} -#inputbar { - spacing: 0; - text-color: @normal-foreground; - padding: 1px ; -} -#case-indicator { - spacing: 0; - text-color: @normal-foreground; -} -#entry { - spacing: 0; - text-color: @normal-foreground; -} -#prompt { - spacing: 0; - text-color: @normal-foreground; -} -#inputbar { - children: [ prompt,textbox-prompt-colon,entry,case-indicator ]; -} -#textbox-prompt-colon { - expand: false; - str: ":"; - margin: 0px 0.3em 0em 0em ; - text-color: @normal-foreground; -} diff --git a/dotfiles/vim/vimrc b/dotfiles/vim/vimrc index 4153c0d..f7f8b4a 100644 --- a/dotfiles/vim/vimrc +++ b/dotfiles/vim/vimrc @@ -49,7 +49,8 @@ let g:pear_tree_pairs = { \ } " Vimwiki -let g:vimwiki_list = [{'path': '~/vimwiki/'}] +let g:vimwiki_list = [{'path': '~/vimwiki/', + \ 'syntax': 'markdown', 'ext': '.md'}] " Other configurations " Colors diff --git a/dotfiles/zsh/zshrc b/dotfiles/zsh/zshrc index 833a9cb..755ec16 100644 --- a/dotfiles/zsh/zshrc +++ b/dotfiles/zsh/zshrc @@ -34,7 +34,9 @@ alias fonts="/home/$USER/.local/share/fonts" alias listfonts="fc-list :scalable=true:spacing=mono: family" alias cachefonts="fc-cache -f -v" -alias wiki="vim ~/vimwiki/index.wiki" +alias c="clear" +alias v="vim" +alias w="vim ~/vimwiki/index.md" # Allow local aliases if [ -f ~/.zshrc_local ]; then