change structure to work with gnu stow

diff --git a/.i3/config b/.i3/config
deleted file mode 100644 (file)
index 6ca9811..0000000
--- a/.i3/config
+++ /dev/null
@@ -1,211 +0,0 @@
-# colours
-set $bg-color             #268bd2
-set $inactive-bg-color    #2f343f
-set $text-color           #2f343f
-set $inactive-text-color  #839495
-set $urgent-bg-color      #dc322f
-set $bar-color            #082833cc
-
-# windows key
-set $mod Mod4
-
-# default font (titles & bar)
-font pango:Ubuntu Mono derivative Powerline 11, Awesome 8
-
-# mouse+$mod to drag floating windows
-floating_modifier $mod
-
-# terminal
-bindsym $mod+Return exec urxvt
-
-# kill focused window
-bindsym $mod+Shift+q kill
-
-# window colours
-# state                 border              background               text                  indicator
-client.focused          $bg-color           $bg-color           $text-color           $bg-color
-client.unfocused        $inactive-bg-color  $inactive-bg-color  $inactive-text-color   $inactive-bg-color
-client.focused_inactive        $inactive-bg-color  $inactive-bg-color  $inactive-text-color    $inactive-bg-color
-client.urgent           $urgent-bg-color    $urgent-bg-color    $text-color           $urgent-bg-color
-
-# rofi
-bindsym $mod+d exec rofi -show run
-
-# change focus
-bindsym $mod+j focus left
-bindsym $mod+k focus down
-bindsym $mod+l focus up
-bindsym $mod+semicolon focus right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# move focused window
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move down
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+semicolon move right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# split in horizontal orientation
-bindsym $mod+h split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
-# Define names for default workspaces for which we configure key bindings later on.
-# We use variables to avoid repeating the names in multiple places.
-set $ws1 "term"
-set $ws2 "chrome"
-set $ws3 "code"
-set $ws4 "misc"
-set $ws5 "school"
-set $ws6 "spotify"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-set $ws10 "10"
-
-# switch to workspace
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-bindsym $mod+9 workspace $ws9
-bindsym $mod+0 workspace $ws10
-
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace $ws1
-bindsym $mod+Shift+2 move container to workspace $ws2
-bindsym $mod+Shift+3 move container to workspace $ws3
-bindsym $mod+Shift+4 move container to workspace $ws4
-bindsym $mod+Shift+5 move container to workspace $ws5
-bindsym $mod+Shift+6 move container to workspace $ws6
-bindsym $mod+Shift+7 move container to workspace $ws7
-bindsym $mod+Shift+8 move container to workspace $ws8
-bindsym $mod+Shift+9 move container to workspace $ws9
-bindsym $mod+Shift+0 move container to workspace $ws10
-
-# assign windows to workspaces
-assign[class="Chromium"] $ws2
-assign[class="Spotify"] $ws6
-assign[class="Atom"] $ws3
-
-# assign workspaces to monitors
-workspace $ws6 output VGA1
-
-# reload the configuration file
-bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-# exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-
-        # Pressing left will shrink the window’s width.
-        # Pressing right will grow the window’s width.
-        # Pressing up will shrink the window’s height.
-        # Pressing down will grow the window’s height.
-        bindsym j resize shrink width 10 px or 10 ppt
-        bindsym k resize grow height 10 px or 10 ppt
-        bindsym l resize shrink height 10 px or 10 ppt
-        bindsym semicolon resize grow width 10 px or 10 ppt
-
-        # same bindings, but for the arrow keys
-        bindsym Left resize shrink width 10 px or 10 ppt
-        bindsym Down resize grow height 10 px or 10 ppt
-        bindsym Up resize shrink height 10 px or 10 ppt
-        bindsym Right resize grow width 10 px or 10 ppt
-
-        # back to normal: Enter or Escape or $mod+r
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-        bindsym $mod+r mode "default"
-}
-
-bindsym $mod+r mode "resize"
-
-# move floating windows with keys
-bindsym $mod+m mode "move" focus floating
-mode "move" {
-    bindsym $mod+Tab focus right
-
-    bindsym Left  move left
-    bindsym Down  move down
-    bindsym Up    move up
-    bindsym Right move right
-
-    bindsym h     move left
-    bindsym j     move down
-    bindsym k     move up
-    bindsym l     move right
-
-    # back to normal: Enter or Escape
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-}
-
-for_window [window_type=dialog] floating enable
-bindsym XF86AudioRaiseVolume exec --no-startup-id amixer sset Speaker 3dB+
-bindsym XF86AudioLowerVolume exec --no-startup-id amixer sset Speaker 3dB-
-bindsym XF86AudioMute exec --no-startup-id amixer sset Speaker toggle
-bindsym XF86AudioPlay exec playerctl play-pause
-bindsym XF86AudioPause exec playerctl play-pause
-bindsym XF86AudioNext exec playerctl next
-bindsym XF86AudioPrev exec playerctl previous
-
-
-
-
-
-# i3bar
-bar {
-       font pango:Ubuntu Mono derivative Powerline 11
-       i3bar_command i3bar -t
-        status_command exec i3blocks
-#      status_command i3status
-#      output VGA-0
-       colors {
-               background $bar-color
-       }
-}
-
-for_window[class="^.*"] border pixel 5
-
-gaps inner 15
-gaps outer 0

