From 5534b6e924256d8d59004e33773c8ddfcba0ee06 Mon Sep 17 00:00:00 2001 From: CramMK Date: Mon, 25 May 2020 10:18:33 +0200 Subject: [PATCH] Idk what I changed tbh --- README.md | 2 +- config.yaml | 7 - dotfiles/i3/i3 | 10 +- dotfiles/polybar/config | 51 ++- dotfiles/vifm/colors/palenight.vifm | 29 -- dotfiles/vifm/scripts/README | 6 - dotfiles/vifm/vifmrc | 485 ---------------------------- 7 files changed, 55 insertions(+), 535 deletions(-) delete mode 100644 dotfiles/vifm/colors/palenight.vifm delete mode 100644 dotfiles/vifm/scripts/README delete mode 100644 dotfiles/vifm/vifmrc diff --git a/README.md b/README.md index 408b3c5..4493839 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ My personal configurations, managed with the 'dotdrop' submodule. + App Launcher: `rofi` + Audio Visualizer: `cava` + Wallpaper: `teh` -+ Filebrowser: `vifm` ++ Filebrowser: `ranger` ## Profiles + `laptop`: All of the dotfiles diff --git a/config.yaml b/config.yaml index 23c8eae..bf54d4f 100644 --- a/config.yaml +++ b/config.yaml @@ -75,9 +75,6 @@ dotfiles: d_neofetch: src: neofetch dst: ~/.config/neofetch - d_vifm: - src: vifm - dst: ~/.config/vifm f_dir_colors: src: dir_colors/dir_colors dst: ~/.dir_colors @@ -98,7 +95,6 @@ profiles: - rofi - cava - neofetch - - vifm - dir_colors work: include: @@ -164,9 +160,6 @@ profiles: neofetch: dotfiles: - d_neofetch - vifm: - dotfiles: - - d_vifm dir_colors: dotfiles: - f_dir_colors diff --git a/dotfiles/i3/i3 b/dotfiles/i3/i3 index f8d973c..459a153 100644 --- a/dotfiles/i3/i3 +++ b/dotfiles/i3/i3 @@ -92,8 +92,8 @@ bindsym $mod+f fullscreen toggle # change container layout (stacked, tabbed, toggle split) bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed -bindsym $mod+e layout toggle split +#bindsym $mod+w layout tabbed +bindsym $mod+a layout toggle split # toggle tiling / floating bindsym $mod+Shift+space floating toggle @@ -101,9 +101,6 @@ bindsym $mod+Shift+space floating toggle # change focus between tiling / floating windows #bindsym $mod+space focus mode_toggle -# focus the parent container -bindsym $mod+a focus parent - # focus the child container #bindsym $mod+d focus child @@ -260,6 +257,9 @@ gaps inner 5 # vifm bindsym $mod+Shift+Return exec xterm vifm +# ranger +bindsym $mod+e exec xterm ranger + exec_always --no-startup-id ~/.config/polybar/start.sh & exec_always --no-startup-id dunst {%@@ endif @@%} diff --git a/dotfiles/polybar/config b/dotfiles/polybar/config index 1615ba5..c183a50 100644 --- a/dotfiles/polybar/config +++ b/dotfiles/polybar/config @@ -89,7 +89,7 @@ monitor = "eDP-1" modules-left = title modules-center = -modules-right = +modules-right = wpchanger ############################################################################### [bar/external_top] @@ -143,7 +143,7 @@ ws-icon-7 = 8;8 ws-icon-8 = 9;9 ws-icon-9 = 10;10 -label-focused = %index% +label-focused = %icon% label-focused-foreground = ${colors.background} label-focused-background = ${colors.accent} label-focused-padding = 1 @@ -335,3 +335,50 @@ click-left = "pkill -n polybar" type = custom/script exec = ~/.config/polybar/load.sh interval = 5.0 + +############################################################################### +[module/wpchanger] +type = custom/text +content = "Wallpaper" +;content = "" +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" + +[module/hp_nord] +inherit = module/powerbase +content = " HP Nord " +click-left = "feh --bg-scale ~/.wallpaper/hp_nord.png" + +[module/closewpbar] +type = custom/text +content = " Cancel" +click-left = "pkill -n polybar" diff --git a/dotfiles/vifm/colors/palenight.vifm b/dotfiles/vifm/colors/palenight.vifm deleted file mode 100644 index af52fb9..0000000 --- a/dotfiles/vifm/colors/palenight.vifm +++ /dev/null @@ -1,29 +0,0 @@ -" palenight color scheme for vifm - -" Reset all styles first -highlight clear - -highlight Border cterm=none ctermfg=default ctermbg=default - -highlight TopLine cterm=none ctermfg=002 ctermbg=default -highlight TopLineSel cterm=bold ctermfg=002 ctermbg=default - -highlight Win cterm=none ctermfg=251 ctermbg=default -highlight Directory cterm=bold ctermfg=004 ctermbg=default -highlight CurrLine cterm=bold,inverse ctermfg=default ctermbg=default -highlight OtherLine cterm=bold ctermfg=default ctermbg=default -highlight Selected cterm=none ctermfg=003 ctermbg=008 - -highlight JobLine cterm=bold ctermfg=251 ctermbg=008 -highlight StatusLine cterm=none ctermfg=008 ctermbg=default -highlight ErrorMsg cterm=bold ctermfg=001 ctermbg=default -highlight WildMenu cterm=bold ctermfg=015 ctermbg=008 -highlight CmdLine cterm=none ctermfg=007 ctermbg=default - -highlight Executable cterm=bold ctermfg=002 ctermbg=default -highlight Link cterm=bold ctermfg=006 ctermbg=default -highlight BrokenLink cterm=bold ctermfg=001 ctermbg=default -highlight Device cterm=bold,standout ctermfg=000 ctermbg=011 -highlight Fifo cterm=none ctermfg=003 ctermbg=default -highlight Socket cterm=bold ctermfg=005 ctermbg=default - diff --git a/dotfiles/vifm/scripts/README b/dotfiles/vifm/scripts/README deleted file mode 100644 index 7694952..0000000 --- a/dotfiles/vifm/scripts/README +++ /dev/null @@ -1,6 +0,0 @@ -This directory is dedicated for user-supplied scripts/executables. -vifm modifies its PATH environment variable to let user run those -scripts without specifying full path. All subdirectories are added -as well. File in a subdirectory overrules file with the same name -in parent directories. Restart might be needed to recognize files -in newly created or renamed subdirectories. \ No newline at end of file diff --git a/dotfiles/vifm/vifmrc b/dotfiles/vifm/vifmrc deleted file mode 100644 index 63640df..0000000 --- a/dotfiles/vifm/vifmrc +++ /dev/null @@ -1,485 +0,0 @@ -" vim: filetype=vifm : -" Sample configuration file for vifm (last updated: 2 June, 2019) -" You can edit this file by hand. -" The " character at the beginning of a line comments out the line. -" Blank lines are ignored. -" The basic format for each item is shown with an example. - -" ------------------------------------------------------------------------------ - -" Command used to edit files in various contexts. The default is vim. -" If you would like to use another vi clone such as Elvis or Vile -" you will need to change this setting. - -set vicmd=vim -" set vicmd=elvis\ -G\ termcap -" set vicmd=vile - -" This makes vifm perform file operations on its own instead of relying on -" standard utilities like `cp`. While using `cp` and alike is a more universal -" solution, it's also much slower when processing large amounts of files and -" doesn't support progress measuring. - -set syscalls - -" Trash Directory -" The default is to move files that are deleted with dd or :d to -" the trash directory. If you change this you will not be able to move -" files by deleting them and then using p to put the file in the new location. -" I recommend not changing this until you are familiar with vifm. -" This probably shouldn't be an option. - -set trash - -" This is how many directories to store in the directory history. - -set history=100 - -" Automatically resolve symbolic links on l or Enter. - -set nofollowlinks - -" With this option turned on you can run partially entered commands with -" unambiguous beginning using :! (e.g. :!Te instead of :!Terminal or :!Te). - -" set fastrun - -" Natural sort of (version) numbers within text. - -set sortnumbers - -" Maximum number of changes that can be undone. - -set undolevels=100 - -" Use Vim's format of help file (has highlighting and "hyperlinks"). -" If you would rather use a plain text help file set novimhelp. - -set vimhelp - -" If you would like to run an executable file when you -" press return on the file name set this. - -set norunexec - -" Selected color - -colorscheme palenight - -" Format for displaying time in file list. For example: -" TIME_STAMP_FORMAT=%m/%d-%H:%M -" See man date or man strftime for details. - -set timefmt=%m/%d\ %H:%M - -" Show list of matches on tab completion in command-line mode - -set wildmenu - -" Display completions in a form of popup with descriptions of the matches - -set wildstyle=popup - -" Display suggestions in normal, visual and view modes for keys, marks and -" registers (at most 5 files). In other view, when available. - -set suggestoptions=normal,visual,view,otherpane,keys,marks,registers - -" Ignore case in search patterns unless it contains at least one uppercase -" letter - -set ignorecase -set smartcase - -" Don't highlight search results automatically - -set nohlsearch - -" Use increment searching (search while typing) -set incsearch - -" Try to leave some space from cursor to upper/lower border in lists - -set scrolloff=4 - -" Don't do too many requests to slow file systems - -if !has('win') - set slowfs=curlftpfs -endif - -" Set custom status line look - -set statusline=" Hint: %z%= %A %10u:%-7g %15s %20d " - -" ------------------------------------------------------------------------------ - -" :mark mark /full/directory/path [filename] - -mark b ~/bin/ -mark h ~/ - -" ------------------------------------------------------------------------------ - -" :com[mand][!] command_name action -" The following macros can be used in a command -" %a is replaced with the user arguments. -" %c the current file under the cursor. -" %C the current file under the cursor in the other directory. -" %f the current selected file, or files. -" %F the current selected file, or files in the other directory. -" %b same as %f %F. -" %d the current directory name. -" %D the other window directory name. -" %m run the command in a menu window - -command! df df -h %m 2> /dev/null -command! diff vim -d %f %F -command! zip zip -r %f.zip %f -command! run !! ./%f -command! make !!make %a -command! mkcd :mkdir %a | cd %a -command! vgrep vim "+grep %a" -command! reload :write | restart - -" ------------------------------------------------------------------------------ - -" The file type is for the default programs to be used with -" a file extension. -" :filetype pattern1,pattern2 defaultprogram,program2 -" :fileviewer pattern1,pattern2 consoleviewer -" The other programs for the file type can be accessed with the :file command -" The command macros %f, %F, %d, %F may be used in the commands. -" The %a macro is ignored. To use a % you must put %%. - -" For automated FUSE mounts, you must register an extension with :file[x]type -" in one of following formats: -" -" :filetype extensions FUSE_MOUNT|some_mount_command using %SOURCE_FILE and %DESTINATION_DIR variables -" %SOURCE_FILE and %DESTINATION_DIR are filled in by vifm at runtime. -" A sample line might look like this: -" :filetype *.zip,*.jar,*.war,*.ear FUSE_MOUNT|fuse-zip %SOURCE_FILE %DESTINATION_DIR -" -" :filetype extensions FUSE_MOUNT2|some_mount_command using %PARAM and %DESTINATION_DIR variables -" %PARAM and %DESTINATION_DIR are filled in by vifm at runtime. -" A sample line might look like this: -" :filetype *.ssh FUSE_MOUNT2|sshfs %PARAM %DESTINATION_DIR -" %PARAM value is filled from the first line of file (whole line). -" Example first line for SshMount filetype: root@127.0.0.1:/ -" -" You can also add %CLEAR if you want to clear screen before running FUSE -" program. - -" Pdf -filextype *.pdf zathura %c %i &, apvlv %c, xpdf %c -fileviewer *.pdf pdftotext -nopgbrk %c - - -" PostScript -filextype *.ps,*.eps,*.ps.gz - \ {View in zathura} - \ zathura %f, - \ {View in gv} - \ gv %c %i &, - -" Djvu -filextype *.djvu - \ {View in zathura} - \ zathura %f, - \ {View in apvlv} - \ apvlv %f, - -" Audio -filetype *.wav,*.mp3,*.flac,*.m4a,*.wma,*.ape,*.ac3,*.og[agx],*.spx,*.opus - \ {Play using ffplay} - \ ffplay -nodisp -autoexit %c, - \ {Play using MPlayer} - \ mplayer %f, -fileviewer *.mp3 mp3info -fileviewer *.flac soxi - -" Video -filextype *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob, - \*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx, - \*.as[fx] - \ {View using ffplay} - \ ffplay -fs -autoexit %f, - \ {View using Dragon} - \ dragon %f:p, - \ {View using mplayer} - \ mplayer %f, -fileviewer *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob, - \*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx, - \*.as[fx] - \ ffprobe -pretty %c 2>&1 - -" Web -filextype *.html,*.htm - \ {Open with dwb} - \ dwb %f %i &, - \ {Open with firefox} - \ firefox %f &, - \ {Open with uzbl} - \ uzbl-browser %f %i &, -filetype *.html,*.htm links, lynx - -" Object -filetype *.o nm %f | less - -" Man page -filetype *.[1-8] man ./%c -fileviewer *.[1-8] man ./%c | col -b - -" Images -filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm - \ {View in sxiv} - \ sxiv %f, - \ {View in gpicview} - \ gpicview %c, - \ {View in shotwell} - \ shotwell, -fileviewer *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm - \ identify %f - -" OpenRaster -filextype *.ora - \ {Edit in MyPaint} - \ mypaint %f, - -" Mindmap -filextype *.vym - \ {Open with VYM} - \ vym %f &, - -" MD5 -filetype *.md5 - \ {Check MD5 hash sum} - \ md5sum -c %f %S, - -" SHA1 -filetype *.sha1 - \ {Check SHA1 hash sum} - \ sha1sum -c %f %S, - -" SHA256 -filetype *.sha256 - \ {Check SHA256 hash sum} - \ sha256sum -c %f %S, - -" SHA512 -filetype *.sha512 - \ {Check SHA512 hash sum} - \ sha512sum -c %f %S, - -" GPG signature -filetype *.asc - \ {Check signature} - \ !!gpg --verify %c, - -" Torrent -filetype *.torrent ktorrent %f & -fileviewer *.torrent dumptorrent -v %c - -" FuseZipMount -filetype *.zip,*.jar,*.war,*.ear,*.oxt,*.apkg - \ {Mount with fuse-zip} - \ FUSE_MOUNT|fuse-zip %SOURCE_FILE %DESTINATION_DIR, - \ {View contents} - \ zip -sf %c | less, - \ {Extract here} - \ tar -xf %c, -fileviewer *.zip,*.jar,*.war,*.ear,*.oxt zip -sf %c - -" ArchiveMount -filetype *.tar,*.tar.bz2,*.tbz2,*.tgz,*.tar.gz,*.tar.xz,*.txz - \ {Mount with archivemount} - \ FUSE_MOUNT|archivemount %SOURCE_FILE %DESTINATION_DIR, -fileviewer *.tgz,*.tar.gz tar -tzf %c -fileviewer *.tar.bz2,*.tbz2 tar -tjf %c -fileviewer *.tar.txz,*.txz xz --list %c -fileviewer *.tar tar -tf %c - -" Rar2FsMount and rar archives -filetype *.rar - \ {Mount with rar2fs} - \ FUSE_MOUNT|rar2fs %SOURCE_FILE %DESTINATION_DIR, -fileviewer *.rar unrar v %c - -" IsoMount -filetype *.iso - \ {Mount with fuseiso} - \ FUSE_MOUNT|fuseiso %SOURCE_FILE %DESTINATION_DIR, - -" SshMount -filetype *.ssh - \ {Mount with sshfs} - \ FUSE_MOUNT2|sshfs %PARAM %DESTINATION_DIR %FOREGROUND, - -" FtpMount -filetype *.ftp - \ {Mount with curlftpfs} - \ FUSE_MOUNT2|curlftpfs -o ftp_port=-,,disable_eprt %PARAM %DESTINATION_DIR %FOREGROUND, - -" Fuse7z and 7z archives -filetype *.7z - \ {Mount with fuse-7z} - \ FUSE_MOUNT|fuse-7z %SOURCE_FILE %DESTINATION_DIR, -fileviewer *.7z 7z l %c - -" Office files -filextype *.odt,*.doc,*.docx,*.xls,*.xlsx,*.odp,*.pptx libreoffice %f & -fileviewer *.doc catdoc %c -fileviewer *.docx docx2txt.pl %f - - -" TuDu files -filetype *.tudu tudu -f %c - -" Qt projects -filextype *.pro qtcreator %f & - -" Directories -filextype */ - \ {View in thunar} - \ Thunar %f &, - -" Syntax highlighting in preview -" -" Explicitly set highlight type for some extensions -" -" 256-color terminal -" fileviewer *.[ch],*.[ch]pp highlight -O xterm256 -s dante --syntax c %c -" fileviewer Makefile,Makefile.* highlight -O xterm256 -s dante --syntax make %c -" -" 16-color terminal -" fileviewer *.c,*.h highlight -O ansi -s dante %c -" -" Or leave it for automatic detection -" -" fileviewer *[^/] pygmentize -O style=monokai -f console256 -g - -" Displaying pictures in terminal -" -" fileviewer *.jpg,*.png shellpic %c - -" Open all other files with default system programs (you can also remove all -" :file[x]type commands above to ensure they don't interfere with system-wide -" settings). By default all unknown files are opened with 'vi[x]cmd' -" uncommenting one of lines below will result in ignoring 'vi[x]cmd' option -" for unknown file types. -" For *nix: -" filetype * xdg-open -" For OS X: -" filetype * open -" For Windows: -" filetype * start, explorer - -" ------------------------------------------------------------------------------ - -" What should be saved automatically between vifm sessions. Drop "savedirs" -" value if you don't want vifm to remember last visited directories for you. -set vifminfo=dhistory,savedirs,chistory,state,tui,shistory, - \phistory,fhistory,dirstack,registers,bookmarks,bmarks - -" ------------------------------------------------------------------------------ - -" Examples of configuring both panels - -" Customize view columns a bit (enable ellipsis for truncated file names) -" -" set viewcolumns=-{name}..,6{}. - -" Filter-out build and temporary files -" -" filter! /^.*\.(lo|o|d|class|py[co])$|.*~$/ - -" ------------------------------------------------------------------------------ - -" Sample mappings - -" Start shell in current directory -nnoremap s :shell - -" Display sorting dialog -nnoremap S :sort - -" Toggle visibility of preview window -nnoremap w :view -vnoremap w :viewgv - -" Open file in existing instance of gvim -nnoremap o :!gvim --remote-tab-silent %f -" Open file in new instance of gvim -nnoremap O :!gvim %f - -" Open file in the background using its default program -nnoremap gb :file &l - -" Interaction with system clipboard -if has('win') - " Yank current directory path to Windows clipboard with forward slashes - nnoremap yp :!echo %"d:gs!\!/! %i | clip - " Yank path to current file to Windows clipboard with forward slashes - nnoremap yf :!echo %"c:gs!\!/! %i | clip -elseif executable('xclip') - " Yank current directory path into the clipboard - nnoremap yd :!echo %d | xclip %i - " Yank current file path into the clipboard - nnoremap yf :!echo %c:p | xclip %i -elseif executable('xsel') - " Yank current directory path into primary and selection clipboards - nnoremap yd :!echo -n %d | xsel --input --primary %i && - \ echo -n %d | xsel --clipboard --input %i - " Yank current file path into into primary and selection clipboards - nnoremap yf :!echo -n %c:p | xsel --input --primary %i && - \ echo -n %c:p | xsel --clipboard --input %i -endif - -" Mappings for faster renaming -nnoremap I cw -nnoremap cc cw -nnoremap A cw - -" Open console in current directory -nnoremap ,t :!xterm & - -" Open editor to edit vifmrc and apply settings after returning to vifm -nnoremap ,c :write | edit $MYVIFMRC | restart -" Open gvim to edit vifmrc -nnoremap ,C :!gvim --remote-tab-silent $MYVIFMRC & - -" Toggle wrap setting on ,w key -nnoremap ,w :set wrap! - -" Example of standard two-panel file managers mappings -nnoremap :!less %f -nnoremap :edit -nnoremap :copy -nnoremap :move -nnoremap :mkdir -nnoremap :delete - -" ------------------------------------------------------------------------------ - -" Various customization examples - -" Use ag (the silver searcher) instead of grep -" -" set grepprg='ag --line-numbers %i %a %s' - -" Add additional place to look for executables -" -" let $PATH = $HOME.'/bin/fuse:'.$PATH - -" Block particular shortcut -" -" nnoremap - -" Export IPC name of current instance as environment variable and use it to -" communicate with the instance later. -" -" It can be used in some shell script that gets run from inside vifm, for -" example, like this: -" vifm --server-name "$VIFM_SERVER_NAME" --remote +"cd '$PWD'" -" -" let $VIFM_SERVER_NAME = v:servername - -map :q