dotfiles update

13 files changed, 58 insertions, 140 deletions

diff --git a/.config/X11/dark b/.config/X11/dark
index 5af9449..e2de625 100644
--- a/.config/X11/dark
+++ b/.config/X11/dark
@@ -1,21 +1,21 @@
-*.color0:  #26233a
-*.color1:  #eb6f92
-*.color2:  #31748f
-*.color3:  #f6c177
-*.color4:  #9ccfd8
-*.color5:  #c4a7e7
-*.color6:  #ebbcba
-*.color7:  #e0def4
-*.color8:  #6e6a86
-*.color9:  #eb6f92
-*.color10: #31748f
-*.color11: #f6c177
-*.color12: #9ccfd8
-*.color13: #c4a7e7
-*.color14: #ebbcba
-*.color15: #e0def4
+*.color0:  #45475A
+*.color1:  #F38BA8
+*.color2:  #A6E3A1
+*.color3:  #F9E2AF
+*.color4:  #89B4FA
+*.color5:  #F5C2E7
+*.color6:  #94E2D5
+*.color7:  #BAC2DE
+*.color8:  #585B70
+*.color9:  #F38BA8
+*.color10: #A6E3A1
+*.color11: #F9E2AF
+*.color12: #89B4FA
+*.color13: #F5C2E7
+*.color14: #94E2D5
+*.color15: #A6ADC8
 
-*.foreground: #e0def4
-*.background: #191724
-*.cursor_background: #524f67
-*.cursor_foreground: #e0def4
+*.foreground: #cdd6f4
+*.background: #1e1e2e
+*.cursor_background: #f5e0dc
+*.cursor_foreground: #1e1e2e
diff --git a/.config/fcitx5/conf/classicui.conf b/.config/fcitx5/conf/classicui.conf
index 12677f6..e182f22 100644
--- a/.config/fcitx5/conf/classicui.conf
+++ b/.config/fcitx5/conf/classicui.conf
@@ -22,4 +22,6 @@ ShowLayoutNameInIcon=False
 UseInputMethodLangaugeToDisplayText=True
 # Theme
 Theme=loek
+# Force font DPI on Wayland
+ForceWaylandDPI=0
 
diff --git a/.config/fcitx5/conf/mozc.conf b/.config/fcitx5/conf/mozc.conf
index 16c9eb0..fb1db79 100644
--- a/.config/fcitx5/conf/mozc.conf
+++ b/.config/fcitx5/conf/mozc.conf
@@ -7,5 +7,5 @@ ExpandMode="On Focus"
 # Fix embedded preedit cursor at the beginning of the preedit
 PreeditCursorPositionAtBeginning=False
 # Hotkey to expand usage
-ExpandKey=Control+Alt+H
+ExpandKey=
 
diff --git a/.config/fcitx5/config b/.config/fcitx5/config
index d7ffe9f..c178a55 100644
--- a/.config/fcitx5/config
+++ b/.config/fcitx5/config
@@ -40,13 +40,13 @@ ShareInputState=All
 # Show preedit in application
 PreeditEnabledByDefault=True
 # Show Input Method Information when switch input method
-ShowInputMethodInformation=True
+ShowInputMethodInformation=False
 # Show Input Method Information when changing focus
 showInputMethodInformationWhenFocusIn=False
 # Show compact input method information
 CompactInputMethodInformation=True
 # Show first input method information
-ShowFirstInputMethodInformation=True
+ShowFirstInputMethodInformation=False
 # Default page size
 DefaultPageSize=5
 # Override Xkb Option
diff --git a/.config/fcitx5/profile b/.config/fcitx5/profile
index a3e35fe..da16aba 100644
--- a/.config/fcitx5/profile
+++ b/.config/fcitx5/profile
@@ -22,7 +22,7 @@ Layout=
 # Name
 Name=mozc
 # Layout
-Layout=
+Layout=us
 
 [GroupOrder]
 0=Default