diff --git a/.i3blocks.conf b/.i3blocks.conf
deleted file mode 100644 (file)
index 4160fea..0000000
--- a/.i3blocks.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-# i3blocks config file
-#
-# Please see man i3blocks for a complete reference!
-# The man page is also hosted at http://vivien.github.io/i3blocks
-#
-# List of valid properties:
-#
-# align
-# color
-# background
-# border
-# command
-# full_text
-# instance
-# interval
-# label
-# min_width
-# name
-# separator
-# separator_block_width
-# short_text
-# signal
-# urgent
-
-# Global properties
-command=/usr/lib/i3blocks/$BLOCK_NAME
-separator_block_width=15
-markup=pango
-color=#93a1a1
-
-# music
-[mediaplayer]
-command=~/scripts/i3blocks-music.pl
-interval=1
-
-# volume
-[volume]
-label=VOL
-#label=♪
-instance=Master
-#instance=PCM
-interval=once
-signal=10
-
-# network ip
-[iface]
-interval=1
-
-# network throughput
-[bandwidth]
-interval=1
-command=~/scripts/i3blocks-bandwidth.sh -o "/ "
-
-# load
-[load_average]
-interval=1
-
-# cpu
-[cpu_usage]
-command=~/scripts/i3blocks-cpu.pl -d 1
-interval=1
-
-# date and time
-[time]
-command=date '+%d/%m/%y %H:%M:%S'
-interval=1
-color=#268bd2

diff --git a/.i3status.conf b/.i3status.conf
deleted file mode 100644 (file)
index dab38f5..0000000
--- a/.i3status.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-# i3status configuration file.
-# see "man i3status" for documentation.
-
-# It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s:
-# ß
-# If the above line is not correctly displayed, fix your editor first!
-
-general {
-        colors = true
-        interval = 1
-}
-
-#order += "ipv6"
-#order += "disk /"
-order += "ethernet enp7s0"
-#order += "battery all"
-#order += "volume master"
-order += "load"
-order += "cpu_usage"
-order += "tztime local"
-
-wireless _first_ {
-        format_up = "W: (%quality at %essid) %ip"
-        format_down = "W: down"
-}
-
-ethernet enp7s0 {
-        # if you use %speed, i3status requires root privileges
-        format_up = "enp7s0: %ip"
-        format_down = "enp7s0: down"
-}
-
-battery all {
-        format = "%status %percentage %remaining"
-}
-
-volume master {
-       format = "♪:%volume"
-       device = "Default"
-       mixer = "Speaker"
-       mixer_idx = 0
-}
-
-tztime local {
-        format = "%d/%m/%y %H:%M:%S"
-}
-
-load {
-        format = "%1min"
-}
-
-cpu_usage {
-       format ="%usage"
-#      grep 'cpu ' /proc/stat | awk '{usage=($2+$4)*100/($2+$4+$5)} END {print usage "%"}'
-}
-
-disk "/" {
-        format = "%avail"
-}

