diff --git a/.Xresources b/.Xresources old mode 100755 new mode 100644 index 30ad406..06e31fb --- a/.Xresources +++ b/.Xresources @@ -1,67 +1,7 @@ -! URxvt settings -URxvt.inheritPixmap: false -urxvt.transparent: false -URxvt.imLocale: en_US.UTF-8 -URxvt.scrollBar: false -URxvt.saveLines: 500 -URxvt.cursorBlink: true -URxvt.geometry: 100x25 -URxvt.fading: 30% -URxvt.allow_bold: true -URxvt.internalBorder: 3 -URxvt*perl-lib: /usr/lib/urxvt/perl/ -URxvt*perl-ext-common: default,matcher,font-size -URxvt*url-launcher: /usr/bin/firefox -URxvt*matcher.button: 1 -URxvt*matcher.pattern.1:\\bwww\\.[\\w-]+\\.[\\w./?&@#-]*[\\w/-] -URxvt.keysym.C-Up: font-size:increase -URxvt.keysym.C-Down: font-size:decrease -URxvt.keysym.C-S-Up: font-size:incglobal -URxvt.keysym.C-S-Down: font-size:decglobal -URxvt.keysym.C-equal: font-size:reset -URxvt.keysym.C-slash: font-size:show ! Xft Settings (font) -URxvt.letterSpace: 0 Xft.lcdfilter: lcddefault Xft.antialias: true Xft.rgba:rgba Xft.hinting: true Xft.hintstyle: hintfull Xft.dpi: 92 -URxvt*font: xft:xos4 Terminess Powerline:style=Regular:pixelsize=18,xft:TerminessTTF Nerd Font:pixelsize=20:style=Medium -URxvt*boldFont: xft:xos4 Terminess Powerline:style=Bold:pixelsize=18,xft:TerminessTTF Nerd Font:pixelsize=20:style=Bold -xterm*faceName: Terminess Powerline:pixelsize=14:style=Regular -! special -urxvt.foreground: #c1c4c2 -urxvt.background: #1d1f21 -xterm.background: #1d1f21 -urxvt.cursorColor: #d2c5bc -! black -URxvt*color0: #1d1f21 -URxvt*color8: #303030 -! red -URxvt*color1: #d73555 -URxvt*color9: #c76484 -! green -URxvt*color2: #35d755 -URxvt*color10: #64c784 -! yellow -URxvt*color3: #d7d755 -URxvt*color11: #c7c784 -! blue -URxvt*color4: #3555d7 -URxvt*color12: #6484c7 -! magenta -URxvt*color5: #d755d7 -! purple -URxvt*color13: #7355d7 -! cyan -URxvt*color6: #55b7b7 - -URxvt*color14: #84c7c7 -!#84c7c7 -! white -URxvt*color7: #505050 -URxvt*color15: #d7d7d7 -#include ".config/Xresources.d/t-i3.x" -!#include "~/.config/Xresources.d/t-netbook.x" diff --git a/.chunkwmrc b/.chunkwmrc old mode 100755 new mode 100644 diff --git a/.config/Xresources.d/t-i3.x b/.config/Xresources.d/t-i3.x deleted file mode 100755 index 0f80d41..0000000 --- a/.config/Xresources.d/t-i3.x +++ /dev/null @@ -1,5 +0,0 @@ -rofi.color-normal: #15325A, #f5f5f5, #15325A, #225396, #dfdfdf -rofi.color-urgent: #15325A, #dc322f, #15325A, #dc322f, #dfdfdf -rofi.color-active: #15325A, #268bd2, #15325A, #268bd2, #dfdfdf -rofi.color-window: #15325A,#225396 -rofi.show-icons: true diff --git a/.config/Xresources.d/t-netbook.x b/.config/Xresources.d/t-netbook.x deleted file mode 100755 index af319bc..0000000 --- a/.config/Xresources.d/t-netbook.x +++ /dev/null @@ -1,8 +0,0 @@ -! ------------------------------------------------------------------------------ -! ROFI Color theme -! ------------------------------------------------------------------------------ -rofi.color-enabled: true -rofi.color-window: #273238, #273238, #1e2529 -rofi.color-normal: #273238, #c1c1c1, #273238, #394249, #ffffff -rofi.color-active: #273238, #80cbc4, #273238, #394249, #80cbc4 -rofi.color-urgent: #273238, #ff1844, #273238, #394249, #ff1844 diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml old mode 100755 new mode 100644 diff --git a/.config/alacritty/alacritty_ranger.yml b/.config/alacritty/alacritty_ranger.yml old mode 100755 new mode 100644 diff --git a/.config/conky/conkyrc b/.config/conky/conkyrc old mode 100755 new mode 100644 diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc old mode 100755 new mode 100644 diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf deleted file mode 100755 index f5ea6d3..0000000 --- a/.config/fontconfig/fonts.conf +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - true - - - hintfull - - - - system - DejaVu Sans - devicons - - diff --git a/.config/htop/htoprc b/.config/htop/htoprc deleted file mode 100755 index e98b492..0000000 --- a/.config/htop/htoprc +++ /dev/null @@ -1,26 +0,0 @@ -# Beware! This file is rewritten by htop when settings are changed in the interface. -# The parser is also very primitive, and not human-friendly. -fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=47 -sort_direction=1 -hide_threads=0 -hide_kernel_threads=1 -hide_userland_threads=0 -shadow_other_users=0 -show_thread_names=0 -show_program_path=1 -highlight_base_name=0 -highlight_megabytes=1 -highlight_threads=1 -tree_view=1 -header_margin=1 -detailed_cpu_time=0 -cpu_count_from_zero=0 -update_process_names=0 -account_guest_in_cpu_meter=0 -color_scheme=0 -delay=15 -left_meters=AllCPUs Memory Swap -left_meter_modes=1 1 1 -right_meters=Tasks LoadAverage Uptime -right_meter_modes=2 2 2 diff --git a/.i3/boot.mp3 b/.config/i3/boot.mp3 old mode 100755 new mode 100644 similarity index 100% rename from .i3/boot.mp3 rename to .config/i3/boot.mp3 diff --git a/.i3/config b/.config/i3/config old mode 100755 new mode 100644 similarity index 79% rename from .i3/config rename to .config/i3/config index 67bed3b..de3686f --- a/.i3/config +++ b/.config/i3/config @@ -1,43 +1,33 @@ # T's desktop v3 #exec --no-stratup-id xrandr --output eDP1 --primary --auto #exec --no-startup-id xrandr --output HDMI-0 --auto --mode 2048x1152 --primary -#exec_always --no-startup-id $HOME/.i3/scripts/polybar_launch.sh -#exec --no-startup-id lxqt-policykit-agent -#exec --no-startup-id compton -G -b +exec_always --no-startup-id $HOME/.config/i3/scripts/polybar_launch.sh +exec --no-startup-id compton -G -b #exec --no-startup-id mplayer -fs $HOME/.i3/boot.mp4 #exec --no-startup-id conky -c $HOME/.config/conky/conkyrc -#exec --no-startup-id xset -dpms && xset s noblank && xset s noexpose && xset dpms 600 1800 360 -#exec --no-startup-id synclient TapButton1=1 -#exec xautolock -time 10 -locker $HOME/.i3/scripts/locker.sh +exec --no-startup-id xset -dpms && xset s noblank && xset s noexpose && xset dpms 600 1800 360 +exec --no-startup-id synclient TapButton1=1 +exec xautolock -time 10 -locker $HOME/config/i3/scripts/locker.sh #exec xautolock -locknow #DAEMONS -#exec --no-startup-id urxvtd -q -#exec --no-startup-id udiskie -t -#exec --no-startup-id nitrogen --restore -#exec --no-startup-id dunst +exec --no-startup-id udiskie -t +exec --no-startup-id nitrogen --restore +exec --no-startup-id dunst #exec --no-startup-id mpd #exec --no-startup-id megasync #exec --no-startup-id parcellite -#exec --no-startup-id dunst -#exec --no-startup-id blueman-applet +exec --no-startup-id blueman-applet #Layout -#exec setxkbmap us altgr-intl +exec setxkbmap us altgr-intl #exec xmodmap $HOME/.i3/custom.map -exec --no-startup-id /usr/lib/gnome-settings-daemon/gsd-xsettings -exec_always --no-startup-id gnome-power-manager +#exec --no-startup-id /usr/lib/gnome-settings-daemon/gsd-xsettings +exec--no-startup-id gnome-power-manager exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 -exec --no-startup-id gnome-flashback +#exec --no-startup-id gnome-flashback font pango: xos4 Terminus, Font Awesome 5 Free, Font Awesome 5 Brands 12 #--APPEARANCE--# -#--T-netbook---# -#client.focused #464A55 #464A55 #969AA5 #ffffff -#client.focused_inactive #272B35 #9b9aa6 #ffffff #48504e -#client.urgent #272B35 #900000 #ffffff #900000 -#client.placeholder #000000 #0c0c0c #ffffff #000000 -#client.background #ffffff - #-----T-i3-----# #class border backgr. text indicator client.focused #f8f8f2 #f8f8f2 #44475a #8be9fd @@ -107,8 +97,8 @@ bindsym $mod+space focus mode_toggle #--CUSTOM COMMANDS--# #KEYBOARD LAYOUT SWITCHING -bindsym $alt+F3 exec --no-startup-id setxkbmap us altgr-intl && xmodmap ~/.i3/custom.map -bindsym $alt+F2 exec --no-startup-id setxkbmap si +#bindsym $alt+F3 exec --no-startup-id setxkbmap us altgr-intl && xmodmap ~/.i3/custom.map +#bindsym $alt+F2 exec --no-startup-id setxkbmap si #LAUNCH PROGRAM bindsym $mod+d exec --no-startup-id rofi -color-enabled -show run -font "xos4 Terminus 18" @@ -125,24 +115,22 @@ bindsym XF86AudioPlay exec mpc toggle bindsym XF86AudioStop exec mpc stop bindsym XF86AudioNext exec mpc next bindsym XF86AudioPrev exec mpc previous -bindsym XF86AudioMute exec ~/.i3/scripts/volume_set.sh mute -bindsym XF86AudioRaiseVolume exec ~/.i3/scripts/volume_set.sh up -bindsym XF86AudioLowerVolume exec ~/.i3/scripts/volume_set.sh down +bindsym XF86AudioMute exec ~/.config/i3/scripts/volume_set.sh mute +bindsym XF86AudioRaiseVolume exec ~/.config/i3/scripts/volume_set.sh up +bindsym XF86AudioLowerVolume exec ~/.config/i3/scripts/volume_set.sh down bindsym XF86MonBrightnessUp exec xbacklight +5 bindsym XF86MonBrightnessDown exec xbacklight -5 bindsym XF86KbdBrightnessUp exec asus-kbd-backlight up bindsym XF86KbdBrightnessDown exec asus-kbd-backlight down -bindsym XF86Sleep exec ~/.i3/scripts/locker.sh & systemctl suspend -bindsym $mod+Shift+p exec ~/.i3/scripts/locker.sh & systemctl suspend -bindsym $mod+Shift+o exec ~/.i3/scripts/locker.sh +bindsym XF86Sleep exec ~/.config/i3/scripts/locker.sh & systemctl suspend +bindsym $mod+Shift+p exec ~/.config/i3/scripts/locker.sh & systemctl suspend +bindsym $mod+Shift+o exec ~/.config/i3/scripts/locker.sh #SHUTDOWN+RESTART bindsym $mod+Shift+c reload bindsym $mod+Shift+r restart bindsym $mod+Shift+z exec "i3-msg exit" -bindsym $mod+Shift+e exec ~/.i3/scripts/locker.sh -#SHUTDOWN MENU -bindsym $alt+F4 exec --no-startup-id ~/.i3/scripts/shutdown_menu +bindsym $mod+Shift+e exec ~/.config/i3/scripts/locker.sh #//CUSTOM COMMANDS//# @@ -219,7 +207,7 @@ gaps outer 10 #//BORDER//# #--LAYOUTS--# -bindsym $alt+Shift+l exec $HOME/.i3/scripts/workspace.sh "$HOME/.i3/layouts/workspace-3.json" "$HOME/build/doc24_backend" +#bindsym $alt+Shift+l exec $HOME/.i3/scripts/workspace.sh "$HOME/.i3/layouts/workspace-3.json" "$HOME/build/doc24_backend" #//LAYOUTS//# # resize window (you can also use the mouse for that) diff --git a/.i3/custom.map b/.config/i3/custom.map old mode 100755 new mode 100644 similarity index 100% rename from .i3/custom.map rename to .config/i3/custom.map diff --git a/.i3/layouts/gimp-layout.json b/.config/i3/layouts/gimp-layout.json old mode 100755 new mode 100644 similarity index 100% rename from .i3/layouts/gimp-layout.json rename to .config/i3/layouts/gimp-layout.json diff --git a/.i3/layouts/workspace-3.json b/.config/i3/layouts/workspace-3.json old mode 100755 new mode 100644 similarity index 100% rename from .i3/layouts/workspace-3.json rename to .config/i3/layouts/workspace-3.json diff --git a/.i3/mboot.mp3 b/.config/i3/mboot.mp3 old mode 100755 new mode 100644 similarity index 100% rename from .i3/mboot.mp3 rename to .config/i3/mboot.mp3 diff --git a/.i3/scripts/claw b/.config/i3/scripts/claw similarity index 100% rename from .i3/scripts/claw rename to .config/i3/scripts/claw diff --git a/.i3/scripts/locker.sh b/.config/i3/scripts/locker.sh similarity index 100% rename from .i3/scripts/locker.sh rename to .config/i3/scripts/locker.sh diff --git a/.i3/scripts/polybar_launch.sh b/.config/i3/scripts/polybar_launch.sh similarity index 100% rename from .i3/scripts/polybar_launch.sh rename to .config/i3/scripts/polybar_launch.sh diff --git a/.i3/scripts/rotate_background.sh b/.config/i3/scripts/rotate_background.sh similarity index 100% rename from .i3/scripts/rotate_background.sh rename to .config/i3/scripts/rotate_background.sh diff --git a/.i3/scripts/shutdown_menu b/.config/i3/scripts/shutdown_menu similarity index 100% rename from .i3/scripts/shutdown_menu rename to .config/i3/scripts/shutdown_menu diff --git a/.i3/scripts/term_runner.sh b/.config/i3/scripts/term_runner.sh similarity index 100% rename from .i3/scripts/term_runner.sh rename to .config/i3/scripts/term_runner.sh diff --git a/.i3/scripts/volume_set.sh b/.config/i3/scripts/volume_set.sh similarity index 100% rename from .i3/scripts/volume_set.sh rename to .config/i3/scripts/volume_set.sh diff --git a/.i3/scripts/wan-or-not.sh b/.config/i3/scripts/wan-or-not.sh similarity index 100% rename from .i3/scripts/wan-or-not.sh rename to .config/i3/scripts/wan-or-not.sh diff --git a/.i3/scripts/workspace.sh b/.config/i3/scripts/workspace.sh similarity index 100% rename from .i3/scripts/workspace.sh rename to .config/i3/scripts/workspace.sh diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf deleted file mode 100755 index d7d1aea..0000000 --- a/.config/mpd/mpd.conf +++ /dev/null @@ -1,17 +0,0 @@ -db_file "~/.config/mpd/database" -log_file "~/.config/mpd/log" - -# Optional -music_directory "/media/Music" -playlist_directory "~/.config/mpd/playlists" -pid_file "~/.config/mpd/pid" -state_file "~/.config/mpd/state" -sticker_file "~/.config/mpd/sticker.sql" - -audio_output { - type "pulse" - name "pulse audio" - server "127.0.0.1" -} - -restore_paused "yes" diff --git a/.config/nvim/.gitignore b/.config/nvim/.gitignore old mode 100755 new mode 100644 index 3862762..f412365 --- a/.config/nvim/.gitignore +++ b/.config/nvim/.gitignore @@ -1 +1,2 @@ bundle/* +doc/* diff --git a/.config/nvim/.netrwhist b/.config/nvim/.netrwhist old mode 100755 new mode 100644 diff --git a/.config/nvim/doc/Colorizer.txt b/.config/nvim/doc/Colorizer.txt deleted file mode 100755 index ea5eb0e..0000000 --- a/.config/nvim/doc/Colorizer.txt +++ /dev/null @@ -1,511 +0,0 @@ -*Colorizer.txt* A plugin to color colornames and codes - -Author: Christian Brabandt -Version: 0.11 Thu, 15 Jan 2015 21:49:17 +0100 -Copyright: (c) 2009-2013 by Christian Brabandt - The VIM LICENSE applies to Colorizer.txt - (see |copyright|) except use ColorizerPlugin instead of "Vim". - NO WARRANTY, EXPRESS OR IMPLIED. USE AT-YOUR-OWN-RISK. - -============================================================================== -Contents *Colorizer* -============================================================================== - - 1. Colorizer Manual.............................|Colorizer-manual| - 1.1 :ColorHighlight......................|:ColorHighlight| - 1.2 :ColorClear..........................|:ColorClear| - 1.3 :RGB2Term............................|:RGB2Term| - 1.4 :HSL2RGB.............................|:HSL2RGB| - 1.5 :Term2RGB............................|:Term2RGB| - 1.6 :ColorContrast.......................|:ColorContrast| - 1.7 :ColorSwapFgBg.......................|:ColorSwapFgBg| - 1.8 :ColorToggle.........................|:ColorToggle| - 2. Configuration................................|Colorizer-config| - 2.1 Automatic loading...................|Colorizer-auto| - 2.2 Automatically highlight filetypes...|Colorizer-hl-ft| - 2.3 Skip coloring comments..............|Colorizer-comments| - 2.4 Adjust the contrast.................|Colorizer-contrast| - 2.5 Highlight colornames................|Colorizer-hl-names| - 2.6 Use X11 colornames..................|Colorizer-names| - 2.7 Use syntax highlighting.............|Colorizer-syntax| - 2.8 Specify patterns to highlight.......|Colorizer-pattern| - 2.9 Colorizing Taskwarrior files........|Colorizer-taskwarrior-files| - 2.10 Colorizing vim syntax files.........|Colorizer-vim-files| - 2.11 Use custom colornames...............|Colorizer-custom-colornames| - 2.12 Colorizing :hi statements...........|Colorizer-vim-hi| - 3. Colorizer Mappings...........................|Colorizer-maps| - 4. Colorizer Tips...............................|Colorizer-tips| - 5. Colorizer Feedback...........................|Colorizer-feedback| - 6. Colorizer History............................|Colorizer-history| - -============================================================================== -1. Colorizer Manual *Colorizer-manual* -============================================================================== - -Functionality - -This plugin is based on the css_color plugin by Nikolaus Hofer. The idea is to -highlight color names and codes in the same color that they represent. - -The plugin understands the W3C colors (used for CSS files for example), the -color names from the X11 Window System and also codes in hex notation, like -#FF0000 (which represents Red in the RGB color system). Additionally, it -supports the CSS color specifications, e.g. rgb(RR,GG,BB) color representation -in either absolute or percentage values and also the HVL color -representation like hvl(H,V,L) - -It works best in the gui version of Vim, but the plugin also supports 256 and -88 color terminals and translates the colors to those supported by the -terminal. 16 and 8 color terminals should work theoretically too, but have not -been widely tested. Note that translating the colors to the terminal might -impose a performance penalty, depending on the terminal type and the number of -matches in the file. - -This plugin defines the following commands: - - *:ColorHighlight* -:[range]ColorHighlight[!] [args] - -Scan the lines given by [range] for color code names and highlight those. If -[range] is omitted, the whole file will be scanned. If the ! is used, the -plugin will redefine all highlighting groups. If ! is not used, it will -skip patterns, that would take too long and make Vim unresponsive. - -[args] can by any of "syntax" or "match". "syntax" means to convert the -highlighting to syntax highlighting. This is useful, so a plugin like -|2html.vim| can convert the colors correctly to HTML. The default is -"match", which uses the |matchadd()| function. (Prepending "no" is -supported and will disable that setting and use the opposite). - - *:ColorClear* -:ColorClear Turn off color highlighting. - - *:RGB2Term* -:RGB2Term Translate the color code given as argument to - the closest color that can be displayed in the - terminal. The color must be given in the - format #RRGGBB (the hex format of the colors red, - green and blue (the '#' is optional), or - alternatively like rgb(X,X,X) - - Uses the number of colors your terminal is capable - of (or 256 colors for gVim). - - *:HSL2RGB* -:HSL2RGB hsl(h,v,l) Translate the HVL color defined by the string - 'hsl(h,v%,l%)' into a color that the current - terminal can display. Note that the color must be - given in the format 'hsl(HH, V, L)' where HH - defines the Hue as absolute value between 0 and - 255 and V and L represent a percentage for value - and Lightness. - - *:Term2RGB* -:Term2RGB number Translate terminal color to an RGB color - (using the xterm 256 color cube). - - *:ColorContrast* -:ColorContrast Switch between all different color contrast - settings (foreground colors). - *:ColorSwapFgBg* -:ColorSwapFgBg Switch between foreground and background colors. - This will toggle in 3 ways. From Swapping - foreground and background colors, to only - highlighting the foreground color back to normal - foreground background color. - - *:ColorToggle* -:ColorToggle Switch between highlighting colors and no - highlighting. - -============================================================================== -2 Colorizer Configuration *Colorizer-config* -============================================================================== - -2.1 Automatic loading *Colorizer-auto* ---------------------- - -The Colorizer plugin can be configured to automatically load when opening a -new file. Note that this might slow down the loading process, especially on -the terminal. To enable this, simply set the variable 'g:colorizer_auto_color' -to 1, e.g. by defining it in your |.vimrc| > - - :let g:colorizer_auto_color = 1 -< -(Not recommended, see below at |Colorizer-hl-ft| for the preferred way) - -2.2 Automatically highlight filetypes *Colorizer-hl-ft* -------------------------------------- - -If you want to have certain filetypes automatically highlighted, you can use -the variable g:colorizer_auto_filetype, e.g. to enable highlighting for -HTML and CSS files by default, add the following to your |.vimrc|: > - - :let g:colorizer_auto_filetype='css,html' -< -After restarting Vim, the plugin will become active whenever the filetype is -set to either html or css. - -2.3 Skip coloring comments *Colorizer-comments* --------------------------- - -You can skip comments from being colored by setting the variable -g:colorizer_skip_comments to 1: > - - :let g:colorizer_skip_comments = 1 -< -The plugin will skip all matches of color codes and names that appear inside -comments (this only works when syntax highlighting is enabled |:syn-on|) - -Note however, that if the same color is used inside comments and outside -comments, it will also be highlighted inside the comments, because -coloring is done matching only the color pattern and once this is done outside -of comments, this will also match inside comments. - -2.4 Adjust the contrast *Colorizer-contrast* ------------------------ - -Colorizer can be adjusted to blur the contrast between foreground and -background color. For this, the variable 'g:colorizer_fgcontrast' can be used. -It can be given any value between -1 and 2 with 2 being the default. Each -smaller value will decrease the contrast a little bit, with -1 being special, -as there is the foreground color equals the background color. Use -|:ColorContrast| to cycle through the different values. - -2.5 Highlight colornames *Colorizer-hl-names* ------------------------- - -If for any reason you don't want the plugin to highlight colornames, you can -prevent this by setting the g:colorizer_colornames variable to 0, e.g. put > - - :let g:colorizer_colornames = 0 -< -into your |.vimrc| - -2.6 Use X11 colornames *Colorizer-names* ----------------------- - -Colorizer can be configured to support all color names defined by the X11 -Window System. By default it only supports the colors defined by the W3C for -the CSS specification. To use the X11 color names, set the variable -'g:colorzer_x11_names' to 1, e,g. put in your |.vimrc| > - - let g:colorizer_x11_names = 1 -< - -2.7 Use syntax highlighting *Colorizer-syntax* ---------------------------- - -The plugin by default uses the |matchadd()| functions for highlighting colors -on the fly. Unfortunately, this is a problem, if you want to have the result -successfully transformed to a HTML file using the |2html.vim| plugin. Therefore, -the Colorizer plugin can also convert the highlighting to correct syntax -highlighting. Use either the > - - :ColorHighlight syntax -< -command (see |:ColorHighlight|) or set the variable 'g:colorizer_syntax' to 1, -e.g. in your |.vimrc| put > - - let g:colorizer_syntax = 1 -< - -2.8 Specify pattern to highlight *Colorizer-pattern* --------------------------------- - -By default, Colorizer detects the following patterns and highlights them as -hex colors (for better readability it is separated into 3 parts): > - - # %(\x\{3}\|\x\{6}\) \%(\>\|[-_]\)\@=/' -< - -This means it always looks for a '#' followed by either a 3 or 6 hexadecimal -digits denoting the RGB hex color codes, followed by either the word-boundary -(|/\>|), a hyphen or a underscore. But only the first and middle part will be -highlighted (i.e. the RGB color codes). - -You can of course specify a different pattern for your needs by setting the -g:colorizer_hex_pattern variable. e.g. to display '#RRGGBB' and have all of it -highlighted, use > - - let g:colorizer_hex_pattern = ['#', '\%(\x\{3}\|\x\{6}\)', ''] - -2.9 Colorizing Taskwarrior files *Colorizer-taskwarrior-files* --------------------------------- - -For taskwarrior files, this plugin can also highlight those colors. By -default, this will only work, if the file name ends with '.theme' - -For an example, see this website: -http://taskwarrior.org/news/182 - -2.10 Colorizing vim syntax files *Colorizer-vim-files* --------------------------------- - -Colorizer also supports highlighting vim syntax files. For this to work, the -'filetype' must be set to vim, then the plugin tries to identify the colors -and highlight them. - -2.11 Use custom colornames *Colorizer-custom-colornames* --------------------------- - -You can add separate colornames to be colored. For this to work, set the -variable g:colorizer_custom_colors to your liking, e.g. like this: > - - let g:colorizer_custom_colors = { 'blue': '#ff0000'} - -Guess what, this will color the word blue in red. - -2.12 Colorizing :highlight statements *Colorizer-vim-hi* -------------------------------------- - -Colorizer also supports highlighting |:hi| statements, that are used by vim -colorschemes and syntax files as well as a dump of the |:hi| command -To colorizer :hi statements, the 'filetype' must be set to vim, while for :hi -dumps, the 'filetype' must be empty. - -============================================================================== -3. Colorizer Mappings *Colorizer-maps* -============================================================================== - -By default, the Colorizer plugin does not map any key, so that it won't -pollute the global mapping namespace. If you want however to have the -following default maps set up, set the global variable g:colorizer_auto_map -in your |.vimrc| like this: > - - :let g:colorizer_auto_map = 1 - -< -This will set up the following key mappings (if they are not already taken): - -Keys Name Function ----- ---- -------- -cC Colorizer Toggle highlighting of Colors. In visual - mode it only highlights the colors in the - selected region (normal and visual mode). -cT ColorContrast Cycle through contrast setting - |:ColorContrast| (normal and visual mode) -cF ColorFgBg Toggle foreground and background color - |:ColorSwapFgBg| - -It uses the prefix c to set all functionality up. By default, -is defined as '\' (||). Use the name provided in the second column to -map the function to a different key. - -============================================================================== -4. Colorizer Tips *Colorizer-tips* -============================================================================== - -You can enable the plugin to be loaded for certain filetypes automatically. -This makes sense for example for CSS files or HTML files. To do so, create the -following autocommand in your |.vimrc| > - - :au BufNewFile,BufRead *.css,*.html,*.htm :ColorHighlight! -< -This will automatically highlight all existing color codes and names if you -edit either a HTML file or a CSS file. Note that this does not update the -highlighting, after you have been changing the file. - -The recommended way to do this is to use the g:colorizer_auto_filetype -variable and set this to the desired filetypes. |Colorizer-hl-ft| - - *Colorizer-slowdown* ----------------- -Slow performance ----------------- -Depending on your file, any of the highlighting functions might cause an -performance decrease. This can be analyed, by setting the variable -g:colorizer_debug to 1 in e.g. your |.vimrc| like this: > - - :let g:colorizer_debug = 1 -< -The next time, you call |:ColorHighlight|, the plugin will output runtime -statistics, from which you can see, which function caused the slowdowns. -Consider this output: - - Colorstatistics at: 12:20 ` - Duration: 0.034110 ` - colornames: 0.030865s ` - hex: 0.000968s ` - hsla: 0.000350s ` - rgb: 0.000354s ` - rgba: 0.000491s ` - taskwarrior: 0.000020s ` - term: 0.000219s ` - term_conceal: 0.000105s ` - vimcolors: 0.000036s ` - vimhighl_dump: 0.000025s ` - vimhighlight: 0.000025s ` - -From this you can see, that the colorname highlighting caused the largest -slowdown, it took 0.03 seconds to complete. This is expected, as the -colornames pattern is long and contains many branches. - -Functions with a value less then 100 have probably been skipped and were not -being executed. - -If you want to skip certain functions, you can set the variable -g:colorizer__disable and then those functions won't be called anymore -(e.g. do disable the colorname highlighting, put in your |.vimrc| this: > - - let g:colorizer_colornames_disable = 1 -< -If the slowdown is still noticeable, you might want to create -a new issue at the plugins repository (|Colorizer-feedback|). You should -provide a sample file, so that I will be able to reproduce the issue. - -Note, this needs a Vim with the |+reltime| feature. -============================================================================== -5. Colorizer Feedback *Colorizer-feedback* -============================================================================== - -Feedback is always welcome. If you like the plugin, please rate it at the -vim-page: http://www.vim.org/scripts/script.php?script_id=3963 - -You can also follow the development of the plugin at github: -http://github.com/chrisbra/color_highlight - -Bugs can also be reported there: -https://github.com/chrisbra/color_highlight/issues - -Alternatively, you can also report any bugs to the maintainer, mentioned in -the third line of this document. Please don't hesitate to contact me, I -won't bite ;) - -If you like the plugin, write me an email (look in the third line for my mail -address). And if you are really happy, vote for the plugin and consider -looking at my Amazon whishlist: http://www.amazon.de/wishlist/2BKAHE8J7Z6UW - -============================================================================== -6. Colorizer History *Colorizer-history* -============================================================================== - -0.12 (unreleased) {{{1 -- TermConceal should also conceal  -- properly escape terminal colors, so that |Colorizer-syntax| works correctly -- use matchaddpos() for highlighting ansi term colors (should speed up vim - highlighting considerably) -- only reset TermConceal syntax group (reported by audriusk in - https://github.com/chrisbra/Colorizer/issues/41, thanks!) -- correctly check for patch 7.4.083 (:keeppatterns modifier, reported by - gbell12 in https://github.com/chrisbra/Colorizer/issues/42, thanks!) -- disable BufLeave autocommand to disable colors -- basic Neovim support (also should work with TrueColor in Terminal) -- Make |:RGB2term| always init colortable, so that when resetting 't_Co' - it will work correctly -- Make it work with Vims Term Truecolor feature (patch 7.4.1770) -- Make it work with neovim fixes https://github.com/chrisbra/Colorizer/issues/45 - and https://github.com/chrisbra/Colorizer/issues/46 -- Support css colors: #rrggbbaa format - -0.11 Jan 15, 2015 {{{1 -- use |TextChanged| autocommand if possible -- Support Ansi True Color support if possible -- Hide ^[[K$ for terminal colors (reported by masukomi at - https://github.com/chrisbra/Colorizer/issues/36, thanks!) -- Do not expand() to expand shellvars (fixed by Daniel Hahler in - https://github.com/chrisbra/Colorizer/issues/37, thanks!) -- Document, how to analyze slowdown |Colorizer-slowdown| -- |:ColorContrast| would error, if the plugin has not been initialized - (reported by Daniel Hahler in - https://github.com/chrisbra/Colorizer/issues/38, thanks!) -- always define reltime variable (reported by mantislin in - https://github.com/chrisbra/Colorizer/issues/39, thanks!) -- Only call conceal function once for ansiterm colors -- reduce calls to DoColor in autocommands (to only do, when something changed) - -0.10 Mar 27, 2014 {{{1 -- Also highlight Ansi Term sequences -- Match colornames using the "old" RE Engine, if Vim supports it. -- Make |:RGB2Xterm| output the color name in its color -- Rename |:RGB2Xterm| to |:RGB2Term| -- Highlight Taskwarrior file -- Code refactoring -- Make |:ColorSwapFgBg| work as expected (did not always toggle reliably - between all states) -- Correctly parse Ansi Term colors -- |:Term2RGB| -- Highlight Vim color files correctly -- merge colorhighlight plugin https://github.com/blueyed/colorhighlight.vim - -0.9: Aug 14, 2013: {{{1 -- https://github.com/chrisbra/color_highlight/issues/15 (rgba highlighting - didn't work for floating point value of alpha, reported by LiTuX.S, thanks!) -- https://github.com/chrisbra/color_highlight/issues/16 (rgb() pattern did - match too much, reported by taecilla, thanks!) -- https://github.com/chrisbra/color_highlight/issues/19 (error on calling - ColorWinEnter() command, reported by wedgwood, thanks!) -- https://github.com/chrisbra/color_highlight/issues/20 and - https://github.com/chrisbra/color_highlight/issues/21 - (also color on split commands, reported by wedgwood and Andri Möll, Thanks!) -- https://github.com/chrisbra/color_highlight/issues/22 (Make sure, patterns - like white-space won't get colored, reported by Andri Möll, Thanks!) -- https://github.com/chrisbra/color_highlight/issues/23 (ColorToggle got - confused when several windows with highlighting exists, reported by Andri - Möll, Thanks!) -- https://github.com/chrisbra/color_highlight/issues/24 (turning off coloring - should also remove the autocommands, reported by Andri Möll, Thanks!) - -0.8: Dec 14, 2012 {{{1 -- https://github.com/chrisbra/color_highlight/issues/13 (colorizing should not - stop at word-boundaries, reported by teschmitz, thanks!) -- https://github.com/chrisbra/color_highlight/issues/14 (convert highlighting - to syntax groups, so TOhtml works, reported by teschmitz, thanks!) - -0.7: Jul 25, 2012 {{{1 -- Highlight rgb colors with whitespace after comma (reported by sergey-vlasov - in https://github.com/chrisbra/color_highlight/issues/12, thanks!) -- Save and restore the search register, so the plugin doesn't clobber it -- check for 'ed' and 'gd' defaults - -0.6: May 17, 2012 {{{1 -- Fix various issues with hsl coloring (reported by teschmitz in - https://github.com/chrisbra/color_highlight/issues/9, thanks!) -- Make it possible, to skip coloring comments (reported by teschmitz in - https://github.com/chrisbra/color_highlight/issues/10, thanks!) -- search highlighting should overrule color highlighting(reported by teschmitz - in https://github.com/chrisbra/color_highlight/issues/11, thanks!) -- updated documentation (suggested by teschmitz, thanks!) - -0.5: Apr 03, 2012 {{{1 -- Fix issue 7 (reported by teschmitz in - https://github.com/chrisbra/color_highlight/issues/7, thanks!) -0.4: Mar, 23, 2012 {{{1 -- |:ColorSwapFgBg| (suggested by teschmitz, in - https://github.com/chrisbra/color_highlight/issues/3, thanks!) -- make automatic color loading work (reported by wedgwood in - https://github.com/chrisbra/color_highlight/issues/6, thanks!) - |Colorizer-auto| and |Colorizer-hl-ft| -- more documentation updates -- added Mappings (suggested by Ingo Karkat, thanks!) |Colorizer-maps| -- prevent highlighting of color names (suggested by Tarlika Schmitz in - https://github.com/chrisbra/color_highlight/issues/5, thanks!) - |Colorizer-hl-names| -- enable filetype specific autocommands, so that for certain filetypes - colors are highlighted automatically |Colorizer-hl-ft| - (suggested by Tarlika Schmitz, thanks!) - -0.3: Mar 15, 2012 {{{1 -- Use the g:colorizer_fgcontrast variable to have lesser contrast between - foreground and background colors (patch by Ingo Karkat, thanks!) -- gvim did not color rgb(...) codes -- did not correctly highlight 3 letter color codes (issue - https://github.com/chrisbra/color_highlight/issues/1, - reported by Taybin Rutkin, thanks!) -- support autoloading (requested by Ingo Karkat, thanks!) -- add |GLVS| support -- |:ColorContrast| to interactively switch between contrast settings - (suggested by Ingo Karkat, thanks!) -0.2: Mar 02, 2012 {{{1 - -- Initial upload -- development versions are available at the github repository -- put plugin on a public repository - (http://github.com/chrisbra/color_highlight) - -0.1: Mar 02, 2012 {{{1 -- first internal version - }}} -============================================================================== -Modeline: -vim:tw=78:ts=8:ft=help:et:fdm=marker:fdl=0:norl diff --git a/.config/nvim/doc/tags b/.config/nvim/doc/tags deleted file mode 100755 index c10d4a4..0000000 --- a/.config/nvim/doc/tags +++ /dev/null @@ -1,29 +0,0 @@ -:ColorClear Colorizer.txt /*:ColorClear* -:ColorContrast Colorizer.txt /*:ColorContrast* -:ColorHighlight Colorizer.txt /*:ColorHighlight* -:ColorSwapFgBg Colorizer.txt /*:ColorSwapFgBg* -:ColorToggle Colorizer.txt /*:ColorToggle* -:HSL2RGB Colorizer.txt /*:HSL2RGB* -:RGB2Term Colorizer.txt /*:RGB2Term* -:Term2RGB Colorizer.txt /*:Term2RGB* -Colorizer Colorizer.txt /*Colorizer* -Colorizer-auto Colorizer.txt /*Colorizer-auto* -Colorizer-comments Colorizer.txt /*Colorizer-comments* -Colorizer-config Colorizer.txt /*Colorizer-config* -Colorizer-contrast Colorizer.txt /*Colorizer-contrast* -Colorizer-custom-colornames Colorizer.txt /*Colorizer-custom-colornames* -Colorizer-feedback Colorizer.txt /*Colorizer-feedback* -Colorizer-history Colorizer.txt /*Colorizer-history* -Colorizer-hl-ft Colorizer.txt /*Colorizer-hl-ft* -Colorizer-hl-names Colorizer.txt /*Colorizer-hl-names* -Colorizer-manual Colorizer.txt /*Colorizer-manual* -Colorizer-maps Colorizer.txt /*Colorizer-maps* -Colorizer-names Colorizer.txt /*Colorizer-names* -Colorizer-pattern Colorizer.txt /*Colorizer-pattern* -Colorizer-slowdown Colorizer.txt /*Colorizer-slowdown* -Colorizer-syntax Colorizer.txt /*Colorizer-syntax* -Colorizer-taskwarrior-files Colorizer.txt /*Colorizer-taskwarrior-files* -Colorizer-tips Colorizer.txt /*Colorizer-tips* -Colorizer-vim-files Colorizer.txt /*Colorizer-vim-files* -Colorizer-vim-hi Colorizer.txt /*Colorizer-vim-hi* -Colorizer.txt Colorizer.txt /*Colorizer.txt* diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim old mode 100755 new mode 100644 diff --git a/.config/polybar/config b/.config/polybar/config old mode 100755 new mode 100644 diff --git a/.config/ranger/.gitignore b/.config/ranger/.gitignore index 611522a..6ac0594 100755 --- a/.config/ranger/.gitignore +++ b/.config/ranger/.gitignore @@ -1 +1,2 @@ /history +tagged diff --git a/.config/ranger/bookmarks b/.config/ranger/bookmarks old mode 100755 new mode 100644 diff --git a/.config/ranger/commands.py b/.config/ranger/commands.py old mode 100755 new mode 100644 diff --git a/.config/ranger/devicons.py b/.config/ranger/devicons.py old mode 100755 new mode 100644 diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf old mode 100755 new mode 100644 diff --git a/.config/ranger/rifle.conf b/.config/ranger/rifle.conf old mode 100755 new mode 100644 diff --git a/.config/ranger/scope.sh b/.config/ranger/scope.sh old mode 100755 new mode 100644 diff --git a/.config/ranger/tagged b/.config/ranger/tagged deleted file mode 100755 index bb1ad4a..0000000 --- a/.config/ranger/tagged +++ /dev/null @@ -1,19 +0,0 @@ -/home/tristan/build/vim-smooth/colors -a:/home/tristan/build/rineja/app/assets -v:/home/tristan/build/rineja/app/views -c:/home/tristan/build/rineja/app/controllers -c:/home/tristan/build/rineja/config -a:/home/tristan/build/rineja/app -d:/home/tristan/build/rineja/db -p:/home/tristan/build/rineja/public -G:/home/tristan/build/rineja/Gemfile -r:/home/tristan/build/rineja -s:/home/tristan/build/shoppe -d:/home/tristan/build/dotfiles -b:/home/tristan/build -+:/run/media/tristan/SAMSUNG/Games/PC/linux/Feist-TiNYiSO -+:/run/media/tristan/SAMSUNG/Games/PC/linux/Infinifactory.Linux-ACTiVATED -+:/run/media/tristan/SAMSUNG/Games/PC/linux/RimWorld914Linux -+:/run/media/tristan/SAMSUNG/Games/PC/linux/Shadowrun Returns -+:/run/media/tristan/SAMSUNG/Games/PC/linux/Shovel Knight Linux -+:/run/media/tristan/SAMSUNG/Games/PC/linux/TIS-100 (GOG) (Linux) diff --git a/.config/systemd/user/background-rotate.service b/.config/systemd/user/background-rotate.service old mode 100755 new mode 100644 diff --git a/.config/systemd/user/background-rotate.timer b/.config/systemd/user/background-rotate.timer old mode 100755 new mode 100644 diff --git a/.config/termite/config b/.config/termite/config deleted file mode 100755 index 259e388..0000000 --- a/.config/termite/config +++ /dev/null @@ -1,86 +0,0 @@ -[options] -#allow_bold = true -#audible_bell = false -#clickable_url = true -#dynamic_title = true -font = xos4 Terminess Powerline 16 -#fullscreen = true -#geometry = 640x480 -#icon_name = terminal -#mouse_autohide = false -#scroll_on_output = false -#scroll_on_keystroke = true -# Length of the scrollback buffer, 0 disabled the scrollback buffer -# and setting it to a negative value means "infinite scrollback" -scrollback_lines = 10000 -#search_wrap = true -#urgent_on_bell = true -#hyperlinks = false - -# $BROWSER is used by default if set, with xdg-open as a fallback -#browser = xdg-open - -# "system", "on" or "off" -#cursor_blink = system - -# "block", "underline" or "ibeam" -#cursor_shape = block - -# Hide links that are no longer valid in url select overlay mode -#filter_unmatched_urls = true - -# Emit escape sequences for extra modified keys -#modify_other_keys = false - -# set size hints for the window -#size_hints = false - -# "off", "left" or "right" -#scrollbar = off - -[colors] -# If both of these are unset, cursor falls back to the foreground color, -# and cursor_foreground falls back to the background color. -#cursor = #dcdccc -#cursor_foreground = #dcdccc - -#foreground = #dcdccc -#foreground_bold = #ffffff -background = #1d1f21 - -# 20% background transparency (requires a compositor) -#background = rgba(63, 63, 63, 0.8) - -# If unset, will reverse foreground and background -#highlight = #2f2f2f - -# Colors from color0 to color254 can be set -color0 = #1d1f21 -color1 = #d73555 -color8 = #303030 -color9 = #c76484 -color2 = #35d755 -color10 = #64c784 -color3 = #d7d755 -color11 = #c7c784 -color4 = #3555d7 -color12 = #6484c7 -color5 = #d755d7 -color13 = #7355d7 -color6 = #55b7b7 -color14 = #84c7c7 -color7 = #b7b7b7 -color15 = #d7d7d7 - -[hints] -#font = xos4 Terminus 12 -#foreground = #dcdccc -#background = #3f3f3f -#active_foreground = #e68080 -#active_background = #3f3f3f -#padding = 2 -#border = #3f3f3f -#border_width = 0.5 -#roundness = 2.0 - -# vim: ft=dosini cms=#%s diff --git a/.dmrc b/.dmrc old mode 100755 new mode 100644 diff --git a/.gitconfig b/.gitconfig old mode 100755 new mode 100644 diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 index 3af71c2..b288bde --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ .config/ranger/bookmarks .config/systemd/user/default.target.wants .config/systemd/user/timers.target.wants +.zsh-update +.config/htop diff --git a/.gitmodules b/.gitmodules old mode 100755 new mode 100644 diff --git a/.i3/i3blocks-netbook.conf b/.i3/i3blocks-netbook.conf deleted file mode 100755 index 75010b3..0000000 --- a/.i3/i3blocks-netbook.conf +++ /dev/null @@ -1,38 +0,0 @@ -command=/usr/lib/i3blocks/$BLOCK_NAME -separator_block_width=15 -markup=pango - -[battery] -command=~/build/i3blocks-battery/battery.py -interval=5 - -[is_online] -command=~/.i3/scripts/wan-or-not.sh    -interval=3 - -[cpu_usage] -label= -interval=1 - -[RAM] -label= -command=~/.i3/scripts/RAM.sh -interval=3 - -[disk] -label= -instance=/ -interval=60 - -[key_layout] -command= ~/.i3/scripts/key_layout -label= -interval=2 - -[time] -command=date '+%d.%m.%y %H:%M' -interval=5 - -[shutdown_menu] -full_text= Quit -command= ~/.i3/scripts/shutdown_menu -c diff --git a/.i3/i3blocks.conf b/.i3/i3blocks.conf deleted file mode 100755 index cf3cee9..0000000 --- a/.i3/i3blocks.conf +++ /dev/null @@ -1,50 +0,0 @@ -command=/usr/lib/i3blocks/$BLOCK_NAME -separator_block_width=15 -markup=pango - -#[mpd_status] -#command=~/.i3/mpd_status.sh -#interval=2 - -[is_online] -command=~/.i3/scripts/wan-or-not.sh    -interval=5 - -[cpu_usage] -label= -interval=2 - -[RAM] -label= -command=~/.i3/scripts/RAM.sh -interval=2 - -[disk] -color=#6484C7 -label= -instance=/home -interval=100 - -[disk] -label= -instance=/ -interval=100 - -[disk] -label=M: -instance=/media -interval=100 - -[key_layout] -command= ~/.i3/scripts/key_layout -label= -interval=2 - -[time] -label= -command=date '+%d.%m.%y %H:%M' -interval=5 - -[shutdown_menu] -full_text= Quit -command= ~/.i3/scripts/shutdown_menu -c diff --git a/.i3/scripts/RAM.sh b/.i3/scripts/RAM.sh deleted file mode 100755 index 6dbc7da..0000000 --- a/.i3/scripts/RAM.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -ram=$(free -m) -arr=($ram) -max=$(awk "BEGIN {printf \"%.2f\",${arr[7]}/1024}") -cur=$(awk "BEGIN {printf \"%.2f\",${arr[8]}/1024}") -echo "${cur}GB/${max}GB" - diff --git a/.i3/scripts/key_layout b/.i3/scripts/key_layout deleted file mode 100755 index 2103e42..0000000 --- a/.i3/scripts/key_layout +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2016 Patrick Haun -# Edited: Denis Kadyshev -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -setxkbmap -query | awk ' - BEGIN{layout="";variant=""} - /^layout/{layout=$2} - /^variant/{variant=$2} - END{printf("%s %s",layout,variant)}' diff --git a/.i3/scripts/mpd_status.sh b/.i3/scripts/mpd_status.sh deleted file mode 100755 index 4ce3b34..0000000 --- a/.i3/scripts/mpd_status.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -SONG=$(mpc current) - -for i in $(mpc --format ""); do - a=$i - break -done - -case $BLOCK_BUTTON in - 2) mpc toggle ;; - 1) mpc prev ;; - 3) mpc next ;; -esac - -if [ -z "$SONG" ]; then - OUT="" -else - if [ $a = "[playing]" ]; then - OUT="" - else - OUT="" - fi - OUT="$OUT $SONG" -fi -echo $OUT diff --git a/.oh-my-zsh b/.oh-my-zsh index 0e7c813..efcbd9f 160000 --- a/.oh-my-zsh +++ b/.oh-my-zsh @@ -1 +1 @@ -Subproject commit 0e7c81316cab30d28d362f69ddc72be83029ac34 +Subproject commit efcbd9f3480a28ec69c607c46adcbfd8d230ac9f diff --git a/.skhdrc b/.skhdrc old mode 100755 new mode 100644 diff --git a/.taskrc b/.taskrc old mode 100755 new mode 100644 diff --git a/.zsh-update b/.zsh-update old mode 100755 new mode 100644 diff --git a/.zshrc b/.zshrc old mode 100755 new mode 100644 index 404347c..ead31d3 --- a/.zshrc +++ b/.zshrc @@ -22,16 +22,9 @@ else ZSH_THEME="T-netbook" fi -plugins=(git git-extras ruby capistrano bundler archlinux zsh-autosuggestions) +plugins=(git git-extras archlinux) source $ZSH/oh-my-zsh.sh - -export RUBY_GC_HEAP_INIT_SLOTS=800000 -export RUBY_HEAP_FREE_MIN=100000 -export RUBY_HEAP_SLOTS_INCREMENT=300000 -export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1 -export RUBY_GC_MALLOC_LIMIT=79000000 - # export MANPATH="/usr/local/man:$MANPATH" export RANGER_LOAD_DEFAULT_RC=FALSE @@ -59,11 +52,4 @@ alias ccat="source-highlight --out-format=esc -i" alias lal="ls -la" alias lh="ls -lh" alias ip="ip -c" -alias be="bundle exec" -alias ber="bundle exec rails" alias ssc="sudo systemctl" - -# Add RVM to PATH for scripting. Make sure this is the last PATH variable change. -export PATH="$HOME/.rvm/bin:$PATH" - -source $HOME/.rvm/scripts/rvm diff --git a/install.sh b/install.sh index a9f2365..de0461c 100755 --- a/install.sh +++ b/install.sh @@ -30,7 +30,7 @@ symlink_dotfiles() { for file in .config/*; do [ ! -e "${HOME}/${file}" ] && ln -fs "${SCRIPT_DIR}/${file}" "${HOME}/${file}" done - [ ! -e "${HOME}/.oh-my-zsh/custom/themes" ] && ln -fs "${SCRIPT_DIR}/zsh-themes" "${HOME}/.oh-my-zsh/custom/themes" + [ -e "${HOME}/.oh-my-zsh/custom/themes" ] && rm -r "${HOME}/.oh-my-zsh/custom/themes" && ln -fs "${SCRIPT_DIR}/zsh-themes" "${HOME}/.oh-my-zsh/custom/themes" } for var in "$@" @@ -40,20 +40,22 @@ do fi # Install already build packages + if [ $var == "-i" ] ; then + sudo pacman -S zsh zsh-autosuggestions zsh-syntax-highlighting alacritty neovim i3-gaps ctags udiskie nitrogen compton dunst rofi terminus-font openssh lxappearance xsel conky firejail wget ttf-font-awesome + sudo firecfg + fi if [ $var == "-t" ] ; then - sudo pacman -S zsh zsh-syntax-highlighting neovim i3-gaps ctags mplayer udiskie nitrogen compton dunst rofi terminus-font openssh lxappearance xsel conky firejail linux-hardened wget ttf-font-awesome wget https://aur.archlinux.org/cgit/aur.git/snapshot/trizen.tar.gz tar -xvf trizen.tar.gz cd trizen makepkg -sri cd .. rm -r trizen* - sudo firecfg fi # Install packages from the AUR if [ $var == "-ii" ]; then - trizen -S polybar megasync alacritty-scrollback-git i3lock-color-git terminess-powerline-font-git arc-gtk-theme numix-circle-arc-icons-git pulsemixer + trizen -S polybar i3lock-color-git terminess-powerline-font-git arc-gtk-theme numix-circle-arc-icons-git pulsemixer fi if [ $var == "-l" ]; then diff --git a/nmdispatcher/90-media.sh b/nmdispatcher/90-media.sh deleted file mode 100755 index 984bd98..0000000 --- a/nmdispatcher/90-media.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -REMOTE='192.168.1.2:/' -LOCAL='/media' - -interface=$1 status=$2 -if [ "$CONNECTION_UUID" = "7e64138d-bb9f-4869-9140-6c8276895990" ]; then - case $status in - up) - mount $REMOTE $LOCAL - ;; - down) - umount /media - ;; - esac -fi diff --git a/zsh-themes/T-i3.zsh-theme b/zsh-themes/T-i3.zsh-theme old mode 100755 new mode 100644 diff --git a/zsh-themes/T-netbook.zsh-theme b/zsh-themes/T-netbook.zsh-theme old mode 100755 new mode 100644 diff --git a/zsh-themes/TServer.zsh-theme b/zsh-themes/TServer.zsh-theme old mode 100755 new mode 100644