diff --git a/bash/.bashrc b/bash/.bashrc index f6309a6..a81594f 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -172,7 +172,8 @@ stty -echoctl export M2_HOME=/home/jfm/Tools/apache-maven export PATH=$PATH:$M2_HOME/bin:/home/jfm/Tools/openshift-origin-client/ export GIT_EDITOR=vim - +export EDITOR="nvr -s --remote" +export VISUAL="nvr -s --remote" #Aliases #alias oc="/home/jfm/Tools/openshift-origin-client/oc" alias ocdev="oc -n onboarding-dev" diff --git a/compton/.config/compton/compton.conf b/compton/.config/compton/compton.conf index 702d08b..df13e61 100644 --- a/compton/.config/compton/compton.conf +++ b/compton/.config/compton/compton.conf @@ -116,6 +116,11 @@ frame-opacity = 1; inactive-opacity-override = false; alpha-step = 0.06; +opacity-rule = [ + "100:name = 'Netflix'", + "100:class_g = 'Google-chrome'" +]; + # Dim inactive windows. (0.0 - 1.0) # inactive-dim = 0.2; # Do not let dimness adjust based on window opacity. @@ -127,8 +132,11 @@ alpha-step = 0.06; # Do not let blur radius adjust based on window opacity. blur-background-fixed = false; blur-background-exclude = [ - "window_type = 'dock'", - "window_type = 'desktop'" + "name = 'Netflix'", + "class_g = 'netflix.com'", + "class_g = 'Google-chrome'", + "window_type = 'dock'", + "window_type = 'desktop'" ]; ################################# @@ -149,7 +157,11 @@ fade-out-step = 0.03; # no-fading-openclose = true; # Specify a list of conditions of windows that should not be faded. -fade-exclude = [ ]; +fade-exclude = [ + "name = 'Netflix'", + "class_g = 'netflix.com'", + "class_g = 'Google-chrome'" +]; ################################# # diff --git a/i3/.i3/config b/i3/.config/i3/config similarity index 90% rename from i3/.i3/config rename to i3/.config/i3/config index c06e1ce..4a6da75 100644 --- a/i3/.i3/config +++ b/i3/.config/i3/config @@ -145,15 +145,15 @@ bindsym $mod+Shift+9 move container to workspace $ws9; workspace $ws9 bindsym $mod+Shift+0 move container to workspace $ws0; workspace $ws0 # WORKSPACE CREATION -bindsym $mod+Ctrl+1 exec --no-startup-id ~/.i3/workspaces/ws01.sh -bindsym $mod+Ctrl+2 exec --no-startup-id ~/.i3/workspaces/ws02.sh -bindsym $mod+Ctrl+3 exec --no-startup-id ~/.i3/workspaces/ws03.sh -bindsym $mod+Ctrl+4 exec --no-startup-id ~/.i3/workspaces/ws04.sh -#bindsym $mod+Ctrl+5 exec --no-startup-id ~/.i3/workspaces/ws05.sh -#bindsym $mod+Ctrl+6 exec --no-startup-id ~/.i3/workspaces/ws06.sh -#bindsym $mod+Ctrl+7 exec --no-startup-id ~/.i3/workspaces/ws07.sh -bindsym $mod+Ctrl+9 exec --no-startup-id ~/.i3/workspaces/ws09.sh -bindsym $mod+Ctrl+0 exec --no-startup-id ~/.i3/workspaces/ws00.sh +bindsym $mod+Ctrl+1 exec --no-startup-id ~/.config/i3/workspaces/ws01.sh +bindsym $mod+Ctrl+2 exec --no-startup-id ~/.config/i3/workspaces/ws02.sh +bindsym $mod+Ctrl+3 exec --no-startup-id ~/.config/i3/workspaces/ws03.sh +bindsym $mod+Ctrl+4 exec --no-startup-id ~/.config/i3/workspaces/ws04.sh +#bindsym $mod+Ctrl+5 exec --no-startup-id ~/.config/i3/workspaces/ws05.sh +#bindsym $mod+Ctrl+6 exec --no-startup-id ~/.config/i3/workspaces/ws06.sh +#bindsym $mod+Ctrl+7 exec --no-startup-id ~/.config/i3/workspaces/ws07.sh +bindsym $mod+Ctrl+9 exec --no-startup-id ~/.config/i3/workspaces/ws09.sh +bindsym $mod+Ctrl+0 exec --no-startup-id ~/.config/i3/workspaces/ws00.sh # Open specific applications in floating mode for_window [class="^.*"] border pixel 0 @@ -161,6 +161,7 @@ for_window [class="Nitrogen"] floating enable sticky enable border none for_window [class="feh"] floating enable sticky enable border none for_window [class="mpv"] floating enable sticky enable border none for_window [class="^jetbrains-.+"][window_type=dialog] focus +for_window [class="Arandr"] floating enable sticky enable border none # reload the configuration file bindsym $mod+Shift+c reload @@ -233,4 +234,4 @@ smart_gaps on smart_borders on #### Custom Config -exec --no-startup-id /home/jfm/.i3/scripts/start_layout.sh +exec --no-startup-id /home/jfm/.config/i3/scripts/start_layout.sh diff --git a/i3/.i3/i3lock/LICENSE b/i3/.config/i3/i3lock/LICENSE similarity index 100% rename from i3/.i3/i3lock/LICENSE rename to i3/.config/i3/i3lock/LICENSE diff --git a/i3/.i3/i3lock/README.md b/i3/.config/i3/i3lock/README.md similarity index 100% rename from i3/.i3/i3lock/README.md rename to i3/.config/i3/i3lock/README.md diff --git a/i3/.i3/i3lock/lock b/i3/.config/i3/i3lock/lock similarity index 100% rename from i3/.i3/i3lock/lock rename to i3/.config/i3/i3lock/lock diff --git a/i3/.i3/i3lock/lock.png b/i3/.config/i3/i3lock/lock.png similarity index 100% rename from i3/.i3/i3lock/lock.png rename to i3/.config/i3/i3lock/lock.png diff --git a/i3/.i3/i3lock/text.png b/i3/.config/i3/i3lock/text.png similarity index 100% rename from i3/.i3/i3lock/text.png rename to i3/.config/i3/i3lock/text.png diff --git a/i3/.i3/layouts/workspace0-irc.json b/i3/.config/i3/layouts/workspace0-irc.json similarity index 100% rename from i3/.i3/layouts/workspace0-irc.json rename to i3/.config/i3/layouts/workspace0-irc.json diff --git a/i3/.i3/layouts/workspace0-timewaste.json b/i3/.config/i3/layouts/workspace0-timewaste.json similarity index 100% rename from i3/.i3/layouts/workspace0-timewaste.json rename to i3/.config/i3/layouts/workspace0-timewaste.json diff --git a/i3/.i3/layouts/workspace1-comms.json b/i3/.config/i3/layouts/workspace1-comms.json similarity index 100% rename from i3/.i3/layouts/workspace1-comms.json rename to i3/.config/i3/layouts/workspace1-comms.json diff --git a/i3/.i3/layouts/workspace2-web.json b/i3/.config/i3/layouts/workspace2-web.json similarity index 100% rename from i3/.i3/layouts/workspace2-web.json rename to i3/.config/i3/layouts/workspace2-web.json diff --git a/i3/.i3/layouts/workspace3-ide.json b/i3/.config/i3/layouts/workspace3-ide.json similarity index 100% rename from i3/.i3/layouts/workspace3-ide.json rename to i3/.config/i3/layouts/workspace3-ide.json diff --git a/i3/.i3/layouts/workspace4-work.json b/i3/.config/i3/layouts/workspace4-work.json similarity index 96% rename from i3/.i3/layouts/workspace4-work.json rename to i3/.config/i3/layouts/workspace4-work.json index 5d4ec5e..9f44512 100644 --- a/i3/.i3/layouts/workspace4-work.json +++ b/i3/.config/i3/layouts/workspace4-work.json @@ -37,7 +37,7 @@ "y": 0 }, "name": "shell1", - "percent": 0.5, + "percent": 0.7, "swallows": [ { "class": "^Termite$", @@ -57,7 +57,7 @@ "y": 0 }, "name": "shell2", - "percent": 0.5, + "percent": 0.3, "swallows": [ { "class": "^Termite$", diff --git a/i3/.i3/layouts/workspace5-oc.json b/i3/.config/i3/layouts/workspace5-oc.json similarity index 100% rename from i3/.i3/layouts/workspace5-oc.json rename to i3/.config/i3/layouts/workspace5-oc.json diff --git a/i3/.i3/layouts/workspace6-logs.json b/i3/.config/i3/layouts/workspace6-logs.json similarity index 100% rename from i3/.i3/layouts/workspace6-logs.json rename to i3/.config/i3/layouts/workspace6-logs.json diff --git a/i3/.i3/layouts/workspace9-news.json b/i3/.config/i3/layouts/workspace9-news.json similarity index 100% rename from i3/.i3/layouts/workspace9-news.json rename to i3/.config/i3/layouts/workspace9-news.json diff --git a/i3/.config/i3/layouts/ws-comms-wide.json b/i3/.config/i3/layouts/ws-comms-wide.json new file mode 100644 index 0000000..1d7fbcc --- /dev/null +++ b/i3/.config/i3/layouts/ws-comms-wide.json @@ -0,0 +1,125 @@ +{ + "border": "none", + "floating": "auto_off", + "layout": "splitv", + "percent": 0.333333333333333, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "jfm@moerks:~", + "percent": 0.5, + "swallows": [ + { + "class": "^Termite$" + } + ], + "type": "con" + }, + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "jfm@moerks:~", + "percent": 0.5, + "swallows": [ + { + "class": "^Termite$" + } + ], + "type": "con" + } + ] +} + +{ + "border": "none", + "floating": "auto_off", + "layout": "splitv", + "percent": 0.333333333333333, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "jfm@moerks:~", + "percent": 0.5, + "swallows": [ + { + "class": "^Termite$" + } + ], + "type": "con" + }, + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "jfm@moerks:~", + "percent": 0.5, + "swallows": [ + { + "class": "^Termite$" + } + ], + "type": "con" + } + ] +} + +{ + "border": "none", + "floating": "auto_off", + "layout": "splitv", + "percent": 0.333333333333333, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "jfm@moerks:~", + "percent": 1, + "swallows": [ + { + "class": "^Termite$" + } + ], + "type": "con" + } + ] +} + diff --git a/i3/.config/i3/layouts/ws-ide-wide.json b/i3/.config/i3/layouts/ws-ide-wide.json new file mode 100644 index 0000000..ea2ff64 --- /dev/null +++ b/i3/.config/i3/layouts/ws-ide-wide.json @@ -0,0 +1,80 @@ +{ + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "Chrome", + "percent": 0.333333333333333, + "swallows": [ + { + "class": "^Google\\-chrome" + } + ], + "type": "con" +} + +{ + "border": "none", + "floating": "auto_off", + "layout": "splith", + "percent": 0.41875, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "IntelliJ", + "percent": 0.595663265306122, + "swallows": [ + { + "class": "^Termite$", + "title": "^vim$" + } + ], + "type": "con" + } + ] +} + +{ + "border": "none", + "floating": "auto_off", + "layout": "splitv", + "percent": 0.247916666666667, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "Shell", + "percent": 0.5, + "swallows": [ + { + "class": "^Termite$", + "title": "^shell$" + } + ], + "type": "con" + } + ] +} + diff --git a/i3/.config/i3/layouts/ws-work-wide.json b/i3/.config/i3/layouts/ws-work-wide.json new file mode 100644 index 0000000..6f8bf7c --- /dev/null +++ b/i3/.config/i3/layouts/ws-work-wide.json @@ -0,0 +1,148 @@ +{ + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "Chrome", + "percent": 0.333333333333333, + "swallows": [ + { + "class": "^Google\\-chrome" + } + ], + "type": "con" +} + +{ + "border": "none", + "floating": "auto_off", + "layout": "splith", + "percent": 0.41875, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "NeoVim", + "percent": 0.595663265306122, + "swallows": [ + { + "class": "^Termite$", + "title": "^vim$" + } + ], + "type": "con" + }, + { + "border": "none", + "floating": "auto_off", + "layout": "splitv", + "percent": 0.404336734693878, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "Shell", + "percent": 0.791666666666667, + "swallows": [ + { + "class": "^Termite$", + "title": "^shell1$" + } + ], + "type": "con" + }, + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "Ranger", + "percent": 0.208333333333333, + "swallows": [ + { + "class": "^Termite$", + "title": "^ranger$" + } + ], + "type": "con" + } + ] + } + ] +} + +{ + "border": "none", + "floating": "auto_off", + "layout": "splitv", + "percent": 0.247916666666667, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "Netflix", + "percent": 0.5, + "swallows": [ + { + "class": "^Netflix$" + } + ], + "type": "con" + }, + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "WeeChat", + "percent": 0.5, + "swallows": [ + { + "class": "^Termite$", + "title": "^weechat$" + } + ], + "type": "con" + } + ] +} + diff --git a/i3/.i3/scripts/dock.sh b/i3/.config/i3/scripts/dock.sh similarity index 81% rename from i3/.i3/scripts/dock.sh rename to i3/.config/i3/scripts/dock.sh index 850fd47..b242b19 100755 --- a/i3/.i3/scripts/dock.sh +++ b/i3/.config/i3/scripts/dock.sh @@ -2,18 +2,18 @@ if [[ $(iwgetid -r) = *adazio* ]]; then - ~/.i3/scripts/work-monitors.sh & - ~/.i3/scripts/work-layout.sh & + ~/.config/i3/scripts/work-monitors.sh & + ~/.config/i3/scripts/work-layout.sh & fi if [[ $(iwgetid -r) = *moerks.dk* ]]; then - ~/.i3/scripts/home-monitors.sh & + ~/.config/i3/scripts/home-monitors.sh & sleep 5 - ~/.i3/scripts/home-layout.sh & + ~/.config/i3/scripts/home-layout.sh & fi sleep 1 -. ~/.i3/env +. ~/.config/i3/env echo $PRIMARY echo $SECONDARY diff --git a/i3/.i3/scripts/home-layout.sh b/i3/.config/i3/scripts/home-layout.sh similarity index 70% rename from i3/.i3/scripts/home-layout.sh rename to i3/.config/i3/scripts/home-layout.sh index 5e91caa..0b7368a 100755 --- a/i3/.i3/scripts/home-layout.sh +++ b/i3/.config/i3/scripts/home-layout.sh @@ -1,14 +1,13 @@ #!/bin/sh -ENV_FILE="/home/jfm/.i3/env" +ENV_FILE="/home/jfm/.config/i3/env" /bin/cat <$ENV_FILE export LAPTOP="DP1-3" export PRIMARY="DP1-3" export SECONDARY="DP1-2" -export LDPI_PROFILE="default" -export HDPI_PROFILE="laptop" +export LOCATION="home" EOM . $ENV_FILE diff --git a/i3/.i3/scripts/home-monitors.sh b/i3/.config/i3/scripts/home-monitors.sh similarity index 100% rename from i3/.i3/scripts/home-monitors.sh rename to i3/.config/i3/scripts/home-monitors.sh diff --git a/i3/.i3/scripts/i3exit b/i3/.config/i3/scripts/i3exit similarity index 100% rename from i3/.i3/scripts/i3exit rename to i3/.config/i3/scripts/i3exit diff --git a/i3/.i3/scripts/laptop-layout.sh b/i3/.config/i3/scripts/laptop-layout.sh similarity index 87% rename from i3/.i3/scripts/laptop-layout.sh rename to i3/.config/i3/scripts/laptop-layout.sh index 483eae1..9e29879 100755 --- a/i3/.i3/scripts/laptop-layout.sh +++ b/i3/.config/i3/scripts/laptop-layout.sh @@ -1,6 +1,6 @@ #!/bin/sh -ENV_FILE="/home/jfm/.i3/env" +ENV_FILE="/home/jfm/.config/i3/env" /bin/cat <$ENV_FILE export LAPTOP="eDP1" diff --git a/i3/.i3/scripts/laptop-monitors.sh b/i3/.config/i3/scripts/laptop-monitors.sh similarity index 100% rename from i3/.i3/scripts/laptop-monitors.sh rename to i3/.config/i3/scripts/laptop-monitors.sh diff --git a/i3/.i3/scripts/music.sh b/i3/.config/i3/scripts/music.sh similarity index 100% rename from i3/.i3/scripts/music.sh rename to i3/.config/i3/scripts/music.sh diff --git a/i3/.i3/scripts/start_layout.sh b/i3/.config/i3/scripts/start_layout.sh similarity index 71% rename from i3/.i3/scripts/start_layout.sh rename to i3/.config/i3/scripts/start_layout.sh index 448d7b8..a5068ff 100755 --- a/i3/.i3/scripts/start_layout.sh +++ b/i3/.config/i3/scripts/start_layout.sh @@ -6,7 +6,7 @@ monitors=`eval $CONNECTED_CMD` sleep 5 if [ $monitors -gt 1 ] then - ~/.i3/scripts/dock.sh & + ~/.config/i3/scripts/dock.sh & else - ~/.i3/scripts/undock.sh & + ~/.config/i3/scripts/undock.sh & fi diff --git a/i3/.i3/scripts/undock.sh b/i3/.config/i3/scripts/undock.sh similarity index 86% rename from i3/.i3/scripts/undock.sh rename to i3/.config/i3/scripts/undock.sh index 8f41c5e..a7c0a33 100755 --- a/i3/.i3/scripts/undock.sh +++ b/i3/.config/i3/scripts/undock.sh @@ -1,11 +1,11 @@ #!/bin/bash -~/.i3/scripts/laptop-monitors.sh & +~/.config/i3/scripts/laptop-monitors.sh & sleep 3 -~/.i3/scripts/laptop-layout.sh & +~/.config/i3/scripts/laptop-layout.sh & sleep 1 -. ~/.i3/env +. ~/.config/i3/env echo $PRIMARY echo $SECONDARY diff --git a/i3/.i3/scripts/work-layout.sh b/i3/.config/i3/scripts/work-layout.sh similarity index 88% rename from i3/.i3/scripts/work-layout.sh rename to i3/.config/i3/scripts/work-layout.sh index 3a75c4c..db04b45 100755 --- a/i3/.i3/scripts/work-layout.sh +++ b/i3/.config/i3/scripts/work-layout.sh @@ -1,6 +1,6 @@ #!/bin/sh -ENV_FILE="/home/jfm/.i3/env" +ENV_FILE="/home/jfm/.config/i3/env" /bin/cat <$ENV_FILE export LAPTOP="eDP1" diff --git a/i3/.i3/scripts/work-monitors.sh b/i3/.config/i3/scripts/work-monitors.sh similarity index 100% rename from i3/.i3/scripts/work-monitors.sh rename to i3/.config/i3/scripts/work-monitors.sh diff --git a/i3/.i3/wallpaper/fedora_simple.jpg b/i3/.config/i3/wallpaper/fedora_simple.jpg similarity index 100% rename from i3/.i3/wallpaper/fedora_simple.jpg rename to i3/.config/i3/wallpaper/fedora_simple.jpg diff --git a/i3/.i3/wallpaper/fedora_splash.jpg b/i3/.config/i3/wallpaper/fedora_splash.jpg similarity index 100% rename from i3/.i3/wallpaper/fedora_splash.jpg rename to i3/.config/i3/wallpaper/fedora_splash.jpg diff --git a/i3/.i3/wallpaper/frozen_leafs.jpg b/i3/.config/i3/wallpaper/frozen_leafs.jpg similarity index 100% rename from i3/.i3/wallpaper/frozen_leafs.jpg rename to i3/.config/i3/wallpaper/frozen_leafs.jpg diff --git a/i3/.config/i3/workspaces/ws00.sh b/i3/.config/i3/workspaces/ws00.sh new file mode 100755 index 0000000..9e64b53 --- /dev/null +++ b/i3/.config/i3/workspaces/ws00.sh @@ -0,0 +1,5 @@ +#!/bin/bash +. ~/.config/i3/env +i3-msg "workspace 0:; append_layout ~/.config/i3/layouts/workspace0-irc.json" +i3-msg "workspace 0:; exec termite -t weechat -e weechat" +i3-msg "workspace 0:; move workspace to output $SECONDARY" diff --git a/i3/.config/i3/workspaces/ws01.sh b/i3/.config/i3/workspaces/ws01.sh new file mode 100755 index 0000000..75a5554 --- /dev/null +++ b/i3/.config/i3/workspaces/ws01.sh @@ -0,0 +1,17 @@ +#!/bin/bash +. ~/.config/i3/env + +if [ $LOCATION = "home" ]; +then + i3-msg "workspace 1:; append_layout ~/.config/i3/layouts/ws-comms-wide.json" + i3-msg "workspace 1:; exec google-chrome-stable --app=https://mail.google.com" + i3-msg "workspace 1:; exec google-chrome-stable --app=https://calendar.google.com" + i3-msg "workspace 1:; exec google-chrome-stable --app=https://chat.google.com" + i3-msg "workspace 1:; exec google-chrome-stable --app=https://messages.android.com" + i3-msg "workspace 1:; exec google-chrome-stable --app=https://mattermost.yousee.dk/tdcgroup/channels/onboarding" + i3-msg "workspace 1:; move workspace to output $PRIMARY" +else + i3-msg "workspace 1:; append_layout ~/.config/i3/layouts/workspace1-comms.json" + i3-msg "workspace 1:; exec google-chrome-stable --no-default-browser-check --new-window https://www.toggl.com/app/timer https://mail.google.com/mail/u/0/#inbox https://calendar.google.com/calendar/r?tab=mc https://chat.google.com https://messages.android.com https://mattermost.yousee.dk/tdcgroup/channels/onboarding" + i3-msg "workspace 1:; move workspace to output $LAPTOP" +fi diff --git a/i3/.i3/workspaces/ws02.sh b/i3/.config/i3/workspaces/ws02.sh similarity index 62% rename from i3/.i3/workspaces/ws02.sh rename to i3/.config/i3/workspaces/ws02.sh index 5fbd6e1..44840ed 100755 --- a/i3/.i3/workspaces/ws02.sh +++ b/i3/.config/i3/workspaces/ws02.sh @@ -1,7 +1,7 @@ #!/bin/bash -. ~/.i3/env +. ~/.config/i3/env -i3-msg "workspace 2:: append_layout ~/.i3/layouts/workspace2-web.json" +i3-msg "workspace 2:: append_layout ~/.config/i3/layouts/workspace2-web.json" i3-msg "workspace 2:; exec google-chrome-stable --no-default-browser-check --new-window" i3-msg "workspace 2:; move workspace to output $PRIMARY" diff --git a/i3/.config/i3/workspaces/ws03.sh b/i3/.config/i3/workspaces/ws03.sh new file mode 100755 index 0000000..7c70dfe --- /dev/null +++ b/i3/.config/i3/workspaces/ws03.sh @@ -0,0 +1,11 @@ +#!/bin/bash +. ~/.config/i3/env + +if [ $LOCATION = "home" ]; +then + i3-msg "workspace 3:IDE; append_layout ~/.config/i3/layouts/ws-ide-wide.json" + i3-msg "workspace 3:IDE; move workspace to output $PRIMARY" +else + i3-msg "workspace 3:IDE; append_layout ~/.config/i3/layouts/workspace3-ide.json" + i3-msg "workspace 3:IDE; move workspace to output $PRIMARY" +fi diff --git a/i3/.config/i3/workspaces/ws04.sh b/i3/.config/i3/workspaces/ws04.sh new file mode 100755 index 0000000..7b302ea --- /dev/null +++ b/i3/.config/i3/workspaces/ws04.sh @@ -0,0 +1,20 @@ +#!/bin/bash +. ~/.config/i3/env + +if [ $LOCATION = "home" ]; +then + i3-msg "workspace 4:; append_layout ~/.config/i3/layouts/ws-work-wide.json" + i3-msg "workspace 4:; exec google-chrome-stable --no-default-browser-check --new-window" + i3-msg "workspace 4:; exec termite -t vim -e 'nvr -s --remote'" + i3-msg "workspace 4:; exec termite -t shell1" + i3-msg "workspace 4:; exec termite -t ranger -e ~/.config/ranger/ranger.sh" + i3-msg "workspace 4:; exec google-chrome-stable --app=http://netflix.com" + i3-msg "workspace 4:; exec termite -t weechat -e weechat" + i3-msg "workspace 4:; move workspace to output $PRIMARY" +else + i3-msg "workspace 4:; append_layout ~/.config/i3/layouts/workspace4-work.json" + i3-msg "workspace 4:; exec termite -t shell1" + i3-msg "workspace 4:; exec termite -t shell2 -e ~/.config/ranger/ranger.sh" + i3-msg "workspace 4:; exec termite -t vim -e 'nvr -s --remote'" + i3-msg "workspace 4:; move workspace to output $PRIMARY" +fi diff --git a/i3/.i3/workspaces/ws05.sh b/i3/.config/i3/workspaces/ws05.sh similarity index 69% rename from i3/.i3/workspaces/ws05.sh rename to i3/.config/i3/workspaces/ws05.sh index 4748f8e..8edeeec 100755 --- a/i3/.i3/workspaces/ws05.sh +++ b/i3/.config/i3/workspaces/ws05.sh @@ -1,7 +1,7 @@ #!/bin/bash -. ~/.i3/env +. ~/.config/i3/env -i3-msg "workspace 5:OC; append_layout ~/.i3/layouts/workspace5-oc.json" +i3-msg "workspace 5:OC; append_layout ~/.config/i3/layouts/workspace5-oc.json" i3-msg "workspace 5:OC; exec urxvt -name oc-shell1" i3-msg "workspace 5:OC; exec urxvt -name oc-shell2" i3-msg "workspace 5:OC; exec urxvt -name oc-shell3" diff --git a/i3/.i3/workspaces/ws06.sh b/i3/.config/i3/workspaces/ws06.sh similarity index 70% rename from i3/.i3/workspaces/ws06.sh rename to i3/.config/i3/workspaces/ws06.sh index b127898..1473103 100755 --- a/i3/.i3/workspaces/ws06.sh +++ b/i3/.config/i3/workspaces/ws06.sh @@ -1,7 +1,7 @@ #!/bin/bash -. ~/.i3/env +. ~/.config/i3/env -i3-msg "workspace 6:Logs; append_layout ~/.i3/layouts/workspace6-logs.json" +i3-msg "workspace 6:Logs; append_layout ~/.config/i3/layouts/workspace6-logs.json" i3-msg "workspace 6:Logs; exec urxvt -name logs-shell1" i3-msg "workspace 6:Logs; exec urxvt -name logs-shell2" i3-msg "workspace 6:Logs; exec urxvt -name logs-shell3" diff --git a/i3/.i3/workspaces/ws09.sh b/i3/.config/i3/workspaces/ws09.sh similarity index 77% rename from i3/.i3/workspaces/ws09.sh rename to i3/.config/i3/workspaces/ws09.sh index 00eabb8..9c5b90e 100755 --- a/i3/.i3/workspaces/ws09.sh +++ b/i3/.config/i3/workspaces/ws09.sh @@ -1,6 +1,6 @@ #!/bin/bash -. ~/.i3/env -i3-msg "workspace 9:; append_layout ~/.i3/layouts/workspace9-news.json" +. ~/.config/i3/env +i3-msg "workspace 9:; append_layout ~/.config/i3/layouts/workspace9-news.json" i3-msg "workspace 9:; exec termite -t newsboat -e newsboat" i3-msg "workspace 9:; exec termite -t hackernews -d '/home/jfm/Repositories/bark' -e 'pipenv run python Bark.py'" i3-msg "workspace 9:; exec termite -t rtv -e 'rtv --enable-media --theme solarized-dark'" diff --git a/i3/.i3/workspaces/ws00.sh b/i3/.i3/workspaces/ws00.sh deleted file mode 100755 index fe76ad8..0000000 --- a/i3/.i3/workspaces/ws00.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -. ~/.i3/env -i3-msg "workspace 0:; append_layout ~/.i3/layouts/workspace0-irc.json" -i3-msg "workspace 0:; exec termite -t weechat -e weechat" -i3-msg "workspace 0:; exec termite -t weechat -e weechat" -i3-msg "workspace 0:; move workspace to output $SECONDARY" diff --git a/i3/.i3/workspaces/ws01.sh b/i3/.i3/workspaces/ws01.sh deleted file mode 100755 index 748b3ea..0000000 --- a/i3/.i3/workspaces/ws01.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -. ~/.i3/env - -i3-msg "workspace 1:; append_layout ~/.i3/layouts/workspace1-comms.json" -i3-msg "workspace 1:; exec google-chrome-stable --no-default-browser-check --new-window https://www.toggl.com/app/timer https://mail.google.com/mail/u/0/#inbox https://calendar.google.com/calendar/r?tab=mc https://chat.google.com https://messages.android.com https://mattermost.yousee.dk/tdcgroup/channels/onboarding" -i3-msg "workspace 1:; move workspace to output $LAPTOP" diff --git a/i3/.i3/workspaces/ws03.sh b/i3/.i3/workspaces/ws03.sh deleted file mode 100755 index 1d19d4b..0000000 --- a/i3/.i3/workspaces/ws03.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -. ~/.i3/env - -i3-msg "workspace 3:IDE; append_layout ~/.i3/layouts/workspace3-ide.json" -i3-msg "workspace 3:IDE; move workspace to output $PRIMARY" - diff --git a/i3/.i3/workspaces/ws04.sh b/i3/.i3/workspaces/ws04.sh deleted file mode 100755 index 2abd30b..0000000 --- a/i3/.i3/workspaces/ws04.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -. ~/.i3/env - -i3-msg "workspace 4:; append_layout ~/.i3/layouts/workspace4-work.json" -i3-msg "workspace 4:; exec termite -t shell1" -i3-msg "workspace 4:; exec termite -t shell2" -i3-msg "workspace 4:; exec termite -t vim -e 'nvr -s --remote'" -i3-msg "workspace 4:; move workspace to output $PRIMARY" diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim index 5d41bfa..23ea67b 100644 --- a/neovim/.config/nvim/init.vim +++ b/neovim/.config/nvim/init.vim @@ -18,7 +18,10 @@ colorscheme solarized "Plugins call plug#begin('~/.local/share/nvim/plugged') Plug 'vim-airline/vim-airline' -Plug 'davidhalter/jedi-vim' +Plug 'vim-airline/vim-airline-themes' +Plug 'Valloric/YouCompleteMe' +Plug 'nvie/vim-flake8' +Plug 'vim-syntastic/syntastic' call plug#end() "Airline @@ -28,15 +31,29 @@ let g:airline_powerline_fonts = 1 let g:airline_theme='solarized' let g:airline_solarized_bg='dark' -"Jedi -let g:jedi#use_splits_not_buffers = "bottom" -let g:jedi#show_call_signatures = "1" +"YCM +let g:ycm_server_python_interpreter = 'python2' +let g:ycm_autoclose_preview_window_after_completion=1 +let g:ycm_min_num_of_chars_for_completion=5 +let g:ycm_add_preview_to_completeopt = 1 + +" +let g:syntastic_python_checkers = ['python'] + +"Flake8 +autocmd FileType python map :call Flake8() +let g:flake8_show_in_gutter=1 "Mappings :nmap :w :imap :wa +nnoremap +nnoremap +nnoremap +nnoremap nnoremap :bp nnoremap :bn +nnoremap :%!jq '.' "AutoCommands au BufWinEnter * set number diff --git a/ranger/.config/ranger/ranger.sh b/ranger/.config/ranger/ranger.sh new file mode 100755 index 0000000..84744bd --- /dev/null +++ b/ranger/.config/ranger/ranger.sh @@ -0,0 +1,4 @@ +export EDITOR="nvr -s --remote" +export VISUAL="nvr -s --remote" + +/usr/bin/ranger diff --git a/ranger/.config/ranger/rc.conf b/ranger/.config/ranger/rc.conf new file mode 100644 index 0000000..573c61d --- /dev/null +++ b/ranger/.config/ranger/rc.conf @@ -0,0 +1,4 @@ +setlocal path=/home/jfm/Customers preview_files false +setlocal path=/home/jfm/Repositories vcs_aware true +setlocal path=/home/jfm/Repositories preview_files false +setlocal path=/home/jfm/Repositories/dotfiles show_hidden true diff --git a/rofi/.config/rofi/config b/rofi/.config/rofi/config index e5f16fa..f503780 100644 --- a/rofi/.config/rofi/config +++ b/rofi/.config/rofi/config @@ -1,15 +1,24 @@ - -# rofi.location: 1 -rofi.font: Source Code Pro for Powerline 10 +! rofi.eh: 1 +! rofi.line-margin: 15 +!rofi.location: 4 +!rofi.font: SanFranciscoDisplay-Regular 20 +! rofi.levenshtein-sort: true +! rofi.sidebar-mode: true +! rofi.auto-select: true +rofi.fullscreen: true +rofi.separator-style: dash +rofi.hide-scrollbar: true +rofi.padding: 250 +rofi.bw: 0 rofi.lines: 10 -rofi.color-enabled: true -rofi.bw: 5 -#rofi.color-window: #16a085, #16a085, #1e2529 -#rofi.color-normal: #16a085, #424242, #16a085 -#rofi.color-active: #16a085, #424242, #16a085 -#rofi.color-urgent: #16a085, #424242, #16a085 +rofi.line-padding: 10 +rofi.font: Source Code Pro for Powerline 15 +rofi.show-icons: true -rofi.color-window: #002b36, #073642, #073642 -rofi.color-normal: #002b36, #fdf6e3, #002b36, #b58900, #002b36 -rofi.color-active: #002b36, #fdf6e3, #002b36, #b58900, #002b36 -rofi.color-urgent: #002b36, #fdf6e3, #002b36, #b58900, #002b36 +! Window 'background''border' 'separator' +rofi.color-window: #A60f2536, #00000000, #268bd2 + +! State 'bg', 'fg', 'altbg', 'hlbg', 'hlfg' +rofi.color-normal: #00000000, #fdf6e3, #00000000, #00000000, #268bd2 +rofi.color-active: #00000000, #fdf6e3, #00000000, #00000000, #268bd2 +rofi.color-urgent: #00000000, #fdf6e3, #00000000, #00000000, #268bd2 diff --git a/rofi/.config/rofi/config.org b/rofi/.config/rofi/config.org new file mode 100644 index 0000000..e5f16fa --- /dev/null +++ b/rofi/.config/rofi/config.org @@ -0,0 +1,15 @@ + +# rofi.location: 1 +rofi.font: Source Code Pro for Powerline 10 +rofi.lines: 10 +rofi.color-enabled: true +rofi.bw: 5 +#rofi.color-window: #16a085, #16a085, #1e2529 +#rofi.color-normal: #16a085, #424242, #16a085 +#rofi.color-active: #16a085, #424242, #16a085 +#rofi.color-urgent: #16a085, #424242, #16a085 + +rofi.color-window: #002b36, #073642, #073642 +rofi.color-normal: #002b36, #fdf6e3, #002b36, #b58900, #002b36 +rofi.color-active: #002b36, #fdf6e3, #002b36, #b58900, #002b36 +rofi.color-urgent: #002b36, #fdf6e3, #002b36, #b58900, #002b36