i think i broke fish config last time, sorry about that lol. updated i3

and fish configuration files.

Signed-off-by: czjstmax <jstmaxlol@disroot.org>

2 files changed, 74 insertions, 48 deletions

diff --git a/cfg/i3/config b/cfg/i3/config
index 93879cf..797dd2d 100644
--- a/cfg/i3/config
+++ b/cfg/i3/config
@@ -7,16 +7,19 @@
 # mod key
 # -------------------------
 set $mod Mod4
+set $mod_alt Mod1
 
 # -------------------------
-# default terminal & launcher
+# defaults
 # -------------------------
 #set $term alacritty
 set $term kitty
 set $shell fish
+set $browser librewolf
+set $filemgr nautilus
 # font stuff
 set $jfont Iosevka
-set $jfont_size 8
+set $jfont_size 9
 
 # RES BEFORE ANYTHING
 exec --no-startup-id x11-32-res
@@ -24,13 +27,15 @@ exec --no-startup-id x11-32-res
 # ------------------------
 # system & controls
 # ------------------------
-bindsym Mod1+Space exec jmdmenu run
 bindsym $mod+BackSpace exec jmdmenu run
+bindsym $mod_alt+Space exec jmdmenu run
+bindsym $mod+Shift+BackSpace exec jmdmenu raw
 bindsym $mod+Return exec $term
+bindsym $mod+Shift+b exec $browser
 #bindsym $mod+v exec jmdmenu clipbd
 bindsym $mod+period exec jmdmenu bmj
 bindsym $mod+Shift+c exec xcolor | jmdmenu
-bindsym $mod+e exec nemo
+bindsym $mod+e exec $filemgr
 # functions binds
 bindsym XF86MonBrightnessUp exec brightnessctl set +5%
 bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
@@ -48,11 +53,6 @@ bindsym XF86AudioMute exec pamixer -t
 # mute mic
 bindsym XF86AudioMicMute exec pamixer --default-source -t
 
-# remap capslock to escape
-exec --no-startup-id setxkbmap -option caps:escape
-# compose key
-exec --no-startup-id setxkbmap -option compose:ralt
-
 # -------------------------
 # window management
 # -------------------------
@@ -84,15 +84,15 @@ bindsym $mod+Shift+Tab exec i3-msg workspace prev_on_output
 # -------------------------
 # workspaces
 # -------------------------
-set $ws1 "1:f"
-set $ws2 "2:u"
-set $ws3 "3:c"
-set $ws4 "4:k"
-set $ws5 "5:my"
-set $ws6 "6:l"
-set $ws7 "7:i"
-set $ws8 "8:f"
-set $ws9 "9:e"
+set $ws1 "1の一"
+set $ws2 "2の二"
+set $ws3 "3の三"
+set $ws4 "4の死"
+set $ws5 "5の五"
+set $ws6 "6の六"
+set $ws7 "7の七"
+set $ws8 "8の八"
+set $ws9 "9の九"
 
 bindsym $mod+1 workspace $ws1
 bindsym $mod+2 workspace $ws2
@@ -133,20 +133,20 @@ client.urgent           #0f0f0f #0f0f0f #f82323 #0f0f0f
 # bar black + white (kurobar.sh)
 # -------------------------
 bar {
-    #status_command i3status
-	status_command ~/.config/i3/kurobar.sh
-    font pango:$jfont $jfont_size
-    position top
-    colors {
-        background #0f0f0f
-        statusline #f82323
-        separator  #f82323
-        
-        focused_workspace  #0f0f0f #f82323 #0f0f0f
-        active_workspace   #0f0f0f #f82323 #0f0f0f
-        inactive_workspace #0f0f0f #0f0f0f #f82323
-        urgent_workspace   #0f0f0f #0f0f0f #f82323
-    }
+#status_command i3status
+    status_command ~/.config/i3/kurobar.sh
+        font pango:$jfont $jfont_size
+        position top
+        colors {
+            background #0f0f0f
+                statusline #f82323
+                separator  #f82323
+
+                focused_workspace  #0f0f0f #f82323 #0f0f0f
+                active_workspace   #0f0f0f #f82323 #0f0f0f
+                inactive_workspace #0f0f0f #0f0f0f #f82323
+                urgent_workspace   #0f0f0f #0f0f0f #f82323
+        }
 }
 
 # -------------------------