diff --git a/.config/i3/config b/.config/i3/config
deleted file mode 100644
index 425f7be..0000000
--- a/.config/i3/config
+++ /dev/null
@@ -1,99 +0,0 @@
-# variables
-set $mod Mod4
-set $inner_gaps 10
-set $outer_gaps 0
-
-# set gaps
-gaps inner $inner_gaps
-gaps outer $outer_gaps
-
-# border color
-client.focused          #262427 #262427 #fdf9f7 #262427 #262427
-client.focused_inactive #121213 #121213 #fdf9f7 #121213 #121213
-client.unfocused        #121213 #121213 #fdf9f7 #121213 #121213
-client.urgent           #121213 #de9dac #fdf9f7 #de9dac #de9dac
-client.placeholder      #000000 #0c0c0c #fdf9f7 #121213 #121213
-client.background       #f9ece8
-
-# Replace window decorations with a border
-for_window [class=".*"] border pixel 0
-
-# font
-font pango:Inter 9
-
-# no idea what these do but they were in here by default
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
-exec --no-startup-id nm-applet
-set $refresh_i3status killall -SIGUSR1 i3status
-
-floating_modifier $mod
-
-# Gaps
-bindsym $mod+i gaps inner current plus 5
-bindsym $mod+Shift+i gaps inner current minus 5
-bindsym $mod+o gaps outer current plus 5
-bindsym $mod+Shift+o gaps outer current minus 5
-bindsym $mod+n gaps inner current set -1; gaps outer current set 0
-bindsym $mod+d gaps inner current set $inner_gaps; gaps outer current set $outer_gaps;
-
-# Autostart
-exec "sh ~/.config/i3/autostart"
-
-# split in horizontal orientation
-bindsym $mod+bar split h
-bindsym $mod+minus split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen toggle
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+Alt+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+Shift+a focus parent
-
-# workspaces
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $ws5 "5"
-set $ws6 "6"
-set $ws7 "7"
-set $ws8 "8"
-
-# switch to workspace
-bindsym $mod+1 workspace number $ws1
-bindsym $mod+2 workspace number $ws2
-bindsym $mod+3 workspace number $ws3
-bindsym $mod+4 workspace number $ws4
-bindsym $mod+5 workspace number $ws5
-bindsym $mod+6 workspace number $ws6
-bindsym $mod+7 workspace number $ws7
-bindsym $mod+8 workspace number $ws8
-
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace number $ws1
-bindsym $mod+Shift+2 move container to workspace number $ws2
-bindsym $mod+Shift+3 move container to workspace number $ws3
-bindsym $mod+Shift+4 move container to workspace number $ws4
-bindsym $mod+Shift+5 move container to workspace number $ws5
-bindsym $mod+Shift+6 move container to workspace number $ws6
-bindsym $mod+Shift+7 move container to workspace number $ws7
-bindsym $mod+Shift+8 move container to workspace number $ws8
-
-# always floating windows
-for_window [class="Steam"] floating enable
-for_window [class="cinquo"] floating enable
-for_window [class="RAIL"] floating enable
-for_window [class="Conky"] floating enable
-for_window [title="Farge"] floating enable
-for_window [title="^\[floating\].*"] floating enable
-for_window [window_type=notification] floating enable
-
-for_window [class="Unturned.x86_64"] floating disable
-for_window [class="Unturned.x86_64"] fullscreen disable
-
diff --git a/.config/i3/config##template b/.config/i3/config##template
index 7c4c5da..19bad90 100644
--- a/.config/i3/config##template
+++ b/.config/i3/config##template
@@ -97,6 +97,7 @@ for_window [class="Conky"] floating enable
 for_window [title="Farge"] floating enable
 for_window [title="^\[floating\].*"] floating enable
 for_window [window_type=notification] floating enable
+for_window [title="JidePopup"] floating enable
 
 for_window [class="Unturned.x86_64"] floating disable
 for_window [class="Unturned.x86_64"] fullscreen disable
diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json
index 124d711..f0e4517 100644
--- a/.config/nvim/coc-settings.json
+++ b/.config/nvim/coc-settings.json
@@ -26,13 +26,12 @@
 			"args":["-cli", "/bin/arduino-cli", "-clangd", "/bin/clangd", "-cli-config", "/home/loek/.arduino15/arduino-cli.yaml"]
 		},
 		"sql": {
-			"command": "sql-language-server",
-			"args" : ["up", "--method", "stdio"],
+			"command": "sqls",
 			"filetypes": ["sql", "mysql"]
 		},
 		"vhdl": {
 			"command": "vhdl_ls",
-			"filetypes": ["v", "vhd"]
+			"filetypes": ["vhdl"]
 		}
 	}
 }
