From 72f55571d601b9cbccd893a1fb45c8a3cc9ec528 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Mon, 4 Feb 2019 15:00:21 +0100 Subject: [PATCH 01/21] Spaceline-all-the-icons doesn't seem to work any longer --- emacs/emacs.el | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/emacs/emacs.el b/emacs/emacs.el index 50f0aad..4014e8a 100644 --- a/emacs/emacs.el +++ b/emacs/emacs.el @@ -1385,7 +1385,8 @@ signature-file is the path to the file which contains the signature." ;; spaceline ;; Powerline theme from Spacemacs -(use-package spaceline) +(use-package spaceline + :init (spaceline-emacs-theme)) ;; fancy-battery ;; Fancy battery display @@ -1393,14 +1394,6 @@ signature-file is the path to the file which contains the signature." :after spaceline :init (fancy-battery-mode)) -;; spaceline-all-the-icons -;; A Spaceline Mode Line theme using All The Icons -(use-package spaceline-all-the-icons - :after fancy-battery - :config - (spaceline-all-the-icons-theme) - (spaceline-toggle-all-the-icons-battery-status-on)) - ;; Doom theme ;; https://github.com/hlissner/emacs-doom-themes (use-package doom-themes From eb0457e9cfb0a094dc597d8df9d36b060bd01a79 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Thu, 14 Feb 2019 20:27:22 +0100 Subject: [PATCH 02/21] Emacs Org-Mode: Adjust fontification block length --- emacs/emacs.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/emacs/emacs.el b/emacs/emacs.el index 4014e8a..2b8435e 100644 --- a/emacs/emacs.el +++ b/emacs/emacs.el @@ -509,6 +509,10 @@ ;; store link to message if in header view, not to header query (setq org-mu4e-link-query-in-headers-mode nil) + ;; Adjust fontification block length + (setcar (nthcdr 4 org-emphasis-regexp-components) 10) + (org-set-emph-re 'org-emphasis-regexp-components org-emphasis-regexp-components) + :bind (("C-c l" . org-store-link) ("C-c c" . org-capture) From e9b168e5b6d7bef7ce5f14351b6bc7fb90ea08d5 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Wed, 27 Feb 2019 16:14:06 +0100 Subject: [PATCH 03/21] Emacs org-mode: added habits to org-modules --- emacs/emacs.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/emacs/emacs.el b/emacs/emacs.el index 2b8435e..d86773a 100644 --- a/emacs/emacs.el +++ b/emacs/emacs.el @@ -366,6 +366,8 @@ (use-package org :mode "\\.org$" :config + ;; Add org modules + (add-to-list 'org-modules 'habits) ;; add scrartcl LaTeX class to org (with-eval-after-load 'ox-latex (add-to-list 'org-latex-classes From eb27c2978424c6787f777579b627182112b38318 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 9 Mar 2019 17:52:33 +0100 Subject: [PATCH 04/21] Reorganized fish shell configuration --- links.list | 2 +- shells/fish/conf.d/abbr.fish | 31 ++++++ shells/fish/conf.d/alias.fish | 36 +++++++ shells/fish/conf.d/debian.fish | 37 +++++++ shells/fish/conf.d/emacs.fish | 25 +++++ shells/fish/conf.d/env.fish | 48 +++++++++ shells/fish/conf.d/nix.fish | 25 +++++ shells/fish/conf.d/pure.fish | 70 +++++++++++++ shells/fish/conf.d/x.fish | 32 ++++++ shells/fish/config.fish | 135 ------------------------- shells/fish/functions/.gitignore | 10 ++ shells/fish/functions/cdl.fish | 22 +++- shells/fish/functions/diff.fish | 27 +++++ shells/fish/functions/fish_prompt.fish | 1 - shells/fish/functions/fish_title.fish | 12 --- shells/fish/functions/g.fish | 27 ----- shells/fish/functions/haha.fish | 5 - shells/fish/functions/sbcl.fish | 27 +++++ shells/fish/functions/upgrade.fish | 8 -- shells/fish/functions/vim.fish | 3 - 20 files changed, 390 insertions(+), 193 deletions(-) create mode 100644 shells/fish/conf.d/abbr.fish create mode 100644 shells/fish/conf.d/alias.fish create mode 100644 shells/fish/conf.d/debian.fish create mode 100644 shells/fish/conf.d/emacs.fish create mode 100644 shells/fish/conf.d/env.fish create mode 100644 shells/fish/conf.d/nix.fish create mode 100644 shells/fish/conf.d/pure.fish create mode 100644 shells/fish/conf.d/x.fish delete mode 100644 shells/fish/config.fish create mode 100644 shells/fish/functions/diff.fish delete mode 120000 shells/fish/functions/fish_prompt.fish delete mode 100644 shells/fish/functions/fish_title.fish delete mode 100644 shells/fish/functions/g.fish delete mode 100644 shells/fish/functions/haha.fish create mode 100644 shells/fish/functions/sbcl.fish delete mode 100644 shells/fish/functions/upgrade.fish delete mode 100644 shells/fish/functions/vim.fish diff --git a/links.list b/links.list index 0649429..1f20e13 100644 --- a/links.list +++ b/links.list @@ -12,7 +12,7 @@ redshift/redshift .config/redshift.conf screen/screenrc .screenrc shells/bashrc .bashrc shells/zshrc .zshrc -shells/fish/config.fish .config/fish/ +shells/fish/conf.d .config/fish/ shells/fish/functions .config/fish/ stumpwm/stumpwmrc .stumpwmrc x/xinitrc .xinitrc diff --git a/shells/fish/conf.d/abbr.fish b/shells/fish/conf.d/abbr.fish new file mode 100644 index 0000000..dc787d5 --- /dev/null +++ b/shells/fish/conf.d/abbr.fish @@ -0,0 +1,31 @@ +# Copyright © 2019 Marcel Kapfer +# MIT License + +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +# the Software, and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +# Fish Abbrevations +# Those are expanded before execution +# See: https://fishshell.com/docs/current/commands.html#abbr + +if status --is-interactive + abbr --add --global l ls + abbr --add --global ping ping -c 3 mmk2410.org + abbr --add --global pingtest ping -c 3 mmk2410.org + abbr --add --global e eval $EDITOR + abbr --add --global g git +end diff --git a/shells/fish/conf.d/alias.fish b/shells/fish/conf.d/alias.fish new file mode 100644 index 0000000..6aaa659 --- /dev/null +++ b/shells/fish/conf.d/alias.fish @@ -0,0 +1,36 @@ +# Copyright © 2019 Marcel Kapfer +# MIT License + +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +# the Software, and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +if status --is-interactive + alias grep='grep --color=auto' + alias df='df -h' + alias du='du -c -h' + alias mkdir='mkdir -p -v' + alias ln='ln -i' + alias chown='chown --preserve-root' + alias chmod='chmod --preserve-root' + alias chgrp='chgrp --preserve-root' + alias ps='ps aux k%cpu' + alias q=' exit' + alias Q=' exit' + alias x=' exit' + alias o='xdg-open' + alias vim="nvim" +end diff --git a/shells/fish/conf.d/debian.fish b/shells/fish/conf.d/debian.fish new file mode 100644 index 0000000..61b9684 --- /dev/null +++ b/shells/fish/conf.d/debian.fish @@ -0,0 +1,37 @@ +# Copyright © 2019 Marcel Kapfer +# MIT License + +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +# the Software, and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +# Debian Packaging + +# quilt +alias dquilt="quilt --quiltrc=$HOME/.quiltrc-dpkg" + +# Variables +set -x DEBUILD_DPKG_BUILDPACKAGE_OPTS "-i -I -us -uc" +set -x DEBUILD_LINTIAN_OPTS "-i -I --show-overrides" +set -x DEBSIGN_KEYID "9FE01C39F74551D434116394CADE6F0C09F21B09" + +if test -z $DEBFULLNAME + set -Ux DEBFULLNAME "Marcel Kapfer" +end + +if test -z $DEBEMAIL + set -Ux DEBEMAIL "opensource@mmk2410.org" +end diff --git a/shells/fish/conf.d/emacs.fish b/shells/fish/conf.d/emacs.fish new file mode 100644 index 0000000..c8735df --- /dev/null +++ b/shells/fish/conf.d/emacs.fish @@ -0,0 +1,25 @@ +# Copyright © 2019 Marcel Kapfer +# MIT License + +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +# the Software, and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +# Run zsh when using emacs +# Current problem with fish seems to be the theme +if test $TERM = "eterm-color" + exec zsh +end diff --git a/shells/fish/conf.d/env.fish b/shells/fish/conf.d/env.fish new file mode 100644 index 0000000..73bb4b3 --- /dev/null +++ b/shells/fish/conf.d/env.fish @@ -0,0 +1,48 @@ +# Copyright © 2019 Marcel Kapfer +# MIT License + +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +# the Software, and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +set -x ARCHFLAGS -arch_x86_64 + +set -e GPG_TTY +set -Ux GPG_TTY (tty) + +if test -z $EDITOR + set -Ux EDITOR es +end + +if test -z $VISUAL + set -Ux VISUAL es +end + +if test -z $GIT_EDITOR + set -Ux GIT_EDITOR es +end + +if test -z $GOPATH + set -Ux GOPATH ~/.go +end + +if test -z $XDG_CURRENT_DESKTOP + set -Ux XDG_CURRENT_DESKTOP GNOME +end + +if test -z $QT_STYLE_OVERRIDE + set -Ux QT_STYLE_OVERRIDE kvantum +end diff --git a/shells/fish/conf.d/nix.fish b/shells/fish/conf.d/nix.fish new file mode 100644 index 0000000..eac59e9 --- /dev/null +++ b/shells/fish/conf.d/nix.fish @@ -0,0 +1,25 @@ +# Copyright © 2019 Marcel Kapfer +# MIT License + +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +# the Software, and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +# Source the Nix profile, if it exists. +set -l NIX_PROFILE $HOME/.nix-profile/etc/profile.d/nix.fish +if test -e $NIX_PROFILE + source $NIX_PROFILE +end diff --git a/shells/fish/conf.d/pure.fish b/shells/fish/conf.d/pure.fish new file mode 100644 index 0000000..1bf429e --- /dev/null +++ b/shells/fish/conf.d/pure.fish @@ -0,0 +1,70 @@ +set --universal pure_version 2.1.1 # used for bug report + +# Base colors +_pure_set_default pure_color_primary (set_color blue) +_pure_set_default pure_color_info (set_color cyan) +_pure_set_default pure_color_mute (set_color brblack) +_pure_set_default pure_color_success (set_color magenta) +_pure_set_default pure_color_normal (set_color normal) +_pure_set_default pure_color_danger (set_color red) +_pure_set_default pure_color_light (set_color white) +_pure_set_default pure_color_warning (set_color yellow) +_pure_set_default pure_color_dark (set_color black) + +# Prompt +_pure_set_default pure_symbol_prompt "❯" +_pure_set_default pure_symbol_reverse_prompt "❮" # used for VI mode +_pure_set_default pure_color_prompt_on_error $pure_color_danger +_pure_set_default pure_color_prompt_on_success $pure_color_success + +# Current Working Directory +_pure_set_default pure_color_current_directory $pure_color_primary + +# Git +_pure_set_default pure_symbol_git_unpulled_commits "⇣" +_pure_set_default pure_symbol_git_unpushed_commits "⇡" +_pure_set_default pure_symbol_git_dirty "*" +_pure_set_default pure_color_git_unpulled_commits $pure_color_info +_pure_set_default pure_color_git_unpushed_commits $pure_color_info +_pure_set_default pure_color_git_branch $pure_color_mute +_pure_set_default pure_color_git_dirty $pure_color_mute + +# SSH info +_pure_set_default pure_color_ssh_hostname $pure_color_mute +_pure_set_default pure_color_ssh_separator $pure_color_mute +_pure_set_default pure_color_ssh_user_normal $pure_color_mute +_pure_set_default pure_color_ssh_user_root $pure_color_light + +# Virtualenv for Pyhon +_pure_set_default pure_color_virtualenv $pure_color_mute +# Deactivate the default virtualenv prompt so that we can add our own +set --global --export VIRTUAL_ENV_DISABLE_PROMPT 1 + +# Print current working directory at the beginning of prompt +# true (default): current directory, git, user@hostname (ssh-only), command duration +# false: user@hostname (ssh-only), current directory, git, command duration +_pure_set_default pure_begin_prompt_with_current_directory true + +# Show exit code of last command as a separate prompt character (cf. https://github.com/sindresorhus/pure/wiki#show-exit-code-of-last-command-as-a-separate-prompt-character) +# false - single prompt character, default +# true - separate prompt character +_pure_set_default pure_separate_prompt_on_error false + +# Max execution time of a process before its run time is shown when it exits +_pure_set_default pure_threshold_command_duration 5 +_pure_set_default pure_color_command_duration $pure_color_warning + +# Right Prompt variables +_pure_set_default pure_right_prompt "" +_pure_set_default pure_color_right_prompt $pure_color_normal + +# VI mode indicator +# true (default): indicate a non-insert mode by reversing the prompt symbol (❮) +# false: indicate vi mode with [I], [N], [V] +_pure_set_default pure_reverse_prompt_symbol_in_vimode true + +# Title +_pure_set_default pure_symbol_title_bar_separator "—" + +# Whether or not is a fresh session +set --global _pure_fresh_session true diff --git a/shells/fish/conf.d/x.fish b/shells/fish/conf.d/x.fish new file mode 100644 index 0000000..71cdc4b --- /dev/null +++ b/shells/fish/conf.d/x.fish @@ -0,0 +1,32 @@ +# Copyright © 2019 Marcel Kapfer +# MIT License + +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +# the Software, and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +# Automatically start X at login +# source: https://wiki.archlinux.org/index.php/Fish#Start_X_at_login +# This must be at the bottom of this file +if status --is-login + if test -z "$DISPLAY" -a $XDG_VTNR = 1 + # Unlock GPG keyring befor starting X. + # This makes some things easier. + echo "gpg unlock" | gpg -se -r me@mmk2410.org > /dev/null + pulseaudio -D # start pulseaudio before X is started + exec startx -- -keeptty + end +end diff --git a/shells/fish/config.fish b/shells/fish/config.fish deleted file mode 100644 index e04a471..0000000 --- a/shells/fish/config.fish +++ /dev/null @@ -1,135 +0,0 @@ -set -x ARCHFLAGS -arch_x86_64 - -set -e GPG_TTY -set -Ux GPG_TTY (tty) - -eval (thefuck --alias | tr '\n' ';') -alias l="ls" -alias diff='colordiff' -alias grep='grep --color=auto' -alias more='less' -alias df='df -h' -alias du='du -c -h' -alias mkdir='mkdir -p -v' -alias nano='nano -w' -alias ping='ping -c 3' -alias pingtest='ping -c 3 marcel-kapfer.de' -alias dmesg='dmesg -HL' -alias da='date "+%A, %B %d, %Y [%T]"' -alias du1='du --max-depth=1' -alias hist='history | grep' # requires an argument -alias openports='ss --all --numeric --processes --ipv4 --ipv6' -alias pgg='ps -Af | grep' # requires an argument -alias ln='ln -i' -alias chown='chown --preserve-root' -alias chmod='chmod --preserve-root' -alias chgrp='chgrp --preserve-root' -alias cls=' echo -ne "\033c"' -alias ps='ps aux k%cpu' -alias new='touch' -alias re='/sbin/reboot' -alias off='/sbin/poweroff' -alias vol='alsamixer' -alias q=' exit' -alias Q=' exit' -alias x=' exit' -alias cd..='cd ..' -alias sbcl='rlwrap sbcl' -alias o='xdg-open' -alias nemo='nemo --no-desktop' - -alias mmk2410='~/.mmk2410' - -# Debian Packaging - -# quilt -alias dquilt="quilt --quiltrc=$HOME/.quiltrc-dpkg" - -# Variables -set -x DEBUILD_DPKG_BUILDPACKAGE_OPTS "-i -I -us -uc" -set -x DEBUILD_LINTIAN_OPTS "-i -I --show-overrides" -set -x DEBSIGN_KEYID "9FE01C39F74551D434116394CADE6F0C09F21B09" - -# if [ -z $SSH_CLIENT ] -# ~/.mmk2410 -# end - -if [ -z $EDITOR ] - set -Ux EDITOR es -end - -if [ -z $VISUAL ] - set -Ux VISUAL es -end - -if [ -z $GIT_EDITOR ] - set -Ux GIT_EDITOR es -end - -if [ -z $GOPATH ] - set -Ux GOPATH ~/.go -end - -if test -z $DEBFULLNAME - set -Ux DEBFULLNAME "Marcel Kapfer" -end - -if test -z $DEBEMAIL - set -Ux DEBEMAIL "opensource@mmk2410.org" -end - -if test -z $XDG_CURRENT_DESKTOP - set -Ux XDG_CURRENT_DESKTOP GNOME -end - -if test -z $QT_STYLE_OVERRIDE - set -Ux QT_STYLE_OVERRIDE kvantum -end - -# Attach the autoscreen screen session if StumpWM is running -# and it's not already in use. -# if test \( -n $DESKTOP_SESSION \) -a \( $DESKTOP_SESSION = "stumpwm" \) -# if screen -list | grep -q "No Sockets" -# screen -dmS autoscreen -# exec screen -r -# else if screen -list | grep -Eq "\.autoscreen.*Detached" -# exec screen -r -# end -# end - -# gpg-agent as SSH agent -# set -e SSH_AGENT_PID -# set -e SSH_AUTH_SOCK -# if test -z $gnupg_SSH_AUTH_SOCK_by -# set gnupg_SSH_AUTH_SOCK_by 0 -# end -# if test $gnupg_SSH_AUTH_SOCK_by -ne %self -# set UID (id -u) -# set -Ux SSH_AUTH_SOCK "/run/user/$UID/gnupg/S.gpg-agent.ssh" -# end -# gpg-connect-agent updatestartuptty /bye > /dev/null - -# Source the Nix profile, if it exists. -set -l NIX_PROFILE $HOME/.nix-profile/etc/profile.d/nix.fish -if test -e $NIX_PROFILE - source $NIX_PROFILE -end - -# Run zsh when using emacs -# Current problem with fish seems to be the theme -if test $TERM = "eterm-color" - exec zsh -end - -# Automatically start X at login -# source: https://wiki.archlinux.org/index.php/Fish#Start_X_at_login -# This must be at the bottom of this file -if status --is-login - if test -z "$DISPLAY" -a $XDG_VTNR = 1 - # Unlock GPG keyring befor starting X. - # This makes some things easier. - echo "gpg unlock" | gpg -se -r me@mmk2410.org > /dev/null - pulseaudio -D # start pulseaudio before X is started - exec startx -- -keeptty - end -end diff --git a/shells/fish/functions/.gitignore b/shells/fish/functions/.gitignore index 49074af..643eb47 100644 --- a/shells/fish/functions/.gitignore +++ b/shells/fish/functions/.gitignore @@ -22,3 +22,13 @@ set_color_custom.fish vcs.name.fish vcs.present.fish fisher.fish +fin.fish +fish_greeting.fish +fish_mode_prompt.fish +host_info.fish +last_job_id.fish +pwd_info.fish +pwd_is_home.fish +_* +fish_prompt.fish +fish_title.fish diff --git a/shells/fish/functions/cdl.fish b/shells/fish/functions/cdl.fish index e529f41..9618302 100644 --- a/shells/fish/functions/cdl.fish +++ b/shells/fish/functions/cdl.fish @@ -1,4 +1,24 @@ -function cdl +# Copyright © 2019 Marcel Kapfer +# MIT License + +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +# the Software, and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +function cdl --wraps cd --description "Switch directory and show content" cd $argv l end diff --git a/shells/fish/functions/diff.fish b/shells/fish/functions/diff.fish new file mode 100644 index 0000000..eae0167 --- /dev/null +++ b/shells/fish/functions/diff.fish @@ -0,0 +1,27 @@ +# Copyright © 2019 Marcel Kapfer +# MIT License + +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +# the Software, and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +function diff --wraps diff --description "Use colordiff instead of diff, if available" + if type -q colordiff + colordiff $argv + else + diff $argv + end +end diff --git a/shells/fish/functions/fish_prompt.fish b/shells/fish/functions/fish_prompt.fish deleted file mode 120000 index f1f0416..0000000 --- a/shells/fish/functions/fish_prompt.fish +++ /dev/null @@ -1 +0,0 @@ -/home/marcel/.config/fisherman/eco/functions/fish_prompt.fish \ No newline at end of file diff --git a/shells/fish/functions/fish_title.fish b/shells/fish/functions/fish_title.fish deleted file mode 100644 index f1646ed..0000000 --- a/shells/fish/functions/fish_title.fish +++ /dev/null @@ -1,12 +0,0 @@ -# Defined in /tmp/fish.au862c/fish_title.fish @ line 2 -function fish_title - if test -z $EMACS - if test $_ = 'fish' - echo (prompt_pwd) - else - echo $_ - end - else - true - end -end diff --git a/shells/fish/functions/g.fish b/shells/fish/functions/g.fish deleted file mode 100644 index 8abc055..0000000 --- a/shells/fish/functions/g.fish +++ /dev/null @@ -1,27 +0,0 @@ -function g - git $argv -end - -function gst - git status $argv -end - -function gcom - git commit $argv -end - -function gad - git add $argv -end - -function gup - git push $argv -end - -function gdo - git pull $argv -end - -function gdif - git diff $argv -end diff --git a/shells/fish/functions/haha.fish b/shells/fish/functions/haha.fish deleted file mode 100644 index 4c69ff1..0000000 --- a/shells/fish/functions/haha.fish +++ /dev/null @@ -1,5 +0,0 @@ -function haha - for x in (seq 10) - echo hahahahahahahahahahahahahahahahahaha - end -end diff --git a/shells/fish/functions/sbcl.fish b/shells/fish/functions/sbcl.fish new file mode 100644 index 0000000..1724e14 --- /dev/null +++ b/shells/fish/functions/sbcl.fish @@ -0,0 +1,27 @@ +# Copyright © 2019 Marcel Kapfer +# MIT License + +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +# the Software, and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +function sbcl --wraps sbcl --description "Wrap SBCL with rlwrap (readline support)" + if type -q rlwrap + rlwrap sbcl $argv + else + sbcl $argv + end +end diff --git a/shells/fish/functions/upgrade.fish b/shells/fish/functions/upgrade.fish deleted file mode 100644 index e714f92..0000000 --- a/shells/fish/functions/upgrade.fish +++ /dev/null @@ -1,8 +0,0 @@ -function upgrade --description "Upgrade the system" - sudo apt update - and sudo apt upgrade - and sudo apt full-upgrade - and sudo apt autoremove - sudo tlmgr update --self --all - sudo npm update -g -end diff --git a/shells/fish/functions/vim.fish b/shells/fish/functions/vim.fish deleted file mode 100644 index f0a542e..0000000 --- a/shells/fish/functions/vim.fish +++ /dev/null @@ -1,3 +0,0 @@ -function vim - nvim $argv -end From e9766d56db76f91dcca7fa4728f2d42d7186dc5a Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 9 Mar 2019 17:58:50 +0100 Subject: [PATCH 05/21] Fish: added sudo abbrevation --- shells/fish/conf.d/abbr.fish | 1 + 1 file changed, 1 insertion(+) diff --git a/shells/fish/conf.d/abbr.fish b/shells/fish/conf.d/abbr.fish index dc787d5..e5f9ce8 100644 --- a/shells/fish/conf.d/abbr.fish +++ b/shells/fish/conf.d/abbr.fish @@ -28,4 +28,5 @@ if status --is-interactive abbr --add --global pingtest ping -c 3 mmk2410.org abbr --add --global e eval $EDITOR abbr --add --global g git + abbr --add --global s sudo end From bc374eb43b66d92c3d90267f8dbf08fcf1423e87 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 6 Apr 2019 07:43:14 +0200 Subject: [PATCH 06/21] Emacs: Updated copyright year --- emacs/emacs.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs/emacs.el b/emacs/emacs.el index d86773a..31bc627 100644 --- a/emacs/emacs.el +++ b/emacs/emacs.el @@ -1,5 +1,5 @@ ;; Emacs configuration -;; Marcel Kapfer (C) 2016 - 2018 +;; Marcel Kapfer (C) 2016 - 2019 ;; MIT License ;; ----------------------------------------------------------------------------- From a2cf09910ee8f1f0cb19e673385cc140b5ae431e Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 6 Apr 2019 07:43:25 +0200 Subject: [PATCH 07/21] Emacs Org-Mode: fixed org-habit import --- emacs/emacs.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/emacs/emacs.el b/emacs/emacs.el index 31bc627..7864236 100644 --- a/emacs/emacs.el +++ b/emacs/emacs.el @@ -367,7 +367,8 @@ :mode "\\.org$" :config ;; Add org modules - (add-to-list 'org-modules 'habits) + (require 'org-habit) + (add-to-list 'org-modules "org-habit") ;; add scrartcl LaTeX class to org (with-eval-after-load 'ox-latex (add-to-list 'org-latex-classes From 607bf4b0ec17f8263f2055484dce3c02b5c44024 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 6 Apr 2019 07:44:02 +0200 Subject: [PATCH 08/21] Emacs: Added nix and haskell mode --- emacs/emacs.el | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/emacs/emacs.el b/emacs/emacs.el index 7864236..7538f18 100644 --- a/emacs/emacs.el +++ b/emacs/emacs.el @@ -1386,6 +1386,14 @@ signature-file is the path to the file which contains the signature." (use-package rust-mode :mode (("\\.rs\\'" . rust-mode))) +;; nix-mode +(use-package nix-mode + :mode (("\\.nix\\'" . nix-mode))) + +;; haskell-mode +(use-package haskell-mode + :mode (("\\.hs\\'" . haskell-mode))) + ;; all-the-icons ;; A utility package to collect various Icon Fonts and propertized them within Emacs (use-package all-the-icons) From ba331172c7be5d8c192633c0ef61b06ba63d14a5 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 6 Apr 2019 07:44:11 +0200 Subject: [PATCH 09/21] =?UTF-8?q?Emacs=20Org-Mode:=20org-iswitchb=20?= =?UTF-8?q?=E2=86=92=20org-switchb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- emacs/emacs.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs/emacs.el b/emacs/emacs.el index 7538f18..21d2e90 100644 --- a/emacs/emacs.el +++ b/emacs/emacs.el @@ -519,7 +519,7 @@ :bind (("C-c l" . org-store-link) ("C-c c" . org-capture) - ("C-c o" . org-iswitchb) + ("C-c o" . org-switchb) ("C-c a" . org-agenda)) :hook (org-mode-hook . flyspell-mode)) From d3430030e946b426de034b8b84c6e254420aa20b Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 6 Apr 2019 07:45:49 +0200 Subject: [PATCH 10/21] Fish: sorted config files --- shells/fish/conf.d/{emacs.fish => 00-emacs.fish} | 0 shells/fish/conf.d/{env.fish => 00-env.fish} | 7 +++---- shells/fish/conf.d/{abbr.fish => 10-abbr.fish} | 12 ++++++------ shells/fish/conf.d/{alias.fish => 10-alias.fish} | 0 shells/fish/conf.d/{nix.fish => 40-nix.fish} | 0 shells/fish/conf.d/{debian.fish => 60-debian.fish} | 0 shells/fish/conf.d/{x.fish => 99-x.fish} | 0 7 files changed, 9 insertions(+), 10 deletions(-) rename shells/fish/conf.d/{emacs.fish => 00-emacs.fish} (100%) rename shells/fish/conf.d/{env.fish => 00-env.fish} (94%) rename shells/fish/conf.d/{abbr.fish => 10-abbr.fish} (84%) rename shells/fish/conf.d/{alias.fish => 10-alias.fish} (100%) rename shells/fish/conf.d/{nix.fish => 40-nix.fish} (100%) rename shells/fish/conf.d/{debian.fish => 60-debian.fish} (100%) rename shells/fish/conf.d/{x.fish => 99-x.fish} (100%) diff --git a/shells/fish/conf.d/emacs.fish b/shells/fish/conf.d/00-emacs.fish similarity index 100% rename from shells/fish/conf.d/emacs.fish rename to shells/fish/conf.d/00-emacs.fish diff --git a/shells/fish/conf.d/env.fish b/shells/fish/conf.d/00-env.fish similarity index 94% rename from shells/fish/conf.d/env.fish rename to shells/fish/conf.d/00-env.fish index 73bb4b3..5024860 100644 --- a/shells/fish/conf.d/env.fish +++ b/shells/fish/conf.d/00-env.fish @@ -23,12 +23,11 @@ set -x ARCHFLAGS -arch_x86_64 set -e GPG_TTY set -Ux GPG_TTY (tty) -if test -z $EDITOR - set -Ux EDITOR es -end +set -e EDITOR +set -Ux EDITOR "emacsclient -"t if test -z $VISUAL - set -Ux VISUAL es + set -Ux VISUAL emacsclient -t end if test -z $GIT_EDITOR diff --git a/shells/fish/conf.d/abbr.fish b/shells/fish/conf.d/10-abbr.fish similarity index 84% rename from shells/fish/conf.d/abbr.fish rename to shells/fish/conf.d/10-abbr.fish index e5f9ce8..ce374a8 100644 --- a/shells/fish/conf.d/abbr.fish +++ b/shells/fish/conf.d/10-abbr.fish @@ -23,10 +23,10 @@ # See: https://fishshell.com/docs/current/commands.html#abbr if status --is-interactive - abbr --add --global l ls - abbr --add --global ping ping -c 3 mmk2410.org - abbr --add --global pingtest ping -c 3 mmk2410.org - abbr --add --global e eval $EDITOR - abbr --add --global g git - abbr --add --global s sudo + abbr --add l ls + abbr --add ping ping -c 3 mmk2410.org + abbr --add pingtest ping -c 3 mmk2410.org + abbr --add e eval $EDITOR + abbr --add g git + abbr --add s sudo end diff --git a/shells/fish/conf.d/alias.fish b/shells/fish/conf.d/10-alias.fish similarity index 100% rename from shells/fish/conf.d/alias.fish rename to shells/fish/conf.d/10-alias.fish diff --git a/shells/fish/conf.d/nix.fish b/shells/fish/conf.d/40-nix.fish similarity index 100% rename from shells/fish/conf.d/nix.fish rename to shells/fish/conf.d/40-nix.fish diff --git a/shells/fish/conf.d/debian.fish b/shells/fish/conf.d/60-debian.fish similarity index 100% rename from shells/fish/conf.d/debian.fish rename to shells/fish/conf.d/60-debian.fish diff --git a/shells/fish/conf.d/x.fish b/shells/fish/conf.d/99-x.fish similarity index 100% rename from shells/fish/conf.d/x.fish rename to shells/fish/conf.d/99-x.fish From 2c7e29a59739da66b5d707458253eb8a5b6e6430 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 6 Apr 2019 07:46:17 +0200 Subject: [PATCH 11/21] StummpWM: Updated copyright --- stumpwm/stumpwmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stumpwm/stumpwmrc b/stumpwm/stumpwmrc index 5d2d7fe..50471e6 100644 --- a/stumpwm/stumpwmrc +++ b/stumpwm/stumpwmrc @@ -3,7 +3,7 @@ ;; StumpWM configuration file ;; ;; -;; 2016 - 2018 (c) Marcel Kapfer +;; 2016 - 2019 (c) Marcel Kapfer ;; MIT License (in-package :stumpwm) From 26f449cc9a1bcd767d448c1098c7f644c329c57d Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 6 Apr 2019 07:46:34 +0200 Subject: [PATCH 12/21] StumpWM: Switched default keyboard layout to de --- stumpwm/stumpwmrc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stumpwm/stumpwmrc b/stumpwm/stumpwmrc index 50471e6..cb6e7bb 100644 --- a/stumpwm/stumpwmrc +++ b/stumpwm/stumpwmrc @@ -8,7 +8,9 @@ (in-package :stumpwm) -(defparameter *key-layout* "us -variant altgr-intl" "Stores the current key layout") +;; Other parameters +(defparameter *key-layout* "de" "Stores the current key layout") + ;; creating or rename groups (setf (group-name (first (screen-groups (current-screen)))) "web") From 4e77af561de89a79d26b0b199e5bf04587d9c794 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 6 Apr 2019 07:46:53 +0200 Subject: [PATCH 13/21] StumpWM: Define parameters for default applications --- stumpwm/stumpwmrc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/stumpwm/stumpwmrc b/stumpwm/stumpwmrc index cb6e7bb..227cc95 100644 --- a/stumpwm/stumpwmrc +++ b/stumpwm/stumpwmrc @@ -11,6 +11,13 @@ ;; Other parameters (defparameter *key-layout* "de" "Stores the current key layout") +;; Default applicatoins +(defparameter *web-browser* "firefox" "Stores the web browser") +(defparameter *editor* "emacsclient -c" "Stores the editor") +(defparameter *terminal* "urxvt" "Stores the terminal emulator") +(defparameter *file-manager* "dolphin" "Stores the terminal emulator") +(defparameter *music-player* "spotify" "Stores the terminal emulator") + ;; creating or rename groups (setf (group-name (first (screen-groups (current-screen)))) "web") From 79807339823786343adbfa549c040cadf472c253 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 6 Apr 2019 07:47:09 +0200 Subject: [PATCH 14/21] StumpWM: Set path to module dir --- stumpwm/stumpwmrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stumpwm/stumpwmrc b/stumpwm/stumpwmrc index 227cc95..34762ee 100644 --- a/stumpwm/stumpwmrc +++ b/stumpwm/stumpwmrc @@ -18,6 +18,8 @@ (defparameter *file-manager* "dolphin" "Stores the terminal emulator") (defparameter *music-player* "spotify" "Stores the terminal emulator") +;; set correct module directory +(set-module-dir "~/.stumpwm.d/contrib") ;; creating or rename groups (setf (group-name (first (screen-groups (current-screen)))) "web") From dcb8d29c4bf0e5c63355e7d9ee592232161b0c0b Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 6 Apr 2019 07:47:29 +0200 Subject: [PATCH 15/21] StumpWM: Swichted to defined default applications --- stumpwm/stumpwmrc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/stumpwm/stumpwmrc b/stumpwm/stumpwmrc index 34762ee..113ce4a 100644 --- a/stumpwm/stumpwmrc +++ b/stumpwm/stumpwmrc @@ -93,25 +93,25 @@ ;;; emacs (defcommand emacs () () "run emacs" - (run-or-raise "es" '(:class "Emacs"))) + (run-or-raise *editor* '(:class "Emacs"))) ;; root keybindings ; ;; browser -(define-key *root-map* (kbd "W") "exec x-www-browser") -(define-key *root-map* (kbd "P") "exec x-www-browser --private-window") +(define-key *root-map* (kbd "W") (concatenate 'string "exec " *web-browser*)) +(define-key *root-map* (kbd "P") (concatenate 'string "exec " *web-browser* " --private-window")) ;;; terminal -(define-key *root-map* (kbd "c") "exec x-terminal-emulator") +(define-key *root-map* (kbd "c") (concatenate 'string "exec " *terminal*)) -;;; es as emacs -(define-key *root-map* (kbd "e") "exec es") +;;; (text) editor +(define-key *root-map* (kbd "e") (concatenate 'string "exec " *editor*)) ;;; ranger -(define-key *root-map* (kbd "C-c") "exec nemo --no-desktop") +(define-key *root-map* (kbd "C-c") (concatenate 'string "exec " *file-manager*)) ;;; spotify -(define-key *root-map* (kbd "m") "exec spotify") +(define-key *root-map* (kbd "m") (concatenate 'string "exec " *music-player*)) ;;; bind keys for changing workspace (define-key *root-map* (kbd "C-1") "change-workspace web") From 840854bd84b7a7f53f9cf70f84cd3ce96389ff96 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 6 Apr 2019 07:48:10 +0200 Subject: [PATCH 16/21] StumpWM: Updated make-web-jump to parameter applications --- stumpwm/stumpwmrc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/stumpwm/stumpwmrc b/stumpwm/stumpwmrc index 113ce4a..ca52a0a 100644 --- a/stumpwm/stumpwmrc +++ b/stumpwm/stumpwmrc @@ -320,14 +320,14 @@ (defmacro make-web-jump (name prefix) `(defcommand ,(intern name) (search) ((:rest ,(concatenate 'string name " search: "))) (substitute #\+ #\Space search) - (run-shell-command (concatenate 'string ,prefix search)))) + (run-shell-command (concatenate 'string *www-browser* " " ,prefix search)))) -(make-web-jump "google" "x-www-browser http://www.google.com/search?q=") -(make-web-jump "googlede" "x-www-browser http://www.google.de/search?q=") -(make-web-jump "duckduckgo" "x-www-browser https://duckduckgo.com/?q=") -(make-web-jump "packages" "x-www-browser https://packages.debian.org/") -(make-web-jump "wikipedia" "x-www-browser https://en.wikipedia.org/w/index.php?search=") -(make-web-jump "wikipediade" "x-www-browser https://de.wikipedia.org/w/index.php?search=") +(make-web-jump "google" "http://www.google.com/search?q=") +(make-web-jump "googlede" "http://www.google.de/search?q=") +(make-web-jump "duckduckgo" "https://duckduckgo.com/?q=") +(make-web-jump "packages" "https://packages.debian.org/") +(make-web-jump "wikipedia" "https://en.wikipedia.org/w/index.php?search=") +(make-web-jump "wikipediade" "https://de.wikipedia.org/w/index.php?search=") (defun list-screen-layouts () "Return an alist of possible screen layouts. Those are the layouts saved in From 1e67608d3ea1f81e3f42bd5c854835e871e65c09 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 6 Apr 2019 07:48:33 +0200 Subject: [PATCH 17/21] =?UTF-8?q?StumpWM:=20power=20state=20commands:=20sy?= =?UTF-8?q?stem-=20=E2=86=92=20systemctl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stumpwm/stumpwmrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stumpwm/stumpwmrc b/stumpwm/stumpwmrc index ca52a0a..459169b 100644 --- a/stumpwm/stumpwmrc +++ b/stumpwm/stumpwmrc @@ -152,10 +152,10 @@ ;; computer power state keys (defvar *powerstate-frame-bindings* (let ((m (make-sparse-keymap))) - (define-key m (kbd "M-s") "system-suspend") - (define-key m (kbd "M-p") "system-poweroff") - (define-key m (kbd "M-r") "system-restart") - (define-key m (kbd "M-h") "system-hibernate") + (define-key m (kbd "M-s") "systemctl suspend") + (define-key m (kbd "M-p") "systemctl poweroff") + (define-key m (kbd "M-r") "systemctl reboot") + (define-key m (kbd "M-h") "systemctl hibernate") m)) (define-key *root-map* (kbd "C-F12") '*powerstate-frame-bindings*) From 31c53f08efcc06835b6d5d4ad8223b222137bbbe Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 6 Apr 2019 07:49:37 +0200 Subject: [PATCH 18/21] StumpWM: Use paramter applications for startup --- stumpwm/stumpwmrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stumpwm/stumpwmrc b/stumpwm/stumpwmrc index 459169b..1d7ca1f 100644 --- a/stumpwm/stumpwmrc +++ b/stumpwm/stumpwmrc @@ -394,8 +394,8 @@ script." ;; bwSyncAndShare (run-shell-command "bwsyncandshare") -;; firefox -(run-shell-command "x-www-browser") +;; web browser +(run-shell-command *web-browser*) ;; telegram (run-shell-command "telegram-desktop") From cfb34ca2329f0534144cc9ef26cb269eb75aa8d7 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 6 Apr 2019 07:49:49 +0200 Subject: [PATCH 19/21] StumpWM: don't start orage --- stumpwm/stumpwmrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/stumpwm/stumpwmrc b/stumpwm/stumpwmrc index 1d7ca1f..ca11290 100644 --- a/stumpwm/stumpwmrc +++ b/stumpwm/stumpwmrc @@ -403,9 +403,6 @@ script." ;; redshift (run-shell-command "redshift") -;; orage -(run-shell-command "orage") - ;; last settings ;; (stumptray:stumptray) From 835f57d7e2a37e73f7ff0490ffa152b440ac2ed2 Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 6 Apr 2019 07:49:58 +0200 Subject: [PATCH 20/21] StumpWM: don't start bwSyncAndShare --- stumpwm/stumpwmrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/stumpwm/stumpwmrc b/stumpwm/stumpwmrc index ca11290..9cecefc 100644 --- a/stumpwm/stumpwmrc +++ b/stumpwm/stumpwmrc @@ -391,9 +391,6 @@ script." ;; owncloud (run-shell-command "nextcloud") -;; bwSyncAndShare -(run-shell-command "bwsyncandshare") - ;; web browser (run-shell-command *web-browser*) From 0346ab7437c73ec88330d92cf82aad8ea60aae5d Mon Sep 17 00:00:00 2001 From: Marcel Kapfer Date: Sat, 6 Apr 2019 07:50:14 +0200 Subject: [PATCH 21/21] =?UTF-8?q?StumpWM:=20nitrogen=20=E2=86=92=20feh=20f?= =?UTF-8?q?or=20wallpaper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stumpwm/stumpwmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stumpwm/stumpwmrc b/stumpwm/stumpwmrc index 9cecefc..806b02c 100644 --- a/stumpwm/stumpwmrc +++ b/stumpwm/stumpwmrc @@ -177,7 +177,7 @@ (run-shell-command "dunst") ;; nitrogen (wallpaper) -(run-shell-command "nitrogen --restore") +(run-shell-command "~/.fehbg") ;; start compton (compositor) (run-shell-command "compton --config ~/.config/compton.conf")