@@ -160,11 +160,18 @@ exec --no-startup-id nm-applet
 exec --no-startup-id xsetroot -cursor_name left_ptr
 exec --no-startup-id xsetroot -solid "#1f1f1f" 
 exec --no-startup-id picom
-exec --no-startup-id com.dec05eba.gpu_screen_recorder
+#exec --no-startup-id com.dec05eba.gpu_screen_recorder
 exec --no-startup-id kwalletd6
 exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Tapping Enabled" 1
 exec --no-startup-id xinput set-prop "MOSART Semi. 2.4G Wireless Mouse" "libinput Accel Speed" -1
 exec --no-startup-id blueman-applet
+exec --no-startup-id xfsettingsd
+
+# remap capslock to escape
+exec --no-startup-id setxkbmap -option caps:escape
+# compose key
+exec --no-startup-id setxkbmap -option compose:ralt
+
 
 # -------------------------
 # reload / restart / exit
diff --git a/cfg/i3/jmdmenu b/cfg/i3/jmdmenu
index 2f48614..eab3e4f 100644
--- a/cfg/i3/jmdmenu
+++ b/cfg/i3/jmdmenu
@@ -4,7 +4,7 @@
 # configuration
 # -------------------------
 #DMENU_FN="chirufont-10,Noto Color Emoji-10"
-DMENU_FN="Iosevka-10,Noto Color Emoji-10"
+DMENU_FN="Iosevka-10:Noto Emoji-10"
 DMENU_NB="#0f0f0f"   # normal background
 DMENU_NF="#f82323"   # normal foreground
 DMENU_SB="#f82323"   # selected background
@@ -13,25 +13,44 @@ DMENU_PROMPT="=> "
 DMENU_LINES=10
 
 # -------------------------
-# choose mode: dmenu_run or custom list
+# choose mode
 # -------------------------
 if [ "$1" = "run" ]; then
-	echo -e "LOG :: \$1 = \"run\"\n"
-	echo -e "LOG :: . . .\n"
+	echo -e "log:> \$1==\"run\""
+	echo -e "log:> ...\n"
+
 	dmenu_run -fn "$DMENU_FN" \
-        	  -nb "$DMENU_NB" -nf "$DMENU_NF" \
-                  -sb "$DMENU_SB" -sf "$DMENU_SF" \
-                  -l "$DMENU_LINES" -p "$DMENU_PROMPT"
+	          -nb "$DMENU_NB" -nf "$DMENU_NF" \
+	          -sb "$DMENU_SB" -sf "$DMENU_SF" \
+	          -l "$DMENU_LINES" -p "$DMENU_PROMPT"
+
 elif [ "$1" = "bmj" ]; then
-	echo -e "LOG :: \$1 = \"bmj\"\n"
-	echo -e "LOG :: . . .\n"
-	bemoji
+	echo -e "log:> \$1==\"bmj\""
+	echo -e "log:> ...\n"
+
+	bemoji -tcpn
+
+elif [ "$1" = "raw" ]; then
+	echo -e "log:> \$1==\"raw\""
+	echo -e "log:> ...\n"
+
+	cmd="$(
+		setsid dmenu -fn "$DMENU_FN" \
+		             -nb "$DMENU_NB" -nf "$DMENU_NF" \
+		             -sb "$DMENU_SB" -sf "$DMENU_SF" \
+		             -l "$DMENU_LINES" -p "$DMENU_PROMPT" \
+		             </dev/null
+	)"
+
+	[ -n "$cmd" ] && fish -c "$cmd"
+
 else
-	echo -e "LOG :: Reading from stdin\n"
-	echo -e "LOG :: . . .\n"
+	echo -e "log:> reading from stdin."
+	echo -e "log:> ...\n"
+
 	dmenu -fn "$DMENU_FN" \
-              -nb "$DMENU_NB" -nf "$DMENU_NF" \
-              -sb "$DMENU_SB" -sf "$DMENU_SF" \
-              -l "$DMENU_LINES" -p "$DMENU_PROMPT"
+	      -nb "$DMENU_NB" -nf "$DMENU_NF" \
+	      -sb "$DMENU_SB" -sf "$DMENU_SF" \
+	      -l "$DMENU_LINES" -p "$DMENU_PROMPT"
 fi