commit 71efe1fe69e2e2c1f19a222feab51570ad022b46
parent d4377573e3f7c4d630a6c62937db138b9f03741b
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Sun, 23 Dec 2018 18:25:08 +0100
Merge branch 'master' of a3nm.net:git/myconfig
Diffstat:
11 files changed, 341 insertions(+), 34 deletions(-)
diff --git a/apt/arduino b/apt/arduino
@@ -0,0 +1 @@
+arduino
diff --git a/apt/misc b/apt/misc
@@ -54,3 +54,5 @@ irqbalance
qemu-user-static # chroot into an ARM system
pdf2svg
+
+mdf2iso
diff --git a/apt/wayland b/apt/wayland
@@ -1,20 +1,29 @@
+# == wlroots ==
+libavcodec-dev
+libavformat-dev
+libavutil-dev
+libcap-dev
+libdrm2
+libdrm-dev
+libegl1-mesa-dev
+libgbm-dev
+libgles2-mesa-dev
libinput-dev
-weston
+libpixman-1-dev
+libpng-dev
+libsystemd-dev
+libxcb-composite0-dev
+libxcb-icccm4-dev
+libxcb-xinput-dev
+libxkbcommon-dev
+meson
+wayland-protocols
xwayland
-libudev-dev
-libwayland-dev
-libx11-dev
-libxcomposite-dev
-libxdamage-dev
-libxfixes-dev
-libxext-dev
-libxrender-dev
-libxrandr-dev
-libxinerama-dev
-libpcre3-dev
-libconfig-dev
-libdrm-dev
-libgl1-mesa-dev
-libdbus-1-dev
-asciidoc
-libxcb-ewmh-dev
+
+# == sway ==
+libjson-c-dev
+libcairo2-dev
+libgdk-pixbuf2.0-dev
+libpam0g-dev
+libpango1.0-dev
+scdoc
diff --git a/apt/wayland-old b/apt/wayland-old
@@ -0,0 +1,20 @@
+libinput-dev
+weston
+xwayland
+libudev-dev
+libwayland-dev
+libx11-dev
+libxcomposite-dev
+libxdamage-dev
+libxfixes-dev
+libxext-dev
+libxrender-dev
+libxrandr-dev
+libxinerama-dev
+libpcre3-dev
+libconfig-dev
+libdrm-dev
+libgl1-mesa-dev
+libdbus-1-dev
+asciidoc
+libxcb-ewmh-dev
diff --git a/i3/config b/i3/config
@@ -180,4 +180,4 @@ bindsym XF86MonBrightnessDown exec /usr/bin/xbacklight -dec 5
#TODO default split ratio 2/3
#TODO default veritcal split is stacked
-exec ~/bin/startup
+exec ~/bin/startup_i3
diff --git a/install.sh b/install.sh
@@ -65,6 +65,7 @@ ln -s ~/config/gnupg/gpg-agent.conf ~/.gnupg/gpg-agent.conf
ln -s ~/config/gnupg/gpg.conf ~/.gnupg/gpg.conf
ln -s ~/config/i3/config ~/.i3/config
+ln -s ~/config/sway ~/.config/sway
ln -s ~/config/latexmk ~/.latexmkrc
ln -s ~/config/abcde ~/.abcde.conf
ln -s ~/config/reportbugrc ~/.reportbugrc
diff --git a/sway/config b/sway/config
@@ -0,0 +1,192 @@
+# 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!
+
+# exec compton -CGb
+
+set $mod Mod4
+
+# font for window titles. ISO 10646 = Unicode
+#font -*-Terminus*-*-*-*-*-*-*-*-*-*-*-*
+font Terminus 10
+#font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+
+client.background #000000
+
+# Use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+focus_follows_mouse yes
+
+#bindsym $mod+shift+Return exec "~/bin/urxvtcdfont"
+bindsym $mod+Return exec gnome-terminal
+#bindsym $mod+Return exec "urxvtpwd ~/bin/urxvtcdfont"
+bindsym $mod+b exec "firefox"
+bindsym $mod+o exec "gnome-terminal -e ~/bin/my-mutt"
+bindsym $mod+i exec "gnome-terminal -e ~/bin_private/weechat"
+bindsym $mod+Shift+t exec "~/bin/screenshot_sway"
+bindsym $mod+Shift+s exec ~/bin/xpass
+bindsym $mod+Shift+y exec ~/bin/my-rofi -show ssh
+bindsym $mod+Shift+f exec ~/bin/xpapers
+bindsym $mod+y [urgent=latest] focus
+
+bindsym $mod+Shift+a move container to workspace back_and_forth; workspace back_and_forth
+
+workspace_auto_back_and_forth yes
+
+# kill focused window
+bindsym $mod+Shift+c kill
+bindsym $mod+q kill
+
+# start dmenu (a program launcher)
+bindsym $mod+e exec ~/bin/my-rofi -show run
+bindsym $mod+shift+e exec ~/bin/my-rofi -show window
+bindsym $mod+Shift+w exec "wen=`~/bin/my-rofi -dmenu` && exec ~/bin/wwen $wen"
+bindsym $mod+m exec "gnome-terminal -e ~/bin/msr"
+bindsym $mod+Shift+m exec "music=`~/bin/my-rofi -dmenu` && exec ~/bin/ytmusic $music"
+
+# change focus
+bindsym $mod+h focus left
+bindsym $mod+j focus down
+bindsym $mod+k focus up
+bindsym $mod+l 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
+
+# split in horizontal orientation
+bindsym $mod+w 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+t layout tabbed
+bindsym $mod+d layout default
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+bindsym $mod+Tab exec todo
+
+# focus the parent container
+bindsym $mod+u focus parent
+
+bindsym $mod+a workspace back_and_forth
+# assuming that there are at most two outputs
+# bindsym $mod+Shift+a move workspace to output right
+
+# focus the child container
+#bindcode $mod+d fo****cus child
+
+# switch to workspace
+bindsym $mod+1 workspace 1
+bindsym $mod+2 workspace 2
+bindsym $mod+3 workspace 3
+bindsym $mod+4 workspace 4
+bindsym $mod+5 workspace 5
+bindsym $mod+6 workspace 6
+bindsym $mod+7 workspace 7
+bindsym $mod+8 workspace 8
+bindsym $mod+9 workspace 9
+bindsym $mod+0 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
+
+bindsym $mod+p workspace prev
+bindsym $mod+n workspace next
+bindsym $mod+Shift+p move container to output left
+bindsym $mod+Shift+n move container to output right
+
+
+# reload the configuration file
+bindsym $mod+Shift+D 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+greater exit
+
+bindsym $mod+x exec ~/bin/afk_sway
+bindsym $mod+Shift+x exec ~/bin/dodo_sway
+
+# 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 10 px or 10 ppt
+ bindsym j resize grow height 10 px or 10 ppt
+ bindsym k resize shrink height 10 px or 10 ppt
+ bindsym l resize grow width 10 px or 10 ppt
+ bindsym Shift+h resize shrink width 1 px or 1 ppt
+ bindsym Shift+j resize grow height 1 px or 1 ppt
+ bindsym Shift+k resize shrink height 1 px or 1 ppt
+ bindsym Shift+l resize grow width 1 px or 1 ppt
+
+
+ # back to normal: Enter or Escape
+ bindsym Return mode "default"
+ bindsym Escape mode "default"
+ bindsym $mod+r mode "default"
+}
+
+bindsym $mod+r mode "resize"
+
+workspace_layout stacking
+
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+bar {
+ status_command i3status
+ mode hide
+ position bottom
+ #font -*-Terminus*-*-*-*-*-*-*-*-*-*-*-*
+ font Terminus
+}
+
+input * {
+ repeat_delay 250
+ repeat_rate 50
+ xkb_layout a3nm
+}
+
+bindsym XF86AudioLowerVolume exec pavol '-5%'
+bindsym XF86AudioRaiseVolume exec pavol '+5%'
+bindsym XF86AudioMute exec /usr/bin/pactl set-sink-volume 0 0
+bindsym XF86MonBrightnessUp exec /usr/bin/xbacklight -inc 10
+bindsym XF86MonBrightnessDown exec /usr/bin/xbacklight -dec 5
+
+#TODO default split ratio 2/3
+#TODO default veritcal split is stacked
+
+exec ~/bin/startup
diff --git a/sway/status b/sway/status
@@ -0,0 +1,65 @@
+general {
+ colors = true
+ interval = 1
+ color_separator = "#00FF00"
+}
+
+order += "ipv6"
+order += "disk /"
+order += "run_watch DHCP"
+order += "wireless wlan0"
+order += "ethernet eth0"
+order += "battery 0"
+order += "cpu_temperature 0"
+order += "load"
+order += "time"
+
+wireless wlan0 {
+ format_up = "W: (%quality at %essid) %ip"
+ format_down = "W: down"
+}
+
+ethernet eth0 {
+ # if you use %speed, i3status requires root privileges
+ format_up = "E: %ip (%speed)"
+ format_down = "E: down"
+}
+
+battery 0 {
+ format = "%status %percentage %remaining"
+ hide_seconds = true
+ integer_battery_capacity = true
+ last_full_capacity = true
+ low_threshold = 10
+}
+
+run_watch DHCP {
+ pidfile = "/var/run/dhclient*.pid"
+}
+
+run_watch VPN {
+ pidfile = "/var/run/vpnc/pid"
+}
+
+time {
+ format = "%Y-%m-%d %H:%M:%S"
+}
+
+load {
+ format = "%1min"
+}
+
+cpu_temperature 0 {
+ format = "T: %degrees °C"
+}
+
+disk "/" {
+ format = "%free on /"
+}
+
+volume master {
+ format = "vol %volume "
+ device = "default"
+ mixer = "Master"
+ mixer_idx = 0
+}
diff --git a/xkb/README b/xkb/README
@@ -0,0 +1,10 @@
+This folder gets symlinked as ~/.xkb.
+
+To load under Xorg:
+
+- xkbcomp -I$HOME/config/xkb ~/config/xkb/map $DISPLAY
+
+To load with wayland and sway:
+
+- XKB_DEFAULT_LAYOUT=a3nm sway
+
diff --git a/xkb/symbols/a3nm b/xkb/symbols/a3nm
@@ -0,0 +1,7 @@
+// based on a keyboard map from an 'xkb/symbols/dk' file
+
+partial alphanumeric_keys
+xkb_symbols "dvorak" {
+ include "pc+us(dvorak)+inet(evdev)+accents(accents)+compose(caps)+altgr(altgr)+space(space)"
+};
+
diff --git a/xkb/symbols/accents b/xkb/symbols/accents
@@ -1,18 +1,18 @@
partial alphanumeric_keys
xkb_symbols "accents" {
- key <AC02> { [ o, O, ocircumflex, Ocircumflex ] };
- key <AC03> { [ e, E, eacute, Eacute ] };
- key <AB01> { [ semicolon, colon, agrave, Agrave ] };
- key <AB03> { [ j, J, egrave, Egrave ] };
- key <AD01> { [ apostrophe, quotedbl, acircumflex, Acircumflex ] };
- key <AD02> { [ comma, less, dead_cedilla ] };
- key <AD03> { [ period, greater, ecircumflex, Ecircumflex ] };
- key <AD04> { [ p, P, ucircumflex, Ucircumflex ] };
- key <AC04> { [ u, U, ugrave, Ugrave ] };
- key <AC05> { [ i, I, icircumflex, Icircumflex ] };
- key <AC07> { [ h, H, dead_acute ] };
- key <AC08> { [ t, T, dead_circumflex ] };
- key <AC09> { [ n, N, dead_grave ] };
- key <AC10> { [ s, S, dead_diaeresis ] };
- key <AD08> { [ c, C, ccedilla, Ccedilla ] };
+ replace key <AC02> { [ o, O, ocircumflex, Ocircumflex ] };
+ replace key <AC03> { [ e, E, eacute, Eacute ] };
+ replace key <AB01> { [ semicolon, colon, agrave, Agrave ] };
+ replace key <AB03> { [ j, J, egrave, Egrave ] };
+ replace key <AD01> { [ apostrophe, quotedbl, acircumflex, Acircumflex ] };
+ replace key <AD02> { [ comma, less, dead_cedilla ] };
+ replace key <AD03> { [ period, greater, ecircumflex, Ecircumflex ] };
+ replace key <AD04> { [ p, P, ucircumflex, Ucircumflex ] };
+ replace key <AC04> { [ u, U, ugrave, Ugrave ] };
+ replace key <AC05> { [ i, I, icircumflex, Icircumflex ] };
+ replace key <AC07> { [ h, H, dead_acute ] };
+ replace key <AC08> { [ t, T, dead_circumflex ] };
+ replace key <AC09> { [ n, N, dead_grave ] };
+ replace key <AC10> { [ s, S, dead_diaeresis ] };
+ replace key <AD08> { [ c, C, ccedilla, Ccedilla ] };
};
