Adds some x1 specific files as we equalise dotfiles

6 files changed, 476 insertions, 2 deletions

diff --git a/Xresources-laptop b/Xresources-laptop
index d8b8729..88194a6 100644
--- a/Xresources-laptop
+++ b/Xresources-laptop
@@ -1,4 +1,5 @@
 /* xterm*font: -Misc-Fixed-Medium-R-Normal--10-100-75-75-C-60-ISO10646-1 */
+Xft.dpi: 196
 
 /* this is good
 /* XTerm*font: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1 */
@@ -26,7 +27,7 @@ xterm*faceName: DejaVu Sans Mono
 /*xterm*faceName: Cascadia Mono */
 /* xterm*faceName: Ubuntu Mono */
 ! xterm*faceName: Terminus
-xterm*faceSize: 11
+xterm*faceSize: 12
 /* xterm*faceName: "Jetbrains Mono Nerd Mono" */
 /* xterm*faceName: "Cascadia Code Nerd Font" */
 /* xterm*faceName: "Jetbrains Mono Nerd Font" */
diff --git a/Xresources-laptop-x1 b/Xresources-laptop-x1
new file mode 100644
index 0000000..ad96d85
--- /dev/null
+++ b/Xresources-laptop-x1
@@ -0,0 +1,73 @@
+/* xterm*font: -Misc-Fixed-Medium-R-Normal--10-100-75-75-C-60-ISO10646-1 */
+
+/* this is good
+/* XTerm*font: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1 */
+
+/* xterm*font: -misc-fixed-medium-r-normal-*-13-100-100-*-c-70-iso8859-1 */
+/* xterm*font: fixed */
+/* xterm*font:     *-fixed-*-*-*-18-* */
+/* xterm*font: fixed */
+/* xterm*fontSize: 12 */
+/* xterm*faceName:     unifont */
+/* xterm*faceSize:10 */
+/* xterm*faceName: terminus-16 */
+/* xterm*font: terminus-18 */
+/* xterm*faceName:  Hack Nerd Font Mono */
+XTerm*cursorBlink: false
+XTerm*blinkAsBold: false
+/* XTerm*colorMode: false */
+XTerm*dynamicColors: false
+XTerm*colorBDMode: false
+XTerm*colorULMode: false
+/* XTerm*cursorColor: black */
+! xterm*boldFont: terminus-14
+/* xterm*faceName: Hack Nerd Font */
+xterm*faceName: DejaVu Sans Mono
+/*xterm*faceName: Cascadia Mono */
+/* xterm*faceName: Ubuntu Mono */
+! xterm*faceName: Terminus
+xterm*faceSize: 16
+/* xterm*faceName: "Jetbrains Mono Nerd Mono" */
+/* xterm*faceName: "Cascadia Code Nerd Font" */
+/* xterm*faceName: "Jetbrains Mono Nerd Font" */
+/* xterm*faceSize: 15 */
+/* xterm*vt100*geometry: 80x50 */
+XTerm*geometry: 120x30
+/* xterm*background: black */
+/* xterm*foreground: white */
+XTerm*allowBoldFonts: false
+xterm*boldMode: false
+XTerm*eightBitInput: false
+/* this is essential to stop the stupid fucking chars for instance in weechat */
+XTerm*VT100*metaSendsEscape: true
+xterm*selectToClipboard: true
+
+xterm*foreground:   white
+xterm*background:   black
+/* xterm*background: Dark Slate Blue */
+/* xterm*background: Dim Gray */
+/* xterm*background: Dark Slate Gray */
+/* xterm*background: Midnight Blue */
+/* xterm*background: Indigo */
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! Gruvbox dark
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+/* xterm*foreground:   #ebdbb2 */
+/* xterm*background:   #1d2021 */
+/* xterm*color0:       #1d2021 */
+/* xterm*color1:       #cc241d */
+/* xterm*color2:       #98971a */
+/* xterm*color3:       #d79921 */
+/* xterm*color4:       #458588 */
+/* xterm*color5:       #b16286 */
+/* xterm*color6:       #689d6a */
+/* xterm*color7:       #a89984 */
+/* xterm*color8:       #928374 */
+/* xterm*color9:       #fb4934 */
+/* xterm*color10:      #b8bb26 */
+/* xterm*color11:      #fabd2f */
+/* xterm*color12:      #83a598 */
+/* xterm*color13:      #d3869b */
+/* xterm*color14:      #8ec07c */
+/* xterm*color15:      #ebdbb2 */
diff --git a/bashrc b/bashrc
index 5e7615d..37786f9 100644
--- a/bashrc
+++ b/bashrc
@@ -111,7 +111,7 @@ alias pacget="pacman -Slq | fzf --multi --preview 'pacman -Si {1}' | xargs -ro s
 alias pacpreview="pacman -Qq | fzf --preview 'pacman -Qil {}' --layout=reverse --bind 'enter:execute(pacman -Qil {} | less)'"
 alias qn2firefox='pandoc /home/lemon/Documents/Notes/quicknote.md -o /tmp/quicknote.html && firefox /tmp/quicknote.html'
 alias qnarchive='mkdir /tmp/quicknotes && cp ~/code/html/yulqen.org/content/techjournal/quicknote_capture_* /tmp/quicknotes && cp ~/Documents/Notes/quicknote.md /tmp/quicknotes && tar czf quicknotes.tgz -C /tmp/quicknotes .'