diff --git a/.config/picom.conf##template b/.config/picom.conf##template
index a737618..4e61d15 100644
--- a/.config/picom.conf##template
+++ b/.config/picom.conf##template
@@ -48,8 +48,10 @@ wintypes: {
 };
 
 animations = true;
-animation-stiffness = 500.0;
-animation-dampening = 20.0;
-animation-window-mass = 0.1;
-animation-for-open-window = "zoom";
+animation-stiffness-tag-change = 350.0;
+animation-stiffness-in-tag = 350.0;
+animation-window-mass = 0.8;
+animation-dampening = 25.0;
+animation-for-open-window = "none";
+animation-clamping = false;
 
diff --git a/.config/polybar/config.ini##template b/.config/polybar/config.ini##template
index a021f3e..daa4ecf 100644
--- a/.config/polybar/config.ini##template
+++ b/.config/polybar/config.ini##template
@@ -50,8 +50,8 @@ modules-center = battery1 battery2 brightness
 modules-right = wireless keyboard volume whoami
 {% else %}
 modules-left = time date
-modules-center = weather mpd
-modules-right = keyboard volume whoami
+modules-center = mpd
+modules-right = wacomtouch keyboard volume whoami
 {% endif %}
 
 separator =
@@ -115,13 +115,6 @@ time = %{T2}%H時%M分%{T-}
 format = <label>
 label = %time%
 
-[module/weather]
-type = custom/script
-exec = ~/.config/polybar-forecast/target/release/polybar-forecast
-interval = 120
-exec-if = ping openweathermap.org -c 1
-label-font = 2
-
 [module/whoami]
 type = custom/script
 exec = echo "%{T2}$(id -u -n)%{T-}@%{T2}$(uname -n)%{T-}"
diff --git a/.config/polybar/config.superesc.ini b/.config/polybar/config.superesc.ini
index 3a1e28d..c4d8bb2 100644
--- a/.config/polybar/config.superesc.ini
+++ b/.config/polybar/config.superesc.ini
@@ -9,4 +9,10 @@ label-song = %{T2}%artist%%{T-}: %title%
 label-song-maxlen = 50
 label-song-ellipsis = true
 
+[module/wacomtouch]
+type = custom/script
+exec = ~/.local/share/bin/wacomtouch
+interval = 1
+# label-font = 1
+
 # vim:ft=dosini
diff --git a/.local/share/bin/wacomtouch b/.local/share/bin/wacomtouch
new file mode 100755
index 0000000..6c1e51a
--- /dev/null
+++ b/.local/share/bin/wacomtouch
@@ -0,0 +1,14 @@
+#!/bin/sh
+# print if wacom tablet has touch on or off
+bye() {
+	echo $1
+	exit
+}
+
+[ ! -e /dev/input/by-id/usb-Wacom_Co._Ltd._Intuos_PTS-if01-event-mouse ] && bye
+
+if evtest --query /dev/input/by-id/usb-Wacom_Co._Ltd._Intuos_PTS-if01-event-mouse EV_SW SW_MUTE_DEVICE; then
+	bye "touch on"
+else
+	bye "touch off"
+fi
diff --git a/.zshrc b/.zshrc
index 94b443b..beaa57d 100644
--- a/.zshrc
+++ b/.zshrc
@@ -33,7 +33,7 @@ alias vim="nvim"
 alias copy="xclip -selection c"
 alias clipout="xclip -selection c -out"
 alias ncp="ncmpcpp"
-alias dnd="dragon-drag-and-drop -x"
+alias dnd="dragon-drag-and-drop -a -x"
 alias scdl="scdl --onlymp3 -l"
 alias screenrecord='giph -f 60 -s -b 4 -c 255,255,255 $(date +"$HOME/%Y-%m-%d_%H-%M-%S.mp4")'
 alias deemix="deemix -b FLAC -p ~/dl"