From 482e0e3dfd1d05e24b3995e997563001fe990ee8 Mon Sep 17 00:00:00 2001 From: Severin Kaderli Date: Wed, 19 Jun 2019 13:37:52 +0200 Subject: [PATCH 01/11] Fix floating toggle Signed-off-by: Severin Kaderli --- system/.config/i3/config.base | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/.config/i3/config.base b/system/.config/i3/config.base index 5d5787c..cb29fde 100644 --- a/system/.config/i3/config.base +++ b/system/.config/i3/config.base @@ -115,8 +115,8 @@ bindsym $mod+T split toggle # Fullscreen toggle bindsym $mod+F11 fullscreen toggle -# toggle tiling / floating -bindsym $mod+Shift+Space floating toggle +# Toggle between floating / tilling mode +bindsym $mod+S floating toggle # Workspace switching bindsym $mod+1 workspace $workspace1 From 4d8b1920ab37e99fcb38cd1ae7f7028bd24ae293 Mon Sep 17 00:00:00 2001 From: Severin Kaderli Date: Wed, 19 Jun 2019 13:38:19 +0200 Subject: [PATCH 02/11] Add phpstorm settings Signed-off-by: Severin Kaderli --- .gitignore | 11 +++++++- install | 3 +++ .../.config/phpstorm/codestyles/Default.xml | 1 + .../includes/PHP File Header.php | 25 +++++++++++++++++++ .../phpstorm/options/colors.scheme.xml | 5 ++++ system/.config/phpstorm/options/editor.xml | 6 +++++ system/.config/phpstorm/options/laf.xml | 5 ++++ system/.config/phpstorm/options/ui.lnf.xml | 5 ++++ 8 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 system/.config/phpstorm/codestyles/Default.xml create mode 100644 system/.config/phpstorm/fileTemplates/includes/PHP File Header.php create mode 100644 system/.config/phpstorm/options/colors.scheme.xml create mode 100644 system/.config/phpstorm/options/editor.xml create mode 100644 system/.config/phpstorm/options/laf.xml create mode 100644 system/.config/phpstorm/options/ui.lnf.xml diff --git a/.gitignore b/.gitignore index 779d87b..d899551 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,13 @@ system/.config/cmus/* system/.config/polybar/scripts/gmail/credentials.json system/.config/i3/config -system/.config/gtk-2.0/gtkfilechooser.ini \ No newline at end of file +system/.config/gtk-2.0/gtkfilechooser.ini + +# PhpStorm Configuration +system/.config/phpstorm/options/dimensions.xml +system/.config/phpstorm/options/debugger.xml +system/.config/phpstorm/options/images.support.xml +system/.config/phpstorm/options/other.xml +system/.config/phpstorm/options/project.default.xml +system/.config/phpstorm/options/updates.xml +system/.config/phpstorm/options/usage.statistics.xml \ No newline at end of file diff --git a/install b/install index b97519f..ef49fa2 100755 --- a/install +++ b/install @@ -66,6 +66,7 @@ LINKED_FILES_HOME=( ".config/npm" ".config/octave" ".config/pacman" + ".config/phpstorm" ".config/polybar" ".config/python" ".config/redshift" @@ -91,6 +92,7 @@ declare -A LINKED_FILES LINKED_FILES=( ["${HOME}/music"]="${HOME}/documents/Media/Music" ["${HOME}/pictures"]="${HOME}/documents/Media/Pictures" + ["${HOME}/.PhpStorm2019.1"]="${XDG_CONFIG_HOME}/phpstorm" ) # Permissions to set for folders and files @@ -109,6 +111,7 @@ ADD_GROUPS=( # Array of systemd services which should be enabled SYSTEMD_SERVICES=( "acpid" + "bluetooth" "cronie" "docker" "NetworkManager" diff --git a/system/.config/phpstorm/codestyles/Default.xml b/system/.config/phpstorm/codestyles/Default.xml new file mode 100644 index 0000000..e94f32a --- /dev/null +++ b/system/.config/phpstorm/codestyles/Default.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/system/.config/phpstorm/fileTemplates/includes/PHP File Header.php b/system/.config/phpstorm/fileTemplates/includes/PHP File Header.php new file mode 100644 index 0000000..aa12061 --- /dev/null +++ b/system/.config/phpstorm/fileTemplates/includes/PHP File Header.php @@ -0,0 +1,25 @@ +/* + * Copyright (c) ${YEAR}, whatwedo GmbH + * All rights reserved + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ \ No newline at end of file diff --git a/system/.config/phpstorm/options/colors.scheme.xml b/system/.config/phpstorm/options/colors.scheme.xml new file mode 100644 index 0000000..39308cd --- /dev/null +++ b/system/.config/phpstorm/options/colors.scheme.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/system/.config/phpstorm/options/editor.xml b/system/.config/phpstorm/options/editor.xml new file mode 100644 index 0000000..391c323 --- /dev/null +++ b/system/.config/phpstorm/options/editor.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/system/.config/phpstorm/options/laf.xml b/system/.config/phpstorm/options/laf.xml new file mode 100644 index 0000000..c1f98d9 --- /dev/null +++ b/system/.config/phpstorm/options/laf.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/system/.config/phpstorm/options/ui.lnf.xml b/system/.config/phpstorm/options/ui.lnf.xml new file mode 100644 index 0000000..457ce15 --- /dev/null +++ b/system/.config/phpstorm/options/ui.lnf.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file From 195de4363ed070836b8dda4acc36b932f96d1b46 Mon Sep 17 00:00:00 2001 From: Severin Kaderli Date: Wed, 19 Jun 2019 13:40:55 +0200 Subject: [PATCH 03/11] Move phpstorm settings to correct folder Signed-off-by: Severin Kaderli --- .gitignore | 14 +++++++------- .../phpstorm/{ => config}/codestyles/Default.xml | 0 .../fileTemplates/includes/PHP File Header.php | 0 .../{ => config}/options/colors.scheme.xml | 0 .../phpstorm/{ => config}/options/editor.xml | 0 .../.config/phpstorm/{ => config}/options/laf.xml | 0 .../phpstorm/{ => config}/options/ui.lnf.xml | 0 7 files changed, 7 insertions(+), 7 deletions(-) rename system/.config/phpstorm/{ => config}/codestyles/Default.xml (100%) rename system/.config/phpstorm/{ => config}/fileTemplates/includes/PHP File Header.php (100%) rename system/.config/phpstorm/{ => config}/options/colors.scheme.xml (100%) rename system/.config/phpstorm/{ => config}/options/editor.xml (100%) rename system/.config/phpstorm/{ => config}/options/laf.xml (100%) rename system/.config/phpstorm/{ => config}/options/ui.lnf.xml (100%) diff --git a/.gitignore b/.gitignore index d899551..79f497f 100644 --- a/.gitignore +++ b/.gitignore @@ -22,10 +22,10 @@ system/.config/i3/config system/.config/gtk-2.0/gtkfilechooser.ini # PhpStorm Configuration -system/.config/phpstorm/options/dimensions.xml -system/.config/phpstorm/options/debugger.xml -system/.config/phpstorm/options/images.support.xml -system/.config/phpstorm/options/other.xml -system/.config/phpstorm/options/project.default.xml -system/.config/phpstorm/options/updates.xml -system/.config/phpstorm/options/usage.statistics.xml \ No newline at end of file +system/.config/phpstorm/config/options/dimensions.xml +system/.config/phpstorm/config/options/debugger.xml +system/.config/phpstorm/config/options/images.support.xml +system/.config/phpstorm/config/options/other.xml +system/.config/phpstorm/config/options/project.default.xml +system/.config/phpstorm/config/options/updates.xml +system/.config/phpstorm/config/options/usage.statistics.xml \ No newline at end of file diff --git a/system/.config/phpstorm/codestyles/Default.xml b/system/.config/phpstorm/config/codestyles/Default.xml similarity index 100% rename from system/.config/phpstorm/codestyles/Default.xml rename to system/.config/phpstorm/config/codestyles/Default.xml diff --git a/system/.config/phpstorm/fileTemplates/includes/PHP File Header.php b/system/.config/phpstorm/config/fileTemplates/includes/PHP File Header.php similarity index 100% rename from system/.config/phpstorm/fileTemplates/includes/PHP File Header.php rename to system/.config/phpstorm/config/fileTemplates/includes/PHP File Header.php diff --git a/system/.config/phpstorm/options/colors.scheme.xml b/system/.config/phpstorm/config/options/colors.scheme.xml similarity index 100% rename from system/.config/phpstorm/options/colors.scheme.xml rename to system/.config/phpstorm/config/options/colors.scheme.xml diff --git a/system/.config/phpstorm/options/editor.xml b/system/.config/phpstorm/config/options/editor.xml similarity index 100% rename from system/.config/phpstorm/options/editor.xml rename to system/.config/phpstorm/config/options/editor.xml diff --git a/system/.config/phpstorm/options/laf.xml b/system/.config/phpstorm/config/options/laf.xml similarity index 100% rename from system/.config/phpstorm/options/laf.xml rename to system/.config/phpstorm/config/options/laf.xml diff --git a/system/.config/phpstorm/options/ui.lnf.xml b/system/.config/phpstorm/config/options/ui.lnf.xml similarity index 100% rename from system/.config/phpstorm/options/ui.lnf.xml rename to system/.config/phpstorm/config/options/ui.lnf.xml From c61894001248a999ed60ffc783cf1d71118f79ab Mon Sep 17 00:00:00 2001 From: Severin Kaderli Date: Wed, 19 Jun 2019 13:51:17 +0200 Subject: [PATCH 04/11] Add PHP settings Signed-off-by: Severin Kaderli --- .gitignore | 10 +++++++- .../phpstorm/config/codestyles/Default.xml | 25 ++++++++++++++++++- .../phpstorm/config/options/ide.general.xml | 5 ++++ .../.config/phpstorm/config/options/php.xml | 8 ++++++ 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 system/.config/phpstorm/config/options/ide.general.xml create mode 100644 system/.config/phpstorm/config/options/php.xml diff --git a/.gitignore b/.gitignore index 79f497f..8857c9a 100644 --- a/.gitignore +++ b/.gitignore @@ -22,10 +22,18 @@ system/.config/i3/config system/.config/gtk-2.0/gtkfilechooser.ini # PhpStorm Configuration +system/.config/phpstorm/config/port.lock +system/.config/phpstorm/config/port +system/.config/phpstorm/config/tasks +system/.config/phpstorm/config/plugins +system/.config/phpstorm/system +system/.config/phpstorm/config/phpstorm.key system/.config/phpstorm/config/options/dimensions.xml system/.config/phpstorm/config/options/debugger.xml system/.config/phpstorm/config/options/images.support.xml system/.config/phpstorm/config/options/other.xml system/.config/phpstorm/config/options/project.default.xml system/.config/phpstorm/config/options/updates.xml -system/.config/phpstorm/config/options/usage.statistics.xml \ No newline at end of file +system/.config/phpstorm/config/options/usage.statistics.xml +system/.config/phpstorm/config/options/recentProjectDirectories.xml +system/.config/phpstorm/config/options/window.manager.xml \ No newline at end of file diff --git a/system/.config/phpstorm/config/codestyles/Default.xml b/system/.config/phpstorm/config/codestyles/Default.xml index e94f32a..2b4e1ca 100644 --- a/system/.config/phpstorm/config/codestyles/Default.xml +++ b/system/.config/phpstorm/config/codestyles/Default.xml @@ -1 +1,24 @@ - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/system/.config/phpstorm/config/options/ide.general.xml b/system/.config/phpstorm/config/options/ide.general.xml new file mode 100644 index 0000000..cf8a656 --- /dev/null +++ b/system/.config/phpstorm/config/options/ide.general.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/system/.config/phpstorm/config/options/php.xml b/system/.config/phpstorm/config/options/php.xml new file mode 100644 index 0000000..5a83f7b --- /dev/null +++ b/system/.config/phpstorm/config/options/php.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file From 795b1ba29e78184b23cd31ba6fcc557a8dc6d1f1 Mon Sep 17 00:00:00 2001 From: Severin Kaderli Date: Wed, 19 Jun 2019 13:56:02 +0200 Subject: [PATCH 05/11] Add PhpStorm keymap configuration Signed-off-by: Severin Kaderli --- .../phpstorm/config/keymaps/Custom.xml | 24 +++++++++++++++++++ .../phpstorm/config/options/keymap.xml | 5 ++++ 2 files changed, 29 insertions(+) create mode 100644 system/.config/phpstorm/config/keymaps/Custom.xml create mode 100644 system/.config/phpstorm/config/options/keymap.xml diff --git a/system/.config/phpstorm/config/keymaps/Custom.xml b/system/.config/phpstorm/config/keymaps/Custom.xml new file mode 100644 index 0000000..494e009 --- /dev/null +++ b/system/.config/phpstorm/config/keymaps/Custom.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/system/.config/phpstorm/config/options/keymap.xml b/system/.config/phpstorm/config/options/keymap.xml new file mode 100644 index 0000000..168209d --- /dev/null +++ b/system/.config/phpstorm/config/options/keymap.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file From a7d69833cf19b4b6ec90fc3e2f22bfb92a6ee71b Mon Sep 17 00:00:00 2001 From: Severin Kaderli Date: Wed, 19 Jun 2019 13:57:44 +0200 Subject: [PATCH 06/11] Update PhpStorm keymap Signed-off-by: Severin Kaderli --- system/.config/phpstorm/config/keymaps/Custom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/system/.config/phpstorm/config/keymaps/Custom.xml b/system/.config/phpstorm/config/keymaps/Custom.xml index 494e009..7b1760e 100644 --- a/system/.config/phpstorm/config/keymaps/Custom.xml +++ b/system/.config/phpstorm/config/keymaps/Custom.xml @@ -1,11 +1,9 @@ - - From b15f3e1688f29e8755b04eab18bfabe5eba7b21d Mon Sep 17 00:00:00 2001 From: Severin Kaderli Date: Wed, 19 Jun 2019 14:03:06 +0200 Subject: [PATCH 07/11] Add custom codestyle Signed-off-by: Severin Kaderli --- .../phpstorm/config/codestyles/{Default.xml => Custom.xml} | 2 +- .../.config/phpstorm/config/options/code.style.schemes.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) rename system/.config/phpstorm/config/codestyles/{Default.xml => Custom.xml} (96%) create mode 100644 system/.config/phpstorm/config/options/code.style.schemes.xml diff --git a/system/.config/phpstorm/config/codestyles/Default.xml b/system/.config/phpstorm/config/codestyles/Custom.xml similarity index 96% rename from system/.config/phpstorm/config/codestyles/Default.xml rename to system/.config/phpstorm/config/codestyles/Custom.xml index 2b4e1ca..6e9cca1 100644 --- a/system/.config/phpstorm/config/codestyles/Default.xml +++ b/system/.config/phpstorm/config/codestyles/Custom.xml @@ -1,4 +1,4 @@ - +