diff --git a/.zshrc b/.zshrc
deleted file mode 100755 (executable)
index 6caeb4a..0000000
--- a/.zshrc
+++ /dev/null
@@ -1,50 +0,0 @@
-# Path to oh-my-zsh installation
-export ZSH=/home/andrew/.oh-my-zsh
-
-# ---
-# Keybinds
-# ---
-
-# Ctrl+Bksp deletes preceding word
-bindkey '^H' backward-delete-word
-
-# Ctrl+Del deletes succeeding word
-bindkey '^[[3^' delete-word
-
-# Ctrl+left arrow moves cursor one word left
-bindkey '^[Od' backward-word
-
-# Ctrl+right arrow moves cursor one word right
-bindkey '^[Oc' forward-word
-
-# Custom delimeters for delete-word
-WORDCHARS='*?_-.[]~=&;!#$%^(){}<>'
-
-# ---
-# Behaviour
-# ---
-
-#Allow bash-style comments
-setopt interactivecomments
-
-export EDITOR='nano'
-
-# Timestamp in history command ("mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd")
-HIST_STAMPS="dd.mm.yyy"
-
-DISABLE_UNTRACKED_FILES_DIRTY="true"
-
-# ---
-# Appearance
-# ---
-ZSH_THEME="agnoster"
-COMPLETION_WAITING_DOTS="true"
-
-# Would you like to use another custom folder than $ZSH/custom?
-# ZSH_CUSTOM=/path/to/new-custom-folder
-
-# plugins can be found in ~/.oh-my-zsh/plugins/*
-plugins=(git)
-
-source $ZSH/oh-my-zsh.sh
-

