compton/vim bugfixes, rm ultisnips from .vimrc

diff --git a/compton/.compton.conf b/compton/.compton.conf
index a5ee1a51b9fdecaebf2b4583fb54a54309666be6..8e23699dd9824cd663c143b187cc41c15eaa63f8 100644 (file)
--- a/compton/.compton.conf
+++ b/compton/.compton.conf
@@ -98,7 +98,9 @@ shadow-exclude = [
     "class_g ?= 'Cairo-dock'",\r
     "class_g ?= 'Xfce4-notifyd'",\r
     "class_g ?= 'Xfce4-power-manager'",\r
-    "_GTK_FRAME_EXTENTS@:c"\r
+    "_GTK_FRAME_EXTENTS@:c",\r
+    # Workaround for Zoom screensharing\r
+    "name = 'cpt_frame_window'"\r
 ];\r
 # Avoid drawing shadow on all shaped windows (see also: --detect-rounded-corners)\r
 shadow-ignore-shaped = false;\r

diff --git a/i3/.i3/config b/i3/.i3/config
index 4744c71ebc64511ce80d819fba13b82a16e617fb..1dcd6140ef2295b073bf6b5b1a6f4be95af9e5d5 100644 (file)
--- a/i3/.i3/config
+++ b/i3/.i3/config
@@ -55,6 +55,10 @@ bindsym $mod+Shift+Down move down
 bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
+# move workspace to other monitor
+bindsym $mod+Control+k move workspace to output down
+bindsym $mod+Control+l move workspace to output up
+
 # split in horizontal orientation
 bindsym $mod+h split h
 
@@ -120,12 +124,13 @@ bindsym $mod+Shift+0 move container to workspace $ws10
 
 # assign windows to workspaces
 assign[class="urxvt"] $ws1
-assign[class="Chromium"] $ws2
+#assign[class="Chromium"] $ws2
 assign[class="Spotify"] $ws6
 assign[class="Atom"] $ws3
 
 # assign workspaces to monitors
-workspace $ws6 output VGA1
+workspace $ws1 output DVI-D-0
+workspace $ws2 output HDMI-0
 
 # reload the configuration file
 bindsym $mod+Shift+c reload
@@ -228,9 +233,9 @@ exec_always --no-startup-id feh --bg-fill /home/andrew/.wallpaper.jpg
 exec_always --no-startup-id compton -b --config /home/andrew/.compton.conf
 exec_always --no-startup-id setxkbmap -option caps:swapescape
 exec_always --no-startup-id xbindkeys --poll-rc
+exec_always --no-startup-id xmodmap /home/andrew/.xmodmap
 
 # start GUI apps
 exec --no-startup-id i3-msg 'workspace $ws2; exec chromium'
-exec --no-startup-id i3-msg 'workspace $ws6; exec spotify'
 exec --no-startup-id i3-msg 'workspace $ws1; exec urxvt'
 exec --no-startup-id tilda

diff --git a/i3/.i3blocks.conf b/i3/.i3blocks.conf
index 15f99341c707cc0d86f58b04fd5499c7c9c667b0..9b1adb00d452ee0ea4e234a0d73955d1e8b3012c 100644 (file)
--- a/i3/.i3blocks.conf
+++ b/i3/.i3blocks.conf
@@ -30,12 +30,13 @@ color=#93a1a1
 
 # music
 [mediaplayer]
+label=♪
 command=/home/andrew/scripts/i3blocks-music.pl
 interval=1
 
 # volume
 [volume]
-label=♪
+label=🔊
 instance=Master
 #instance=PCM
 interval=once

diff --git a/vim/.vimrc b/vim/.vimrc
index 3d452ab549e0b20056cb5ff9af3b92864edfdef4..6b5bfc8a90143b391465339ad0559747e6caeacc 100644 (file)
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -20,8 +20,8 @@ Plugin 'VundleVim/Vundle.vim' " let Vundle manage Vundle, required
 
 Plugin 'vim-pandoc/vim-pandoc-syntax'
 Plugin 'godlygeek/tabular'
-Plugin 'SirVer/ultisnips'
-Plugin 'honza/vim-snippets'
+"Plugin 'SirVer/ultisnips'
+"Plugin 'honza/vim-snippets'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required