From 2cee61644e1fa0bf8cc2b83fbf8ef3dc6ddea737 Mon Sep 17 00:00:00 2001 From: Sijmen Schoon Date: Sun, 10 May 2020 03:07:32 +0200 Subject: [PATCH] many: idk where these come from --- config/fish/config.fish | 40 ----------------- config/fish/fish_variables | 32 ------------- config/i3/backlight.fish | 17 ++++++- config/nvim/init.vim | 3 +- config/pretty-git-prompt.yml | 87 ++++++++++++++++++++++++++++++++++++ config/sway/config | 17 ++++--- 6 files changed, 116 insertions(+), 80 deletions(-) delete mode 100644 config/fish/config.fish delete mode 100644 config/fish/fish_variables create mode 100644 config/pretty-git-prompt.yml diff --git a/config/fish/config.fish b/config/fish/config.fish deleted file mode 100644 index 116ca50..0000000 --- a/config/fish/config.fish +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/fish -set PATH /usr/bin/vendor_perl $PATH -set PATH $HOME/.yarn/bin $PATH -set PATH $HOME/.local/bin $PATH -set PATH $HOME/Android/Sdk/platform-tools $PATH -set PATH $HOME/.cargo/bin $PATH -set PATH $HOME/go/bin $PATH -set PATH $HOME/.npm-global/bin $PATH - -set RUSTC_WRAPPER sccache - -set SOURCEKIT_TOOLCHAIN_PATH "$HOME/.local/share/swift" - -set EDITOR nvim -export ANDROID_HOME=$HOME/.android-sdk - -alias vim nvim -alias v nvim - -alias dcm docker-compose - -function dcb - docker-compose exec $argv bash -end - -thefuck --alias | source - -function fh - find -iname "$argv*" -end -function ft - find -iname "*$argv" -end -function f - find -iname "*$argv*" -end - -function wttr - curl "https://wttr.in/$argv" -end diff --git a/config/fish/fish_variables b/config/fish/fish_variables deleted file mode 100644 index be7647f..0000000 --- a/config/fish/fish_variables +++ /dev/null @@ -1,32 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR __fish_init_2_39_8:\x1d -SETUVAR __fish_init_2_3_0:\x1d -SETUVAR __fish_initialized:2398 -SETUVAR fish_color_autosuggestion:555\x1ebrblack -SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:\x2d\x2dbold -SETUVAR fish_color_comment:red -SETUVAR fish_color_cwd:green -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:brmagenta -SETUVAR fish_color_error:brred -SETUVAR fish_color_escape:bryellow\x1e\x2d\x2dbold -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:bryellow -SETUVAR fish_color_param:cyan -SETUVAR fish_color_quote:yellow -SETUVAR fish_color_redirection:brblue -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_user:brgreen -SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_greeting: -SETUVAR fish_key_bindings:fish_default_key_bindings -SETUVAR fish_pager_color_completion:\x1d -SETUVAR fish_pager_color_description:B3A06D\x1eyellow -SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan diff --git a/config/i3/backlight.fish b/config/i3/backlight.fish index 8f7c152..8015a64 100755 --- a/config/i3/backlight.fish +++ b/config/i3/backlight.fish @@ -1,9 +1,21 @@ #!/usr/bin/fish xbacklight $argv[1..-1] + +# TODO DDC stuff +#if pidof ddcutil +# exit 1 +#end + set brightness (cat /sys/class/backlight/intel_backlight/brightness) set bar (seq -s "─" 0 (math $brightness / 42) | tr -d '[:digit:]') - set percentage (printf '%16s%d%%' '' (math $brightness / 12)) + +# TODO DDC stuff figure this out again someday +#set brightness (ddcutil getvcp 10 -t | awk '{print $4}') +#set brightness (math $brightness $argv[1..-1]) +#set bar (seq -s "─" 0 (math $brightness / 3.5) | tr -d '[:digit:]') +#set percentage (printf '%38s%d%%' '' $brightness) + set body "$percentage\n $bar" set title ' Helderheid' @@ -17,3 +29,6 @@ else echo $id > "$file" chmod 600 "$file" end + +# TODO DDC stuff +#ddcutil setvcp 10 $brightness diff --git a/config/nvim/init.vim b/config/nvim/init.vim index de97230..15d69c7 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -11,9 +11,10 @@ Plug 'Asheq/close-buffers.vim' " This plug-in allows you to quickly bdelete sev Plug 'ctrlpvim/ctrlp.vim' " Full path fuzzy file, buffer, mru, tag, ... finder for Vim. Plug 'haya14busa/incsearch.vim' " incsearch.vim incrementally highlights ALL pattern matches unlike default 'incsearch'. Plug 'mhinz/vim-startify' " This plugin provides a start screen for Vim and Neovim. +Plug 'nightsense/snow' Plug 'ryanoasis/vim-devicons' " Adds file type icons to Vim plugins Plug 'scrooloose/nerdtree' " A tree explorer plugin for vim. -Plug 'nightsense/snow' +Plug 'sjl/gundo.vim' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' Plug 'Yggdroot/indentLine' diff --git a/config/pretty-git-prompt.yml b/config/pretty-git-prompt.yml new file mode 100644 index 0000000..3c7ee05 --- /dev/null +++ b/config/pretty-git-prompt.yml @@ -0,0 +1,87 @@ +--- +# default configuration for pretty-git-prompt +# configuration parameters are descrbed on first occurence only +# +# version of configuration file (required), type string +# right now it needs to be set to '1' +version: '1' +# configuration of various values (required), type dict +# if you omit a value, it won't be displayed +values: + # usually repository is in state 'clean' (which is not displayed) + # but it can also be in state like merge, rebase, cherry-pick -- this is displayed then + - type: repository_state + # formatting (required), both (pre_format, post_format) are required + # you can include coloring in pre_format and reset colors in post_format + # you can also include arbitrary string + # for more information about setting colors for zsh: + # https://wiki.archlinux.org/index.php/zsh#Colors + # http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Visual-effects + # and bash: + # https://www.ibm.com/developerworks/linux/library/l-tip-prompt/ + # + # this is how the value is formatted in the end: + # [pre_format][value][post_format] + pre_format: ' ' + post_format: '' + # this is used to separate values between each other + - type: separator + # condition when to display the separator (required), type string + # possible values: + # * always -- display no matter what + # * surrounded -- show only when there is a value displayed before of after separator + display: surrounded + pre_format: ' ' + post_format: '' + # monitor status against different remotes - track history divergence + - type: remote_difference + # remote branch name (optional), type string + # example: 'upstream/master' + # if omitted look for remotely tracked branch usually set up with: + # git branch --set-upstream-to + # remote_branch: '' + # display the remote even if there is no difference with current branch (required), type bool + display_if_uptodate: true + pre_format: ' ' + post_format: '' + # values which can be displayed as part of 'remote_difference' + values: + # formatting for remote name and branch name + - type: name + # there are some special values which are substituted: + # * will be replaced with name of a remote + # * will be replaced with current branch name + # * will be replaced with name of remote branch + pre_format: ' %F{blue}' + post_format: '%f' + # the number of files present locally which are missing in remote repo + - type: ahead + pre_format: '%F{blue}↑' + post_format: '%f' + # the number of commits present in remote repo which are missing locally + - type: behind + pre_format: '%F{blue}↓' + post_format: '%f' + - type: separator + display: surrounded + pre_format: ' ' + post_format: '' + # the number of untracked files + - type: new + pre_format: '+' + post_format: '' + # the number of tracked files which were changed in working tree + - type: changed + pre_format: 'Δ' + post_format: '' + # the number of files added to index + - type: staged + pre_format: '▶' + post_format: '' + # during merge, rebase, or others, the numbers files which conflict + - type: conflicts + pre_format: '✖' + post_format: '' + - type: stash + pre_format: '' + post_format: '' diff --git a/config/sway/config b/config/sway/config index a361211..e0ea7ed 100644 --- a/config/sway/config +++ b/config/sway/config @@ -1,6 +1,3 @@ -# i3 config file (v4) -# -# Please see http://i3wm.org/docs/userguide.html for a complete reference! # Laptop display output 'Unknown 0x06D7 0x00000000' { scale 2 @@ -54,6 +51,16 @@ output 'Philips Consumer Electronics Company PHL 243V5 ZV01602021067' { bg /home/sijmen/Pictures/malta.jpg fill } +output 'Goldstar Company Ltd LG Ultra HD 0x00008520' { + scale 1.3 + position 0 0 + subpixel rgb +} +output 'Samsung Electric Company SyncMaster HMAS909662' { + position 2954 700 + subpixel rgb +} + set $mod Mod4 # Font for window titles. Will also be used by the bar unless a different font @@ -285,11 +292,11 @@ bar { } } +focus_follows_mouse no for_window [class="^.*"] border pixel 2 gaps inner 0 exec --no-startup-id sh -c "PYTHONUNBUFFERED=1 python $HOME/.config/i3/icons.py 2>&1 > /tmp/icons.log" -focus_follows_mouse no exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 input "1739:0:Synaptics_TM3276-031" { @@ -305,5 +312,3 @@ input type:keyboard { xkb_options caps:backspace,compose:ralt xkb_layout us } - -exec --no-startup-id source /etc/profile