Unify things and rename things

2 files changed, 0 insertions, 310 deletions

diff --git a/saki/dot_i3/config b/saki/dot_i3/config
deleted file mode 100644
index b8305f8..0000000
--- a/saki/dot_i3/config
+++ /dev/null
@@ -1,234 +0,0 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout somewhen, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-
-# defaults
-#client.focused          #4c7899 #285577 #ffffff #2e9ef4
-#client.focused_inactive #333333 #5f676a #ffffff #484e50
-#client.unfocused        #333333 #222222 #888888 #292d2e
-#client.urgent           #2f343a #900000 #ffffff #900000
-
-# class                 border  backgr. text    indicator
-#client.focused          #97734c #77432c #ffffff #2e9ef4
-#client.focused_inactive #333333 #5f676a #ffffff #484e50
-#client.unfocused        #333333 #222222 #888888 #292d2e
-#client.urgent           #2f343a #900000 #ffffff #900000
-#client.background		#111111
-
-client.focused          #333333 #5A5958 #dddddd #2e7ec4
-client.focused_inactive #333333 #2f373a #AAAAAA #484e50
-client.unfocused        #333333 #222222 #888888 #292d2e
-client.urgent           #2f343a #900000 #ffffff #900000
-client.background		#111111
-
-set $mod Mod4
-
-# font for window titles. ISO 10646 = Unicode
-#font -misc-fixed-medium-r-normal--12-120-75-75-C-70-iso10646-1
-font pango:Inconsolata 13px
-
-# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-# start a terminal
-bindsym $mod+Return exec i3-sensible-terminal
-
-# bindsym $mod+Shift+X exec xscreensaver-command -lock
-bindsym $mod+Shift+X exec i3lock -d -c 111111 -I 5
-
-# music control
-bindsym $mod+Shift+P exec mpc toggle
-bindsym $mod+Shift+N exec mpc next
-
-bindsym $mod+Shift+S exec /home/katchup/usr/bin/ss
-bindsym $mod+Shift+M exec /home/katchup/usr/bin/ms
-
-# kill focused window
-bindsym $mod+Shift+Q kill
-
-# start dmenu (a program launcher)
-bindsym $mod+p exec dmenu_run
-
-# change focus
-bindsym $mod+h focus left
-bindsym $mod+j focus down
-bindsym $mod+k focus up
-bindsym $mod+l 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+H move left
-bindsym $mod+Shift+J move down
-bindsym $mod+Shift+K move up
-bindsym $mod+Shift+L 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+b split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen
-
-# change container layout (stacked, tabbed, default)
-bindsym $mod+s layout stacking
-bindsym $mod+z layout tabbed
-bindsym $mod+e layout default
-
-# 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+q focus parent
-
-# focus the child container
-#bindcode $mod+d focus child
-
-# switch to workspace
-bindsym $mod+ampersand workspace 1
-bindsym $mod+eacute workspace 2
-bindsym $mod+quotedbl workspace 3
-bindsym $mod+apostrophe workspace 4
-bindsym $mod+parenleft workspace 5
-bindsym $mod+minus workspace 6
-bindsym $mod+egrave workspace 7
-bindsym $mod+underscore workspace 8
-bindsym $mod+ccedilla workspace 9
-bindsym $mod+agrave workspace 10
-
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace 1
-bindsym $mod+Shift+2 move container to workspace 2
-bindsym $mod+Shift+3 move container to workspace 3
-bindsym $mod+Shift+4 move container to workspace 4
-bindsym $mod+Shift+5 move container to workspace 5
-bindsym $mod+Shift+6 move container to workspace 6
-bindsym $mod+Shift+7 move container to workspace 7
-bindsym $mod+Shift+8 move container to workspace 8
-bindsym $mod+Shift+9 move container to workspace 9
-bindsym $mod+Shift+0 move container to workspace 10
-
-# 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 exit
-
-# Other keys
-bindsym XF86AudioMute exec pactl set-sink-mute 0 toggle
-bindsym XF86AudioRaiseVolume exec pactl set-sink-mute 0 false && pactl set-sink-volume 0 +5%
-bindsym XF86AudioLowerVolume exec pactl set-sink-mute 0 false && pactl set-sink-volume 0 -5%
-
-bindsym $mod+t border normal
-bindsym $mod+y border 1pixel
-bindsym $mod+u border none
-
-
-for_window [title="xfce4-notifyd"] floating enable
-for_window [title="xfce4-notifyd"] border none
-for_window [title="Caml graphics"] floating enable
-for_window [title="QEMU"] floating enable
-for_window [title="a.out"] floating enable
-for_window [title="mgrx*"] floating enable
-for_window [class="Octave-gui"] floating enable
-for_window [class="Klavaro"] floating enable
-for_window [class="Steam"] floating enable
-for_window [class="Wine"] floating enable
-for_window [class="StepMania"] floating enable
-for_window [class="stepmania"] floating enable
-for_window [class="anki"] floating enable
-for_window [class="visu.bin"] floating enable
-for_window [class="pathfind"] floating enable
-
-new_window 1pixel
-
-# 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 h resize shrink width 5 px or 5 ppt
-        bindsym j resize grow height 5 px or 5 ppt
-        bindsym k resize shrink height 5 px or 5 ppt
-        bindsym l resize grow width 5 px or 5 ppt
-
-        # same bindings, but for the arrow keys
-        bindsym 113 resize shrink width 5 px or 5 ppt
-        bindsym 116 resize grow height 5 px or 5 ppt
-        bindsym 111 resize shrink height 5 px or 5 ppt
-        bindsym 114 resize grow width 5 px or 5 ppt
-
-        # back to normal: Enter or Escape
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-}
-
-bindsym $mod+r mode "resize"
-
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
-	status_command i3status --config ~/.i3/i3status.conf
-	#font -misc-fixed-medium-r-normal--12-120-75-75-C-70-iso10646-1
-	font pango:Inconsolata 14px
-	colors {
-        background #111111
-        statusline #EEEEEE
-
-        focused_workspace  #222222 #222222 #C8E7A4
-        active_workspace   #222222 #222222 #EAB93D
-        inactive_workspace #222222 #222222 #888888
-        urgent_workspace   #222222 #222222 #FF8D8D
-    }
-}
-
-exec_always xsetroot -cursor_name arrow
-#exec_always xcompmgr
-#exec_always feh --bg-scale /usr/share/backgrounds/xfce/vect_or.jpg
-#exec_always feh --bg-scale /home/katchup/wp/undessindedragon2.jpg
-#exec_always feh --bg-scale /home/katchup/Stuff/wp/lain_87_1680.jpg
-exec_always feh --bg-scale /home/katchup/Stuff/wp/wanikani.png
-exec_always /home/katchup/lab/wkwwin/script.sh
-#exec xscreensaver -nosplash
-exec pulseaudio --start
-#exec mpd
-#exec ~/.i3/mpdscribble.sh
-exec_always xinput --set-prop 'HID 04d9:1133' 'Device Accel Constant Deceleration' 2
-exec_always xinput --set-prop 'HID 04d9:1133' 'Device Accel Adaptive Deceleration' 2
-exec_always xinput --set-prop 'HID 04d9:1133' 'Device Accel Velocity Scaling' 5
-# exec nm-applet
-exec pasystray
-exec redshift-gtk -l 48.8567:2.3508
-exec owncloud
-#exec ~/.i3/notify-serv.sh
-exec xset -b # disable bell
-
-# mouse wheel speed
-exec xinput set-prop "Microsoft Microsoft® Comfort Mouse 4500" "Evdev Scrolling Distance" 1 1 1
-
diff --git a/saki/dot_i3/i3status.conf b/saki/dot_i3/i3status.conf
deleted file mode 100644
index 82fb837..0000000
--- a/saki/dot_i3/i3status.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-general {
-        colors = true
-		color_good = "#93D44F"
-		color_bad = "#FF8D8D"
-		color_degraded = "#FFC123"
-        interval = 5
-}
-
-order += "ipv6"
-# order += "run_watch DHCP"
-order += "run_watch VPN"
-# order += "wireless wlan0"
-order += "ethernet enp4s0"
-order += "disk /home"
-# order += "mpd"
-order += "volume master"
-# order += "battery 1"
-order += "cpu_temperature 1"
-order += "load"
-order += "time"
-
-# mpd {
-#     format_up = "%artist - %title"
-#     format_down = " - "
-#     host = "127.0.0.1"
-#     port = 6600
-# }
-
-wireless wlan0 {
-        format_up = "W: (%quality at %essid) %ip"
-        format_down = "W: down"
-}
-
-ethernet enp4s0 {
-        # if you use %speed, i3status requires root privileges
-        format_up = "E: %ip"
-        format_down = "E: down"
-}
-
-volume master {
-        format = "♪: %volume"
-        device = "default"
-        mixer = "Master"
-        mixer_idx = 0
-}
-
-battery 1 {
-        format = "%status %percentage %remaining"
-}
-
-run_watch DHCP {
-        pidfile = "/var/run/dhcpcd*.pid"
-}
-
-run_watch VPN {
-        pidfile = "/var/run/openvpn@*.pid"
-}
-
-time {
-        format = "%a %Y-%m-%d %H:%M:%S"
-}
-
-load {
-        format = "%1min"
-}
-
-cpu_temperature 1 {
-        format = "T: %degrees °C"
-        path = "/sys/class/thermal/thermal_zone2/temp"
-}
-
-disk "/home" {
-        format = "%avail"
-}