diff --git a/i3/.i3/config b/i3/.i3/config
new file mode 100644 (file)
index 0000000..48e59c0
--- /dev/null
+++ b/i3/.i3/config
@@ -0,0 +1,212 @@
+# colours
+set $bg-color             #268bd2
+set $inactive-bg-color    #2f343f
+set $text-color           #2f343f
+set $inactive-text-color  #839495
+set $urgent-bg-color      #dc322f
+set $bar-color            #082833cc
+
+# windows key
+set $mod Mod4
+
+# default font (titles & bar)
+font pango:Ubuntu Mono derivative Powerline 11, Awesome 8
+
+# mouse+$mod to drag floating windows
+floating_modifier $mod
+
+# terminal
+bindsym $mod+Return exec urxvt
+
+# kill focused window
+bindsym $mod+Shift+q kill
+
+# window colours
+# state                 border              background               text                  indicator
+client.focused          $bg-color           $bg-color           $text-color           $bg-color
+client.unfocused        $inactive-bg-color  $inactive-bg-color  $inactive-text-color   $inactive-bg-color
+client.focused_inactive        $inactive-bg-color  $inactive-bg-color  $inactive-text-color    $inactive-bg-color
+client.urgent           $urgent-bg-color    $urgent-bg-color    $text-color           $urgent-bg-color
+
+# rofi
+bindsym $mod+d exec rofi -show run
+
+# change focus
+bindsym $mod+j focus left
+bindsym $mod+k focus down
+bindsym $mod+l focus up
+bindsym $mod+semicolon focus right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# move focused window
+bindsym $mod+Shift+j move left
+bindsym $mod+Shift+k move down
+bindsym $mod+Shift+l move up
+bindsym $mod+Shift+semicolon move right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+# split in horizontal orientation
+bindsym $mod+h split h
+
+# split in vertical orientation
+bindsym $mod+v split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+f fullscreen toggle
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+a focus parent
+
+# focus the child container
+#bindsym $mod+d focus child
+
+# Define names for default workspaces for which we configure key bindings later on.
+# We use variables to avoid repeating the names in multiple places.
+set $ws1 "term"
+set $ws2 "chrome"
+set $ws3 "code"
+set $ws4 "misc"
+set $ws5 "school"
+set $ws6 "spotify"
+set $ws7 "7"
+set $ws8 "8"
+set $ws9 "9"
+set $ws10 "10"
+
+# switch to workspace
+bindsym $mod+1 workspace $ws1
+bindsym $mod+2 workspace $ws2
+bindsym $mod+3 workspace $ws3
+bindsym $mod+4 workspace $ws4
+bindsym $mod+5 workspace $ws5
+bindsym $mod+6 workspace $ws6
+bindsym $mod+7 workspace $ws7
+bindsym $mod+8 workspace $ws8
+bindsym $mod+9 workspace $ws9
+bindsym $mod+0 workspace $ws10
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace $ws1
+bindsym $mod+Shift+2 move container to workspace $ws2
+bindsym $mod+Shift+3 move container to workspace $ws3
+bindsym $mod+Shift+4 move container to workspace $ws4
+bindsym $mod+Shift+5 move container to workspace $ws5
+bindsym $mod+Shift+6 move container to workspace $ws6
+bindsym $mod+Shift+7 move container to workspace $ws7
+bindsym $mod+Shift+8 move container to workspace $ws8
+bindsym $mod+Shift+9 move container to workspace $ws9
+bindsym $mod+Shift+0 move container to workspace $ws10
+
+# assign windows to workspaces
+assign[class="Chromium"] $ws2
+assign[class="Spotify"] $ws6
+assign[class="Atom"] $ws3
+
+# assign workspaces to monitors
+workspace $ws6 output VGA1
+
+# reload the configuration file
+bindsym $mod+Shift+c reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+r restart
+# exit i3 (logs you out of your X session)
+bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+        # These bindings trigger as soon as you enter the resize mode
+
+        # Pressing left will shrink the window’s width.
+        # Pressing right will grow the window’s width.
+        # Pressing up will shrink the window’s height.
+        # Pressing down will grow the window’s height.
+        bindsym j resize shrink width 10 px or 10 ppt
+        bindsym k resize grow height 10 px or 10 ppt
+        bindsym l resize shrink height 10 px or 10 ppt
+        bindsym semicolon resize grow width 10 px or 10 ppt
+
+        # same bindings, but for the arrow keys
+        bindsym Left resize shrink width 10 px or 10 ppt
+        bindsym Down resize grow height 10 px or 10 ppt
+        bindsym Up resize shrink height 10 px or 10 ppt
+        bindsym Right resize grow width 10 px or 10 ppt
+
+        # back to normal: Enter or Escape or $mod+r
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+        bindsym $mod+r mode "default"
+}
+
+bindsym $mod+r mode "resize"
+
+# move floating windows with keys
+bindsym $mod+m mode "move" focus floating
+mode "move" {
+    bindsym $mod+Tab focus right
+
+    bindsym Left  move left
+    bindsym Down  move down
+    bindsym Up    move up
+    bindsym Right move right
+
+    bindsym h     move left
+    bindsym j     move down
+    bindsym k     move up
+    bindsym l     move right
+
+    # back to normal: Enter or Escape
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+
+for_window [window_type=dialog] floating enable
+bindsym XF86AudioRaiseVolume exec --no-startup-id amixer sset Speaker 3dB+
+bindsym XF86AudioLowerVolume exec --no-startup-id amixer sset Speaker 3dB-
+bindsym XF86AudioMute exec --no-startup-id amixer sset Speaker toggle
+bindsym XF86AudioPlay exec playerctl play-pause
+bindsym XF86AudioPause exec playerctl play-pause
+bindsym XF86AudioNext exec playerctl next
+bindsym XF86AudioPrev exec playerctl previous
+
+
+
+
+
+# i3bar
+bar {
+       font pango:Ubuntu Mono derivative Powerline 11
+       i3bar_command i3bar -t
+        status_command exec i3blocks
+#      status_command i3status
+#      output VGA-0
+       colors {
+               background $bar-color
+       }
+}
+
+for_window[class="^.*"] border pixel 5
+
+gaps inner 15
+gaps outer 0
+

diff --git a/i3/.i3blocks.conf b/i3/.i3blocks.conf
new file mode 100644 (file)
index 0000000..4160fea
--- /dev/null
+++ b/i3/.i3blocks.conf
@@ -0,0 +1,67 @@
+# i3blocks config file
+#
+# Please see man i3blocks for a complete reference!
+# The man page is also hosted at http://vivien.github.io/i3blocks
+#
+# List of valid properties:
+#
+# align
+# color
+# background
+# border
+# command
+# full_text
+# instance
+# interval
+# label
+# min_width
+# name
+# separator
+# separator_block_width
+# short_text
+# signal
+# urgent
+
+# Global properties
+command=/usr/lib/i3blocks/$BLOCK_NAME
+separator_block_width=15
+markup=pango
+color=#93a1a1
+
+# music
+[mediaplayer]
+command=~/scripts/i3blocks-music.pl
+interval=1
+
+# volume
+[volume]
+label=VOL
+#label=♪
+instance=Master
+#instance=PCM
+interval=once
+signal=10
+
+# network ip
+[iface]
+interval=1
+
+# network throughput
+[bandwidth]
+interval=1
+command=~/scripts/i3blocks-bandwidth.sh -o "/ "
+
+# load
+[load_average]
+interval=1
+
+# cpu
+[cpu_usage]
+command=~/scripts/i3blocks-cpu.pl -d 1
+interval=1
+
+# date and time
+[time]
+command=date '+%d/%m/%y %H:%M:%S'
+interval=1
+color=#268bd2

diff --git a/i3/.i3status.conf b/i3/.i3status.conf
new file mode 100644 (file)
index 0000000..dab38f5
--- /dev/null
+++ b/i3/.i3status.conf
@@ -0,0 +1,60 @@
+# i3status configuration file.
+# see "man i3status" for documentation.
+
+# It is important that this file is edited as UTF-8.
+# The following line should contain a sharp s:
+# ß
+# If the above line is not correctly displayed, fix your editor first!
+
+general {
+        colors = true
+        interval = 1
+}
+
+#order += "ipv6"
+#order += "disk /"
+order += "ethernet enp7s0"
+#order += "battery all"
+#order += "volume master"
+order += "load"
+order += "cpu_usage"
+order += "tztime local"
+
+wireless _first_ {
+        format_up = "W: (%quality at %essid) %ip"
+        format_down = "W: down"
+}
+
+ethernet enp7s0 {
+        # if you use %speed, i3status requires root privileges
+        format_up = "enp7s0: %ip"
+        format_down = "enp7s0: down"
+}
+
+battery all {
+        format = "%status %percentage %remaining"
+}
+
+volume master {
+       format = "♪:%volume"
+       device = "Default"
+       mixer = "Speaker"
+       mixer_idx = 0
+}
+
+tztime local {
+        format = "%d/%m/%y %H:%M:%S"
+}
+
+load {
+        format = "%1min"
+}
+
+cpu_usage {
+       format ="%usage"
+#      grep 'cpu ' /proc/stat | awk '{usage=($2+$4)*100/($2+$4+$5)} END {print usage "%"}'
+}
+
+disk "/" {
+        format = "%avail"
+}

diff --git a/zsh/.zshrc b/zsh/.zshrc
new file mode 100755 (executable)
index 0000000..6caeb4a
--- /dev/null
+++ b/zsh/.zshrc
@@ -0,0 +1,50 @@
+# Path to oh-my-zsh installation
+export ZSH=/home/andrew/.oh-my-zsh
+
+# ---
+# Keybinds
+# ---
+
+# Ctrl+Bksp deletes preceding word
+bindkey '^H' backward-delete-word
+
+# Ctrl+Del deletes succeeding word
+bindkey '^[[3^' delete-word
+
+# Ctrl+left arrow moves cursor one word left
+bindkey '^[Od' backward-word
+
+# Ctrl+right arrow moves cursor one word right
+bindkey '^[Oc' forward-word
+
+# Custom delimeters for delete-word
+WORDCHARS='*?_-.[]~=&;!#$%^(){}<>'
+
+# ---
+# Behaviour
+# ---
+
+#Allow bash-style comments
+setopt interactivecomments
+
+export EDITOR='nano'
+
+# Timestamp in history command ("mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd")
+HIST_STAMPS="dd.mm.yyy"
+
+DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# ---
+# Appearance
+# ---
+ZSH_THEME="agnoster"
+COMPLETION_WAITING_DOTS="true"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# plugins can be found in ~/.oh-my-zsh/plugins/*
+plugins=(git)
+
+source $ZSH/oh-my-zsh.sh
+