From c8f8da8e00b817e87b99878f6ddd0cc87f74104e Mon Sep 17 00:00:00 2001 From: Tuan-Dat Tran Date: Mon, 11 Mar 2019 23:59:49 +0100 Subject: [PATCH] Off to a new start --- .gitignore | 1 + config/.Xdefaults | 5 + config/.Xresources | 73 +- config/.config/i3/config | 145 +- config/.config/polybar/config | 1 - config/.config/ranger/rc.conf | 2 +- config/.config/ranger/rifle.conf | 227 --- config/.config/termite/config | 78 - vim/.vim/bundle/Vundle.vim | 1 - vim/.vim/bundle/vim-pandoc | 1 - vim/.vim/bundle/vim-pandoc-syntax | 1 - vim/.vim/colors/PaperColor.vim | 2215 ----------------------------- vim/.vim/ftplugin/go.vim | 11 - vim/.vim/spell/de.utf-8.add | 46 + vim/.vim/spell/de.utf-8.add.spl | Bin 4095 -> 4740 bytes vim/.vimrc | 29 +- zsh/.warprc | 5 - zsh/.zshrc | 86 +- 18 files changed, 171 insertions(+), 2756 deletions(-) create mode 100644 config/.Xdefaults delete mode 100644 config/.config/ranger/rifle.conf delete mode 100644 config/.config/termite/config delete mode 160000 vim/.vim/bundle/Vundle.vim delete mode 160000 vim/.vim/bundle/vim-pandoc delete mode 160000 vim/.vim/bundle/vim-pandoc-syntax delete mode 100644 vim/.vim/colors/PaperColor.vim delete mode 100644 vim/.vim/ftplugin/go.vim delete mode 100644 zsh/.warprc diff --git a/.gitignore b/.gitignore index 3b71bca..cbf48cb 100755 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ \#*\# *.log .#* +vim/.vim/bundle/* emacs/.emacs.d/* config/.scripts/playstate !emacs/.emacs.d/snippets* diff --git a/config/.Xdefaults b/config/.Xdefaults new file mode 100644 index 0000000..3adce49 --- /dev/null +++ b/config/.Xdefaults @@ -0,0 +1,5 @@ +! Fonts +urxvt*font: xft:Hack Nerd Font Mono:style=Regular:size=11:hinting=full, xft:DejaVu Sans Mono for Powerline:size=11 + +! Behavior +urxvt*scrollBar: false diff --git a/config/.Xresources b/config/.Xresources index b3ecf87..884c2e8 100644 --- a/config/.Xresources +++ b/config/.Xresources @@ -1,37 +1,36 @@ -! special -*.foreground: #444444 -*.background: #eeeeee -*.cursorColor: #444444 - -! black -*.color0: #eeeeee -*.color8: #bcbcbc - -! red -*.color1: #af0000 -*.color9: #d70000 - -! green -*.color2: #008700 -*.color10: #d70087 - -! yellow -*.color3: #5f8700 -*.color11: #8700af - -! blue -*.color4: #0087af -*.color12: #d75f00 - -! magenta -*.color5: #878787 -*.color13: #d75f00 - -! cyan -*.color6: #005f87 -*.color14: #005faf - -! white -*.color7: #444444 -*.color15: #005f87 - +! special +*.foreground: #9ea7a6 +*.background: #232c31 +*.cursorColor: #9ea7a6 + +! black +*.color0: #232c31 +*.color8: #3f4944 + +! red +*.color1: #2a5491 +*.color9: #2a5491 + +! green +*.color2: #237986 +*.color10: #237986 + +! yellow +*.color3: #a03b1e +*.color11: #a03b1e + +! blue +*.color4: #484d79 +*.color12: #484d79 + +! magenta +*.color5: #c59820 +*.color13: #c59820 + +! cyan +*.color6: #b02f30 +*.color14: #b02f30 + +! white +*.color7: #9ea7a6 +*.color15: #b5d8f6 diff --git a/config/.config/i3/config b/config/.config/i3/config index 21ee136..e059595 100644 --- a/config/.config/i3/config +++ b/config/.config/i3/config @@ -25,9 +25,6 @@ new_window none new_float normal hide_edge_borders none -exec --no-startup-id volumeicon -bindsym $mod+Ctrl+m exec termite -e 'alsamixer' - ################################################################################################ ###################################### Workspace Settings ###################################### ################################################################################################ @@ -43,6 +40,7 @@ set $ws7 7:  set $ws8 8:  set $ws9 9:  + # switch to workspace bindsym $mod+1 workspace $ws1 bindsym $mod+2 workspace $ws2 @@ -77,33 +75,16 @@ bindsym $mod+Shift+8 move container to workspace $ws8; workspace $ws8 bindsym $mod+Shift+9 move container to workspace $ws9; workspace $ws9 # Open specific applications in floating mode -for_window [title="alsamixer"] floating enable border pixel 1 -for_window [title="File Transfer*"] floating enable -for_window [class="Lightdm-gtk-greeter-settings"] floating enable -for_window [class="Lxappearance"] floating enable sticky enable border normal for_window [class="Nitrogen"] floating enable sticky enable border normal -for_window [class="Oblogout"] fullscreen enable -for_window [class="octopi"] floating enable -for_window [class="Pavucontrol"] floating enable -for_window [class="(?i)System-config-printer.py"] floating enable border normal -for_window [class="Thus"] floating enable border normal -for_window [class="Timeset-gui"] floating enable border normal for_window [class="(?i)virtualbox"] floating enable border normal for_window [title="KeePassX$"] floating enable border normal for_window [title="Eddie - Settings"] floating enable border normal for_window [class="^Thunderbird$" title="^.*Event:"] floating enable -# Give boarder to terminal windows -for_window [class="(?i)termite"] border pixel 3 - -# switch to workspace with urgent window automatically -for_window [urgent=latest] focus - # https://github.com/z3ntu/dotfiles/blob/master/i3/.config/i3/config # Steam -for_window [class="^Steam$" title="^Friends$"] floating enable -for_window [class="^Steam$" title="Steam - News"] floating enable -for_window [class="^Steam$" title=".* - Chat"] floating enable +for_window [class="^Steam$" title="^Friends List$"] floating enable +for_window [class="^Steam$" title="Steam"] floating enable for_window [class="^Steam$" title="^Settings$"] floating enable for_window [class="^Steam$" title=".* - event started"] floating enable for_window [class="^Steam$" title=".* CD key"] floating enable @@ -111,27 +92,19 @@ for_window [class="^Steam$" title="^Steam - Self Updater$"] floating enable for_window [class="^Steam$" title="^Screenshot Uploader$"] floating enable for_window [class="^Steam$" title="^Steam Guard - Computer Authorization Required$"] floating enable for_window [title="^Steam Keyboard$"] floating enable -# Jetbrains -for_window [class="^com-intellij-updater-Runner$" title="^Update$"] floating enable -for_window [instance="^sun-awt-X11-XDialogPeer$" title="^Complete Installation$"] floating enable - - ############################################################################### ############################ Startup Applications ############################# ############################################################################### -exec --no-startup-id setxkbmap us,de; setxkbmap -option ctrl:swapcaps -exec --no-startup-id nitrogen --restore +exec --no-startup-id setxkbmap us,de; setxkbmap -option ctrl:nocaps +exec --no-startup-id feh --randomize --bg-fill /usr/share/backgrounds/* exec --no-startup-id compton -b exec --no-startup-id nextcloud -exec --no-startup-id emacs --daemon exec --no-startup-id udiskie exec --no-startup-id polybar beep -r exec --no-startup-id polybar boop -r exec --no-startup-id nm-applet -exec --no-startup-id xss-lock -- python ~/.scripts/i3lock.py -# exec --no-startup-id kdeconnect-indicator ############################################################################### ################################# Keybindings ################################# @@ -140,7 +113,7 @@ exec --no-startup-id xss-lock -- python ~/.scripts/i3lock.py bindsym $mod+Shift+s exec poweroff # start a terminal -bindsym $mod+Return exec termite +bindsym $mod+Return exec i3-sensible-terminal # kill focused window bindsym $mod+Shift+q kill @@ -156,8 +129,6 @@ bindsym XF86MonBrightnessDown exec "xbacklight -dec 10; notify-send 'brightness bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle -# bindsym XF86AudioPlay exec "if [ `cat /home/$USER/.scripts/playstate` = 0 ]; then echo '1'>/home/$USER/.scripts/playstate;else echo '0'>/home/$USER/.scripts/playstate;fi" -# bindsym XF86AudioStop exec "playerctl stop && echo '0'>/home/$USER/.scripts/playstate" bindsym XF86AudioPlay exec "playerctl play-pause; cmus-remote -u" bindsym XF86AudioStop exec "playerctl stop; cmus-remote -s" bindsym XF86AudioNext exec "playerctl next; cmus-remote -n" @@ -165,7 +136,8 @@ bindsym XF86AudioPrevious exec "playerctl previous; cmus-remote -r" # Application Shortcuts bindsym $mod+b exec firefox -bindsym $mod+e exec termite -e ranger +bindsym $mod+e exec i3-sensible-terminal -e ranger +bindsym $mod+Shift+e exec spacefm bindsym $mod+m exec thunderbird bindsym Print exec --no-startup-id scrot @@ -205,18 +177,10 @@ bindsym $mod+a focus parent # move the currently focused window to the scratchpad bindsym $mod+Shift+minus move scratchpad -# Show the next scratchpad window or hide the focused scratchpad window. -# If there are multiple scratchpad windows, this command cycles through them. -bindsym $mod+minus scratchpad show -bindsym $mod+Alt+v exec ~/.vim-anywhere/bin/run -#navigate workspaces next / previous -bindsym $mod+Ctrl+semicolon workspace next -bindsym $mod+Ctrl+j workspace prev -# bindsym Alt+Tab workspace next - # restart/exit i3 bindsym $mod+Shift+r restart -bindsym $mod+Shift+e exit +bindsym Control+Shift+e exit +bindsym Control+Shift+l exec dm-tool lock # Resize window (you can also use the mouse for that) bindsym $mod+r mode "resize" @@ -228,13 +192,10 @@ mode "resize" { bindsym l resize grow width 5 px or 5 ppt # exit resize mode: Enter or Escape - bindsym $mod+g mode "default" + bindsym $mod+g mode "default" bindsym Return mode "default" bindsym Escape mode "default" -} - -# Lock screen -bindsym $mod+0 exec --no-startup-id "python ~/.scripts/i3lock.py" + } # Color palette used for the terminal ( ~/.extend.Xresources file ) # Colors are gathered based on the documentation: @@ -248,24 +209,24 @@ bindsym $mod+0 exec --no-startup-id "python ~/.scripts/i3lock.py" # to: # background $term_background # Same logic applied to everything else. - set_from_resource $term_background background - set_from_resource $term_foreground foreground - set_from_resource $term_color0 color0 - set_from_resource $term_color1 color1 - set_from_resource $term_color2 color2 - set_from_resource $term_color3 color3 - set_from_resource $term_color4 color4 - set_from_resource $term_color5 color5 - set_from_resource $term_color6 color6 - set_from_resource $term_color7 color7 - set_from_resource $term_color8 color8 - set_from_resource $term_color9 color9 - set_from_resource $term_color10 color10 - set_from_resource $term_color11 color11 - set_from_resource $term_color12 color12 - set_from_resource $term_color13 color13 - set_from_resource $term_color14 color14 - set_from_resource $term_color15 color15 +set_from_resource $term_background background +set_from_resource $term_foreground foreground +set_from_resource $term_color0 color0 +set_from_resource $term_color1 color1 +set_from_resource $term_color2 color2 +set_from_resource $term_color3 color3 +set_from_resource $term_color4 color4 +set_from_resource $term_color5 color5 +set_from_resource $term_color6 color6 +set_from_resource $term_color7 color7 +set_from_resource $term_color8 color8 +set_from_resource $term_color9 color9 +set_from_resource $term_color10 color10 +set_from_resource $term_color11 color11 +set_from_resource $term_color12 color12 +set_from_resource $term_color13 color13 +set_from_resource $term_color14 color14 +set_from_resource $term_color15 color15 # Theme colors # class backgr. border text indic. child_border @@ -299,35 +260,35 @@ set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global) bindsym $mod+Shift+g mode "$mode_gaps" mode "$mode_gaps" { - bindsym o mode "$mode_gaps_outer" - bindsym i mode "$mode_gaps_inner" - bindsym $mod+g mode "default" - bindsym Return mode "default" - bindsym Escape mode "default" +bindsym o mode "$mode_gaps_outer" +bindsym i mode "$mode_gaps_inner" +bindsym $mod+g mode "default" +bindsym Return mode "default" +bindsym Escape mode "default" } mode "$mode_gaps_inner" { - bindsym plus gaps inner current plus 5 - bindsym minus gaps inner current minus 5 - bindsym 0 gaps inner current set 0 +bindsym plus gaps inner current plus 5 +bindsym minus gaps inner current minus 5 +bindsym 0 gaps inner current set 0 - bindsym Shift+plus gaps inner all plus 5 - bindsym Shift+minus gaps inner all minus 5 - bindsym Shift+0 gaps inner all set 0 +bindsym Shift+plus gaps inner all plus 5 +bindsym Shift+minus gaps inner all minus 5 +bindsym Shift+0 gaps inner all set 0 - bindsym $mod+g mode "default" - bindsym Return mode "default" - bindsym Escape mode "default" +bindsym $mod+g mode "default" +bindsym Return mode "default" +bindsym Escape mode "default" } mode "$mode_gaps_outer" { - bindsym plus gaps outer current plus 5 - bindsym minus gaps outer current minus 5 - bindsym 0 gaps outer current set 0 +bindsym plus gaps outer current plus 5 +bindsym minus gaps outer current minus 5 +bindsym 0 gaps outer current set 0 - bindsym Shift+plus gaps outer all plus 5 - bindsym Shift+minus gaps outer all minus 5 - bindsym Shift+0 gaps outer all set 0 +bindsym Shift+plus gaps outer all plus 5 +bindsym Shift+minus gaps outer all minus 5 +bindsym Shift+0 gaps outer all set 0 - bindsym $mod+g mode "default" - bindsym Return mode "default" - bindsym Escape mode "default" +bindsym $mod+g mode "default" +bindsym Return mode "default" +bindsym Escape mode "default" } diff --git a/config/.config/polybar/config b/config/.config/polybar/config index df65923..4ad197a 100644 --- a/config/.config/polybar/config +++ b/config/.config/polybar/config @@ -22,7 +22,6 @@ fixed-center = true tray-position = right tray-padding = 2 -tray-transparent = true background = #00000000 foreground = ${colors.foreground} diff --git a/config/.config/ranger/rc.conf b/config/.config/ranger/rc.conf index 51ad8d1..6179b5d 100644 --- a/config/.config/ranger/rc.conf +++ b/config/.config/ranger/rc.conf @@ -2,7 +2,7 @@ set preview_images true set vcs_aware true map f console scout -ftsea%space -map gg console mkdir%space +map md console mkdir%space map np shell cp -r ~/Templates/LaTeX/Protokoll $(date +%g.%m.%%d); ~/Templates/LaTeX/fsrprotokoll.sh map ny shell cp %f ../Protokoll_$(echo $(basename $(pwd)) | awk '{gsub("\\.","-");print}' $2).pdf map nrg shell cp ~/Templates/LaTeX/Invoice/elektro_invoice.tex Gefeba_Elektro_-_Rechnung_$(date +%g-%m)_-Elektro.tex; ~/Templates/LaTeX/Invoice/InvNum.sh diff --git a/config/.config/ranger/rifle.conf b/config/.config/ranger/rifle.conf deleted file mode 100644 index e20a7ab..0000000 --- a/config/.config/ranger/rifle.conf +++ /dev/null @@ -1,227 +0,0 @@ -# vim: ft=cfg -# -# This is the configuration file of "rifle", ranger's file executor/opener. -# Each line consists of conditions and a command. For each line the conditions -# are checked and if they are met, the respective command is run. -# -# Syntax: -# , , ... = command -# -# The command can contain these environment variables: -# $1-$9 | The n-th selected file -# $@ | All selected files -# -# If you use the special command "ask", rifle will ask you what program to run. -# -# Prefixing a condition with "!" will negate its result. -# These conditions are currently supported: -# match | The regexp matches $1 -# ext | The regexp matches the extension of $1 -# mime | The regexp matches the mime type of $1 -# name | The regexp matches the basename of $1 -# path | The regexp matches the absolute path of $1 -# has | The program is installed (i.e. located in $PATH) -# env | The environment variable "variable" is non-empty -# file | $1 is a file -# directory | $1 is a directory -# number | change the number of this command to n -# terminal | stdin, stderr and stdout are connected to a terminal -# X | $DISPLAY is not empty (i.e. Xorg runs) -# -# There are also pseudo-conditions which have a "side effect": -# flag | Change how the program is run. See below. -# label