-alias quickqr=“qrencode -t ansiutf8 $1”
+alias quickqr='qrencode -t ansiutf8 $1'
 alias rnr=read_and_review
 alias ststatus='curl -X GET -H "X-API-Key:giuDMYqvFhM2G5ziuFFXLEpC5SjdpgzF"  http://localhost:8384/rest/db/status?folder=eahtt-9qkuk|jq'
 alias sync-tunnel='ssh -N -L 9090:127.0.0.1:8384 syncthing@syncthing-ct.banded-neon.ts.net'
diff --git a/i3-laptop-config-x1 b/i3-laptop-config-x1
new file mode 100644
index 0000000..aa795e6
--- /dev/null
+++ b/i3-laptop-config-x1
@@ -0,0 +1,334 @@
+#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 some time, 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!
+
+# start compton compiz
+#exec compton
+
+for_window [class="qjackctl"] floating enable
+
+#for_window [class="^.*"] border pixel 2
+ 
+# dracula theme START
+# class                 border  bground text    indicator child_border
+client.focused          #6272A4 #6272A4 #F8F8F2 #6272A4   #6272A4
+client.focused_inactive #44475A #44475A #F8F8F2 #44475A   #44475A
+client.unfocused        #282A36 #282A36 #BFBFBF #282A36   #282A36
+client.urgent           #44475A #FF5555 #F8F8F2 #FF5555   #FF5555
+client.placeholder      #282A36 #282A36 #F8F8F2 #282A36   #282A36
+
+client.background       #F8F8F2
+ 
+# dracula theme END
+#
+#gaps inner 0
+#gaps outer 0
+#gaps horizontal 0
+#gaps vertical 0
+#gaps top 0
+#gaps right 0
+#gaps bottom 0
+#gaps left 0
+
+#smart_gaps on
+
+set $mod Mod4
+
+# no border
+new_window none
+# border none
+# new_window 1pixel
+#default_border normal
+#smart_borders on
+#smart_borders no_gaps
+
+# Font for window titles. Will also be used by the bar unless a different font
+# is used in the bar {} block below.
+#font pango:monospace 8
+#font pango:mono 10
+font pang:Iosevka Regular 8
+
+# This font is widely installed, provides lots of unicode glyphs, right-to-left
+# text rendering and scalability on retina/hidpi displays (thanks to pango).
+#font pango:DejaVu Sans Mono 8
+
+# Before i3 v4.8, we used to recommend this one as the default:
+# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+# The font above is very space-efficient, that is, it looks good, sharp and
+# clear in small sizes. However, its unicode glyph coverage is limited, the old
+# X core fonts rendering does not support right-to-left and this being a bitmap
+# font, it doesn’t scale on retina/hidpi displays.
+
+# Use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+# get network app and others
+#exec --no-startup-id nm-applet
+#exec --no-startup-id /usr/bin/qjackctl
+#exec --no-startup-id /usr/bin/nextcloud
+#exec --no-startup-id /usr/bin/feh --bg-max /home/lemon/Pictures/Wallpapers/wp2015908-dystopia-wallpapers.jpg
+#exec --no-startup-id /usr/bin/feh --bg-max /home/lemon/Pictures/Wallpapers/IMG_20191030_111003_Bokeh.jpg
+exec --no-startup-id /usr/bin/feh --bg-max /home/lemon/Pictures/Wallpapers/gnu-linux-simple-wallpaper.png
+#exec --no-startup-id /home/lemon/.screenlayout/two_screens_normal.sh
+#exec --no-startup-id /home/lemon/.screenlayout/desktop_layout_debian.sh
+exec --no-startup-id /home/lemon/.screenlayout/left_horiz_right_vert.sh
+#exec --no-startup-id /usr/bin/clipit
+#exec --no-startup-id /usr/bin/redshift
+exec --no-startup-id /usr/bin/xfce4-clipman
+#exec --no-startup-id /usr/bin/emacs --daemon
+#exec --no-startup-id /usr/bin/copyq
+#exec --no-startup-id /usr/bin/xfce4-mixer
+#exec --no-startup-id /usr/bin/xfce4-power-manager-settings  # setting this
+#means laptop lid closure will kill suspend the laptop so switched off for now
+
+# scratchpad
+# Make the currently focused window a scratchpad
+#bindsym $mod+Shift+minus exec /home/lemon/bin/i3scripts/scratch_todo
+# bindsym $mod+Shift+BackSpace move scratchpad
+# bindsym $mod+minus scratchpad show
+
+bindsym $mod+minus exec mdlinkopen
+
+# Show the sup-mail scratchpad window, if any.
+#bindsym mod4+z [title="^Sup ::"] scratchpad show
+
+# start a terminal
+#bindsym $mod+Return exec alacritty
+#bindsym $mod+Return exec xterm -itc -en en_GB.UTF-8
+bindsym $mod+Return exec xterm
+#bindsym $mod+Return exec alacritty
+#bindsym $mod+Return exec i3-sensible-terminal
+#bindsym $mod+Return exec urxvt
+#bindsym $mod+Return exec st
+
+# change gap size
+
+bindsym $mod+z			gaps outer current plus 5
+bindsym $mod+Shift+z    gaps outer current minus 5
+bindsym $mod+i			gaps inner current plus 5
+bindsym $mod+Shift+g         gaps inner current minus 5
+
+# kill focused window
+bindsym $mod+Shift+q kill
+
+# start dmenu (a program launcher)
+bindsym $mod+d exec "dmenu_run -nf '#F8F8F2' -nb '#282A36' -sb '#6272A4' -sf '#F8F8F2' -fn 'IosevkaNerdFont-Regular14' -p 'dmenu%'"
+
+# There also is the (new) i3-dmenu-desktop which only displays applications
+# shipping a .desktop file. It is a wrapper around dmenu, so you need that
+# installed.
+bindsym $mod+t exec --no-startup-id i3-dmenu-desktop
+
+# pass for dmenu
+bindsym $mod+p exec /usr/bin/passmenu
+
+# read 1 character and mark the current window with this character
+bindsym $mod+m exec i3-input -F 'mark %s' -l 1 -P 'Mark: '
+#
+# # read 1 character and go to the window with the character
+bindsym $mod+g exec i3-input -F '[con_mark="%s"] focus' -l 1 -P 'Goto: '
+
+#swap containers
+# you have to use $mod+m to set the target container as f first for this to work
+bindsym $mod+Shift+p swap container with mark f
+
+## change focus
+#bindsym $mod+j focus left
+#bindsym $mod+k focus down
+#bindsym $mod+l focus up
+#bindsym $mod+semicolon focus right
+
+# change focus - vim -style
+bindsym $mod+u split h
+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 horizontal
+
+# split in vertical orientation
+bindsym $mod+v split vertical
+
+# 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
+
+exec --no-startup-id /usr/bin/clipmenud
+exec --no-startup-id xset r rate 200 50
+exec --no-startup-id setxkbmap -option ctrl:nocaps
+exec --no-startup-id setxkbmap -layout us
+exec --no-startup-id dbus-launch --exit-with-session
+
+# 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
+#
+#set $workspace1 "1: Terminals"
+#set $workspace2 "2: Browser"
+
+# switch to workspace
+#bindsym $mod+1 workspace $workspace1
+#bindsym $mod+2 workspace $workspace2
+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
+
+
+# switch to workspace
+#bindsym $mod+1 workspace $workspace1
+#bindsym $mod+2 workspace $workspace2
+bindsym $mod+Control+1 workspace 11
+bindsym $mod+Control+2 workspace 12
+bindsym $mod+Control+3 workspace 3
+bindsym $mod+Control+4 workspace 14
+bindsym $mod+Control+5 workspace 15
+bindsym $mod+Control+6 workspace 16
+bindsym $mod+Control+7 workspace 17
+bindsym $mod+Control+8 workspace 18
+bindsym $mod+Control+9 workspace 19
+bindsym $mod+Control+0 workspace 20
+
+# dealing with multiple monitors
+bindsym $mod+Shift+greater move container to output right
+bindsym $mod+Shift+less move container to output left
+
+bindsym $mod+Shift+bracketright move workspace to output right
+bindsym $mod+Shift+bracketleft move workspace to output left
+
+# move focused container to workspace
+#bindsym $mod+Shift+1 move container to workspace $workspace1
+#bindsym $mod+Shift+2 move container to workspace $workspace2
+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
+#
+# move focused container to workspace > 10
+#bindsym $mod+Shift+1 move container to workspace $workspace1
+#bindsym $mod+Shift+2 move container to workspace $workspace2
+bindsym $mod+Control+Shift+1 move container to workspace 11
+bindsym $mod+Control+Shift+2 move container to workspace 12
+bindsym $mod+Control+Shift+3 move container to workspace 13
+bindsym $mod+Control+Shift+4 move container to workspace 14
+bindsym $mod+Control+Shift+5 move container to workspace 15
+bindsym $mod+Control+Shift+6 move container to workspace 16
+bindsym $mod+Control+Shift+7 move container to workspace 17
+bindsym $mod+Control+Shift+8 move container to workspace 18
+bindsym $mod+Control+Shift+9 move container to workspace 19
+bindsym $mod+Control+Shift+0 move container to workspace 20
+
+# 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
+        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 /home/lemon/bin/conky-i3bar
+#    position top
+#}
+#
+
+bar {
+    tray_output primary
+    status_command i3status
+    position bottom
+    font pango:Iosevka Nerd Font Regular 11
+    mode dock
+
+    colors {
+#    background #282A36
+    background #000000
+    statusline #F8F8F2
+    separator  #44475A
+
+    focused_workspace  #44475A #44475A #F8F8F2
+    active_workspace   #282A36 #44475A #F8F8F2
+    inactive_workspace #282A36 #282A36 #BFBFBF
+    urgent_workspace   #FF5555 #FF5555 #F8F8F2
+    binding_mode       #FF5555 #FF5555 #F8F8F2
+    }
+}
diff --git a/i3status_config_x1 b/i3status_config_x1
new file mode 100644
index 0000000..af41cb1
--- /dev/null
+++ b/i3status_config_x1
@@ -0,0 +1,56 @@
+# 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 = 5
+}
+
+
+# order += "ipv6"
+order += "wireless _first_"
+order += "ethernet"
+#order += "ethernet _first_"
+#order += "battery all"
+# order += "disk /"
+# order += "load"
+order += "memory"
+order += "tztime local"
+
+wireless _first_ {
+        format_up = "W: (%quality at %essid) %ip"
+        format_down = "W: down"
+}
+
+ethernet _first_ {
+        format_up = "E: %ip (%speed)"
+        format_down = "E: down"
+}
+
+battery all {
+        format = "%status %percentage %remaining"
+}
+
+# disk "/" {
+#         format = "%avail"
+# }
+
+# load {
+#         format = "%1min"
+# }
+
+
+memory {
+        format = "%used | %available"
+        threshold_degraded = "1G"
+        format_degraded = "MEMORY < %available"
+}
+
+tztime local {
+        format = "%Y-%m-%d %H:%M:%S"
+}
diff --git a/xinitrc-x1 b/xinitrc-x1
new file mode 100755
index 0000000..7f9df95
--- /dev/null
+++ b/xinitrc-x1
@@ -0,0 +1,10 @@
+gnome-keyring-daemon --replace --daemonize --components=gpg,pkcs11,secrets,ssh
+xmodmap .xmodmap
+xrdb ~/.Xresources
+xinput set-prop "TPPS/2 IBM TrackPoint" "libinput Accel Speed" 0.99 &
+#exec dbus-launch --exit-with-session i3
+
+remove Lock = Caps_Lock
+keysym Caps_Lock = Control_L
+add Control = Control_L
+xset r rate 300 30